diff --git a/.cursor/rules/audit-review.mdc b/.cursor/rules/audit-review.mdc
new file mode 100644
index 000000000000..b57ce4650e31
--- /dev/null
+++ b/.cursor/rules/audit-review.mdc
@@ -0,0 +1,145 @@
+---
+description: Standardize deep feature-audit output and defect reporting
+alwaysApply: true
+---
+
+# Feature Audit Reporting Standard
+
+Use this format when the user asks for a deep audit, fault injection, or review of any feature/change.
+
+## Required Output
+
+- Report **confirmed defects only** first.
+- Classify each finding as **High**, **Medium**, or **Low**.
+- For each finding include:
+  - short title,
+  - concrete impact,
+  - exact file/function reference,
+  - brief proof sketch tied to code path,
+  - at least one **code snippet** that demonstrates the defect condition.
+- Include an **Assumptions & Limits** section for static reasoning:
+  - what was not executed at runtime,
+  - what could not be proven without dynamic testing.
+- Include **audit confidence**:
+  - overall confidence (High/Medium/Low),
+  - what additional evidence would raise confidence.
+
+## Severity Rubric (Required)
+
+- Use consistent severity scoring with these dimensions:
+  - impact on correctness/security/availability,
+  - likelihood under realistic workloads,
+  - blast radius,
+  - exploitability (if security-relevant).
+- Default guidance:
+  - **High**: crash/UB/data corruption/auth bypass/deadlock with realistic trigger.
+  - **Medium**: incorrect behavior or reliability risk requiring narrower preconditions.
+  - **Low**: diagnostics/consistency/maintainability issues without direct correctness break.
+
+## Required Analysis Dimensions
+
+- For very large PRs, require **functional partitioning** before deep analysis:
+  - split review scope into functionality/workstream partitions,
+  - run the full audit loop per partition,
+  - produce per-partition findings and coverage,
+  - deduplicate cross-partition findings by root cause,
+  - end with cross-partition interaction risks and overall summary.
+- Compute and document a **call graph** for changed code before defect analysis:
+  - entrypoints,
+  - dispatch/validation chain,
+  - state/cache/storage interactions,
+  - integration boundaries (network/filesystem/external services),
+  - error/exception propagation paths.
+- Cover full transition flow when relevant:
+  - entrypoint -> processing -> state updates -> outputs/side effects.
+- Include **logical testing of all code paths**:
+  - enumerate reachable branches in changed logic,
+  - define expected outcome per branch (success, handled failure, fail-open/fail-closed, exception),
+  - include malformed input, timeout/integration failure, and concurrency/timing branches.
+- Include **fault category planning before injection**:
+  - define feature-specific logical fault categories from the reviewed code,
+  - list category scope and key transitions affected,
+  - then execute fault injection **category by category** and report findings per category.
+- Require a **full fault-category completion matrix** on every deep audit:
+  - include all generated categories,
+  - process categories one-by-one in explicit order,
+  - mark each category as Executed / Not Applicable / Deferred,
+  - record pass/fail outcome and defects found per category,
+  - provide justification for every Not Applicable or Deferred category.
+- Include **invariant-first analysis**:
+  - define key invariants that must always hold,
+  - map each critical transition to invariant preservation checks.
+- Include **interleaving analysis** for multithreaded paths:
+  - document at least several plausible thread interleavings for shared-state transitions.
+- Include a **transition mapping** from defect to state transition.
+- Include a **logical fault-injection mapping** that shows which injected condition triggers each defect.
+- Include integration impact checks:
+  - config/load-time behavior,
+  - protocol/API behavior,
+  - concurrency/timing behavior,
+  - observability/logging behavior.
+- Include **coverage accounting**:
+  - call-graph nodes covered vs not covered,
+  - transitions reviewed vs not reviewed,
+  - fault categories executed vs skipped (with reason).
+- Include an explicit **coverage stop condition**:
+  - coverage is complete only when each in-scope call-graph node/transition/category is either reviewed or marked skipped with justification.
+- Include **error-contract consistency checks**:
+  - equivalent faults should have equivalent outcomes where intended (reject/exception/error code).
+- Include **performance/resource failure checks**:
+  - high-cardinality input, memory pressure implications, retry storms, lock contention hotspots.
+- Include **rollback/partial-update checks**:
+  - for each mutation sequence, verify state remains consistent if exceptions/cancellation occur mid-path.
+- For C++ codebases, include **major C++ bug-type coverage**:
+  - memory lifetime/use-after-free/use-after-move,
+  - iterator/reference invalidation,
+  - data races and lock-order/deadlock risks,
+  - exception-safety/partial-update hazards,
+  - integer overflow/underflow and signedness errors,
+  - ownership/resource leaks (RAII violations),
+  - undefined behavior from invalid casts/aliasing/lifetime.
+
+## Guardrails
+
+- Do not mix confirmed defects with hypotheticals.
+- Mark uncertain items explicitly as “not confirmed”.
+- Use fail-open/fail-closed language for security-sensitive paths when applicable.
+- Keep summaries concise and actionable.
+- For each confirmed defect, include minimal evidence schema:
+  - trigger condition,
+  - affected transition,
+  - why this is a defect (not just a design preference).
+- For each confirmed defect, also include:
+  - smallest logical reproduction steps,
+  - likely fix direction (one line),
+  - regression test direction (one line),
+  - affected subsystem and blast radius,
+  - code evidence snippet(s) from the referenced file(s).
+- Deduplicate findings by root cause:
+  - one primary defect per root cause, with secondary manifestations listed under it.
+- If no defects are found, explicitly report residual risks and untested paths.
+
+## Canonical Report Order (Required)
+
+1. Scope and partitions (if large PR)
+2. Call graph
+3. Transition matrix
+4. Logical code-path testing summary
+5. Fault categories and category-by-category injection results
+6. Confirmed defects (High/Medium/Low)
+7. Coverage accounting + stop-condition status
+8. Assumptions & Limits
+9. Confidence rating and confidence-raising evidence
+10. Residual risks and untested paths
+
+## Multithreaded DB Priority
+
+For this repository, prioritize concurrency/locking defects early in review because they can cause correctness failures, hangs, and crashes under production load.
+
+- Always check for:
+  - unsynchronized shared-state access and data races,
+  - lock-order inversions and deadlock potential,
+  - iterator/reference invalidation across concurrent mutation,
+  - exception paths that leave shared state partially updated,
+  - shutdown/reload races and stale-pointer/lifetime hazards.
+- Escalate race/deadlock/crash findings with high severity by default unless strong evidence shows limited impact.
diff --git a/.cursor/skills/audit-review/SKILL.md b/.cursor/skills/audit-review/SKILL.md
new file mode 100644
index 000000000000..7903a7c3924e
--- /dev/null
+++ b/.cursor/skills/audit-review/SKILL.md
@@ -0,0 +1,179 @@
+---
+name: audit-review
+description: Perform deep feature audits with transition-matrix and logical fault-injection validation. Use when reviewing complex changes, regressions, state-machine behavior, config interactions, API/protocol flows, and concurrency-sensitive logic.
+---
+
+# Audit Review
+
+## Purpose
+
+Run a repeatable deep audit for any feature and report confirmed defects with severity.
+Default mode is static reasoning unless runtime execution is explicitly performed.
+
+## Workflow
+
+1. If PR scope is large, partition by functionality/workstream first:
+   - define partitions and boundaries,
+   - review each partition independently with the full workflow below,
+   - track per-partition findings and coverage,
+   - deduplicate cross-partition findings by root cause,
+   - finish with cross-partition interaction risks.
+2. Build call graph first:
+   - user/system entrypoints (API, RPC, CLI, worker, scheduler)
+   - dispatch and validation layers
+   - state/storage/cache interactions
+   - downstream integrations (network, filesystem, service calls)
+   - exception and error-propagation paths
+3. Build transition matrix:
+   - request/event entry -> processing stages -> state changes -> outputs/side effects
+   - define key invariants and annotate where each transition must preserve them
+4. Perform logical testing of all code paths:
+   - enumerate all reachable branches in changed logic,
+   - record expected branch outcomes (success, handled failure, fail-open/fail-closed, exception),
+   - include happy path, malformed input, integration timeout/failure, and concurrency/timing branches.
+5. Define logical fault categories from the code under review:
+   - derive categories from actual components, transitions, and dependencies in scope,
+   - document category boundary and affected states/transitions,
+   - prioritize categories by risk and blast radius.
+6. Run logical fault injection category-by-category:
+   - execute one category at a time,
+   - for each category cover success/failure/edge/concurrency paths as applicable,
+   - record pass/fail-open/fail-closed/exception behavior per injected fault.
+   - maintain a category completion matrix with status:
+     - Executed / Not Applicable / Deferred,
+     - outcome,
+     - defects found,
+     - justification for Not Applicable or Deferred.
+7. Confirm each finding with code-path evidence.
+8. Produce coverage accounting:
+   - reviewed vs unreviewed call-graph nodes,
+   - reviewed vs unreviewed transitions,
+   - executed vs skipped fault categories (with reasons).
+   - mark coverage complete only when every in-scope node/transition/category is reviewed or explicitly skipped with justification.
+9. For multithreaded/shared-state paths, perform interleaving analysis:
+   - write several plausible thread interleavings per critical transition,
+   - identify race/deadlock/lifetime hazards per interleaving.
+10. For mutation-heavy paths, perform rollback/partial-update analysis:
+   - reason about exception/cancellation at intermediate points,
+   - verify state invariants still hold.
+
+## C++ Bug-Type Coverage (Required for C++ audits)
+
+- memory lifetime defects (use-after-free/use-after-move/dangling refs)
+- iterator/reference invalidation
+- data races and lock-order/deadlock risks
+- exception-safety and partial-update rollback hazards
+- integer overflow/underflow and signedness conversion bugs
+- ownership/resource leaks (RAII violations)
+- undefined behavior from invalid casts/aliasing/lifetime misuse
+
+## Multithreaded Database Emphasis
+
+For ClickHouse-style multithreaded systems, prioritize these checks before lower-risk issues:
+
+1. Shared mutable state touched by multiple threads without clear synchronization.
+2. Lock hierarchy consistency and potential lock-order inversion/deadlock cycles.
+3. Cross-thread lifetime safety (dangling references/pointers after erase/reload/shutdown).
+4. Concurrent container mutation + iterator/reference use.
+5. Exception/cancellation paths that can leave locks/state inconsistent.
+
+## Output Contract
+
+- Start with confirmed defects only.
+- Group by severity: High, Medium, Low.
+- For each defect include:
+  - title,
+  - impact,
+  - file/function anchor,
+  - fault-injection trigger,
+  - transition mapping,
+  - why it is a defect (not a design preference),
+  - smallest logical repro steps,
+  - likely fix direction (short, concrete: 2-4 bullets or sentences),
+  - regression test direction (short, concrete: 2-4 bullets or sentences),
+  - affected subsystem and blast radius,
+  - at least one code snippet proving the defect.
+- Separate “not confirmed” or “needs runtime proof” from confirmed defects.
+- Include an **Assumptions & Limits** section for static reasoning.
+- Include an overall **confidence rating** and what additional evidence would raise confidence.
+- If no defects are found, include residual risks and untested paths.
+- For large PRs, include per-partition findings/coverage and final cross-partition risk summary.
+- Include a fault-category completion matrix for every deep audit.
+
+### Canonical report order
+
+1. Scope and partitions (if large PR)
+2. Call graph
+3. Transition matrix
+4. Logical code-path testing summary
+5. Fault categories and category-by-category injection results
+6. Confirmed defects (High/Medium/Low)
+7. Coverage accounting + stop-condition status
+8. Assumptions & Limits
+9. Confidence rating and confidence-raising evidence
+10. Residual risks and untested paths
+
+## Standard Audit Report Template (Default: Pointed PR Style)
+
+Default report style should match concise PR review comments:
+- fail-first and action-oriented,
+- only confirmed defects (no pass-by-pass narrative),
+- one short summary line when there are no confirmed defects.
+
+Use the compact template below by default. Use the full 10-section canonical format only when explicitly requested.
+
+```markdown
+Audit update for PR #<id> (<short title/scope>):
+
+Confirmed defects:
+
+- **<Severity>: <short defect title>**
+  - Impact: <concrete user/system impact>
+  - Anchor: `<file>` / `<function or code path>`
+  - Trigger: <smallest condition that triggers defect>
+  - Why defect: <1-2 lines, behavior not preference>
+  - Fix direction (short): <2-4 bullets or sentences>
+  - Regression test direction (short): <2-4 bullets or sentences including positive and edge/failure cases>
+  - Evidence:
+    ```start:end:path
+    // minimal proving snippet
+    ```
+
+<repeat per defect, sorted High -> Medium -> Low>
+
+Coverage summary:
+- Scope reviewed: <partitions or key areas, one line>
+- Categories failed: <count/list>
+- Categories passed: <count only>
+- Assumptions/limits: <one line>
+```
+
+## Severity Rubric
+
+- High: realistic trigger can cause crash/UB/data corruption/auth bypass/deadlock.
+- Medium: correctness/reliability issue with narrower trigger conditions.
+- Low: diagnostics/consistency issues without direct correctness break.
+
+## Checklist
+
+- Verify call graph is explicitly documented before defect analysis.
+- Verify invariants are explicitly listed and checked against transitions.
+- Verify fail-open vs fail-closed behavior where security-sensitive.
+- Verify logical branch coverage for all changed code paths.
+- Verify fault categories are explicitly defined from the reviewed code before injection starts.
+- Verify category-by-category execution and reporting completeness.
+- Verify full fault-category completion matrix is present and complete.
+- Verify concurrency and cache/state transition paths.
+- Verify multithreaded interleavings are explicitly analyzed for critical shared-state paths.
+- Verify rollback/partial-update safety under exception/cancellation points.
+- Verify major C++ bug classes are explicitly covered (or marked not applicable).
+- Verify race/deadlock/crash class defects are prioritized and explicitly reported.
+- Verify error-contract consistency across equivalent fault paths.
+- Verify performance/resource failure classes were considered.
+- Verify findings are deduplicated by root cause.
+- Verify coverage accounting is present (covered vs skipped with reason).
+- Verify stop-condition criteria for coverage completion are explicitly satisfied.
+- Verify every confirmed defect includes code evidence snippets.
+- Verify parser/config/runtime consistency.
+- Verify protocol/API parity across entrypoints.
+- Verify no sensitive-data leakage in logs/errors.
diff --git a/.github/ISSUE_TEMPLATE/10_project-antalya-bug-report.md b/.github/ISSUE_TEMPLATE/10_project-antalya-bug-report.md
new file mode 100644
index 000000000000..0c8c15a05eaf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/10_project-antalya-bug-report.md
@@ -0,0 +1,36 @@
+---
+name: Project Antalya Bug Report
+about: Help us improve Project Antalya
+title: ''
+labels: antalya
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Key information**
+Provide relevant runtime details. 
+ - Project Antalya Build Version
+ - Cloud provider, e.g., AWS
+ - Kubernetes provider, e.g., GKE or Minikube
+ - Object storage, e.g., AWS S3 or Minio
+ - Iceberg catalog, e.g., Glue with REST Proxy
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/10_question.yaml b/.github/ISSUE_TEMPLATE/10_question.yaml
deleted file mode 100644
index 71a3d3da6425..000000000000
--- a/.github/ISSUE_TEMPLATE/10_question.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Question
-description: Ask a question about ClickHouse
-labels: ["question"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > Make sure to check documentation https://clickhouse.com/docs/ first. If the question is concise and probably has a short answer, asking it in [community Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-1gh9ds7f4-PgDhJAaF8ad5RbWBAAjzFg) is probably the fastest way to find the answer. For more complicated questions, consider asking them on StackOverflow with "clickhouse" tag https://stackoverflow.com/questions/tagged/clickhouse
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Question
-      description: Please put your question here.
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/20_feature-request.yaml b/.github/ISSUE_TEMPLATE/20_feature-request.yaml
deleted file mode 100644
index 054efc2d61ee..000000000000
--- a/.github/ISSUE_TEMPLATE/20_feature-request.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Feature request
-description: Suggest an idea for ClickHouse
-labels: ["feature"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Use case
-      description: A clear and concise description of what the intended usage scenario is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/20_project-antalya-feature-request.md b/.github/ISSUE_TEMPLATE/20_project-antalya-feature-request.md
new file mode 100644
index 000000000000..603584bf4428
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/20_project-antalya-feature-request.md
@@ -0,0 +1,20 @@
+---
+name: Project Antalya Feature request
+about: Suggest an idea for Project Antalya
+title: ''
+labels: antalya, enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/30_project-antalya-question.md b/.github/ISSUE_TEMPLATE/30_project-antalya-question.md
new file mode 100644
index 000000000000..c77cee4a916b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/30_project-antalya-question.md
@@ -0,0 +1,16 @@
+---
+name: Project Antalya Question
+about: Ask a question about Project Antalya
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Make sure to check the [Altinity documentation](https://docs.altinity.com/) and the [Altinity Knowledge Base](https://kb.altinity.com/) first. 
+
+If your question is concise and probably has a short answer, asking it in the [the Altinity Slack workspace](https://altinity.com/slack) is probably the fastest way to find the answer. Use the #antalya channel. 
+
+If you'd rather file a GitHub issue, remove all this text and ask your question here. 
+
+Please include relevant environment information as applicable.
diff --git a/.github/ISSUE_TEMPLATE/30_unexpected-behaviour.yaml b/.github/ISSUE_TEMPLATE/30_unexpected-behaviour.yaml
deleted file mode 100644
index 7a34c4bb7ba8..000000000000
--- a/.github/ISSUE_TEMPLATE/30_unexpected-behaviour.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Unexpected behaviour
-description: Some feature is working in non-obvious way
-labels: ["unexpected behaviour"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the unexpected behaviour
-      description: A clear and concise description of what doesn't work as it is supposed to.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Which ClickHouse versions are affected?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * Which ClickHouse server version to use
-        * Which interface to use, if matters
-        * Non-default settings, if any
-        * `CREATE TABLE` statements for all tables involved
-        * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
-        * Queries to run that lead to unexpected result
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/35_incomplete_implementation.yaml b/.github/ISSUE_TEMPLATE/35_incomplete_implementation.yaml
deleted file mode 100644
index 969c1893e6f5..000000000000
--- a/.github/ISSUE_TEMPLATE/35_incomplete_implementation.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Incomplete implementation
-description: Implementation of existing feature is not finished
-labels: ["unfinished code"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the unexpected behaviour
-      description: A clear and concise description of what works not as it is supposed to.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * Which ClickHouse server version to use
-        * Which interface to use, if matters
-        * Non-default settings, if any
-        * `CREATE TABLE` statements for all tables involved
-        * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
-        * Queries to run that lead to unexpected result
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/40_altinity-stable-bug-report.md b/.github/ISSUE_TEMPLATE/40_altinity-stable-bug-report.md
new file mode 100644
index 000000000000..90bf241dc195
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/40_altinity-stable-bug-report.md
@@ -0,0 +1,50 @@
+---
+name: Altinity Stable Bug report
+about: Report something broken in an Altinity Stable Build
+title: ''
+labels: stable
+assignees: ''
+
+---
+
+✅  *I checked [the Altinity Stable Builds lifecycle table](https://docs.altinity.com/altinitystablebuilds/#altinity-stable-builds-life-cycle-table), and the Altinity Stable Build version I'm using is still supported.*
+
+## Type of problem
+Choose one of the following items, then delete the others: 
+
+**Bug report** - something's broken
+
+**Incomplete implementation** - something's not quite right
+
+**Performance issue** - something works, just not as quickly as it should
+
+**Backwards compatibility issue** - something used to work, but now it doesn't
+
+**Unexpected behavior** - something surprising happened, but it wasn't the good kind of surprise
+
+**Installation issue** - something doesn't install the way it should
+
+**Usability issue** - something works, but it could be a lot easier
+
+**Documentation issue** - something in the docs is wrong, incomplete, or confusing
+
+## Describe the situation
+A clear, concise description of what's happening. Can you reproduce it in a ClickHouse Official build of the same version?
+
+## How to reproduce the behavior
+
+* Which Altinity Stable Build version to use 
+* Which interface to use, if it matters
+* Non-default settings, if any
+* `CREATE TABLE` statements for all tables involved
+* Sample data for all these tables, use the [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/31fd4f5eb41d5ec26724fc645c11fe4d62eae07f/programs/obfuscator/README.md) if necessary
+* Queries to run that lead to an unexpected result
+
+## Expected behavior
+A clear, concise description of what you expected to happen.
+
+## Logs, error messages, stacktraces, screenshots...
+Add any details that might explain the issue.
+
+## Additional context
+Add any other context about the issue here.
diff --git a/.github/ISSUE_TEMPLATE/45_usability-issue.yaml b/.github/ISSUE_TEMPLATE/45_usability-issue.yaml
deleted file mode 100644
index 0d2ae1a580e5..000000000000
--- a/.github/ISSUE_TEMPLATE/45_usability-issue.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Usability improvement request
-description: Report something can be made more convenient to use
-labels: ["usability"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the improvement
-      description: A clear and concise description of what you want to happen
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Which ClickHouse versions are affected?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * Which interface to use, if matters
-        * Non-default settings, if any
-        * `CREATE TABLE` statements for all tables involved
-        * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
-        * Queries to run that lead to unexpected result
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/50_altinity-stable-question.md b/.github/ISSUE_TEMPLATE/50_altinity-stable-question.md
new file mode 100644
index 000000000000..027970e25a02
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/50_altinity-stable-question.md
@@ -0,0 +1,16 @@
+---
+name: Altinity Stable Question
+about: Ask a question about an Altinity Stable Build
+title: ''
+labels: question, stable
+assignees: ''
+
+---
+
+Make sure to check the [Altinity documentation](https://docs.altinity.com/) and the [Altinity Knowledge Base](https://kb.altinity.com/) first. 
+
+If your question is concise and probably has a short answer, asking it in the [the Altinity Slack channel](https://altinity.com/slack) is probably the fastest way to find the answer. 
+
+For more complicated questions, consider [asking them on StackOverflow with the tag "clickhouse"](https://stackoverflow.com/questions/tagged/clickhouse). 
+
+If you'd rather file a GitHub issue, remove all this text and ask your question here.
diff --git a/.github/ISSUE_TEMPLATE/50_build-issue.yaml b/.github/ISSUE_TEMPLATE/50_build-issue.yaml
deleted file mode 100644
index 0549944c0bb2..000000000000
--- a/.github/ISSUE_TEMPLATE/50_build-issue.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Build issue
-description: Report failed ClickHouse build from master
-labels: ["build"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > Make sure that `git diff` result is empty and you've just pulled fresh master. Try cleaning up cmake cache. Just in case, official build instructions are published here: https://clickhouse.com/docs/en/development/build/
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the problem
-      description: A clear and concise description of what doesn't work as it is supposed to.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Operating system
-      description: OS kind or distribution, specific version/release, non-standard kernel if any. If you are trying to build inside virtual machine, please mention it too.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: CMake version
-      description: The output of `cmake --version`.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Ninja version
-      description: The output of `ninja --version`.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Compiler name and version
-      description: We recommend to use clang. The version can be obtained via `clang --version`.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Full cmake and/or ninja output with the error
-      description: Please include everything (use https://pastila.nl/ for large output)!
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/60_documentation-issue.yaml b/.github/ISSUE_TEMPLATE/60_documentation-issue.yaml
deleted file mode 100644
index bba6df87a783..000000000000
--- a/.github/ISSUE_TEMPLATE/60_documentation-issue.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Documentation issue
-description: Report something incorrect or missing in documentation
-labels: ["comp-documentation"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > Make sure that `git diff` result is empty and you've just pulled fresh master. Try cleaning up cmake cache. Just in case, official build instructions are published here: https://clickhouse.com/docs/en/development/build/
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the issue
-      description: A clear and concise description of what's wrong in documentation.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/70_performance-issue.yaml b/.github/ISSUE_TEMPLATE/70_performance-issue.yaml
deleted file mode 100644
index 1df99dc76fda..000000000000
--- a/.github/ISSUE_TEMPLATE/70_performance-issue.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Performance issue
-description: Report something working slower than expected
-labels: ["performance"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the situation
-      description: What exactly works slower than expected?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Which ClickHouse versions are affected?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * Which interface to use, if matters
-        * Non-default settings, if any
-        * `CREATE TABLE` statements for all tables involved
-        * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
-        * Queries to run that lead to unexpected result
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected performance
-      description: What are your performance expectation, why do you think they are realistic? Has it been working faster in older ClickHouse releases? Is it working faster in some specific other system?
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/80_backward-compatibility.yaml b/.github/ISSUE_TEMPLATE/80_backward-compatibility.yaml
deleted file mode 100644
index 72f56d781979..000000000000
--- a/.github/ISSUE_TEMPLATE/80_backward-compatibility.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Backward compatibility issue
-description: Report the case when the behaviour of a new version can break existing use cases
-labels: ["backward compatibility"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe the unexpected behaviour
-      description: A clear and concise description of what works not as it is supposed to.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Which ClickHouse versions are affected?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * Which interface to use, if matters
-        * Non-default settings, if any
-        * `CREATE TABLE` statements for all tables involved
-        * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
-        * Queries to run that lead to unexpected result
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/85_bug-report.yaml b/.github/ISSUE_TEMPLATE/85_bug-report.yaml
deleted file mode 100644
index 349bf82a3a4e..000000000000
--- a/.github/ISSUE_TEMPLATE/85_bug-report.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Bug report
-description: Wrong behavior (visible to users) in the official ClickHouse release.
-labels: ["potential bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > Please make sure that the version you're using is still supported (you can find the list [here](https://github.com/ClickHouse/ClickHouse/blob/master/SECURITY.md#scope-and-supported-versions)).
-        > You have to provide the following information whenever possible.
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe what's wrong
-      description: |
-        * A clear and concise description of what works not as it is supposed to.
-        * A link to reproducer in [https://fiddle.clickhouse.com/](https://fiddle.clickhouse.com/).
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Does it reproduce on the most recent release?
-      description: |
-        [The list of releases](https://github.com/ClickHouse/ClickHouse/blob/master/utils/list-versions/version_date.tsv)
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        -----
-        > Change "enabled" to true in "send_crash_reports" section in `config.xml`:
-        ```xml
-        <send_crash_reports>
-            <!-- Changing <enabled> to true allows sending crash reports to -->
-            <!-- the ClickHouse core developers team. -->
-            <enabled>true</enabled>
-        </send_crash_reports>
-        ```
-        -----
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * Which ClickHouse server version to use
-        * Which interface to use, if matters
-        * Non-default settings, if any
-        * `CREATE TABLE` statements for all tables involved
-        * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
-        * Queries to run that lead to unexpected result
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/90_fuzzing-report.yaml b/.github/ISSUE_TEMPLATE/90_fuzzing-report.yaml
deleted file mode 100644
index 84dc8a372e5a..000000000000
--- a/.github/ISSUE_TEMPLATE/90_fuzzing-report.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Assertion found via fuzzing
-description: Potential issue has been found via Fuzzer or Stress tests
-labels: ["fuzz"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A link to the report.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: Try to reproduce the report and copy the tables and queries involved.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: You can find additional information in server logs.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/95_sanitizer-report.yaml b/.github/ISSUE_TEMPLATE/95_sanitizer-report.yaml
deleted file mode 100644
index 7bb47e2b824b..000000000000
--- a/.github/ISSUE_TEMPLATE/95_sanitizer-report.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Sanitizer alert
-description: Potential issue has been found by special code instrumentation
-labels: ["testing"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > (you don't have to strictly follow this form)
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A link to the report.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: Try to reproduce the report and copy the tables and queries involved.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: You can find additional information in server logs.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/96_installation-issues.yaml b/.github/ISSUE_TEMPLATE/96_installation-issues.yaml
deleted file mode 100644
index f71f6079453e..000000000000
--- a/.github/ISSUE_TEMPLATE/96_installation-issues.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Installation issue
-description: Issue with ClickHouse installation from https://clickhouse.com/docs/en/install/
-labels: ["comp-install"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > **I have tried the following solutions**: https://clickhouse.com/docs/en/faq/troubleshooting/#troubleshooting-installation-errors
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Installation type
-      description: Packages, docker, single binary, curl?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Source of the ClickHouse
-      description: A link to the source. Or the command you've tried.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the problem.
-      description: What went wrong and what is the expected result?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Error message and/or stacktrace
-      description: You can find additional information in server logs.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        * For Linux-based operating systems: provide a script for clear docker container from the official image
-        * For anything else: steps to reproduce on as much as possible clear system
-    validations:
-      required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7172463a5781..da3da1eb012d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,24 +18,38 @@ tests/ci/cancel_and_rerun_workflow_lambda/app.py
 - Not for changelog (changelog entry is not required)
 
 
-### Changelog entry (a [user-readable short description](https://github.com/ClickHouse/ClickHouse/blob/master/docs/changelog_entry_guidelines.md) of the changes that goes into CHANGELOG.md):
+### Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
 ...
 
 ### Documentation entry for user-facing changes
+...
 
-- [ ] Documentation is written (mandatory for new features)
-
-<!---
-Directly edit documentation source files in the "docs" folder with the same pull-request as code changes
-
-or
-
-Add a user-readable short description of the changes that should be added to docs.clickhouse.com below.
-
-At a minimum, the following information should be added (but add more as needed).
-- Motivation: Why is this function, table engine, etc. useful to ClickHouse users?
-
-- Parameters: If the feature being added takes arguments, options or is influenced by settings, please list them below with a brief explanation.
-
-- Example use: A query or command.
--->
+### CI/CD Options
+#### Exclude tests:
+- [ ] <!---ci_exclude_fast--> Fast test
+- [ ] <!---ci_exclude_integration--> Integration Tests
+- [ ] <!---ci_exclude_stateless--> Stateless tests
+- [ ] <!---ci_exclude_stateful--> Stateful tests
+- [ ] <!---ci_exclude_performance--> Performance tests
+- [ ] <!---ci_exclude_asan--> All with ASAN
+- [x] <!---ci_exclude_tsan--> All with TSAN
+- [x] <!---ci_exclude_msan--> All with MSAN
+- [x] <!---ci_exclude_ubsan--> All with UBSAN
+- [x] <!---ci_exclude_coverage--> All with Coverage
+- [ ] <!---ci_exclude_aarch64|arm--> All with Aarch64
+- [x] <!---ci_exclude_regression--> All Regression
+- [ ] <!---no_ci_cache--> Disable CI Cache
+
+#### Regression jobs to run:
+- [ ] <!---ci_regression_common--> Fast suites (mostly <1h)
+- [ ] <!---ci_regression_aggregate_functions--> Aggregate Functions (2h)
+- [ ] <!---ci_regression_alter--> Alter (1.5h)
+- [ ] <!---ci_regression_benchmark--> Benchmark (30m)
+- [ ] <!---ci_regression_clickhouse_keeper--> ClickHouse Keeper (1h)
+- [ ] <!---ci_regression_iceberg--> Iceberg (2h)
+- [ ] <!---ci_regression_ldap--> LDAP (1h)
+- [ ] <!---ci_regression_parquet--> Parquet (1.5h)
+- [ ] <!---ci_regression_rbac--> RBAC (1.5h)
+- [ ] <!---ci_regression_ssl_server--> SSL Server (1h)
+- [ ] <!---ci_regression_s3--> S3 (2h)
+- [ ] <!---ci_regression_tiered_storage--> Tiered Storage (2h)
diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index cf5f575e3c74..904a548dadd5 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -1,9 +1,9 @@
 self-hosted-runner:
   labels:
-    - builder
-    - func-tester
-    - func-tester-aarch64
+    - altinity-builder
+    - altinity-func-tester
+    - altinity-func-tester-aarch64
     - fuzzer-unit-tester
-    - style-checker
-    - style-checker-aarch64
+    - altinity-style-checker
+    - altinity-style-checker-aarch64
     - release-maker
diff --git a/.github/actions/create_workflow_report/action.yml b/.github/actions/create_workflow_report/action.yml
new file mode 100644
index 000000000000..8c975ec345c5
--- /dev/null
+++ b/.github/actions/create_workflow_report/action.yml
@@ -0,0 +1,52 @@
+name: Create and Upload Combined Report
+description: Create and upload a combined CI report
+inputs:
+  workflow_config:
+    description: "Workflow config"
+    required: true
+  final:
+    description: "Control whether the report is final or a preview"
+    required: false
+    default: "false"
+runs:
+  using: "composite"
+  steps:
+    - name: Create workflow config
+      shell: bash
+      run: |
+        mkdir -p ./ci/tmp
+        cat > ./ci/tmp/workflow_config.json << 'EOF'
+        ${{ inputs.workflow_config }}
+        EOF
+
+    - name: Create and upload workflow report
+      env:
+        PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+        ACTIONS_RUN_URL: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
+        COMMIT_SHA: ${{ steps.set_version.outputs.commit_sha || github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        FINAL: ${{ inputs.final }}
+      shell: bash
+      run: |
+        pip install clickhouse-driver==0.2.8 numpy==1.26.4 pandas==2.0.3 jinja2==3.1.5
+
+        CMD="python3 .github/actions/create_workflow_report/create_workflow_report.py"
+        ARGS="--actions-run-url $ACTIONS_RUN_URL --known-fails tests/broken_tests.yaml --cves --pr-number $PR_NUMBER"
+
+        set +e -x
+        if [[ "$FINAL" == "false" ]]; then
+          REPORT_LINK=$($CMD $ARGS --mark-preview)
+        else
+          REPORT_LINK=$($CMD $ARGS)
+        fi
+
+        echo $REPORT_LINK
+
+        if [[ "$FINAL" == "true" ]]; then
+          IS_VALID_URL=$(echo $REPORT_LINK | grep -E '^https?://')
+          if [[ -n $IS_VALID_URL ]]; then
+            echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "Error: $REPORT_LINK" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+        fi
diff --git a/.github/actions/create_workflow_report/ci_run_report.html.jinja b/.github/actions/create_workflow_report/ci_run_report.html.jinja
new file mode 100644
index 000000000000..ac9a7a70bb01
--- /dev/null
+++ b/.github/actions/create_workflow_report/ci_run_report.html.jinja
@@ -0,0 +1,272 @@
+<!DOCTYPE html>
+<html lang="en" data-lt-installed="true">
+
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  {%- if is_preview %}
+  <meta http-equiv="Cache-Control" content="max-age=300">
+  {%- endif %}
+  <style>
+    /* Base colors for Altinity */
+    :root {
+      --altinity-background: #000D45;
+      --altinity-accent: #189DCF;
+      --altinity-highlight: #FFC600;
+      --altinity-gray: #6c757d;
+      --altinity-light-gray: #f8f9fa;
+      --altinity-white: #ffffff;
+    }
+
+    /* Body and heading fonts */
+    body {
+      font-family: Arimo, "Proxima Nova", "Helvetica Neue", Helvetica, Arial, sans-serif;
+      font-size: 1rem;
+      background-color: var(--altinity-background);
+      color: var(--altinity-light-gray);
+      padding: 2rem;
+    }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+      font-family: Figtree, "Proxima Nova", "Helvetica Neue", Helvetica, Arial, sans-serif;
+      color: var(--altinity-white);
+    }
+
+    .logo {
+      width: auto;
+      height: 5em;
+    }
+
+    /* General table styling */
+    table {
+      min-width: min(900px, 98vw);
+      margin: 1rem 0;
+      border-collapse: collapse;
+      background-color: var(--altinity-white);
+      border: 1px solid var(--altinity-accent);
+      box-shadow: 0 0 8px rgba(0, 0, 0, 0.05);
+      color: var(--altinity-background);
+    }
+
+    /* Table header styling */
+    th {
+      background-color: var(--altinity-accent);
+      color: var(--altinity-white);
+      padding: 10px 16px;
+      text-align: left;
+      border: none;
+      border-bottom: 2px solid var(--altinity-background);
+      white-space: nowrap;
+    }
+
+    th.hth {
+      border-bottom: 1px solid var(--altinity-accent);
+      border-right: 2px solid var(--altinity-background);
+    }
+
+    /* Table header sorting styling */
+    th {
+      cursor: pointer;
+    }
+
+    th.no-sort {
+      pointer-events: none;
+    }
+
+    th::after,
+    th::before {
+      transition: color 0.2s ease-in-out;
+      font-size: 1.2em;
+      color: transparent;
+    }
+
+    th::after {
+      margin-left: 3px;
+      content: '\025B8';
+    }
+
+    th:hover::after {
+      color: inherit;
+    }
+
+    th.dir-d::after {
+      color: inherit;
+      content: '\025BE';
+    }
+
+    th.dir-u::after {
+      color: inherit;
+      content: '\025B4';
+    }
+
+    /* Table body row styling */
+    tr:hover {
+      background-color: var(--altinity-light-gray);
+    }
+
+    /* Table cell styling */
+    td {
+      padding: 8px 8px;
+      border: 1px solid var(--altinity-accent);
+    }
+
+    /* Link styling */
+    a {
+      color: var(--altinity-accent);
+      text-decoration: none;
+    }
+
+    a:hover {
+      color: var(--altinity-highlight);
+      text-decoration: underline;
+    }
+  </style>
+  <title>{{ title }}</title>
+  <link rel="icon" type="image/svg+xml"
+    href='data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgaWQ9ImEiCiAgIHZpZXdCb3g9IjAgMCA5MS42NjAwMDYgMTA1Ljk5IgogICB2ZXJzaW9uPSIxLjEiCiAgIHNvZGlwb2RpOmRvY25hbWU9ImxvZ29faWNvbi5zdmciCiAgIHdpZHRoPSI5MS42NjAwMDQiCiAgIGhlaWdodD0iMTA1Ljk5IgogICBpbmtzY2FwZTp2ZXJzaW9uPSIxLjEuMiAoMGEwMGNmNTMzOSwgMjAyMi0wMi0wNCkiCiAgIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIgogICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPHNvZGlwb2RpOm5hbWVkdmlldwogICAgIGlkPSJuYW1lZHZpZXc0NyIKICAgICBwYWdlY29sb3I9IiNmZmZmZmYiCiAgICAgYm9yZGVyY29sb3I9IiM2NjY2NjYiCiAgICAgYm9yZGVyb3BhY2l0eT0iMS4wIgogICAgIGlua3NjYXBlOnBhZ2VzaGFkb3c9IjIiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAuMCIKICAgICBpbmtzY2FwZTpwYWdlY2hlY2tlcmJvYXJkPSIwIgogICAgIHNob3dncmlkPSJmYWxzZSIKICAgICBpbmtzY2FwZTp6b29tPSI1Ljc5Nzg1NTIiCiAgICAgaW5rc2NhcGU6Y3g9IjkxLjA2ODE1OSIKICAgICBpbmtzY2FwZTpjeT0iNTQuOTM0MTA3IgogICAgIGlua3NjYXBlOndpbmRvdy13aWR0aD0iMTg1MCIKICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSIxMDE2IgogICAgIGlua3NjYXBlOndpbmRvdy14PSIxNzc0IgogICAgIGlua3NjYXBlOndpbmRvdy15PSIyNyIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIxIgogICAgIGlua3NjYXBlOmN1cnJlbnQtbGF5ZXI9ImEiIC8+CiAgPGRlZnMKICAgICBpZD0iZGVmczQiPgogICAgPHN0eWxlCiAgICAgICBpZD0ic3R5bGUyIj4uYntmaWxsOiNmZmY7fS5je2ZpbGw6IzE5OWRjZjt9PC9zdHlsZT4KICA8L2RlZnM+CiAgPGcKICAgICBpZD0iZzIyIj4KICAgIDxwb2x5Z29uCiAgICAgICBjbGFzcz0iYyIKICAgICAgIHBvaW50cz0iNDUuODgsMCA0NS44OCwwLjA0IDIyLjk0LDEzLjMgMjIuOTMsMTMuMyAyMi45MywxMy4zIDAuMDksMjYuNDkgMC4wOSwyNi40OSAwLjA5LDI2LjQ5IDAsMjYuNTQgMC4wOSwyNi41OSAwLjA5LDUwLjk2IDY2Ljg2LDEyLjEyICIKICAgICAgIGlkPSJwb2x5Z29uNiIgLz4KICAgIDxwb2x5Z29uCiAgICAgICBjbGFzcz0iYyIKICAgICAgIHBvaW50cz0iMjIuOTQsNDIuMjkgNC4yMSw1My4xOSAyMi45NCw2NC4wOCAiCiAgICAgICBpZD0icG9seWdvbjgiIC8+CiAgICA8cG9seWdvbgogICAgICAgY2xhc3M9ImMiCiAgICAgICBwb2ludHM9IjAuMDksNTUuNTkgMC4wOSw3OS40MyAwLDc5LjQ4IDAuMDksNzkuNTQgMC4wOSwxMDUuOTkgMjIuOCw5Mi44OCAyMi44LDkyLjg4IDQzLjc1LDgwLjc5IDAuMjMsNTUuNTEgIgogICAgICAgaWQ9InBvbHlnb24xMCIgLz4KICAgIDxwb2x5Z29uCiAgICAgICBjbGFzcz0iYyIKICAgICAgIHBvaW50cz0iODkuNjEsMjUuMTcgNzAuOTIsMTQuMzggNDguMDMsMjcuNyA2NC4xOCwzNy4wMiA2NC4yMiwzNi45NiA2Ni43OSwzOC40NSAiCiAgICAgICBpZD0icG9seWdvbjEyIiAvPgogICAgPGcKICAgICAgIGlkPSJnMTgiPgogICAgICA8cG9seWdvbgogICAgICAgICBjbGFzcz0iYyIKICAgICAgICAgcG9pbnRzPSI5MS42Niw1Mi44MiA5MS42Myw1Mi44MyA3Ni4zMyw0NCA5MS42Niw1Mi45MiAiCiAgICAgICAgIGlkPSJwb2x5Z29uMTQiIC8+CiAgICAgIDxwb2x5Z29uCiAgICAgICAgIGNsYXNzPSJjIgogICAgICAgICBwb2ludHM9IjkxLjY2LDEwNS43NiA5MS42Niw1Ny41NSA2OC43MSw0NC4yIDY4LjcxLDkyLjUxICIKICAgICAgICAgaWQ9InBvbHlnb24xNiIgLz4KICAgIDwvZz4KICAgIDxwb2x5Z29uCiAgICAgICBjbGFzcz0iYyIKICAgICAgIHBvaW50cz0iOTEuNjYsNTIuODUgOTEuNjYsMjguNjEgNzAuNzcsNDAuNzYgNzYuMjgsNDMuOTcgIgogICAgICAgaWQ9InBvbHlnb24yMCIgLz4KICA8L2c+Cjwvc3ZnPgo=' 
+    />
+</head>
+
+<body>
+  <p><img class="logo"
+      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIGlkPSJhIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NjEuNTUgMTA1Ljk5Ij48ZGVmcz48c3R5bGU+LmJ7ZmlsbDojZmZmO30uY3tmaWxsOiMxOTlkY2Y7fTwvc3R5bGU+PC9kZWZzPjxnPjxwb2x5Z29uIGNsYXNzPSJjIiBwb2ludHM9Ii4wOSA1MC45NiA2Ni44NiAxMi4xMiA0NS44OCAwIDQ1Ljg4IC4wNCAyMi45NCAxMy4zIDIyLjkzIDEzLjMgMjIuOTMgMTMuMyAuMDkgMjYuNDkgLjA5IDI2LjQ5IC4wOSAyNi40OSAwIDI2LjU0IC4wOSAyNi41OSAuMDkgNTAuOTYiLz48cG9seWdvbiBjbGFzcz0iYyIgcG9pbnRzPSI0LjIxIDUzLjE5IDIyLjk0IDY0LjA4IDIyLjk0IDQyLjI5IDQuMjEgNTMuMTkiLz48cG9seWdvbiBjbGFzcz0iYyIgcG9pbnRzPSI0My43NSA4MC43OSAuMjMgNTUuNTEgLjA5IDU1LjU5IC4wOSA3OS40MyAwIDc5LjQ4IC4wOSA3OS41NCAuMDkgMTA1Ljk5IDIyLjggOTIuODggMjIuOCA5Mi44OCA0My43NSA4MC43OSIvPjxwb2x5Z29uIGNsYXNzPSJjIiBwb2ludHM9IjY0LjIyIDM2Ljk2IDY2Ljc5IDM4LjQ1IDg5LjYxIDI1LjE3IDcwLjkyIDE0LjM4IDQ4LjAzIDI3LjcgNjQuMTggMzcuMDIgNjQuMjIgMzYuOTYiLz48Zz48cG9seWdvbiBjbGFzcz0iYyIgcG9pbnRzPSI3Ni4zMyA0NCA5MS42NiA1Mi45MiA5MS42NiA1Mi44MiA5MS42MyA1Mi44MyA3Ni4zMyA0NCIvPjxwb2x5Z29uIGNsYXNzPSJjIiBwb2ludHM9IjY4LjcxIDQ0LjIgNjguNzEgOTIuNTEgOTEuNjYgMTA1Ljc2IDkxLjY2IDU3LjU1IDY4LjcxIDQ0LjIiLz48L2c+PHBvbHlnb24gY2xhc3M9ImMiIHBvaW50cz0iNzAuNzcgNDAuNzYgNzYuMjggNDMuOTcgOTEuNjYgNTIuODUgOTEuNjYgMjguNjEgNzAuNzcgNDAuNzYiLz48L2c+PHBhdGggY2xhc3M9ImIiIGQ9Ik0xNDkuOTIsMjkuNjZoMTIuMzhsMTkuNzIsNDYuNjdoLTEzLjc3bC0zLjM4LTguMjdoLTE3Ljg3bC0zLjMxLDguMjdoLTEzLjVsMTkuNzItNDYuNjdabTExLjI1LDI4LjRsLTUuMTYtMTMuMTctNS4yMywxMy4xN2gxMC4zOVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTE4Ni41MywyOS45OWgxMi44NHYzNS4wOGgyMi40NHYxMS4yNWgtMzUuMjhWMjkuOTlaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yMzAsNDEuMjVoLTEzLjl2LTExLjI1aDQwLjY0djExLjI1aC0xMy45djM1LjA4aC0xMi44NFY0MS4yNVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTI2Mi42MywyOS45OWgxMi45MXY0Ni4zM2gtMTIuOTFWMjkuOTlaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yODQuMDEsMjkuOTloMTEuOThsMTkuMDYsMjQuNDlWMjkuOTloMTIuNzF2NDYuMzNoLTExLjI1bC0xOS43OS0yNS40MnYyNS40MmgtMTIuNzFWMjkuOTlaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0zMzYuMjQsMjkuOTloMTIuOTF2NDYuMzNoLTEyLjkxVjI5Ljk5WiIvPjxwYXRoIGNsYXNzPSJiIiBkPSJNMzY4Ljk0LDQxLjI1aC0xMy45di0xMS4yNWg0MC42NHYxMS4yNWgtMTMuOXYzNS4wOGgtMTIuODRWNDEuMjVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik00MTYuNjgsNTguOThsLTE3LjYxLTI4Ljk5aDE0LjYzbDkuNTMsMTYuODgsOS42LTE2Ljg4aDE0LjM2bC0xNy42MSwyOC43OXYxNy41NGgtMTIuOTF2LTE3LjM0WiIvPjxnPjxwYXRoIGNsYXNzPSJiIiBkPSJNNDU3Ljk5LDM0Ljg5Yy4yOS0uMDksLjU0LS4yNCwuNzMtLjQ0LC4yNS0uMjUsLjM3LS41OCwuMzctMSwwLS40Ny0uMTgtLjg1LS41My0xLjEyLS4zNC0uMjYtLjc5LS40LTEuMzMtLjRoLTIuMDZjLS4wNywwLS4xMiwuMDYtLjEyLC4xMnY0LjYxYzAsLjA3LC4wNiwuMTIsLjEyLC4xMmguNjhjLjA3LDAsLjEyLS4wNiwuMTItLjEydi0xLjYyaC45OWwxLjI5LDEuNjlzLjA2LC4wNSwuMSwuMDVoLjg0cy4wOS0uMDMsLjExLS4wN2MuMDItLjA0LC4wMi0uMDktLjAxLS4xM2wtMS4zMi0xLjcxWm0uMTUtMS40YzAsLjIzLS4wOCwuMzktLjI1LC41MS0uMTgsLjEzLS40MiwuMTktLjcyLC4xOWgtMS4xOXYtMS4zOWgxLjIzYy4zLDAsLjU0LC4wNiwuNywuMTksLjE1LC4xMiwuMjMsLjI4LC4yMywuNVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTQ2MS4yLDMyLjY5Yy0uMjQtLjU2LS41Ny0xLjA1LS45OC0xLjQ3LS40MS0uNDItLjktLjc1LTEuNDYtLjk5LS41Ni0uMjQtMS4xNy0uMzYtMS44Mi0uMzZzLTEuMjYsLjEyLTEuODIsLjM3Yy0uNTYsLjI1LTEuMDYsLjU4LTEuNDgsMS0uNDIsLjQyLS43NSwuOTItLjk4LDEuNDctLjI0LC41Ni0uMzYsMS4xNi0uMzYsMS43OXMuMTIsMS4yMywuMzYsMS43OWMuMjQsLjU2LC41NiwxLjA1LC45OCwxLjQ3LC40MSwuNDIsLjksLjc1LDEuNDYsLjk5LC41NiwuMjQsMS4xNywuMzYsMS44MSwuMzZzMS4yNi0uMTIsMS44Mi0uMzdjLjU2LS4yNSwxLjA2LS41OCwxLjQ3LTEsLjQyLS40MiwuNzUtLjkyLC45OC0xLjQ3LC4yNC0uNTYsLjM2LTEuMTYsLjM2LTEuNzlzLS4xMi0xLjIzLS4zNi0xLjc5Wm0tLjMsMS43OWMwLC41NC0uMSwxLjA2LS4zLDEuNTUtLjIsLjQ5LS40OCwuOTEtLjg0LDEuMjctLjM1LC4zNi0uNzgsLjY1LTEuMjcsLjg2LS40OSwuMjEtMS4wMiwuMzItMS41NywuMzJzLTEuMDktLjExLTEuNTYtLjMxYy0uNDgtLjIxLS45LS41LTEuMjUtLjg2LS4zNS0uMzYtLjYzLS43OC0uODMtMS4yNy0uMi0uNDgtLjMtMS0uMy0xLjU0cy4xLTEuMDYsLjMtMS41NWMuMi0uNDgsLjQ4LS45MSwuODQtMS4yNywuMzYtLjM2LC43OC0uNjUsMS4yNi0uODYsLjQ4LS4yMSwxLjAxLS4zMiwxLjU4LS4zMnMxLjA5LC4xMSwxLjU3LC4zMWMuNDgsLjIxLC45LC41LDEuMjUsLjg2LC4zNSwuMzYsLjYzLC43OCwuODMsMS4yNywuMiwuNDgsLjMsMSwuMywxLjU0WiIvPjwvZz48L3N2Zz4="
+      alt="logo"></p>
+
+  <h1>{{ title }}</h1>
+  <table>
+    <tbody>
+      <tr>
+        <th class="hth no-sort">Pull Request</th>
+        <td>{{ pr_info_html }}</td>
+      </tr>
+      <tr>
+        <th class="hth no-sort">Workflow Run</th>
+        <td><a href="https://github.com/{{ github_repo }}/actions/runs/{{ workflow_id }}">{{ workflow_id }}</a></td>
+      </tr>
+      <tr>
+        <th class="hth no-sort">Commit</th>
+        <td><a href="https://github.com/{{ github_repo }}/commit/{{ commit_sha }}">{{ commit_sha }}</a></td>
+      </tr>
+      <tr>
+        <th class="hth no-sort">Build Report</th>
+        <td>{% for job_name, link in build_report_links.items() %}<a href="{{ link }}">[{{ job_name }}]</a> {% endfor %}</td>
+      </tr>
+      <tr>
+        <th class="hth no-sort">Date</th>
+        <td> {{ date }}</td>
+      </tr>
+    </tbody>
+  </table>
+  {% if is_preview %}
+  <p style="font-weight: bold;color: red;">This is a preview. The workflow is not yet finished.</p>
+  {% endif %}
+  <h2>Table of Contents</h2>
+  <ul>
+    {%- if pr_number != 0 %}<li><a href="#new-fails-pr">New Fails in PR</a> ({{ counts.pr_new_fails }})</li>{% endif %}
+    <li><a href="#ci-jobs-status">CI Jobs Status</a> ({{ counts.jobs_status }})</li>
+    <li><a href="#checks-errors">Checks Errors</a> ({{ counts.checks_errors }})</li>
+    <li><a href="#checks-fails">Checks New Fails</a> ({{ counts.checks_new_fails }})</li>
+    <li><a href="#regression-fails">Regression New Fails</a> ({{ counts.regression_new_fails }})</li>
+    <li><a href="#docker-images-cves">Docker Images CVEs</a> ({{ counts.cves }})</li>
+    <li><a href="#checks-known-fails">Checks Known Fails</a> ({{ counts.checks_known_fails }})</li>
+  </ul>
+
+  {%- if pr_number != 0 -%}
+  <h2 id="new-fails-pr">New Fails in PR</h2>
+  <p> Compared with base sha {{ base_sha }} </p>
+  {{ new_fails_html }}
+  {%- endif %}
+
+  <h2 id="ci-jobs-status">CI Jobs Status</h2>
+  {{ ci_jobs_status_html }}
+
+  <h2 id="checks-errors">Checks Errors</h2>
+  {{ checks_errors_html }}
+
+  <h2 id="checks-fails">Checks New Fails</h2>
+  {{ checks_fails_html }}
+
+  <h2 id="regression-fails">Regression New Fails</h2>
+  {{ regression_fails_html }}
+
+  <h2 id="docker-images-cves">Docker Images CVEs</h2>
+  {{ docker_images_cves_html }}
+
+  <h2 id="checks-known-fails">Checks Known Fails</h2>
+  <p>
+    Fail reason conventions:<br/>
+    KNOWN - Accepted fail and fix is not planned<br/>
+    INVESTIGATE - We don't know why it fails<br/>
+    NEEDSFIX - Investigation done and a fix is needed to make it pass<br/>
+  </p>
+  {{ checks_known_fails_html }}
+
+  <script>
+    document.addEventListener('click', function (e) {
+      try {
+        function findElementRecursive(element, tag) {
+          return element.nodeName === tag ? element :
+            findElementRecursive(element.parentNode, tag)
+        }
+        var descending_th_class = ' dir-d '
+        var ascending_th_class = ' dir-u '
+        var ascending_table_sort_class = 'asc'
+        var regex_dir = / dir-(u|d) /
+        var alt_sort = e.shiftKey || e.altKey
+        var element = findElementRecursive(e.target, 'TH')
+        var tr = findElementRecursive(element, 'TR')
+        var table = findElementRecursive(tr, 'TABLE')
+        function reClassify(element, dir) {
+          element.className = element.className.replace(regex_dir, '') + dir
+        }
+        function getValue(element) {
+          return (
+            (alt_sort && element.getAttribute('data-sort-alt')) ||
+            element.getAttribute('data-sort') || element.innerText
+          )
+        }
+        if (true) {
+          var column_index
+          var nodes = tr.cells
+          for (var i = 0; i < nodes.length; i++) {
+            if (nodes[i] === element) {
+              column_index = element.getAttribute('data-sort-col') || i
+            } else {
+              reClassify(nodes[i], '')
+            }
+          }
+          var dir = descending_th_class
+          if (
+            element.className.indexOf(descending_th_class) !== -1 ||
+            (table.className.indexOf(ascending_table_sort_class) !== -1 &&
+              element.className.indexOf(ascending_th_class) == -1)
+          ) {
+            dir = ascending_th_class
+          }
+          reClassify(element, dir)
+          var org_tbody = table.tBodies[0]
+          var rows = [].slice.call(org_tbody.rows, 0)
+          var reverse = dir === ascending_th_class
+          rows.sort(function (a, b) {
+            var x = getValue((reverse ? a : b).cells[column_index])
+            var y = getValue((reverse ? b : a).cells[column_index])
+            return isNaN(x - y) ? x.localeCompare(y) : x - y
+          })
+          var clone_tbody = org_tbody.cloneNode()
+          while (rows.length) {
+            clone_tbody.appendChild(rows.splice(0, 1)[0])
+          }
+          table.replaceChild(clone_tbody, org_tbody)
+        }
+      } catch (error) {
+      }
+    });
+  </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/.github/actions/create_workflow_report/create_workflow_report.py b/.github/actions/create_workflow_report/create_workflow_report.py
new file mode 100755
index 000000000000..94bc426e7e5f
--- /dev/null
+++ b/.github/actions/create_workflow_report/create_workflow_report.py
@@ -0,0 +1,916 @@
+#!/usr/bin/env python3
+import argparse
+import os
+from pathlib import Path
+from itertools import combinations
+import json
+from datetime import datetime
+from functools import lru_cache
+from glob import glob
+import urllib.parse
+import re
+
+import pandas as pd
+from jinja2 import Environment, FileSystemLoader
+import requests
+from clickhouse_driver import Client
+import boto3
+from botocore.exceptions import NoCredentialsError
+import yaml
+
+
+DATABASE_HOST_VAR = "CHECKS_DATABASE_HOST"
+DATABASE_USER_VAR = "CLICKHOUSE_TEST_STAT_LOGIN"
+DATABASE_PASSWORD_VAR = "CLICKHOUSE_TEST_STAT_PASSWORD"
+S3_BUCKET = "altinity-build-artifacts"
+GITHUB_REPO = "Altinity/ClickHouse"
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN") or os.getenv("GH_TOKEN")
+
+def get_commit_statuses(sha: str) -> pd.DataFrame:
+    """
+    Fetch commit statuses for a given SHA and return as a pandas DataFrame.
+    Handles pagination to get all statuses.
+
+    Args:
+        sha (str): Commit SHA to fetch statuses for.
+
+    Returns:
+        pd.DataFrame: DataFrame containing all statuses.
+    """
+    headers = {
+        "Authorization": f"token {GITHUB_TOKEN}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    url = f"https://api.github.com/repos/{GITHUB_REPO}/commits/{sha}/statuses"
+
+    all_data = []
+
+    while url:
+        response = requests.get(url, headers=headers)
+
+        if response.status_code != 200:
+            raise Exception(
+                f"Failed to fetch statuses: {response.status_code} {response.text}"
+            )
+
+        data = response.json()
+        all_data.extend(data)
+
+        # Check for pagination links in the response headers
+        if "Link" in response.headers:
+            links = response.headers["Link"].split(",")
+            next_url = None
+
+            for link in links:
+                parts = link.strip().split(";")
+                if len(parts) == 2 and 'rel="next"' in parts[1]:
+                    next_url = parts[0].strip("<>")
+                    break
+
+            url = next_url
+        else:
+            url = None
+
+    # Parse relevant fields
+    parsed = [
+        {
+            "job_name": item["context"],
+            "job_status": item["state"],
+            "message": item["description"],
+            "results_link": item["target_url"],
+        }
+        for item in all_data
+    ]
+
+    # Create DataFrame
+    df = pd.DataFrame(parsed)
+
+    # Drop duplicates keeping the first occurrence (newest status for each context)
+    # GitHub returns statuses in reverse chronological order
+    df = df.drop_duplicates(subset=["job_name"], keep="first")
+
+    # Sort by status and job name
+    return df.sort_values(
+        by=["job_status", "job_name"], ascending=[True, True]
+    ).reset_index(drop=True)
+
+
+def get_pr_info_from_number(pr_number: str) -> dict:
+    """
+    Fetch pull request information for a given PR number.
+
+    Args:
+        pr_number (str): Pull request number to fetch information for.
+
+    Returns:
+        dict: Dictionary containing PR information.
+    """
+    headers = {
+        "Authorization": f"token {GITHUB_TOKEN}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    url = f"https://api.github.com/repos/{GITHUB_REPO}/pulls/{pr_number}"
+    response = requests.get(url, headers=headers)
+
+    if response.status_code != 200:
+        raise Exception(
+            f"Failed to fetch pull request info: {response.status_code} {response.text}"
+        )
+
+    return response.json()
+
+
+def get_run_details(run_id: str) -> dict:
+    """
+    Fetch run details for a given run URL.
+    """
+    headers = {
+        "Authorization": f"token {GITHUB_TOKEN}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    url = f"https://api.github.com/repos/{GITHUB_REPO}/actions/runs/{run_id}"
+    response = requests.get(url, headers=headers)
+
+    if response.status_code != 200:
+        raise Exception(
+            f"Failed to fetch run details: {response.status_code} {response.text}"
+        )
+
+    return response.json()
+
+
+def get_checks_fails(client: Client, commit_sha: str, branch_name: str):
+    """
+    Get tests that did not succeed for the given commit and branch.
+    Exclude checks that have status 'error' as they are counted in get_checks_errors.
+    """
+    query = f"""SELECT job_status, job_name, status as test_status, test_name, results_link
+            FROM (
+                SELECT
+                    argMax(check_status, check_start_time) as job_status,
+                    check_name as job_name,
+                    argMax(test_status, check_start_time) as status,
+                    test_name,
+                    report_url as results_link,
+                    task_url
+                FROM `gh-data`.checks
+                WHERE commit_sha='{commit_sha}' AND head_ref='{branch_name}'
+                GROUP BY check_name, test_name, report_url, task_url
+            )
+            WHERE test_status IN ('FAIL', 'ERROR')
+            AND job_status!='error'
+            ORDER BY job_name, test_name
+            """
+    return client.query_dataframe(query)
+
+
+def get_broken_tests_rules(broken_tests_file_path):
+    with open(broken_tests_file_path, "r", encoding="utf-8") as broken_tests_file:
+        broken_tests = yaml.safe_load(broken_tests_file)
+
+    compiled_rules = {"exact": {}, "pattern": {}}
+
+    for test in broken_tests:
+        regex = test.get("regex") is True
+        rule = {
+            "reason": test["reason"],
+        }
+
+        if test.get("check_types"):
+            rule["check_types"] = test["check_types"]
+
+        if regex:
+            rule["regex"] = True
+            compiled_rules["pattern"][re.compile(test["name"])] = rule
+        else:
+            compiled_rules["exact"][test["name"]] = rule
+
+    return compiled_rules
+
+
+def get_known_fail_reason(test_name: str, check_name: str, known_fails: dict):
+    """
+    Returns the reason why a test is known to fail based on its name and build context.
+
+    - Exact-name rules are checked first.
+    - Pattern-name rules are checked next (first match wins).
+    - Message/not_message conditions are ignored.
+    """
+    # 1. Exact-name rules
+    rule_data = known_fails["exact"].get(test_name)
+    if rule_data:
+        check_types = rule_data.get("check_types", [])
+        if not check_types or any(
+            check_type in check_name for check_type in check_types
+        ):
+            return rule_data["reason"]
+
+    # 2. Pattern-name rules
+    for name_re, rule_data in known_fails["pattern"].items():
+        if name_re.fullmatch(test_name):
+            check_types = rule_data.get("check_types", [])
+            if not check_types or any(
+                check_type in check_name for check_type in check_types
+            ):
+                return rule_data["reason"]
+
+    return "No reason given"
+
+
+def get_checks_known_fails(
+    client: Client, commit_sha: str, branch_name: str, known_fails: dict
+):
+    """
+    Get tests that are known to fail for the given commit and branch.
+    """
+    if len(known_fails) == 0:
+        return pd.DataFrame()
+
+    query = f"""SELECT job_name, status as test_status, test_name, results_link
+        FROM (
+            SELECT
+                check_name as job_name,
+                argMax(test_status, check_start_time) as status,
+                test_name,
+                report_url as results_link,
+                task_url
+            FROM `gh-data`.checks
+            WHERE commit_sha='{commit_sha}' AND head_ref='{branch_name}'
+            GROUP BY check_name, test_name, report_url, task_url
+        )
+        WHERE test_status='BROKEN'
+        ORDER BY job_name, test_name
+        """
+
+    df = client.query_dataframe(query)
+
+    if df.shape[0] == 0:
+        return df
+
+    df.insert(
+        len(df.columns) - 1,
+        "reason",
+        df.apply(
+            lambda row: get_known_fail_reason(
+                row["test_name"], row["job_name"], known_fails
+            ),
+            axis=1,
+        ),
+    )
+
+    return df
+
+
+def get_checks_errors(client: Client, commit_sha: str, branch_name: str):
+    """
+    Get checks that have status 'error' for the given commit and branch.
+    """
+    query = f"""SELECT job_status, job_name, status as test_status, test_name, results_link
+            FROM (
+                SELECT
+                    argMax(check_status, check_start_time) as job_status,
+                    check_name as job_name,
+                    argMax(test_status, check_start_time) as status,
+                    test_name,
+                    report_url as results_link,
+                    task_url
+                FROM `gh-data`.checks
+                WHERE commit_sha='{commit_sha}' AND head_ref='{branch_name}'
+                GROUP BY check_name, test_name, report_url, task_url
+            )
+            WHERE job_status=='error'
+            ORDER BY job_name, test_name
+            """
+    return client.query_dataframe(query)
+
+
+def drop_prefix_rows(df, column_to_clean):
+    """
+    Drop rows from the dataframe if:
+    - the row matches another row completely except for the specified column
+    - the specified column of that row is a prefix of the same column in another row
+    """
+    to_drop = set()
+    reference_columns = [col for col in df.columns if col != column_to_clean]
+    for (i, row_1), (j, row_2) in combinations(df.iterrows(), 2):
+        if all(row_1[col] == row_2[col] for col in reference_columns):
+            if row_2[column_to_clean].startswith(row_1[column_to_clean]):
+                to_drop.add(i)
+            elif row_1[column_to_clean].startswith(row_2[column_to_clean]):
+                to_drop.add(j)
+    return df.drop(to_drop)
+
+
+def get_regression_fails(client: Client, job_url: str):
+    """
+    Get regression tests that did not succeed for the given job URL.
+    """
+    # If you rename the alias for report_url, also update the formatters in format_results_as_html_table
+    # Nested SELECT handles test reruns
+    query = f"""SELECT arch, job_name, status, test_name, results_link
+            FROM (
+               SELECT
+                    architecture as arch,
+                    test_name,
+                    argMax(result, start_time) AS status,
+                    job_name,
+                    report_url as results_link,
+                    job_url
+               FROM `gh-data`.clickhouse_regression_results
+               GROUP BY architecture, test_name, job_url, job_name, report_url
+               ORDER BY length(test_name) DESC
+            )
+            WHERE job_url LIKE '{job_url}%'
+            AND status IN ('Fail', 'Error')
+            """
+    df = client.query_dataframe(query)
+    df = drop_prefix_rows(df, "test_name")
+    df["job_name"] = df["job_name"].str.title()
+    return df
+
+
+def get_new_fails_this_pr(
+    client: Client,
+    pr_info: dict,
+    checks_fails: pd.DataFrame,
+    regression_fails: pd.DataFrame,
+):
+    """
+    Get tests that failed in the PR but passed in the base branch.
+    Compares both checks and regression test results.
+    """
+    base_sha = pr_info.get("base", {}).get("sha")
+    if not base_sha:
+        raise Exception("No base SHA found for PR")
+
+    # Modify tables to have the same columns
+    if len(checks_fails) > 0:
+        checks_fails = checks_fails.copy().drop(columns=["job_status"])
+    if len(regression_fails) > 0:
+        regression_fails = regression_fails.copy()
+        regression_fails["job_name"] = regression_fails.apply(
+            lambda row: f"{row['arch']} {row['job_name']}".strip(), axis=1
+        )
+        regression_fails["test_status"] = regression_fails["status"]
+
+    # Combine both types of fails and select only desired columns
+    desired_columns = ["job_name", "test_name", "test_status", "results_link"]
+    all_pr_fails = pd.concat([checks_fails, regression_fails], ignore_index=True)[
+        desired_columns
+    ]
+    if len(all_pr_fails) == 0:
+        return pd.DataFrame()
+
+    # Get all checks from the base branch that didn't fail
+    base_checks_query = f"""SELECT job_name, status as test_status, test_name, results_link
+            FROM (
+                SELECT
+                    check_name as job_name,
+                    argMax(test_status, check_start_time) as status,
+                    test_name,
+                    report_url as results_link,
+                    task_url
+                FROM `gh-data`.checks
+                WHERE commit_sha='{base_sha}'
+                GROUP BY check_name, test_name, report_url, task_url
+            )
+            WHERE test_status NOT IN ('FAIL', 'ERROR')
+            ORDER BY job_name, test_name
+            """
+    base_checks = client.query_dataframe(base_checks_query)
+
+    # Get regression results from base branch that didn't fail
+    base_regression_query = f"""SELECT arch, job_name, status, test_name, results_link
+            FROM (
+               SELECT
+                    architecture as arch,
+                    test_name,
+                    argMax(result, start_time) AS status,
+                    job_url,
+                    job_name,
+                    report_url as results_link
+               FROM `gh-data`.clickhouse_regression_results
+               WHERE results_link LIKE'%/{base_sha}/%'
+               GROUP BY architecture, test_name, job_url, job_name, report_url
+               ORDER BY length(test_name) DESC
+            )
+            WHERE status NOT IN ('Fail', 'Error')
+            """
+    base_regression = client.query_dataframe(base_regression_query)
+    if len(base_regression) > 0:
+        base_regression["job_name"] = base_regression.apply(
+            lambda row: f"{row['arch']} {row['job_name']}".strip(), axis=1
+        )
+        base_regression["test_status"] = base_regression["status"]
+        base_regression = base_regression.drop(columns=["arch", "status"])
+
+    # Combine base results
+    base_results = pd.concat([base_checks, base_regression], ignore_index=True)
+
+    # Find tests that failed in PR but passed in base
+    pr_failed_tests = set(zip(all_pr_fails["job_name"], all_pr_fails["test_name"]))
+    base_passed_tests = set(zip(base_results["job_name"], base_results["test_name"]))
+
+    new_fails = pr_failed_tests.intersection(base_passed_tests)
+
+    # Filter PR results to only include new fails
+    mask = all_pr_fails.apply(
+        lambda row: (row["job_name"], row["test_name"]) in new_fails, axis=1
+    )
+    new_fails_df = all_pr_fails[mask]
+
+    return new_fails_df
+
+
+@lru_cache
+def get_workflow_config() -> dict:
+    workflow_config_files = glob("./ci/tmp/workflow_config*.json")
+    if len(workflow_config_files) == 0:
+        raise Exception("No workflow config file found")
+    if len(workflow_config_files) > 1:
+        raise Exception("Multiple workflow config files found")
+    with open(workflow_config_files[0], "r") as f:
+        return json.load(f)
+
+
+def get_cached_job(job_name: str) -> dict:
+    workflow_config = get_workflow_config()
+    return workflow_config["cache_jobs"].get(job_name, {})
+
+
+def get_cves(pr_number, commit_sha, branch):
+    """
+    Fetch Grype results from S3.
+
+    If no results are available for download, returns ... (Ellipsis).
+    """
+    s3_client = boto3.client("s3", endpoint_url=os.getenv("S3_URL"))
+    prefixes_to_check = set()
+
+    def format_prefix(pr_number, commit_sha, branch):
+        if pr_number == 0:
+            return f"REFs/{branch}/{commit_sha}/grype/"
+        else:
+            return f"PRs/{pr_number}/{commit_sha}/grype/"
+
+    cached_server_job = get_cached_job("Docker server image")
+    if cached_server_job:
+        prefixes_to_check.add(
+            format_prefix(
+                cached_server_job["pr_number"],
+                cached_server_job["sha"],
+                cached_server_job["branch"],
+            )
+        )
+    cached_keeper_job = get_cached_job("Docker keeper image")
+    if cached_keeper_job:
+        prefixes_to_check.add(
+            format_prefix(
+                cached_keeper_job["pr_number"],
+                cached_keeper_job["sha"],
+                cached_keeper_job["branch"],
+            )
+        )
+
+    if not prefixes_to_check:
+        prefixes_to_check = {format_prefix(pr_number, commit_sha, branch)}
+
+    grype_result_dirs = []
+    for s3_prefix in prefixes_to_check:
+        try:
+            response = s3_client.list_objects_v2(
+                Bucket=S3_BUCKET, Prefix=s3_prefix, Delimiter="/"
+            )
+            grype_result_dirs.extend(
+                content["Prefix"] for content in response.get("CommonPrefixes", [])
+            )
+        except Exception as e:
+            print(f"Error listing S3 objects at {s3_prefix}: {e}")
+            continue
+
+    if len(grype_result_dirs) == 0:
+        # We were asked to check the CVE data, but none was found,
+        # maybe this is a preview report and grype results are not available yet
+        return ...
+
+    results = []
+    for path in grype_result_dirs:
+        file_key = f"{path}result.json"
+        try:
+            file_response = s3_client.get_object(Bucket=S3_BUCKET, Key=file_key)
+            content = file_response["Body"].read().decode("utf-8")
+            results.append(json.loads(content))
+        except Exception as e:
+            print(f"Error getting S3 object at {file_key}: {e}")
+            continue
+
+    rows = []
+    for scan_result in results:
+        for match in scan_result["matches"]:
+            rows.append(
+                {
+                    "docker_image": scan_result["source"]["target"]["userInput"],
+                    "severity": match["vulnerability"]["severity"],
+                    "identifier": match["vulnerability"]["id"],
+                    "namespace": match["vulnerability"]["namespace"],
+                }
+            )
+
+    if len(rows) == 0:
+        return pd.DataFrame()
+
+    df = pd.DataFrame(rows).drop_duplicates()
+    df = df.sort_values(
+        by="severity",
+        key=lambda col: col.str.lower().map(
+            {"critical": 1, "high": 2, "medium": 3, "low": 4, "negligible": 5}
+        ),
+    )
+    return df
+
+
+def url_to_html_link(url: str) -> str:
+    if not url:
+        return ""
+    text = url.split("/")[-1].split("?")[0]
+    if not text:
+        text = "results"
+    return f'<a href="{url}">{text}</a>'
+
+
+def format_test_name_for_linewrap(text: str) -> str:
+    """Tweak the test name to improve line wrapping."""
+    return f'<span style="line-break: anywhere;">{text}</span>'
+
+
+def format_test_status(text: str) -> str:
+    """Format the test status for better readability."""
+    if text.lower().startswith("fail"):
+        color = "red"
+    elif text.lower() == "skipped":
+        color = "grey"
+    elif text.lower() in ("success", "ok", "passed", "pass"):
+        color = "green"
+    else:
+        color = "orange"
+
+    return f'<span style="font-weight: bold; color: {color}">{text}</span>'
+
+
+def format_results_as_html_table(results) -> str:
+    if len(results) == 0:
+        return "<p>Nothing to report</p>"
+    results.columns = [col.replace("_", " ").title() for col in results.columns]
+    html = results.to_html(
+        index=False,
+        formatters={
+            "Results Link": url_to_html_link,
+            "Test Name": format_test_name_for_linewrap,
+            "Test Status": format_test_status,
+            "Job Status": format_test_status,
+            "Status": format_test_status,
+            "Message": lambda m: m.replace("\n", " "),
+            "Identifier": lambda i: url_to_html_link(
+                "https://nvd.nist.gov/vuln/detail/" + i
+            ),
+        },
+        escape=False,
+        border=0,
+        classes=["test-results-table"],
+    )
+    return html
+
+
+def backfill_skipped_statuses(
+    job_statuses: pd.DataFrame, pr_number: int, branch: str, commit_sha: str
+):
+    """
+    Fill in the job statuses for skipped jobs.
+    """
+
+    if pr_number == 0:
+        ref_param = f"REF={branch}"
+        workflow_name = "MasterCI"
+    else:
+        ref_param = f"PR={pr_number}"
+        workflow_name = "PR"
+
+    status_file = f"result_{workflow_name.lower()}.json"
+    s3_path = f"https://{S3_BUCKET}.s3.amazonaws.com/{ref_param.replace('=', 's/')}/{commit_sha}/{status_file}"
+    response = requests.get(s3_path)
+
+    if response.status_code != 200:
+        return job_statuses
+
+    status_data = response.json()
+    skipped_jobs = []
+    for job in status_data["results"]:
+        if job["status"] == "skipped" and len(job["links"]) > 0:
+            skipped_jobs.append(
+                {
+                    "job_name": job["name"],
+                    "job_status": job["status"],
+                    "message": job["info"],
+                    "results_link": job["links"][0],
+                }
+            )
+
+    return pd.concat([job_statuses, pd.DataFrame(skipped_jobs)], ignore_index=True)
+
+
+def get_build_report_links(
+    job_statuses: pd.DataFrame, pr_number: int, branch: str, commit_sha: str
+):
+    """
+    Get the build report links for the given PR number, branch, and commit SHA.
+
+    First checks if a build job submitted a success or skipped status.
+    If not available, it guesses the links.
+    """
+    build_job_names = [
+        "Build (amd_release)",
+        "Build (arm_release)",
+        "Docker server image",
+        "Docker keeper image",
+    ]
+    build_report_links = {}
+
+    for job in job_statuses.itertuples():
+        if (
+            job.job_name in build_job_names
+            and job.job_status
+            in (
+                "success",
+                "skipped",
+            )
+            and job.results_link
+        ):
+            build_report_links[job.job_name] = job.results_link
+
+    if 0 < len(build_report_links) < len(build_job_names):
+        # Only have some of the build jobs, guess the rest.
+        # (It was straightforward to force the build jobs to always appear in the cache,
+        # however doing the same for the docker image jobs is difficult.)
+        ref_job, ref_link = list(build_report_links.items())[0]
+        link_template = ref_link.replace(
+            urllib.parse.quote(ref_job, safe=""), "{job_name}"
+        )
+        for job in build_job_names:
+            if job not in build_report_links:
+                build_report_links[job] = link_template.format(job_name=job)
+
+    if len(build_report_links) > 0:
+        return build_report_links
+
+    # No cache or build result was found, guess the links
+    if pr_number == 0:
+        ref_param = f"REF={branch}"
+        workflow_name = "MasterCI"
+    else:
+        ref_param = f"PR={pr_number}"
+        workflow_name = "PR"
+
+    build_report_link_base = f"https://{S3_BUCKET}.s3.amazonaws.com/json.html?{ref_param}&sha={commit_sha}&name_0={urllib.parse.quote(workflow_name, safe='')}"
+    build_report_links = {
+        job_name: f"{build_report_link_base}&name_1={urllib.parse.quote(job_name, safe='')}"
+        for job_name in build_job_names
+    }
+    return build_report_links
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description="Create a combined CI report.")
+    parser.add_argument(  # Need the full URL rather than just the ID to query the databases
+        "--actions-run-url", required=True, help="URL of the actions run"
+    )
+    parser.add_argument(
+        "--pr-number", help="Pull request number for the S3 path", type=int
+    )
+    parser.add_argument("--commit-sha", help="Commit SHA for the S3 path")
+    parser.add_argument(
+        "--no-upload", action="store_true", help="Do not upload the report"
+    )
+    parser.add_argument(
+        "--known-fails", type=str, help="Path to the file with known fails"
+    )
+    parser.add_argument(
+        "--cves", action="store_true", help="Get CVEs from Grype results"
+    )
+    parser.add_argument(
+        "--mark-preview", action="store_true", help="Mark the report as a preview"
+    )
+    return parser.parse_args()
+
+
+def create_workflow_report(
+    actions_run_url: str,
+    pr_number: int = None,
+    commit_sha: str = None,
+    no_upload: bool = False,
+    known_fails_file_path: str = None,
+    check_cves: bool = False,
+    mark_preview: bool = False,
+) -> str:
+
+    host = os.getenv(DATABASE_HOST_VAR)
+    if not host:
+        print(f"{DATABASE_HOST_VAR} is not set")
+    user = os.getenv(DATABASE_USER_VAR)
+    if not user:
+        print(f"{DATABASE_USER_VAR} is not set")
+    password = os.getenv(DATABASE_PASSWORD_VAR)
+    if not password:
+        print(f"{DATABASE_PASSWORD_VAR} is not set")
+    if not GITHUB_TOKEN:
+        print("GITHUB_TOKEN is not set")
+    if not all([host, user, password, GITHUB_TOKEN]):
+        raise Exception("Required environment variables are not set")
+
+    run_id = actions_run_url.split("/")[-1]
+
+    run_details = get_run_details(run_id)
+    branch_name = run_details.get("head_branch", "unknown branch")
+    if pr_number is None or commit_sha is None:
+        if pr_number is None:
+            if len(run_details["pull_requests"]) > 0:
+                pr_number = run_details["pull_requests"][0]["number"]
+            else:
+                pr_number = 0
+        if commit_sha is None:
+            commit_sha = run_details["head_commit"]["id"]
+
+    db_client = Client(
+        host=host,
+        user=user,
+        password=password,
+        port=9440,
+        secure="y",
+        verify=False,
+        settings={"use_numpy": True},
+    )
+
+    fail_results = {
+        "job_statuses": get_commit_statuses(commit_sha),
+        "checks_fails": get_checks_fails(db_client, commit_sha, branch_name),
+        "checks_known_fails": [],
+        "pr_new_fails": [],
+        "checks_errors": get_checks_errors(db_client, commit_sha, branch_name),
+        "regression_fails": get_regression_fails(db_client, actions_run_url),
+        "docker_images_cves": (
+            [] if not check_cves else get_cves(pr_number, commit_sha, branch_name)
+        ),
+    }
+
+    # get_cves returns ... in the case where no Grype result files were found.
+    # This might occur when run in preview mode.
+    cves_not_checked = not check_cves or fail_results["docker_images_cves"] is ...
+
+    if known_fails_file_path:
+        if not os.path.exists(known_fails_file_path):
+            print(f"WARNING:Known fails file {known_fails_file_path} not found.")
+        else:
+            known_fails = get_broken_tests_rules(known_fails_file_path)
+
+            fail_results["checks_known_fails"] = get_checks_known_fails(
+                db_client, commit_sha, branch_name, known_fails
+            )
+
+    if pr_number == 0:
+        pr_info_html = f"Release ({branch_name})"
+    else:
+        try:
+            pr_info = get_pr_info_from_number(pr_number)
+            pr_info_html = f"""<a href="https://github.com/{GITHUB_REPO}/pull/{pr_info["number"]}">
+                    #{pr_info.get("number")} ({pr_info.get("base", {}).get('ref')} <- {pr_info.get("head", {}).get('ref')})  {pr_info.get("title")}
+                    </a>"""
+            fail_results["pr_new_fails"] = get_new_fails_this_pr(
+                db_client,
+                pr_info,
+                fail_results["checks_fails"],
+                fail_results["regression_fails"],
+            )
+        except Exception as e:
+            pr_info_html = e
+
+    fail_results["job_statuses"] = backfill_skipped_statuses(
+        fail_results["job_statuses"], pr_number, branch_name, commit_sha
+    )
+
+    high_cve_count = 0
+    if not cves_not_checked and len(fail_results["docker_images_cves"]) > 0:
+        high_cve_count = (
+            fail_results["docker_images_cves"]["severity"]
+            .str.lower()
+            .isin(("high", "critical"))
+            .sum()
+        )
+
+    # Load the template
+    template = Environment(
+        loader=FileSystemLoader(os.path.dirname(__file__))
+    ).get_template("ci_run_report.html.jinja")
+
+    # Define the context for rendering
+    context = {
+        "title": "ClickHouse® CI Workflow Run Report",
+        "github_repo": GITHUB_REPO,
+        "s3_bucket": S3_BUCKET,
+        "pr_info_html": pr_info_html,
+        "pr_number": pr_number,
+        "workflow_id": run_id,
+        "commit_sha": commit_sha,
+        "base_sha": "" if pr_number == 0 else pr_info.get("base", {}).get("sha"),
+        "date": f"{datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')} UTC",
+        "is_preview": mark_preview,
+        "counts": {
+            "jobs_status": f"{sum(fail_results['job_statuses']['job_status'].value_counts().get(x, 0) for x in ('failure', 'error'))} fail/error",
+            "checks_errors": len(fail_results["checks_errors"]),
+            "checks_new_fails": len(fail_results["checks_fails"]),
+            "regression_new_fails": len(fail_results["regression_fails"]),
+            "cves": "N/A" if cves_not_checked else f"{high_cve_count} high/critical",
+            "checks_known_fails": (
+                "N/A" if not known_fails else len(fail_results["checks_known_fails"])
+            ),
+            "pr_new_fails": len(fail_results["pr_new_fails"]),
+        },
+        "build_report_links": get_build_report_links(
+            fail_results["job_statuses"], pr_number, branch_name, commit_sha
+        ),
+        "ci_jobs_status_html": format_results_as_html_table(
+            fail_results["job_statuses"]
+        ),
+        "checks_errors_html": format_results_as_html_table(
+            fail_results["checks_errors"]
+        ),
+        "checks_fails_html": format_results_as_html_table(fail_results["checks_fails"]),
+        "regression_fails_html": format_results_as_html_table(
+            fail_results["regression_fails"]
+        ),
+        "docker_images_cves_html": (
+            "<p>Not Checked</p>"
+            if cves_not_checked
+            else format_results_as_html_table(fail_results["docker_images_cves"])
+        ),
+        "checks_known_fails_html": (
+            "<p>Not Checked</p>"
+            if not known_fails
+            else format_results_as_html_table(fail_results["checks_known_fails"])
+        ),
+        "new_fails_html": format_results_as_html_table(fail_results["pr_new_fails"]),
+    }
+
+    # Render the template with the context
+    rendered_html = template.render(context)
+
+    report_name = "ci_run_report.html"
+    report_path = Path(report_name)
+    report_path.write_text(rendered_html, encoding="utf-8")
+
+    if no_upload:
+        print(f"Report saved to {report_path}")
+        exit(0)
+
+    if pr_number == 0:
+        report_destination_key = f"REFs/{branch_name}/{commit_sha}"
+    else:
+        report_destination_key = f"PRs/{pr_number}/{commit_sha}"
+
+    report_destination_key += f"/{run_id}/{report_name}"
+
+    # Upload the report to S3
+    s3_client = boto3.client("s3", endpoint_url=os.getenv("S3_URL"))
+
+    try:
+        s3_client.put_object(
+            Bucket=S3_BUCKET,
+            Key=report_destination_key,
+            Body=rendered_html,
+            ContentType="text/html; charset=utf-8",
+        )
+    except NoCredentialsError:
+        print("Credentials not available for S3 upload.")
+
+    return f"https://s3.amazonaws.com/{S3_BUCKET}/" + report_destination_key
+
+
+def main():
+    args = parse_args()
+
+    report_url = create_workflow_report(
+        args.actions_run_url,
+        args.pr_number,
+        args.commit_sha,
+        args.no_upload,
+        args.known_fails,
+        args.cves,
+        args.mark_preview,
+    )
+
+    print(report_url)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/actions/create_workflow_report/workflow_report_hook.sh b/.github/actions/create_workflow_report/workflow_report_hook.sh
new file mode 100755
index 000000000000..04a09a9ee3ca
--- /dev/null
+++ b/.github/actions/create_workflow_report/workflow_report_hook.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This script is for generating preview reports when invoked as a post-hook from a praktika job
+pip install clickhouse-driver==0.2.8 numpy==1.26.4 pandas==2.0.3 jinja2==3.1.5
+ARGS="--mark-preview --known-fails tests/broken_tests.yaml --cves --actions-run-url $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID --pr-number $PR_NUMBER"
+CMD="python3 .github/actions/create_workflow_report/create_workflow_report.py"
+$CMD $ARGS
+
diff --git a/.github/actions/docker_setup/action.yml b/.github/actions/docker_setup/action.yml
new file mode 100644
index 000000000000..56f713fa59d1
--- /dev/null
+++ b/.github/actions/docker_setup/action.yml
@@ -0,0 +1,32 @@
+name: Docker setup
+description: Setup docker
+inputs:
+  test_name:
+    description: name of the test, used in determining ipv6 configs.
+    default: None
+    type: string
+runs:
+  using: "composite"
+  steps:
+    - name: Docker IPv6 configuration
+      shell: bash
+      if: ${{ contains(inputs.test_name, 'Stateless') }}
+      env:
+        ipv6_subnet: 2001:3984:3989::/64
+      run: |
+        # make sure docker uses proper IPv6 config
+        sudo touch /etc/docker/daemon.json
+        sudo chown ubuntu:ubuntu /etc/docker/daemon.json
+        sudo cat <<EOT > /etc/docker/daemon.json
+        {
+          "ipv6": true,
+          "fixed-cidr-v6": "${{ env.ipv6_subnet }}"
+        }
+        EOT
+        sudo chown root:root /etc/docker/daemon.json
+        sudo systemctl restart docker
+        sudo systemctl status docker
+    - name: Docker info
+      shell: bash
+      run: |
+        docker info
diff --git a/.github/actions/runner_setup/action.yml b/.github/actions/runner_setup/action.yml
new file mode 100644
index 000000000000..5a229fdd47e7
--- /dev/null
+++ b/.github/actions/runner_setup/action.yml
@@ -0,0 +1,19 @@
+name: Setup
+description: Setup environment
+runs:
+  using: "composite"
+  steps:
+    - name: Setup zram
+      shell: bash
+      run: |
+          sudo modprobe zram
+          MemTotal=$(grep -Po "(?<=MemTotal:)\s+\d+" /proc/meminfo) # KiB
+          Percent=200
+          ZRAM_SIZE=$(($MemTotal / 1024 / 1024 * $Percent / 100)) # Convert to GiB
+          .github/retry.sh 30 2 sudo zramctl --size ${ZRAM_SIZE}GiB --algorithm zstd /dev/zram0
+          sudo mkswap /dev/zram0 && sudo swapon -p 100 /dev/zram0
+          sudo sysctl vm.swappiness=200
+    - name: Install awscli
+      shell: bash
+      run: |
+          .github/retry.sh 10 30 sudo apt-get install -y awscli
diff --git a/.github/dco.yml b/.github/dco.yml
new file mode 100644
index 000000000000..a0a2aae8f55a
--- /dev/null
+++ b/.github/dco.yml
@@ -0,0 +1,17 @@
+# The configuration file must be named `dco.yml` and placed in the `.github` directory in the default branch of the repository.
+#
+# This configuration file is backwards compatible with the *dcoapp/app* (https://github.com/dcoapp/app) configuration file.
+
+# https://github.com/cncf/dco2?#remediation-commits
+allowRemediationCommits:
+  # Allow individual remediation commits
+  # https://github.com/cncf/dco2?#individual
+  individual: true
+  # Allow third-party remediation commits
+  # https://github.com/cncf/dco2?#third-party
+  thirdParty: false
+
+require:
+  # Members are required to sign-off commits
+  # https://github.com/cncf/dco2?#skipping-sign-off-for-organization-members
+  members: false
diff --git a/.github/grype/parse_vulnerabilities_grype.py b/.github/grype/parse_vulnerabilities_grype.py
new file mode 100644
index 000000000000..fec2ef3bfac7
--- /dev/null
+++ b/.github/grype/parse_vulnerabilities_grype.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+import json
+
+from testflows.core import *
+
+xfails = {}
+
+
+@Name("docker vulnerabilities")
+@XFails(xfails)
+@TestModule
+def docker_vulnerabilities(self):
+    with Given("I gather grype scan results"):
+        with open("./result.json", "r") as f:
+            results = json.load(f)
+
+    for vulnerability in results["matches"]:
+        with Test(
+            f"{vulnerability['vulnerability']['id']}@{vulnerability['vulnerability']['namespace']},{vulnerability['vulnerability']['severity']}",
+            flags=TE,
+        ):
+            note(vulnerability)
+            critical_levels = set(["HIGH", "CRITICAL"])
+            if vulnerability['vulnerability']["severity"].upper() in critical_levels:
+                with Then(
+                    f"Found vulnerability of {vulnerability['vulnerability']['severity']} severity"
+                ):
+                    result(Fail)
+
+
+if main():
+    docker_vulnerabilities()
diff --git a/.github/grype/run_grype_scan.sh b/.github/grype/run_grype_scan.sh
new file mode 100755
index 000000000000..af428e37d669
--- /dev/null
+++ b/.github/grype/run_grype_scan.sh
@@ -0,0 +1,18 @@
+set -x
+set -e
+
+IMAGE=$1
+
+GRYPE_VERSION=${GRYPE_VERSION:-"v0.92.2"}
+
+docker pull $IMAGE
+docker pull anchore/grype:${GRYPE_VERSION}
+
+docker run \
+ --rm --volume /var/run/docker.sock:/var/run/docker.sock \
+ --name Grype anchore/grype:${GRYPE_VERSION} \
+ --scope all-layers \
+ -o json \
+ $IMAGE > result.json
+
+ls -sh
diff --git a/.github/grype/transform_and_upload_results_s3.sh b/.github/grype/transform_and_upload_results_s3.sh
new file mode 100755
index 000000000000..38674d7a2a26
--- /dev/null
+++ b/.github/grype/transform_and_upload_results_s3.sh
@@ -0,0 +1,20 @@
+DOCKER_IMAGE=$(echo "$DOCKER_IMAGE" | sed 's/[\/:]/_/g')
+
+if [ "$PR_NUMBER" -eq 0 ]; then
+    PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA/grype/$DOCKER_IMAGE"
+else
+    PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA/grype/$DOCKER_IMAGE"
+fi
+
+S3_PATH="s3://$S3_BUCKET/$PREFIX"
+HTTPS_RESULTS_PATH="https://$S3_BUCKET.s3.amazonaws.com/index.html#$PREFIX/"
+HTTPS_REPORT_PATH="https://s3.amazonaws.com/$S3_BUCKET/$PREFIX/results.html"
+echo "https_report_path=$HTTPS_REPORT_PATH" >> $GITHUB_OUTPUT
+
+tfs --no-colors transform nice raw.log nice.log.txt
+tfs --no-colors report results -a $HTTPS_RESULTS_PATH raw.log - --copyright "Altinity LTD" | tfs --no-colors document convert > results.html
+
+aws s3 cp --no-progress nice.log.txt $S3_PATH/nice.log.txt --content-type "text/plain; charset=utf-8" || echo "nice log file not found".
+aws s3 cp --no-progress results.html $S3_PATH/results.html || echo "results file not found".
+aws s3 cp --no-progress raw.log $S3_PATH/raw.log || echo "raw.log file not found".
+aws s3 cp --no-progress result.json $S3_PATH/result.json --content-type "text/plain; charset=utf-8" || echo "result.json not found".
\ No newline at end of file
diff --git a/.github/retry.sh b/.github/retry.sh
new file mode 100755
index 000000000000..566c2cf11315
--- /dev/null
+++ b/.github/retry.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Execute command until exitcode is 0 or
+# maximum number of retries is reached
+# Example:
+#    ./retry <retries> <delay> <command>
+retries=$1
+delay=$2
+command="${@:3}"
+exitcode=0
+try=0
+until [ "$try" -ge $retries ]
+do
+  echo "$command"
+  eval "$command"
+  exitcode=$?
+  if [ $exitcode -eq 0 ]; then
+    break
+  fi
+  try=$((try+1))
+  sleep $2
+done
+exit $exitcode
diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 294557a38b0f..2cf948e1ef66 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -3,23 +3,44 @@
 name: BackportPR
 
 on:
+  workflow_dispatch:
+    inputs:
+      no_cache:
+        description: Run without cache
+        required: false
+        type: boolean
+        default: false
   pull_request:
     branches: ['2[1-9].[1-9][0-9]', '2[1-9].[1-9]']
 
 env:
   # Force the stdout and stderr streams to be unbuffered
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
-  DISABLE_CI_CACHE: ${{ vars.DISABLE_CI_CACHE || '0' }}
+  DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
   CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
+  AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
+  AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
+
 
-# Allow updating GH commit statuses and PR comments to post an actual job reports link
-permissions: write-all
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -30,6 +51,27 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -56,7 +98,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -68,6 +110,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -94,7 +143,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -106,6 +155,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -132,7 +188,7 @@ jobs:
           fi
 
   build_amd_debug:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
     name: "Build (amd_debug)"
@@ -144,6 +200,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -170,7 +233,7 @@ jobs:
           fi
 
   build_amd_release:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
     name: "Build (amd_release)"
@@ -182,6 +245,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -208,7 +278,7 @@ jobs:
           fi
 
   build_amd_asan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
     name: "Build (amd_asan)"
@@ -220,6 +290,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_asan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -246,7 +323,7 @@ jobs:
           fi
 
   build_amd_tsan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
     name: "Build (amd_tsan)"
@@ -258,6 +335,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -284,7 +368,7 @@ jobs:
           fi
 
   build_arm_release:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
     name: "Build (arm_release)"
@@ -296,6 +380,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -322,7 +413,7 @@ jobs:
           fi
 
   build_amd_darwin:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kYXJ3aW4p') }}
     name: "Build (amd_darwin)"
@@ -334,6 +425,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_darwin)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -360,7 +458,7 @@ jobs:
           fi
 
   build_arm_darwin:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9kYXJ3aW4p') }}
     name: "Build (arm_darwin)"
@@ -372,6 +470,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_darwin)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -398,7 +503,7 @@ jobs:
           fi
 
   docker_server_image:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
     name: "Docker server image"
@@ -410,6 +515,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker server image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -436,7 +548,7 @@ jobs:
           fi
 
   docker_keeper_image:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
     name: "Docker keeper image"
@@ -448,6 +560,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker keeper image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -474,7 +593,7 @@ jobs:
           fi
 
   install_packages_amd_debug:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX2RlYnVnKQ==') }}
     name: "Install packages (amd_debug)"
@@ -486,6 +605,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -512,7 +638,7 @@ jobs:
           fi
 
   compatibility_check_release:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAocmVsZWFzZSk=') }}
     name: "Compatibility check (release)"
@@ -524,6 +650,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Compatibility check (release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -550,7 +683,7 @@ jobs:
           fi
 
   compatibility_check_aarch64:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAoYWFyY2g2NCk=') }}
     name: "Compatibility check (aarch64)"
@@ -562,6 +695,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Compatibility check (aarch64)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -588,7 +728,7 @@ jobs:
           fi
 
   stateless_tests_amd_asan_distributed_plan_parallel_1_2:
-    runs-on: [self-hosted, amd-medium-cpu]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
     name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
@@ -600,6 +740,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -626,7 +773,7 @@ jobs:
           fi
 
   stateless_tests_amd_asan_distributed_plan_parallel_2_2:
-    runs-on: [self-hosted, amd-medium-cpu]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
     name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
@@ -638,6 +785,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -664,7 +818,7 @@ jobs:
           fi
 
   stateless_tests_amd_asan_distributed_plan_sequential:
-    runs-on: [self-hosted, amd-small-mem]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
     name: "Stateless tests (amd_asan, distributed plan, sequential)"
@@ -676,6 +830,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -702,7 +863,7 @@ jobs:
           fi
 
   stress_test_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF90c2FuKQ==') }}
     name: "Stress test (amd_tsan)"
@@ -714,6 +875,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -740,7 +908,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_1_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 1/6)"
@@ -752,6 +920,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -778,7 +953,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_2_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 2/6)"
@@ -790,6 +965,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -816,7 +998,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_3_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 3/6)"
@@ -828,6 +1010,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -854,7 +1043,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_4_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 4/6)"
@@ -866,6 +1055,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -892,7 +1088,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_5_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 5/6)"
@@ -904,6 +1100,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -930,7 +1133,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_6_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 6/6)"
@@ -942,6 +1145,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -968,7 +1178,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_1_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
     name: "Integration tests (amd_tsan, 1/6)"
@@ -980,6 +1190,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1006,7 +1223,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_2_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
     name: "Integration tests (amd_tsan, 2/6)"
@@ -1018,6 +1235,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1044,7 +1268,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_3_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
     name: "Integration tests (amd_tsan, 3/6)"
@@ -1056,6 +1280,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1082,7 +1313,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_4_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
     name: "Integration tests (amd_tsan, 4/6)"
@@ -1094,6 +1325,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1120,7 +1358,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_5_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
     name: "Integration tests (amd_tsan, 5/6)"
@@ -1132,6 +1370,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1158,7 +1403,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_6_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
     name: "Integration tests (amd_tsan, 6/6)"
@@ -1170,6 +1415,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1196,7 +1448,7 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_arm_release, build_amd_darwin, build_arm_darwin, docker_server_image, docker_keeper_image, install_packages_amd_debug, compatibility_check_release, compatibility_check_aarch64, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, stress_test_amd_tsan, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
@@ -1208,6 +1460,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
new file mode 100644
index 000000000000..77ca2d37b447
--- /dev/null
+++ b/.github/workflows/cancel.yml
@@ -0,0 +1,26 @@
+name: Cancel
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
+on: # yamllint disable-line rule:truthy
+  workflow_run:
+    workflows:
+      - "PR"
+      - "Community PR"
+      - "PullRequestCI"
+      - "ReleaseBranchCI"
+      - "MasterCI"
+      - "DocsCheck"
+      - "BackportPR"
+    types:
+      - requested
+jobs:
+  cancel:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          all_but_latest: true
+          workflow_id: ${{ github.event.workflow.id }}
diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
index 315673d4abcc..8e5191eb33cc 100644
--- a/.github/workflows/cherry_pick.yml
+++ b/.github/workflows/cherry_pick.yml
@@ -28,7 +28,7 @@ jobs:
           REPO_TEAM=core
           EOF
       - name: Check out repository code
-        uses: ClickHouse/checkout@v1
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
         with:
           clear-repository: true
           token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
diff --git a/.github/workflows/compare_fails.yml b/.github/workflows/compare_fails.yml
new file mode 100644
index 000000000000..4b2e8c822c24
--- /dev/null
+++ b/.github/workflows/compare_fails.yml
@@ -0,0 +1,110 @@
+name: Compare CI Failures
+
+on:
+  workflow_dispatch:
+    inputs:
+      current_ref:
+        description: 'Current reference (commit hash or git tag) (default: current commit on selected branch)'
+        required: false
+        type: string
+      previous_ref:
+        description: 'Previous reference to compare with (commit hash, git tag or workflow url) (default: previous stable tag for current reference)'
+        required: false
+        type: string
+      upstream_ref:
+        description: 'Upstream reference to compare with (commit hash, git tag or MAJOR.MINOR version) (default: previous lts tag for current reference)'
+        required: false
+        type: string
+      include_broken:
+        description: 'Include BROKEN tests in comparison'
+        required: false
+        type: boolean
+        default: false
+  push:
+    tags:
+      - 'v*.altinity*'
+
+env:
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CHECKS_DATABASE_USER: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CHECKS_DATABASE_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+
+jobs:
+  Compare:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    steps:
+      - name: Check commit status
+        run: |
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "${{ inputs.current_ref }}" ]]; then
+            # For workflow_dispatch with custom ref, skip the check
+            exit 0
+          fi
+                    
+          # Query GitHub API for commit status
+          STATUSES=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            "https://api.github.com/repos/${{ github.repository }}/commits/${{ github.sha }}/status")
+          
+          # Check if there are any statuses
+          if [ "$(echo $STATUSES | jq '.total_count')" -eq 0 ]; then
+            echo "No commit statuses found for ${{ github.sha }}. Assuming tests have not run yet. Aborting workflow."
+            exit 1
+          fi
+          
+          echo "Found commit statuses, proceeding with comparison."
+
+      - name: Check out repository code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.current_ref || github.ref }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+          cache: 'pip'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install clickhouse-driver requests pandas tabulate
+
+      - name: Set default refs
+        id: default_refs
+        run: |
+          VERSION=$(git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\.[0-9]\+\).*/\1/')
+          echo "Detected version: $VERSION"
+
+          CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity')
+          echo "CURRENT_TAG: $CURRENT_TAG ${{ inputs.current_ref || github.sha }}"
+          PREVIOUS_TAG_COMMIT=$(git log -1 --until=yesterday --tags=v${VERSION}*.altinity* | grep -Po "(?<=commit ).*")
+          PREVIOUS_TAG=$(git tag --contains $PREVIOUS_TAG_COMMIT | sort -r | grep -m 1 'altinity')
+          echo "PREVIOUS_TAG: $PREVIOUS_TAG $PREVIOUS_TAG_COMMIT"
+          UPSTREAM_TAG_COMMIT=$(git log -1 --tags=v${VERSION}*-lts | grep -Po "(?<=commit ).*")
+          UPSTREAM_TAG=$(git tag --contains $UPSTREAM_TAG_COMMIT | sort -r | grep -m 1 'lts')
+          echo "UPSTREAM_TAG: $UPSTREAM_TAG $UPSTREAM_TAG_COMMIT"
+
+          echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_OUTPUT
+          echo "PREVIOUS_TAG_COMMIT=$PREVIOUS_TAG_COMMIT" >> $GITHUB_OUTPUT
+          echo "UPSTREAM_TAG=$UPSTREAM_TAG" >> $GITHUB_OUTPUT
+          echo "UPSTREAM_TAG_COMMIT=$UPSTREAM_TAG_COMMIT" >> $GITHUB_OUTPUT
+          echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_OUTPUT
+      - name: Comparison report
+        if: ${{ !cancelled() }}
+        run: |
+          git clone https://github.com/Altinity/actions.git
+          cd actions
+          git checkout 4623f919ee2738bea69aad405879562476736932
+          python3 scripts/compare_ci_fails.py \
+            --current-ref ${{ steps.default_refs.outputs.CURRENT_TAG || inputs.current_ref || github.sha }} \
+            --previous-ref ${{ steps.default_refs.outputs.PREVIOUS_TAG || inputs.previous_ref || steps.default_refs.outputs.PREVIOUS_TAG_COMMIT }} \
+            --upstream-ref ${{ steps.default_refs.outputs.UPSTREAM_TAG || inputs.upstream_ref || steps.default_refs.outputs.UPSTREAM_TAG_COMMIT }} \
+            ${{ inputs.include_broken && '--broken' || '' }}
+          cat comparison_results.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Upload comparison results
+        uses: actions/upload-artifact@v4
+        with:
+          name: comparison-results
+          path: |
+            actions/comparison_results.md
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index dc708514dfd5..421261fb436f 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -70,7 +70,7 @@ jobs:
     runs-on: [self-hosted, release-maker]
     steps:
       - name: Check out repository code
-        uses: ClickHouse/checkout@v1
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
         with:
           token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
           fetch-depth: 0
diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
new file mode 100644
index 000000000000..b7b5fcd0d940
--- /dev/null
+++ b/.github/workflows/docker_publish.yml
@@ -0,0 +1,183 @@
+name: Republish Multiarch Docker Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      docker_image:
+        description: 'Multiarch Docker image with tag'
+        required: true
+      release_environment:
+        description: 'Select release type: "staging" or "production"'
+        type: choice
+        default: 'staging'
+        options:
+          - staging
+          - production
+      upload_artifacts:
+        description: 'Upload artifacts directly in this workflow'
+        type: boolean
+        default: true
+      s3_upload_path:
+        description: 'Upload artifacts to s3 path'
+        type: string
+        required: false
+  workflow_call:
+    inputs:
+      docker_image:
+        type: string
+        required: true
+      release_environment:
+        type: string
+        required: false
+        default: 'staging'
+      upload_artifacts:
+        type: boolean
+        required: false
+        default: false
+      s3_upload_path:
+        type: string
+        required: false
+    outputs:
+      image_archives_path:
+        description: 'Path to the image archives directory'
+        value: ${{ jobs.republish.outputs.image_archives_path }}
+
+env:
+  IMAGE: ${{ github.event.inputs.docker_image || inputs.docker_image }}
+
+jobs:
+  republish:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    outputs:
+      image_archives_path: ${{ steps.set_path.outputs.image_archives_path }}
+    steps:
+      - name: Docker Hub Login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Set clickhouse-server version as new tag
+        run: |
+          # Determine "clickhouse-server" or "clickhouse-keeper"
+          echo "Input IMAGE: $IMAGE"
+          COMPONENT=$(echo "$IMAGE" | sed -E 's|.*/(clickhouse-[^:]+):.*|\1|')
+          echo "Component determined: $COMPONENT"
+          echo "COMPONENT=$COMPONENT" >> $GITHUB_ENV
+
+          # Pull the image
+          echo "Pulling the image"
+          docker pull $IMAGE
+
+          # Create container for version and symtable checks
+          echo "Creating container for checks..."
+          CONTAINER_ID=$(docker create $IMAGE $COMPONENT --version)
+
+          # Check if binary has symbol table (not stripped)
+          echo "Checking if binary has symtable..."
+          # Try common binary locations
+          BINARY_PATH=""
+          for path in "/usr/bin/clickhouse" "/usr/bin/$COMPONENT"; do
+            if docker cp "$CONTAINER_ID:$path" /tmp/clickhouse-check 2>/dev/null; then
+              BINARY_PATH="$path"
+              break
+            fi
+          done
+
+          if [ -z "$BINARY_PATH" ]; then
+            echo "✗ Could not find clickhouse binary in container"
+            docker rm "$CONTAINER_ID"
+            exit 1
+          fi
+
+          echo "Found binary at $BINARY_PATH"
+          if readelf -S /tmp/clickhouse-check | grep -q '\.symtab'; then
+            echo "✓ Binary has symtable"
+          else
+            echo "✗ Binary is missing symtable"
+            docker rm "$CONTAINER_ID"
+            rm -f /tmp/clickhouse-check
+            exit 1
+          fi
+          rm -f /tmp/clickhouse-check
+
+          # Get version and clean it up
+          echo "Getting version from image..."
+          VERSION_OUTPUT=$(docker start -a "$CONTAINER_ID")
+          docker rm "$CONTAINER_ID"
+          echo "Raw version output: $VERSION_OUTPUT"
+
+          # Extract just the version number
+          NEW_TAG=$(echo "$VERSION_OUTPUT" | sed -E 's/.*version ([0-9.]+[^ ]*).*/\1/')
+          echo "Cleaned version: $NEW_TAG"
+
+          # Append "-prerelease" if necessary
+          if [ "${{ github.event.inputs.release_environment || inputs.release_environment }}" = "staging" ]; then
+            NEW_TAG="${NEW_TAG}-prerelease"
+          fi
+
+          if [[ "$IMAGE" == *-alpine* ]]; then
+            NEW_TAG="${NEW_TAG}-alpine"
+          fi
+          echo "New tag: $NEW_TAG"
+
+          # Export the new tag
+          echo "NEW_TAG=$NEW_TAG" >> $GITHUB_ENV
+
+      - name: Process multiarch manifest
+        run: |
+          echo "Re-tag multiarch image $IMAGE to altinity/$COMPONENT:$NEW_TAG"
+          docker buildx imagetools create --tag "altinity/$COMPONENT:$NEW_TAG" "$IMAGE"
+
+          # Create directory for image archives
+          mkdir -p image_archives
+
+          # Pull and save platform-specific images
+          for PLATFORM in "linux/amd64" "linux/arm64"; do
+            echo "Pulling and saving image for $PLATFORM..."
+            # Pull the specific platform image
+            docker pull --platform $PLATFORM "altinity/$COMPONENT:$NEW_TAG"
+
+            # Save the image to a tar file
+            ARCH=$(echo $PLATFORM | cut -d'/' -f2)
+            docker save "altinity/$COMPONENT:$NEW_TAG" -o "image_archives/${COMPONENT}-${NEW_TAG}-${ARCH}.tar"
+          done
+
+          # Save manifest inspection
+          docker buildx imagetools inspect "altinity/$COMPONENT:$NEW_TAG" > image_archives/manifest.txt
+
+          # Compress the archives
+          cd image_archives
+          for file in *.tar; do
+            gzip "$file"
+          done
+          cd ..
+
+      - name: Set image archives path
+        id: set_path
+        run: |
+          echo "image_archives_path=${{ github.workspace }}/image_archives" >> $GITHUB_OUTPUT
+
+      - name: Upload image archives
+        if: ${{ github.event.inputs.upload_artifacts || inputs.upload_artifacts }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-images-backup
+          path: image_archives/
+          retention-days: 90
+
+      - name: Install aws cli
+        if: ${{ inputs.s3_upload_path != '' }}
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+
+      - name: Upload to S3
+        if: ${{ inputs.s3_upload_path != '' }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: |
+          aws s3 sync image_archives/ "${{ inputs.s3_upload_path }}"
+
diff --git a/.github/workflows/grype_scan.yml b/.github/workflows/grype_scan.yml
new file mode 100644
index 000000000000..a408a6874ac7
--- /dev/null
+++ b/.github/workflows/grype_scan.yml
@@ -0,0 +1,154 @@
+name: Grype Scan
+run-name: Grype Scan ${{ inputs.docker_image }}
+
+on:
+    workflow_dispatch:
+        # Inputs for manual run
+        inputs:
+            docker_image:
+                description: 'Docker image. If no tag, it will be determined by version_helper.py'
+                required: true
+    workflow_call:
+        # Inputs for workflow call
+        inputs:
+            docker_image:
+                description: 'Docker image. If no tag, it will be determined by version_helper.py'
+                required: true
+                type: string
+            version:
+                description: 'Version tag. If no version, it will be determined by version_helper.py'
+                required: false
+                type: string
+                default: ""
+            tag-suffix:
+                description: 'Tag suffix. To be appended the version from version_helper.py'
+                required: false
+                type: string
+                default: ""
+env:
+  PYTHONUNBUFFERED: 1
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  GRYPE_VERSION: "v0.92.2-arm64v8"
+
+jobs:
+    grype_scan:
+        name: Grype Scan
+        runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+        steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+
+        - name: Set up Docker
+          uses: docker/setup-buildx-action@v3
+
+        - name: Set up Python
+          run: |
+            export TESTFLOWS_VERSION="2.4.19"
+            sudo apt-get update
+            sudo apt-get install -y python3-pip python3-venv
+            python3 -m venv venv
+            source venv/bin/activate
+            pip install --upgrade requests chardet urllib3 unidiff boto3 PyGithub
+            pip install testflows==$TESTFLOWS_VERSION awscli==1.33.28
+            echo PATH=$PATH >>$GITHUB_ENV
+
+        - name: Set image tag if not given
+          if: ${{ !contains(inputs.docker_image, ':') }}
+          id: set_version
+          env:
+            TAG_SUFFIX: ${{ inputs.tag-suffix }}
+            SPECIFIED_VERSION: ${{ inputs.version }}
+          run: |
+            python3 ./tests/ci/version_helper.py | grep = | tee /tmp/version_info
+            source /tmp/version_info
+            if [ -z "$SPECIFIED_VERSION" ]; then
+                VERSION=$CLICKHOUSE_VERSION_STRING
+            else
+                VERSION=$SPECIFIED_VERSION
+            fi
+            echo "docker_image=${{ inputs.docker_image }}:$PR_NUMBER-$VERSION$TAG_SUFFIX" >> $GITHUB_OUTPUT
+
+        - name: Run Grype Scan
+          run: |
+            DOCKER_IMAGE=${{ steps.set_version.outputs.docker_image || inputs.docker_image }}
+            ./.github/grype/run_grype_scan.sh $DOCKER_IMAGE
+
+        - name: Parse grype results
+          run: |
+            python3 -u ./.github/grype/parse_vulnerabilities_grype.py -o nice --no-colors --log raw.log --test-to-end
+
+        - name: Transform and Upload Grype Results
+          if: always()
+          id: upload_results
+          env:
+            S3_BUCKET: "altinity-build-artifacts"
+            COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+            PR_NUMBER: ${{ env.PR_NUMBER || github.event.pull_request.number || 0 }}
+            DOCKER_IMAGE: ${{ steps.set_version.outputs.docker_image || inputs.docker_image }}
+          run: |
+            echo "PR_NUMBER=$PR_NUMBER"
+            ./.github/grype/transform_and_upload_results_s3.sh
+
+        - name: Create step summary
+          if: always()
+          id: create_summary
+          run: |
+            jq -r '"**Image**: \(.source.target.userInput)"' result.json >> $GITHUB_STEP_SUMMARY
+            jq -r '.distro | "**Distro**: \(.name):\(.version)"' result.json >> $GITHUB_STEP_SUMMARY
+            if jq -e '.matches | length == 0' result.json > /dev/null; then
+              echo "No CVEs" >> $GITHUB_STEP_SUMMARY
+            else
+              echo "| Severity   | Count |" >> $GITHUB_STEP_SUMMARY
+              echo "|------------|-------|" >> $GITHUB_STEP_SUMMARY
+              jq -r '
+                .matches | 
+                map(.vulnerability.severity) | 
+                group_by(.) | 
+                map({severity: .[0], count: length}) | 
+                sort_by(.severity) | 
+                map("| \(.severity) | \(.count) |") | 
+                .[]
+              ' result.json >> $GITHUB_STEP_SUMMARY
+            fi
+
+            HIGH_COUNT=$(jq -r '.matches | map(.vulnerability) | unique_by(.id) | map(.severity) | map(select(. == "High")) | length' result.json)
+            CRITICAL_COUNT=$(jq -r '.matches | map(.vulnerability) | unique_by(.id) | map(.severity) | map(select(. == "Critical")) | length' result.json)
+            TOTAL_HIGH_CRITICAL=$((HIGH_COUNT + CRITICAL_COUNT))
+            echo "total_high_critical=$TOTAL_HIGH_CRITICAL" >> $GITHUB_OUTPUT
+
+            if [ $TOTAL_HIGH_CRITICAL -gt 0 ]; then
+                echo '## High and Critical vulnerabilities found' >> $GITHUB_STEP_SUMMARY
+                echo '```' >> $GITHUB_STEP_SUMMARY
+                cat raw.log | tfs --no-colors show tests | grep -Pi 'High|Critical' >> $GITHUB_STEP_SUMMARY
+                echo '```' >> $GITHUB_STEP_SUMMARY
+            fi
+
+        - name: Set commit status
+          if: always()
+          uses: actions/github-script@v7
+          with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
+            script: |
+              const totalHighCritical = '${{ steps.create_summary.outputs.total_high_critical }}';
+              const hasError = totalHighCritical === '';
+              const hasVulnerabilities = parseInt(totalHighCritical) > 0;
+              github.rest.repos.createCommitStatus({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                sha: '${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}',
+                state: hasError ? 'error' : hasVulnerabilities ? 'failure' : 'success',
+                target_url: '${{ steps.upload_results.outputs.https_report_path }}',
+                description: hasError ? 'An error occurred' : `Grype Scan Completed with ${totalHighCritical} high/critical vulnerabilities`,
+                context: 'Grype Scan ${{ steps.set_version.outputs.docker_image || inputs.docker_image }}'
+              });
+
+        - name: Upload artifacts
+          if: always()
+          uses: actions/upload-artifact@v6
+          with:
+            name: grype-results-${{ hashFiles('raw.log') }}
+            path: |
+              result.json
+              nice.log.txt
diff --git a/.github/workflows/init_praktika.yml b/.github/workflows/init_praktika.yml
new file mode 100644
index 000000000000..e9f56e0d2396
--- /dev/null
+++ b/.github/workflows/init_praktika.yml
@@ -0,0 +1,27 @@
+name: InitPraktikaReport
+
+# This workflow is used to initialize/update the praktika report in S3.
+# It does not need to run often, when a new release is created should be plenty.
+
+on:
+  workflow_dispatch:
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+
+  init_praktika:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    name: "Init praktika"
+    steps:
+      - name: Init praktika report
+        run: |
+            export PYTHONPATH=./ci:.:
+            pip install htmlmin
+            python3 -m praktika html
+  
\ No newline at end of file
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 00dbccb41836..3412512852fd 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -3,21 +3,43 @@
 name: MasterCI
 
 on:
+  workflow_dispatch:
+    inputs:
+      no_cache:
+        description: Run without cache
+        required: false
+        type: boolean
+        default: false
   push:
-    branches: ['master']
+    branches: ['antalya', 'releases/*', 'antalya-*']
 
 env:
   # Force the stdout and stderr streams to be unbuffered
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
+  DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
   CHECKOUT_REF: ""
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
+  AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
+  AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
+
 
-# Allow updating GH commit statuses and PR comments to post an actual job reports link
-permissions: write-all
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -28,6 +50,27 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -54,7 +97,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -66,6 +109,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -92,7 +142,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -104,6 +154,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -130,7 +187,7 @@ jobs:
           fi
 
   dockers_build_multiplatform_manifest:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAobXVsdGlwbGF0Zm9ybSBtYW5pZmVzdCk=') }}
     name: "Dockers Build (multiplatform manifest)"
@@ -142,43 +199,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  build_arm_tidy:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV90aWR5KQ==') }}
-    name: "Build (arm_tidy)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Dockers Build (multiplatform manifest)"
 
       - name: Prepare env script
         run: |
@@ -200,13 +226,13 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_tidy)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_tidy)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
   build_amd_debug:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
     name: "Build (amd_debug)"
@@ -218,6 +244,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -244,7 +277,7 @@ jobs:
           fi
 
   build_amd_release:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
     name: "Build (amd_release)"
@@ -256,6 +289,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -282,7 +322,7 @@ jobs:
           fi
 
   build_amd_asan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
     name: "Build (amd_asan)"
@@ -294,6 +334,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_asan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -320,7 +367,7 @@ jobs:
           fi
 
   build_amd_tsan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
     name: "Build (amd_tsan)"
@@ -332,6 +379,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -358,7 +412,7 @@ jobs:
           fi
 
   build_amd_msan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
     name: "Build (amd_msan)"
@@ -370,6 +424,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -396,7 +457,7 @@ jobs:
           fi
 
   build_amd_ubsan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
     name: "Build (amd_ubsan)"
@@ -408,6 +469,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -434,7 +502,7 @@ jobs:
           fi
 
   build_amd_binary:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
     name: "Build (amd_binary)"
@@ -446,6 +514,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_binary)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -472,7 +547,7 @@ jobs:
           fi
 
   build_arm_release:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
     name: "Build (arm_release)"
@@ -484,6 +559,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -509,11 +591,11 @@ jobs:
             python3 -m praktika run 'Build (arm_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_asan:
-    runs-on: [self-hosted, builder-aarch64]
+  build_arm_coverage:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9hc2FuKQ==') }}
-    name: "Build (arm_asan)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
+    name: "Build (arm_coverage)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -522,6 +604,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_coverage)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -542,16 +631,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_asan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_coverage)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_asan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_coverage)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_coverage:
-    runs-on: [self-hosted, builder-aarch64]
+  build_arm_binary:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
-    name: "Build (arm_coverage)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
+    name: "Build (arm_binary)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -560,6 +649,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_binary)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -580,16 +676,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_coverage)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_binary)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_coverage)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_binary)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_binary:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
-    name: "Build (arm_binary)"
+  unit_tests_asan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbik=') }}
+    name: "Unit tests (asan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -598,6 +694,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (asan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -618,16 +721,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_binary)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (asan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_binary)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (asan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_darwin:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kYXJ3aW4p') }}
-    name: "Build (amd_darwin)"
+  unit_tests_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbik=') }}
+    name: "Unit tests (tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -636,6 +739,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -656,16 +766,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_darwin)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_darwin)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_darwin:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9kYXJ3aW4p') }}
-    name: "Build (arm_darwin)"
+  unit_tests_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbik=') }}
+    name: "Unit tests (msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -674,6 +784,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -694,16 +811,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_darwin)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_darwin)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_v80compat:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV92ODBjb21wYXQp') }}
-    name: "Build (arm_v80compat)"
+  unit_tests_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodWJzYW4p') }}
+    name: "Unit tests (ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -712,6 +829,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -732,16 +856,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_v80compat)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_v80compat)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_freebsd:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9mcmVlYnNkKQ==') }}
-    name: "Build (amd_freebsd)"
+  docker_server_image:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    name: "Docker server image"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -750,6 +874,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker server image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -770,16 +901,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_freebsd)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker server image' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_freebsd)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker server image' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_ppc64le:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHBwYzY0bGUp') }}
-    name: "Build (ppc64le)"
+  docker_keeper_image:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+    name: "Docker keeper image"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -788,6 +919,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker keeper image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -808,16 +946,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (ppc64le)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker keeper image' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (ppc64le)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker keeper image' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_compat:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
-    name: "Build (amd_compat)"
+  install_packages_amd_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX3JlbGVhc2Up') }}
+    name: "Install packages (amd_release)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -826,6 +964,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -846,16 +991,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_compat)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Install packages (amd_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_compat)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Install packages (amd_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_musl:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tdXNsKQ==') }}
-    name: "Build (amd_musl)"
+  install_packages_arm_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYXJtX3JlbGVhc2Up') }}
+    name: "Install packages (arm_release)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -864,6 +1009,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (arm_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -884,16 +1036,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_musl)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Install packages (arm_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_musl)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Install packages (arm_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_riscv64:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHJpc2N2NjQp') }}
-    name: "Build (riscv64)"
+  compatibility_check_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAocmVsZWFzZSk=') }}
+    name: "Compatibility check (release)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -902,6 +1054,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Compatibility check (release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -922,16 +1081,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (riscv64)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (riscv64)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_s390x:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHMzOTB4KQ==') }}
-    name: "Build (s390x)"
+  compatibility_check_aarch64:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAoYWFyY2g2NCk=') }}
+    name: "Compatibility check (aarch64)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -940,6 +1099,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Compatibility check (aarch64)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -960,16 +1126,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (s390x)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (s390x)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_loongarch64:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGxvb25nYXJjaDY0KQ==') }}
-    name: "Build (loongarch64)"
+  stateless_tests_amd_asan_distributed_plan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -978,6 +1144,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -998,16 +1171,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (loongarch64)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (loongarch64)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_fuzzers:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGZ1enplcnMp') }}
-    name: "Build (fuzzers)"
+  stateless_tests_amd_asan_distributed_plan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1016,6 +1189,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1036,16 +1216,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (fuzzers)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (fuzzers)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_asan:
-    runs-on: [self-hosted, builder]
+  stateless_tests_amd_asan_distributed_plan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbik=') }}
-    name: "Unit tests (asan)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_asan, distributed plan, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1054,6 +1234,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1074,16 +1261,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (asan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (asan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_tsan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbik=') }}
-    name: "Unit tests (tsan)"
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1092,6 +1279,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1112,16 +1306,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_msan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbik=') }}
-    name: "Unit tests (msan)"
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1130,6 +1324,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1150,16 +1351,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_ubsan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodWJzYW4p') }}
-    name: "Unit tests (ubsan)"
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1168,6 +1369,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1188,16 +1396,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  docker_server_image:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
-    name: "Docker server image"
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1206,6 +1414,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1226,1080 +1441,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Docker server image' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Docker server image' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  docker_keeper_image:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
-    name: "Docker keeper image"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Docker keeper image' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Docker keeper image' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  install_packages_amd_release:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX3JlbGVhc2Up') }}
-    name: "Install packages (amd_release)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Install packages (amd_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Install packages (amd_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  install_packages_arm_release:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYXJtX3JlbGVhc2Up') }}
-    name: "Install packages (arm_release)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Install packages (arm_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Install packages (arm_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  compatibility_check_release:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAocmVsZWFzZSk=') }}
-    name: "Compatibility check (release)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Compatibility check (release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Compatibility check (release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  compatibility_check_aarch64:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAoYWFyY2g2NCk=') }}
-    name: "Compatibility check (aarch64)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_asan_distributed_plan_parallel_1_2:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
-    name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_asan_distributed_plan_parallel_2_2:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
-    name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_asan_distributed_plan_sequential:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
-    name: "Stateless tests (amd_asan, distributed plan, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgcGFyYWxsZWwp') }}
-    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgc2VxdWVudGlhbCk=') }}
-    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
-    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
-    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_asyncinsert_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
-    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_asyncinsert_s3_storage_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
-    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_parallel:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (amd_debug, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (amd_debug, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_parallel_1_2:
-    runs-on: [self-hosted, amd-large]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDEvMik=') }}
-    name: "Stateless tests (amd_tsan, parallel, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_parallel_2_2:
-    runs-on: [self-hosted, amd-large]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDIvMik=') }}
-    name: "Stateless tests (amd_tsan, parallel, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_sequential_1_2:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
-    name: "Stateless tests (amd_tsan, sequential, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_sequential_2_2:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
-    name: "Stateless tests (amd_tsan, sequential, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_parallel_1_2:
-    runs-on: [self-hosted, amd-large]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDEvMik=') }}
-    name: "Stateless tests (amd_msan, parallel, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_parallel_2_2:
-    runs-on: [self-hosted, amd-large]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDIvMik=') }}
-    name: "Stateless tests (amd_msan, parallel, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_sequential_1_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
-    name: "Stateless tests (amd_msan, sequential, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_sequential_2_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
-    name: "Stateless tests (amd_msan, sequential, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_ubsan_parallel:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (amd_ubsan, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_ubsan_sequential:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (amd_ubsan, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_distributed_plan_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_distributed_plan_s3_storage_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgcGFyYWxsZWwp') }}
-    name: "Stateless tests (amd_tsan, s3 storage, parallel)"
+  stateless_tests_amd_debug_asyncinsert_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2308,43 +1459,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_s3_storage_sequential_1_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMS8yKQ==') }}
-    name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
 
       - name: Prepare env script
         run: |
@@ -2366,16 +1486,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_tsan_s3_storage_sequential_2_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMi8yKQ==') }}
-    name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
+  stateless_tests_amd_debug_asyncinsert_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2384,6 +1504,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2404,16 +1531,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_arm_binary_parallel:
-    runs-on: [self-hosted, arm-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBwYXJhbGxlbCk=') }}
-    name: "Stateless tests (arm_binary, parallel)"
+  stateless_tests_amd_debug_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_debug, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2422,6 +1549,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2442,16 +1576,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_arm_binary_sequential:
-    runs-on: [self-hosted, arm-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBzZXF1ZW50aWFsKQ==') }}
-    name: "Stateless tests (arm_binary, sequential)"
+  stateless_tests_amd_debug_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_debug, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2460,6 +1594,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2480,16 +1621,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_arm_asan_azure_parallel:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYXNhbiwgYXp1cmUsIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (arm_asan, azure, parallel)"
+  stateless_tests_amd_tsan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_tsan, parallel, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2498,6 +1639,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2518,16 +1666,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_asan, azure, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (arm_asan, azure, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_arm_asan_azure_sequential:
-    runs-on: [self-hosted, arm-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYXNhbiwgYXp1cmUsIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (arm_asan, azure, sequential)"
+  stateless_tests_amd_tsan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_tsan, parallel, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2536,6 +1684,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2556,16 +1711,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_asan, azure, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (arm_asan, azure, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_old_analyzer_1_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 1/6)"
+  stateless_tests_amd_tsan_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_tsan, sequential, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2574,6 +1729,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, sequential, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2594,16 +1756,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_old_analyzer_2_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 2/6)"
+  stateless_tests_amd_tsan_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_tsan, sequential, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2612,6 +1774,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, sequential, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2632,16 +1801,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_old_analyzer_3_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 3/6)"
+  stateless_tests_amd_msan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_msan, parallel, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2650,6 +1819,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2670,16 +1846,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_old_analyzer_4_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 4/6)"
+  stateless_tests_amd_msan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_msan, parallel, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2688,6 +1864,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2708,16 +1891,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_old_analyzer_5_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 5/6)"
+  stateless_tests_amd_msan_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_msan, sequential, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2726,6 +1909,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, sequential, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2746,16 +1936,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_old_analyzer_6_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 6/6)"
+  stateless_tests_amd_msan_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_msan, sequential, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2764,6 +1954,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, sequential, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2784,16 +1981,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_binary_1_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDEvNSk=') }}
-    name: "Integration tests (amd_binary, 1/5)"
+  stateless_tests_amd_ubsan_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_ubsan, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2802,6 +1999,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_ubsan, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2822,16 +2026,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_binary_2_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDIvNSk=') }}
-    name: "Integration tests (amd_binary, 2/5)"
+  stateless_tests_amd_ubsan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_ubsan, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2840,6 +2044,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_ubsan, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2860,16 +2071,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_binary_3_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDMvNSk=') }}
-    name: "Integration tests (amd_binary, 3/5)"
+  stateless_tests_amd_debug_distributed_plan_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2878,6 +2089,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2898,16 +2116,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_binary_4_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDQvNSk=') }}
-    name: "Integration tests (amd_binary, 4/5)"
+  stateless_tests_amd_debug_distributed_plan_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2916,6 +2134,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2936,16 +2161,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_binary_5_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDUvNSk=') }}
-    name: "Integration tests (amd_binary, 5/5)"
+  stateless_tests_amd_tsan_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_tsan, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2954,6 +2179,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2974,16 +2206,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_1_4:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDEvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 1/4)"
+  stateless_tests_amd_tsan_s3_storage_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2992,6 +2224,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3012,16 +2251,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_2_4:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDIvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 2/4)"
+  stateless_tests_amd_tsan_s3_storage_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3030,6 +2269,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3050,16 +2296,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_3_4:
-    runs-on: [self-hosted, arm-medium]
+  stateless_tests_arm_binary_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDMvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 3/4)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (arm_binary, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3068,6 +2314,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3088,16 +2341,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_4_4:
-    runs-on: [self-hosted, arm-medium]
+  stateless_tests_arm_binary_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDQvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 4/4)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (arm_binary, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3106,6 +2359,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3126,16 +2386,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_1_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
-    name: "Integration tests (amd_tsan, 1/6)"
+  integration_tests_amd_asan_old_analyzer_1_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 1/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3144,6 +2404,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3164,16 +2431,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_2_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
-    name: "Integration tests (amd_tsan, 2/6)"
+  integration_tests_amd_asan_old_analyzer_2_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 2/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3182,6 +2449,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3202,16 +2476,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_3_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
-    name: "Integration tests (amd_tsan, 3/6)"
+  integration_tests_amd_asan_old_analyzer_3_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 3/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3220,6 +2494,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3240,16 +2521,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_4_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
-    name: "Integration tests (amd_tsan, 4/6)"
+  integration_tests_amd_asan_old_analyzer_4_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 4/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3258,6 +2539,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3278,16 +2566,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_5_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
-    name: "Integration tests (amd_tsan, 5/6)"
+  integration_tests_amd_asan_old_analyzer_5_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 5/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3296,6 +2584,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3316,16 +2611,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_6_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
-    name: "Integration tests (amd_tsan, 6/6)"
+  integration_tests_amd_asan_old_analyzer_6_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 6/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3334,6 +2629,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3354,16 +2656,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_arm_coverage_parallel:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_coverage]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fY292ZXJhZ2UsIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (arm_coverage, parallel)"
+  integration_tests_amd_binary_1_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDEvNSk=') }}
+    name: "Integration tests (amd_binary, 1/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3372,6 +2674,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 1/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3392,16 +2701,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_coverage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (arm_coverage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_arm_coverage_sequential:
-    runs-on: [self-hosted, arm-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_coverage]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fY292ZXJhZ2UsIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (arm_coverage, sequential)"
+  integration_tests_amd_binary_2_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDIvNSk=') }}
+    name: "Integration tests (amd_binary, 2/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3410,6 +2719,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 2/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3430,16 +2746,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_coverage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (arm_coverage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9kZWJ1Zyk=') }}
-    name: "Stress test (amd_debug)"
+  integration_tests_amd_binary_3_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDMvNSk=') }}
+    name: "Integration tests (amd_binary, 3/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3448,6 +2764,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 3/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3468,16 +2791,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF90c2FuKQ==') }}
-    name: "Stress test (amd_tsan)"
+  integration_tests_amd_binary_4_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDQvNSk=') }}
+    name: "Integration tests (amd_binary, 4/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3486,6 +2809,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 4/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3506,16 +2836,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFybV9hc2FuKQ==') }}
-    name: "Stress test (arm_asan)"
+  integration_tests_amd_binary_5_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDUvNSk=') }}
+    name: "Integration tests (amd_binary, 5/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3524,6 +2854,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 5/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3544,16 +2881,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (arm_asan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (arm_asan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF91YnNhbik=') }}
-    name: "Stress test (amd_ubsan)"
+  integration_tests_arm_binary_distributed_plan_1_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDEvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 1/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3562,6 +2899,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 1/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3582,16 +2926,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9tc2FuKQ==') }}
-    name: "Stress test (amd_msan)"
+  integration_tests_arm_binary_distributed_plan_2_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDIvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 2/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3600,6 +2944,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 2/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3620,16 +2971,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_azure_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGF6dXJlLCB0c2FuKQ==') }}
-    name: "Stress test (azure, tsan)"
+  integration_tests_arm_binary_distributed_plan_3_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDMvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 3/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3638,6 +2989,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 3/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3658,16 +3016,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (azure, tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (azure, tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_azure_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGF6dXJlLCBtc2FuKQ==') }}
-    name: "Stress test (azure, msan)"
+  integration_tests_arm_binary_distributed_plan_4_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDQvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 4/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3676,6 +3034,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 4/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3696,16 +3061,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (azure, msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (azure, msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX2RlYnVnKQ==') }}
-    name: "AST fuzzer (amd_debug)"
+  integration_tests_amd_tsan_1_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
+    name: "Integration tests (amd_tsan, 1/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3714,6 +3079,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3734,16 +3106,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYXJtX2FzYW4p') }}
-    name: "AST fuzzer (arm_asan)"
+  integration_tests_amd_tsan_2_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
+    name: "Integration tests (amd_tsan, 2/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3752,6 +3124,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3772,16 +3151,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (arm_asan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (arm_asan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
+  integration_tests_amd_tsan_3_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3RzYW4p') }}
-    name: "AST fuzzer (amd_tsan)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
+    name: "Integration tests (amd_tsan, 3/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3790,6 +3169,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3810,16 +3196,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX21zYW4p') }}
-    name: "AST fuzzer (amd_msan)"
+  integration_tests_amd_tsan_4_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
+    name: "Integration tests (amd_tsan, 4/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3828,6 +3214,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3848,16 +3241,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3Vic2FuKQ==') }}
-    name: "AST fuzzer (amd_ubsan)"
+  integration_tests_amd_tsan_5_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
+    name: "Integration tests (amd_tsan, 5/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3866,6 +3259,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3886,16 +3286,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfZGVidWcp') }}
-    name: "BuzzHouse (amd_debug)"
+  integration_tests_amd_tsan_6_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
+    name: "Integration tests (amd_tsan, 6/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3904,6 +3304,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3924,16 +3331,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhcm1fYXNhbik=') }}
-    name: "BuzzHouse (arm_asan)"
+  stateless_tests_arm_coverage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_coverage]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fY292ZXJhZ2UsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (arm_coverage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3942,6 +3349,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_coverage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3962,16 +3376,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (arm_asan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_coverage, parallel)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (arm_asan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_coverage, parallel)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdHNhbik=') }}
-    name: "BuzzHouse (amd_tsan)"
+  stateless_tests_arm_coverage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_coverage]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fY292ZXJhZ2UsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (arm_coverage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3980,6 +3394,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_coverage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4000,16 +3421,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_coverage, sequential)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_coverage, sequential)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfbXNhbik=') }}
-    name: "BuzzHouse (amd_msan)"
+  stress_test_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9kZWJ1Zyk=') }}
+    name: "Stress test (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4018,6 +3439,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4038,16 +3466,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdWJzYW4p') }}
-    name: "BuzzHouse (amd_ubsan)"
+  stress_test_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF90c2FuKQ==') }}
+    name: "Stress test (amd_tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4056,6 +3484,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4076,16 +3511,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_amd_release_master_head_1_3:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYW1kX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAxLzMp') }}
-    name: "Performance Comparison (amd_release, master_head, 1/3)"
+  stress_test_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF91YnNhbik=') }}
+    name: "Stress test (amd_ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4094,6 +3529,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4114,16 +3556,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 1/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 1/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_amd_release_master_head_2_3:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYW1kX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAyLzMp') }}
-    name: "Performance Comparison (amd_release, master_head, 2/3)"
+  stress_test_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9tc2FuKQ==') }}
+    name: "Stress test (amd_msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4132,6 +3574,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4152,16 +3601,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 2/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 2/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_amd_release_master_head_3_3:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYW1kX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAzLzMp') }}
-    name: "Performance Comparison (amd_release, master_head, 3/3)"
+  ast_fuzzer_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX2RlYnVnKQ==') }}
+    name: "AST fuzzer (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4170,6 +3619,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4190,16 +3646,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 3/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 3/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_master_head_1_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAxLzMp') }}
-    name: "Performance Comparison (arm_release, master_head, 1/3)"
+  ast_fuzzer_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3RzYW4p') }}
+    name: "AST fuzzer (amd_tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4208,6 +3664,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4228,16 +3691,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 1/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 1/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_master_head_2_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAyLzMp') }}
-    name: "Performance Comparison (arm_release, master_head, 2/3)"
+  ast_fuzzer_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX21zYW4p') }}
+    name: "AST fuzzer (amd_msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4246,6 +3709,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4266,16 +3736,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 2/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 2/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_master_head_3_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAzLzMp') }}
-    name: "Performance Comparison (arm_release, master_head, 3/3)"
+  ast_fuzzer_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3Vic2FuKQ==') }}
+    name: "AST fuzzer (amd_ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4284,6 +3754,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4304,16 +3781,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 3/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 3/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_release_base_1_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIHJlbGVhc2VfYmFzZSwgMS8zKQ==') }}
-    name: "Performance Comparison (arm_release, release_base, 1/3)"
+  buzzhouse_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfZGVidWcp') }}
+    name: "BuzzHouse (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4322,6 +3799,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4342,16 +3826,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, release_base, 1/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, release_base, 1/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_release_base_2_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIHJlbGVhc2VfYmFzZSwgMi8zKQ==') }}
-    name: "Performance Comparison (arm_release, release_base, 2/3)"
+  buzzhouse_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdHNhbik=') }}
+    name: "BuzzHouse (amd_tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4360,6 +3844,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4380,16 +3871,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, release_base, 2/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, release_base, 2/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_release_base_3_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIHJlbGVhc2VfYmFzZSwgMy8zKQ==') }}
-    name: "Performance Comparison (arm_release, release_base, 3/3)"
+  buzzhouse_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfbXNhbik=') }}
+    name: "BuzzHouse (amd_msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4398,6 +3889,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4418,16 +3916,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, release_base, 3/3)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, release_base, 3/3)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  clickbench_amd_release:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q2xpY2tCZW5jaCAoYW1kX3JlbGVhc2Up') }}
-    name: "ClickBench (amd_release)"
+  buzzhouse_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdWJzYW4p') }}
+    name: "BuzzHouse (amd_ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4436,6 +3934,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4456,16 +3961,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'ClickBench (amd_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'ClickBench (amd_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  clickbench_arm_release:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q2xpY2tCZW5jaCAoYXJtX3JlbGVhc2Up') }}
-    name: "ClickBench (arm_release)"
+  clickbench_amd_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q2xpY2tCZW5jaCAoYW1kX3JlbGVhc2Up') }}
+    name: "ClickBench (amd_release)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4474,6 +3979,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "ClickBench (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4494,16 +4006,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'ClickBench (arm_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'ClickBench (amd_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'ClickBench (arm_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'ClickBench (amd_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
-  sqlancer_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U1FMYW5jZXIgKGFtZF9kZWJ1Zyk=') }}
-    name: "SQLancer (amd_debug)"
+  clickbench_arm_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q2xpY2tCZW5jaCAoYXJtX3JlbGVhc2Up') }}
+    name: "ClickBench (arm_release)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4512,6 +4024,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "ClickBench (arm_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4532,13 +4051,13 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'SQLancer (amd_debug)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'ClickBench (arm_release)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'SQLancer (amd_debug)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'ClickBench (arm_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
 
   sqltest:
-    runs-on: [self-hosted, arm-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U1FMVGVzdA==') }}
     name: "SQLTest"
@@ -4550,6 +4069,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "SQLTest"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4576,8 +4102,8 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary, build_amd_darwin, build_arm_darwin, build_arm_v80compat, build_amd_freebsd, build_ppc64le, build_amd_compat, build_amd_musl, build_riscv64, build_s390x, build_loongarch64, build_fuzzers, unit_tests_asan, unit_tests_tsan, unit_tests_msan, unit_tests_ubsan, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, compatibility_check_release, compatibility_check_aarch64, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential, stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel, stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential, stateless_tests_amd_debug_asyncinsert_s3_storage_parallel, stateless_tests_amd_debug_asyncinsert_s3_storage_sequential, stateless_tests_amd_debug_parallel, stateless_tests_amd_debug_sequential, stateless_tests_amd_tsan_parallel_1_2, stateless_tests_amd_tsan_parallel_2_2, stateless_tests_amd_tsan_sequential_1_2, stateless_tests_amd_tsan_sequential_2_2, stateless_tests_amd_msan_parallel_1_2, stateless_tests_amd_msan_parallel_2_2, stateless_tests_amd_msan_sequential_1_2, stateless_tests_amd_msan_sequential_2_2, stateless_tests_amd_ubsan_parallel, stateless_tests_amd_ubsan_sequential, stateless_tests_amd_debug_distributed_plan_s3_storage_parallel, stateless_tests_amd_debug_distributed_plan_s3_storage_sequential, stateless_tests_amd_tsan_s3_storage_parallel, stateless_tests_amd_tsan_s3_storage_sequential_1_2, stateless_tests_amd_tsan_s3_storage_sequential_2_2, stateless_tests_arm_binary_parallel, stateless_tests_arm_binary_sequential, stateless_tests_arm_asan_azure_parallel, stateless_tests_arm_asan_azure_sequential, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_binary_1_5, integration_tests_amd_binary_2_5, integration_tests_amd_binary_3_5, integration_tests_amd_binary_4_5, integration_tests_amd_binary_5_5, integration_tests_arm_binary_distributed_plan_1_4, integration_tests_arm_binary_distributed_plan_2_4, integration_tests_arm_binary_distributed_plan_3_4, integration_tests_arm_binary_distributed_plan_4_4, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, stateless_tests_arm_coverage_parallel, stateless_tests_arm_coverage_sequential, stress_test_amd_debug, stress_test_amd_tsan, stress_test_arm_asan, stress_test_amd_ubsan, stress_test_amd_msan, stress_test_azure_tsan, stress_test_azure_msan, ast_fuzzer_amd_debug, ast_fuzzer_arm_asan, ast_fuzzer_amd_tsan, ast_fuzzer_amd_msan, ast_fuzzer_amd_ubsan, buzzhouse_amd_debug, buzzhouse_arm_asan, buzzhouse_amd_tsan, buzzhouse_amd_msan, buzzhouse_amd_ubsan, performance_comparison_amd_release_master_head_1_3, performance_comparison_amd_release_master_head_2_3, performance_comparison_amd_release_master_head_3_3, performance_comparison_arm_release_master_head_1_3, performance_comparison_arm_release_master_head_2_3, performance_comparison_arm_release_master_head_3_3, performance_comparison_arm_release_release_base_1_3, performance_comparison_arm_release_release_base_2_3, performance_comparison_arm_release_release_base_3_3, clickbench_amd_release, clickbench_arm_release, sqlancer_amd_debug, sqltest]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary, unit_tests_asan, unit_tests_tsan, unit_tests_msan, unit_tests_ubsan, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, compatibility_check_release, compatibility_check_aarch64, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential, stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel, stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential, stateless_tests_amd_debug_asyncinsert_s3_storage_parallel, stateless_tests_amd_debug_asyncinsert_s3_storage_sequential, stateless_tests_amd_debug_parallel, stateless_tests_amd_debug_sequential, stateless_tests_amd_tsan_parallel_1_2, stateless_tests_amd_tsan_parallel_2_2, stateless_tests_amd_tsan_sequential_1_2, stateless_tests_amd_tsan_sequential_2_2, stateless_tests_amd_msan_parallel_1_2, stateless_tests_amd_msan_parallel_2_2, stateless_tests_amd_msan_sequential_1_2, stateless_tests_amd_msan_sequential_2_2, stateless_tests_amd_ubsan_parallel, stateless_tests_amd_ubsan_sequential, stateless_tests_amd_debug_distributed_plan_s3_storage_parallel, stateless_tests_amd_debug_distributed_plan_s3_storage_sequential, stateless_tests_amd_tsan_s3_storage_parallel, stateless_tests_amd_tsan_s3_storage_sequential_1_2, stateless_tests_amd_tsan_s3_storage_sequential_2_2, stateless_tests_arm_binary_parallel, stateless_tests_arm_binary_sequential, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_binary_1_5, integration_tests_amd_binary_2_5, integration_tests_amd_binary_3_5, integration_tests_amd_binary_4_5, integration_tests_amd_binary_5_5, integration_tests_arm_binary_distributed_plan_1_4, integration_tests_arm_binary_distributed_plan_2_4, integration_tests_arm_binary_distributed_plan_3_4, integration_tests_arm_binary_distributed_plan_4_4, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, stateless_tests_arm_coverage_parallel, stateless_tests_arm_coverage_sequential, stress_test_amd_debug, stress_test_amd_tsan, stress_test_amd_ubsan, stress_test_amd_msan, ast_fuzzer_amd_debug, ast_fuzzer_amd_tsan, ast_fuzzer_amd_msan, ast_fuzzer_amd_ubsan, buzzhouse_amd_debug, buzzhouse_amd_tsan, buzzhouse_amd_msan, buzzhouse_amd_ubsan, clickbench_amd_release, clickbench_arm_release, sqltest]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
     outputs:
@@ -4588,6 +4114,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4612,3 +4145,221 @@ jobs:
           else
             python3 -m praktika run 'Finish Workflow' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
           fi
+
+##########################################################################################
+##################################### ALTINITY JOBS ######################################
+##########################################################################################
+
+  GrypeScanServer:
+    needs: [config_workflow, docker_server_image]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        suffix: ['', '-alpine']
+    uses: ./.github/workflows/grype_scan.yml
+    secrets: inherit
+    with:
+      docker_image: altinityinfra/clickhouse-server
+      version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+      tag-suffix: ${{ matrix.suffix }}
+  GrypeScanKeeper:
+      needs: [config_workflow, docker_keeper_image]
+      if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+      uses: ./.github/workflows/grype_scan.yml
+      secrets: inherit
+      with:
+        docker_image: altinityinfra/clickhouse-keeper
+        version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+
+  RegressionTestsRelease:
+    needs: [config_workflow, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
+    uses: ./.github/workflows/regression.yml
+    secrets: inherit
+    with:
+      runner_type: altinity-regression-tester
+      commit: 92f4413c775fc750e826951f5d235766c562a98f
+      arch: x86
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout_minutes: 210
+      workflow_config: ${{ needs.config_workflow.outputs.data }}
+  RegressionTestsAarch64:
+    needs: [config_workflow, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
+    uses: ./.github/workflows/regression.yml
+    secrets: inherit
+    with:
+      runner_type: altinity-regression-tester-aarch64
+      commit: 92f4413c775fc750e826951f5d235766c562a98f
+      arch: aarch64
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout_minutes: 210
+      workflow_config: ${{ needs.config_workflow.outputs.data }}
+
+  SignRelease:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_sign.yml
+    secrets: inherit
+    with:
+      test_name: Sign release
+      runner_type: altinity-style-checker
+      data: ${{ needs.config_workflow.outputs.data }}
+  SignAarch64:
+    needs: [config_workflow, build_arm_release]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_sign.yml
+    secrets: inherit
+    with:
+      test_name: Sign aarch64
+      runner_type: altinity-style-checker-aarch64
+      data: ${{ needs.config_workflow.outputs.data }}
+
+  FinishCIReport:
+    if: ${{ !cancelled() }}
+    needs:
+      - config_workflow
+      - dockers_build_amd
+      - dockers_build_arm
+      - dockers_build_multiplatform_manifest
+      - build_amd_debug
+      - build_amd_release
+      - build_amd_asan
+      - build_amd_tsan
+      - build_amd_msan
+      - build_amd_ubsan
+      - build_amd_binary
+      - build_arm_release
+      - build_arm_coverage
+      - build_arm_binary
+      - unit_tests_asan
+      - unit_tests_tsan
+      - unit_tests_msan
+      - unit_tests_ubsan
+      - docker_server_image
+      - docker_keeper_image
+      - install_packages_amd_release
+      - install_packages_arm_release
+      - compatibility_check_release
+      - compatibility_check_aarch64
+      - stateless_tests_amd_asan_distributed_plan_parallel_1_2
+      - stateless_tests_amd_asan_distributed_plan_parallel_2_2
+      - stateless_tests_amd_asan_distributed_plan_sequential
+      - stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel
+      - stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential
+      - stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel
+      - stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential
+      - stateless_tests_amd_debug_asyncinsert_s3_storage_parallel
+      - stateless_tests_amd_debug_asyncinsert_s3_storage_sequential
+      - stateless_tests_amd_debug_parallel
+      - stateless_tests_amd_debug_sequential
+      - stateless_tests_amd_tsan_parallel_1_2
+      - stateless_tests_amd_tsan_parallel_2_2
+      - stateless_tests_amd_tsan_sequential_1_2
+      - stateless_tests_amd_tsan_sequential_2_2
+      - stateless_tests_amd_msan_parallel_1_2
+      - stateless_tests_amd_msan_parallel_2_2
+      - stateless_tests_amd_msan_sequential_1_2
+      - stateless_tests_amd_msan_sequential_2_2
+      - stateless_tests_amd_ubsan_parallel
+      - stateless_tests_amd_ubsan_sequential
+      - stateless_tests_amd_debug_distributed_plan_s3_storage_parallel
+      - stateless_tests_amd_debug_distributed_plan_s3_storage_sequential
+      - stateless_tests_amd_tsan_s3_storage_parallel
+      - stateless_tests_amd_tsan_s3_storage_sequential_1_2
+      - stateless_tests_amd_tsan_s3_storage_sequential_2_2
+      - stateless_tests_arm_binary_parallel
+      - stateless_tests_arm_binary_sequential
+      - integration_tests_amd_asan_old_analyzer_1_6
+      - integration_tests_amd_asan_old_analyzer_2_6
+      - integration_tests_amd_asan_old_analyzer_3_6
+      - integration_tests_amd_asan_old_analyzer_4_6
+      - integration_tests_amd_asan_old_analyzer_5_6
+      - integration_tests_amd_asan_old_analyzer_6_6
+      - integration_tests_amd_binary_1_5
+      - integration_tests_amd_binary_2_5
+      - integration_tests_amd_binary_3_5
+      - integration_tests_amd_binary_4_5
+      - integration_tests_amd_binary_5_5
+      - integration_tests_arm_binary_distributed_plan_1_4
+      - integration_tests_arm_binary_distributed_plan_2_4
+      - integration_tests_arm_binary_distributed_plan_3_4
+      - integration_tests_arm_binary_distributed_plan_4_4
+      - integration_tests_amd_tsan_1_6
+      - integration_tests_amd_tsan_2_6
+      - integration_tests_amd_tsan_3_6
+      - integration_tests_amd_tsan_4_6
+      - integration_tests_amd_tsan_5_6
+      - integration_tests_amd_tsan_6_6
+      - stateless_tests_arm_coverage_parallel
+      - stateless_tests_arm_coverage_sequential
+      - stress_test_amd_debug
+      - stress_test_amd_tsan
+      - stress_test_amd_ubsan
+      - stress_test_amd_msan
+      - ast_fuzzer_amd_debug
+      - ast_fuzzer_amd_tsan
+      - ast_fuzzer_amd_msan
+      - ast_fuzzer_amd_ubsan
+      - buzzhouse_amd_debug
+      - buzzhouse_amd_tsan
+      - buzzhouse_amd_msan
+      - buzzhouse_amd_ubsan
+      - clickbench_amd_release
+      - clickbench_arm_release
+      - sqltest
+      - finish_workflow
+      - GrypeScanServer
+      - GrypeScanKeeper
+      - RegressionTestsRelease
+      - RegressionTestsAarch64
+      - SignRelease
+      - SignAarch64
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+      - name: Finalize workflow report
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/create_workflow_report
+        with:
+          workflow_config: ${{ needs.config_workflow.outputs.data }}
+          final: true
+
+  SourceUpload:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    env:
+        COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+        VERSION: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+          ref: ${{ fromJson(needs.config_workflow.outputs.data).git_ref }}
+          submodules: true
+          fetch-depth: 0
+          filter: tree:0
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+      - name: Create source tar
+        run: |
+          cd .. && tar czf $RUNNER_TEMP/build_source.src.tar.gz ClickHouse/
+      - name: Upload source tar
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+              S3_PATH="REFs/$GITHUB_REF_NAME/$COMMIT_SHA/build_amd_release"
+          else
+              S3_PATH="PRs/$PR_NUMBER/$COMMIT_SHA/build_amd_release"
+          fi
+
+          aws s3 cp $RUNNER_TEMP/build_source.src.tar.gz s3://altinity-build-artifacts/$S3_PATH/clickhouse-$VERSION.src.tar.gz
diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml
index 3c074f4e47d5..b213f147a2bd 100644
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -8,13 +8,28 @@ on:
 env:
   # Force the stdout and stderr streams to be unbuffered
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   CHECKOUT_REF: ""
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
+  AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
+  AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
 
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -25,6 +40,27 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -51,7 +87,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -63,6 +99,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -89,7 +132,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -101,43 +144,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_mergequeueci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Dockers Build (arm)' --workflow "MergeQueueCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Dockers Build (arm)' --workflow "MergeQueueCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  style_check:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3R5bGUgY2hlY2s=') }}
-    name: "Style check"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Dockers Build (arm)"
 
       - name: Prepare env script
         run: |
@@ -159,13 +171,13 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Style check' --workflow "MergeQueueCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Dockers Build (arm)' --workflow "MergeQueueCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Style check' --workflow "MergeQueueCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Dockers Build (arm)' --workflow "MergeQueueCI" --ci |& tee ./ci/tmp/job.log
           fi
 
   fast_test:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RmFzdCB0ZXN0') }}
     name: "Fast test"
@@ -177,6 +189,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Fast test"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -203,7 +222,7 @@ jobs:
           fi
 
   build_amd_binary:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
     name: "Build (amd_binary)"
@@ -215,6 +234,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_binary)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -241,8 +267,8 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, style_check, fast_test, build_amd_binary]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_binary]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
     outputs:
@@ -253,6 +279,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.github/workflows/nightly_fuzzers.yml b/.github/workflows/nightly_fuzzers.yml
index 66b6f76b35cd..1ea499b3b9e1 100644
--- a/.github/workflows/nightly_fuzzers.yml
+++ b/.github/workflows/nightly_fuzzers.yml
@@ -11,12 +11,13 @@ concurrency:
 
 env:
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   CHECKOUT_REF: ""
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -27,6 +28,27 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -53,7 +75,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -65,6 +87,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -91,7 +120,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -103,6 +132,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -129,7 +165,7 @@ jobs:
           fi
 
   build_fuzzers:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGZ1enplcnMp') }}
     name: "Build (fuzzers)"
@@ -141,6 +177,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (fuzzers)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -167,7 +210,7 @@ jobs:
           fi
 
   libfuzzer_tests:
-    runs-on: [self-hosted, arm-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_fuzzers]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'bGliRnV6emVyIHRlc3Rz') }}
     name: "libFuzzer tests"
@@ -179,6 +222,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "libFuzzer tests"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -205,7 +255,7 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_fuzzers, libfuzzer_tests]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
@@ -217,6 +267,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.github/workflows/nightly_jepsen.yml b/.github/workflows/nightly_jepsen.yml
index b26728880b3e..4201db8788aa 100644
--- a/.github/workflows/nightly_jepsen.yml
+++ b/.github/workflows/nightly_jepsen.yml
@@ -11,12 +11,13 @@ concurrency:
 
 env:
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   CHECKOUT_REF: ""
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -27,6 +28,26 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -53,7 +74,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -65,6 +86,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -91,7 +119,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -103,6 +131,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -129,7 +164,7 @@ jobs:
           fi
 
   build_amd_binary:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
     name: "Build (amd_binary)"
@@ -141,6 +176,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_binary)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -167,7 +209,7 @@ jobs:
           fi
 
   clickhouse_keeper_jepsen:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q2xpY2tIb3VzZSBLZWVwZXIgSmVwc2Vu') }}
     name: "ClickHouse Keeper Jepsen"
@@ -179,6 +221,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "ClickHouse Keeper Jepsen"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -205,7 +254,7 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, clickhouse_keeper_jepsen]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
@@ -217,6 +266,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.github/workflows/nightly_statistics.yml b/.github/workflows/nightly_statistics.yml
index 6d64f8f8876c..c9228837b508 100644
--- a/.github/workflows/nightly_statistics.yml
+++ b/.github/workflows/nightly_statistics.yml
@@ -11,12 +11,13 @@ concurrency:
 
 env:
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   CHECKOUT_REF: ""
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -27,6 +28,26 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -53,7 +74,7 @@ jobs:
           fi
 
   collect_statistics:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     name: "Collect Statistics"
     outputs:
@@ -64,6 +85,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Collect Statistics"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 1aa7b0c3445a..7caf430b9f36 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -3,24 +3,46 @@
 name: PR
 
 on:
+  workflow_dispatch:
+    inputs:
+      no_cache:
+        description: Run without cache
+        required: false
+        type: boolean
+        default: false
   pull_request:
-    branches: ['master']
+    branches: ['antalya', 'releases/*', 'antalya-*']
 
 env:
   # Force the stdout and stderr streams to be unbuffered
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
-  DISABLE_CI_CACHE: ${{ vars.DISABLE_CI_CACHE || '0' }}
+  DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
   CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
+  AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
+  AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
+
 
-# Allow updating GH commit statuses and PR comments to post an actual job reports link
-permissions: write-all
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
+    if: ${{ github.repository == github.event.pull_request.head.repo.full_name }}
     name: "Config Workflow"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
@@ -30,6 +52,27 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -56,7 +99,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -68,6 +111,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -94,7 +144,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -106,6 +156,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -132,7 +189,7 @@ jobs:
           fi
 
   dockers_build_multiplatform_manifest:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAobXVsdGlwbGF0Zm9ybSBtYW5pZmVzdCk=') }}
     name: "Dockers Build (multiplatform manifest)"
@@ -144,81 +201,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  style_check:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3R5bGUgY2hlY2s=') }}
-    name: "Style check"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Style check' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Style check' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  docs_check:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9jcyBjaGVjaw==') }}
-    name: "Docs check"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Dockers Build (multiplatform manifest)"
 
       - name: Prepare env script
         run: |
@@ -240,13 +228,13 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Docs check' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Docs check' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
   fast_test:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RmFzdCB0ZXN0') }}
     name: "Fast test"
@@ -258,43 +246,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Fast test' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Fast test' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  build_arm_tidy:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV90aWR5KQ==') }}
-    name: "Build (arm_tidy)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Fast test"
 
       - name: Prepare env script
         run: |
@@ -316,14 +273,14 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_tidy)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Fast test' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_tidy)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Fast test' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
   build_amd_debug:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
     name: "Build (amd_debug)"
     outputs:
@@ -334,6 +291,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -360,8 +324,8 @@ jobs:
           fi
 
   build_amd_release:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
     name: "Build (amd_release)"
     outputs:
@@ -372,6 +336,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -398,8 +369,8 @@ jobs:
           fi
 
   build_amd_asan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
     name: "Build (amd_asan)"
     outputs:
@@ -410,6 +381,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_asan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -436,8 +414,8 @@ jobs:
           fi
 
   build_amd_tsan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
     name: "Build (amd_tsan)"
     outputs:
@@ -448,6 +426,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -474,8 +459,8 @@ jobs:
           fi
 
   build_amd_msan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
     name: "Build (amd_msan)"
     outputs:
@@ -486,6 +471,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -512,8 +504,8 @@ jobs:
           fi
 
   build_amd_ubsan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
     name: "Build (amd_ubsan)"
     outputs:
@@ -524,6 +516,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -550,8 +549,8 @@ jobs:
           fi
 
   build_amd_binary:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
     name: "Build (amd_binary)"
     outputs:
@@ -562,6 +561,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_binary)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -588,8 +594,8 @@ jobs:
           fi
 
   build_arm_release:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
     name: "Build (arm_release)"
     outputs:
@@ -600,6 +606,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -625,11 +638,11 @@ jobs:
             python3 -m praktika run 'Build (arm_release)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_asan:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9hc2FuKQ==') }}
-    name: "Build (arm_asan)"
+  build_arm_coverage:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
+    name: "Build (arm_coverage)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -638,6 +651,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_coverage)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -658,16 +678,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_coverage)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_coverage)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_coverage:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
-    name: "Build (arm_coverage)"
+  build_arm_binary:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
+    name: "Build (arm_binary)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -676,6 +696,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_binary)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -696,16 +723,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_coverage)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_binary)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_coverage)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_binary)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_binary:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
-    name: "Build (arm_binary)"
+  unit_tests_asan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbik=') }}
+    name: "Unit tests (asan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -714,6 +741,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (asan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -734,16 +768,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_binary)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_binary)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_darwin:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kYXJ3aW4p') }}
-    name: "Build (amd_darwin)"
+  unit_tests_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbik=') }}
+    name: "Unit tests (tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -752,6 +786,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -772,16 +813,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_darwin)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_darwin)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_darwin:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9kYXJ3aW4p') }}
-    name: "Build (arm_darwin)"
+  unit_tests_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbik=') }}
+    name: "Unit tests (msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -790,6 +831,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -810,16 +858,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_darwin)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_darwin)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_arm_v80compat:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV92ODBjb21wYXQp') }}
-    name: "Build (arm_v80compat)"
+  unit_tests_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodWJzYW4p') }}
+    name: "Unit tests (ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -828,6 +876,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -848,16 +903,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_v80compat)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_v80compat)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Unit tests (ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_freebsd:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9mcmVlYnNkKQ==') }}
-    name: "Build (amd_freebsd)"
+  stateless_tests_amd_asan_distributed_plan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -866,6 +921,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -886,16 +948,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_freebsd)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_freebsd)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_ppc64le:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHBwYzY0bGUp') }}
-    name: "Build (ppc64le)"
+  stateless_tests_amd_asan_distributed_plan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -904,6 +966,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -924,16 +993,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (ppc64le)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (ppc64le)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_compat:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
-    name: "Build (amd_compat)"
+  stateless_tests_amd_asan_distributed_plan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_asan, distributed plan, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -942,6 +1011,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -962,16 +1038,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_compat)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_compat)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_amd_musl:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tdXNsKQ==') }}
-    name: "Build (amd_musl)"
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -980,6 +1056,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1000,16 +1083,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (amd_musl)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (amd_musl)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_riscv64:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHJpc2N2NjQp') }}
-    name: "Build (riscv64)"
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1018,6 +1101,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1038,16 +1128,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (riscv64)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (riscv64)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_s390x:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHMzOTB4KQ==') }}
-    name: "Build (s390x)"
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1056,6 +1146,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1076,16 +1173,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (s390x)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (s390x)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_loongarch64:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGxvb25nYXJjaDY0KQ==') }}
-    name: "Build (loongarch64)"
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1094,6 +1191,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1114,16 +1218,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (loongarch64)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (loongarch64)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  build_fuzzers:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGZ1enplcnMp') }}
-    name: "Build (fuzzers)"
+  stateless_tests_amd_debug_asyncinsert_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1132,6 +1236,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1152,16 +1263,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (fuzzers)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (fuzzers)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_asan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbik=') }}
-    name: "Unit tests (asan)"
+  stateless_tests_amd_debug_asyncinsert_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1170,6 +1281,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1190,16 +1308,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_tsan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbik=') }}
-    name: "Unit tests (tsan)"
+  stateless_tests_amd_debug_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_debug, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1208,6 +1326,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1228,16 +1353,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_msan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbik=') }}
-    name: "Unit tests (msan)"
+  stateless_tests_amd_debug_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_debug, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1246,6 +1371,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1266,16 +1398,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  unit_tests_ubsan:
-    runs-on: [self-hosted, builder]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodWJzYW4p') }}
-    name: "Unit tests (ubsan)"
+  stateless_tests_amd_tsan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_tsan, parallel, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1284,6 +1416,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1304,16 +1443,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Unit tests (ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Unit tests (ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_asan_distributed_plan_parallel_1_2:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
-    name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+  stateless_tests_amd_tsan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_tsan, parallel, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1322,6 +1461,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1342,16 +1488,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_asan_distributed_plan_parallel_2_2:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
-    name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+  stateless_tests_amd_tsan_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_tsan, sequential, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1360,6 +1506,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, sequential, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1380,16 +1533,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_asan_distributed_plan_sequential:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
-    name: "Stateless tests (amd_asan, distributed plan, sequential)"
+  stateless_tests_amd_tsan_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_tsan, sequential, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1398,6 +1551,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, sequential, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1418,16 +1578,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgcGFyYWxsZWwp') }}
-    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+  stateless_tests_amd_msan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_msan, parallel, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1436,6 +1596,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, parallel, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1456,16 +1623,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgc2VxdWVudGlhbCk=') }}
-    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+  stateless_tests_amd_msan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_msan, parallel, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1474,6 +1641,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, parallel, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1494,16 +1668,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
-    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+  stateless_tests_amd_msan_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_msan, sequential, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1512,6 +1686,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, sequential, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1532,16 +1713,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
-    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+  stateless_tests_amd_msan_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_msan, sequential, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1550,6 +1731,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, sequential, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1570,16 +1758,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_debug_asyncinsert_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
-    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
+  stateless_tests_amd_ubsan_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_ubsan, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1588,6 +1776,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_ubsan, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1608,16 +1803,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_debug_asyncinsert_s3_storage_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
-    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
+  stateless_tests_amd_ubsan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_ubsan, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1626,6 +1821,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_ubsan, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1646,16 +1848,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_debug_parallel:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (amd_debug, parallel)"
+  stateless_tests_amd_debug_distributed_plan_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1664,6 +1866,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1684,16 +1893,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_debug_sequential:
-    runs-on: [self-hosted, amd-small]
+  stateless_tests_amd_debug_distributed_plan_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (amd_debug, sequential)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1702,6 +1911,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1722,16 +1938,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_tsan_parallel_1_2:
-    runs-on: [self-hosted, amd-large]
+  stateless_tests_amd_tsan_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDEvMik=') }}
-    name: "Stateless tests (amd_tsan, parallel, 1/2)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_tsan, s3 storage, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1740,6 +1956,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1760,16 +1983,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_tsan_parallel_2_2:
-    runs-on: [self-hosted, amd-large]
+  stateless_tests_amd_tsan_s3_storage_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDIvMik=') }}
-    name: "Stateless tests (amd_tsan, parallel, 2/2)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1778,6 +2001,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1798,16 +2028,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_tsan_sequential_1_2:
-    runs-on: [self-hosted, amd-small]
+  stateless_tests_amd_tsan_s3_storage_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
-    name: "Stateless tests (amd_tsan, sequential, 1/2)"
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1816,6 +2046,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1836,16 +2073,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_tsan_sequential_2_2:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
-    name: "Stateless tests (amd_tsan, sequential, 2/2)"
+  stateless_tests_arm_binary_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (arm_binary, parallel)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1854,6 +2091,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, parallel)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1874,16 +2118,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stateless_tests_amd_msan_parallel_1_2:
-    runs-on: [self-hosted, amd-large]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDEvMik=') }}
-    name: "Stateless tests (amd_msan, parallel, 1/2)"
+  stateless_tests_arm_binary_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (arm_binary, sequential)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -1892,1031 +2136,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_parallel_2_2:
-    runs-on: [self-hosted, amd-large]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDIvMik=') }}
-    name: "Stateless tests (amd_msan, parallel, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_sequential_1_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
-    name: "Stateless tests (amd_msan, sequential, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_msan_sequential_2_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
-    name: "Stateless tests (amd_msan, sequential, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_ubsan_parallel:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (amd_ubsan, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_ubsan_sequential:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (amd_ubsan, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_distributed_plan_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHBhcmFsbGVsKQ==') }}
-    name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_debug_distributed_plan_s3_storage_sequential:
-    runs-on: [self-hosted, amd-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHNlcXVlbnRpYWwp') }}
-    name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_s3_storage_parallel:
-    runs-on: [self-hosted, amd-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgcGFyYWxsZWwp') }}
-    name: "Stateless tests (amd_tsan, s3 storage, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_s3_storage_sequential_1_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMS8yKQ==') }}
-    name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_tsan_s3_storage_sequential_2_2:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMi8yKQ==') }}
-    name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_arm_binary_parallel:
-    runs-on: [self-hosted, arm-medium-cpu]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBwYXJhbGxlbCk=') }}
-    name: "Stateless tests (arm_binary, parallel)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_arm_binary_sequential:
-    runs-on: [self-hosted, arm-small]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBzZXF1ZW50aWFsKQ==') }}
-    name: "Stateless tests (arm_binary, sequential)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  bugfix_validation_integration_tests:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, fast_test, build_arm_tidy]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVnZml4IHZhbGlkYXRpb24gKGludGVncmF0aW9uIHRlc3RzKQ==') }}
-    name: "Bugfix validation (integration tests)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Bugfix validation (integration tests)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Bugfix validation (integration tests)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  bugfix_validation_functional_tests:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVnZml4IHZhbGlkYXRpb24gKGZ1bmN0aW9uYWwgdGVzdHMp') }}
-    name: "Bugfix validation (functional tests)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Bugfix validation (functional tests)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Bugfix validation (functional tests)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stateless_tests_amd_asan_flaky_check:
-    runs-on: [self-hosted, amd-small-mem]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZmxha3kgY2hlY2sp') }}
-    name: "Stateless tests (amd_asan, flaky check)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stateless tests (amd_asan, flaky check)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stateless tests (amd_asan, flaky check)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_asan_old_analyzer_1_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 1/6)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_asan_old_analyzer_2_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 2/6)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_asan_old_analyzer_3_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 3/6)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_asan_old_analyzer_4_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 4/6)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_asan_old_analyzer_5_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 5/6)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_asan_old_analyzer_6_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
-    name: "Integration tests (amd_asan, old analyzer, 6/6)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_binary_1_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDEvNSk=') }}
-    name: "Integration tests (amd_binary, 1/5)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_binary_2_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDIvNSk=') }}
-    name: "Integration tests (amd_binary, 2/5)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_binary_3_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDMvNSk=') }}
-    name: "Integration tests (amd_binary, 3/5)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_binary_4_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDQvNSk=') }}
-    name: "Integration tests (amd_binary, 4/5)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_amd_binary_5_5:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDUvNSk=') }}
-    name: "Integration tests (amd_binary, 5/5)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.CHECKOUT_REF }}
-
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  integration_tests_arm_binary_distributed_plan_1_4:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDEvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 1/4)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Stateless tests (arm_binary, sequential)"
 
       - name: Prepare env script
         run: |
@@ -2938,16 +2163,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_2_4:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDIvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 2/4)"
+  stateless_tests_amd_asan_flaky_check:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZmxha3kgY2hlY2sp') }}
+    name: "Stateless tests (amd_asan, flaky check)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2956,6 +2181,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, flaky check)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -2976,16 +2208,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, flaky check)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stateless tests (amd_asan, flaky check)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_3_4:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDMvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 3/4)"
+  integration_tests_amd_asan_old_analyzer_1_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 1/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -2994,6 +2226,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3014,16 +2253,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_arm_binary_distributed_plan_4_4:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDQvNCk=') }}
-    name: "Integration tests (arm_binary, distributed plan, 4/4)"
+  integration_tests_amd_asan_old_analyzer_2_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 2/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3032,6 +2271,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3052,16 +2298,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_1_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
-    name: "Integration tests (amd_tsan, 1/6)"
+  integration_tests_amd_asan_old_analyzer_3_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 3/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3070,6 +2316,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3090,16 +2343,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_2_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
-    name: "Integration tests (amd_tsan, 2/6)"
+  integration_tests_amd_asan_old_analyzer_4_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 4/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3108,6 +2361,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3128,16 +2388,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_3_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
-    name: "Integration tests (amd_tsan, 3/6)"
+  integration_tests_amd_asan_old_analyzer_5_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 5/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3146,6 +2406,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3166,16 +2433,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_4_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
-    name: "Integration tests (amd_tsan, 4/6)"
+  integration_tests_amd_asan_old_analyzer_6_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 6/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3184,6 +2451,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3204,16 +2478,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_5_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
-    name: "Integration tests (amd_tsan, 5/6)"
+  integration_tests_amd_binary_1_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDEvNSk=') }}
+    name: "Integration tests (amd_binary, 1/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3222,6 +2496,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 1/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3242,16 +2523,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_tsan_6_6:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
-    name: "Integration tests (amd_tsan, 6/6)"
+  integration_tests_amd_binary_2_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDIvNSk=') }}
+    name: "Integration tests (amd_binary, 2/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3260,6 +2541,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 2/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3280,16 +2568,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  integration_tests_amd_asan_flaky_check:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBmbGFreSBjaGVjayk=') }}
-    name: "Integration tests (amd_asan, flaky check)"
+  integration_tests_amd_binary_3_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDMvNSk=') }}
+    name: "Integration tests (amd_binary, 3/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3298,6 +2586,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 3/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3318,16 +2613,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Integration tests (amd_asan, flaky check)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Integration tests (amd_asan, flaky check)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  docker_server_image:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
-    name: "Docker server image"
+  integration_tests_amd_binary_4_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDQvNSk=') }}
+    name: "Integration tests (amd_binary, 4/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3336,6 +2631,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 4/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3356,16 +2658,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Docker server image' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Docker server image' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  docker_keeper_image:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
-    name: "Docker keeper image"
+  integration_tests_amd_binary_5_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDUvNSk=') }}
+    name: "Integration tests (amd_binary, 5/5)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3374,6 +2676,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 5/5)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3394,16 +2703,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Docker keeper image' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Docker keeper image' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  install_packages_amd_debug:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX2RlYnVnKQ==') }}
-    name: "Install packages (amd_debug)"
+  integration_tests_arm_binary_distributed_plan_1_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDEvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 1/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3412,6 +2721,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 1/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3432,16 +2748,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Install packages (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Install packages (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  compatibility_check_release:
-    runs-on: [self-hosted, style-checker]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAocmVsZWFzZSk=') }}
-    name: "Compatibility check (release)"
+  integration_tests_arm_binary_distributed_plan_2_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDIvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 2/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3450,6 +2766,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 2/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3470,16 +2793,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Compatibility check (release)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Compatibility check (release)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  compatibility_check_aarch64:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAoYWFyY2g2NCk=') }}
-    name: "Compatibility check (aarch64)"
+  integration_tests_arm_binary_distributed_plan_3_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDMvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 3/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3488,6 +2811,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 3/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3508,16 +2838,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9kZWJ1Zyk=') }}
-    name: "Stress test (amd_debug)"
+  integration_tests_arm_binary_distributed_plan_4_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDQvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 4/4)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3526,6 +2856,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 4/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3546,16 +2883,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF90c2FuKQ==') }}
-    name: "Stress test (amd_tsan)"
+  integration_tests_amd_tsan_1_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
+    name: "Integration tests (amd_tsan, 1/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3564,6 +2901,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3584,16 +2928,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_asan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFybV9hc2FuKQ==') }}
-    name: "Stress test (arm_asan)"
+  integration_tests_amd_tsan_2_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
+    name: "Integration tests (amd_tsan, 2/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3602,6 +2946,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3622,16 +2973,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (arm_asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (arm_asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF91YnNhbik=') }}
-    name: "Stress test (amd_ubsan)"
+  integration_tests_amd_tsan_3_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
+    name: "Integration tests (amd_tsan, 3/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3640,6 +2991,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3660,16 +3018,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  stress_test_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9tc2FuKQ==') }}
-    name: "Stress test (amd_msan)"
+  integration_tests_amd_tsan_4_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
+    name: "Integration tests (amd_tsan, 4/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3678,6 +3036,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3698,16 +3063,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  upgrade_check_amd_asan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VXBncmFkZSBjaGVjayAoYW1kX2FzYW4p') }}
-    name: "Upgrade check (amd_asan)"
+  integration_tests_amd_tsan_5_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
+    name: "Integration tests (amd_tsan, 5/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3716,6 +3081,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3736,16 +3108,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Upgrade check (amd_asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Upgrade check (amd_asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  upgrade_check_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VXBncmFkZSBjaGVjayAoYW1kX3RzYW4p') }}
-    name: "Upgrade check (amd_tsan)"
+  integration_tests_amd_tsan_6_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
+    name: "Integration tests (amd_tsan, 6/6)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3754,6 +3126,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3774,16 +3153,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Upgrade check (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Upgrade check (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  upgrade_check_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VXBncmFkZSBjaGVjayAoYW1kX21zYW4p') }}
-    name: "Upgrade check (amd_msan)"
+  integration_tests_amd_asan_flaky_check:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBmbGFreSBjaGVjayk=') }}
+    name: "Integration tests (amd_asan, flaky check)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3792,6 +3171,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, flaky check)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3812,16 +3198,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Upgrade check (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, flaky check)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Upgrade check (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Integration tests (amd_asan, flaky check)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  upgrade_check_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VXBncmFkZSBjaGVjayAoYW1kX2RlYnVnKQ==') }}
-    name: "Upgrade check (amd_debug)"
+  docker_server_image:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    name: "Docker server image"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3830,6 +3216,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker server image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3850,16 +3243,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Upgrade check (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker server image' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Upgrade check (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker server image' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX2RlYnVnKQ==') }}
-    name: "AST fuzzer (amd_debug)"
+  docker_keeper_image:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+    name: "Docker keeper image"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3868,6 +3261,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker keeper image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3888,16 +3288,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker keeper image' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Docker keeper image' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYXJtX2FzYW4p') }}
-    name: "AST fuzzer (arm_asan)"
+  install_packages_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX2RlYnVnKQ==') }}
+    name: "Install packages (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3906,6 +3306,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3926,16 +3333,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (arm_asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Install packages (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (arm_asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Install packages (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3RzYW4p') }}
-    name: "AST fuzzer (amd_tsan)"
+  compatibility_check_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAocmVsZWFzZSk=') }}
+    name: "Compatibility check (release)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3944,6 +3351,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Compatibility check (release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -3964,16 +3378,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (release)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (release)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX21zYW4p') }}
-    name: "AST fuzzer (amd_msan)"
+  compatibility_check_aarch64:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAoYWFyY2g2NCk=') }}
+    name: "Compatibility check (aarch64)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -3982,6 +3396,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Compatibility check (aarch64)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4002,16 +3423,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Compatibility check (aarch64)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  ast_fuzzer_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3Vic2FuKQ==') }}
-    name: "AST fuzzer (amd_ubsan)"
+  stress_test_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9kZWJ1Zyk=') }}
+    name: "Stress test (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4020,6 +3441,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4040,16 +3468,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_debug:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfZGVidWcp') }}
-    name: "BuzzHouse (amd_debug)"
+  stress_test_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF90c2FuKQ==') }}
+    name: "Stress test (amd_tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4058,6 +3486,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4078,16 +3513,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhcm1fYXNhbik=') }}
-    name: "BuzzHouse (arm_asan)"
+  stress_test_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_ubsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF91YnNhbik=') }}
+    name: "Stress test (amd_ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4096,6 +3531,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4116,16 +3558,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (arm_asan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (arm_asan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdHNhbik=') }}
-    name: "BuzzHouse (amd_tsan)"
+  stress_test_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_msan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9tc2FuKQ==') }}
+    name: "Stress test (amd_msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4134,6 +3576,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4154,16 +3603,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_msan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfbXNhbik=') }}
-    name: "BuzzHouse (amd_msan)"
+  ast_fuzzer_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX2RlYnVnKQ==') }}
+    name: "AST fuzzer (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4172,6 +3621,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4192,16 +3648,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  buzzhouse_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdWJzYW4p') }}
-    name: "BuzzHouse (amd_ubsan)"
+  ast_fuzzer_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3RzYW4p') }}
+    name: "AST fuzzer (amd_tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4210,6 +3666,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4230,16 +3693,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_amd_release_master_head_1_3:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYW1kX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAxLzMp') }}
-    name: "Performance Comparison (amd_release, master_head, 1/3)"
+  ast_fuzzer_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX21zYW4p') }}
+    name: "AST fuzzer (amd_msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4248,6 +3711,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4268,16 +3738,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 1/3)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 1/3)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_amd_release_master_head_2_3:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYW1kX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAyLzMp') }}
-    name: "Performance Comparison (amd_release, master_head, 2/3)"
+  ast_fuzzer_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QVNUIGZ1enplciAoYW1kX3Vic2FuKQ==') }}
+    name: "AST fuzzer (amd_ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4286,6 +3756,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "AST fuzzer (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4306,16 +3783,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 2/3)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 2/3)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'AST fuzzer (amd_ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_amd_release_master_head_3_3:
-    runs-on: [self-hosted, amd-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYW1kX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAzLzMp') }}
-    name: "Performance Comparison (amd_release, master_head, 3/3)"
+  buzzhouse_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfZGVidWcp') }}
+    name: "BuzzHouse (amd_debug)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4324,6 +3801,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4344,16 +3828,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 3/3)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (amd_release, master_head, 3/3)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_debug)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_master_head_1_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAxLzMp') }}
-    name: "Performance Comparison (arm_release, master_head, 1/3)"
+  buzzhouse_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdHNhbik=') }}
+    name: "BuzzHouse (amd_tsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4362,6 +3846,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4382,16 +3873,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 1/3)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 1/3)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_tsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_master_head_2_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAyLzMp') }}
-    name: "Performance Comparison (arm_release, master_head, 2/3)"
+  buzzhouse_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfbXNhbik=') }}
+    name: "BuzzHouse (amd_msan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4400,6 +3891,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4420,16 +3918,16 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 2/3)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 2/3)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_msan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
-  performance_comparison_arm_release_master_head_3_3:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_release]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'UGVyZm9ybWFuY2UgQ29tcGFyaXNvbiAoYXJtX3JlbGVhc2UsIG1hc3Rlcl9oZWFkLCAzLzMp') }}
-    name: "Performance Comparison (arm_release, master_head, 3/3)"
+  buzzhouse_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnV6ekhvdXNlIChhbWRfdWJzYW4p') }}
+    name: "BuzzHouse (amd_ubsan)"
     outputs:
       data: ${{ steps.run.outputs.DATA }}
     steps:
@@ -4438,6 +3936,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "BuzzHouse (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4458,14 +3963,14 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 3/3)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Performance Comparison (arm_release, master_head, 3/3)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'BuzzHouse (amd_ubsan)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, style_check, docs_check, fast_test, build_arm_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan, build_arm_coverage, build_arm_binary, build_amd_darwin, build_arm_darwin, build_arm_v80compat, build_amd_freebsd, build_ppc64le, build_amd_compat, build_amd_musl, build_riscv64, build_s390x, build_loongarch64, build_fuzzers, unit_tests_asan, unit_tests_tsan, unit_tests_msan, unit_tests_ubsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential, stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel, stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential, stateless_tests_amd_debug_asyncinsert_s3_storage_parallel, stateless_tests_amd_debug_asyncinsert_s3_storage_sequential, stateless_tests_amd_debug_parallel, stateless_tests_amd_debug_sequential, stateless_tests_amd_tsan_parallel_1_2, stateless_tests_amd_tsan_parallel_2_2, stateless_tests_amd_tsan_sequential_1_2, stateless_tests_amd_tsan_sequential_2_2, stateless_tests_amd_msan_parallel_1_2, stateless_tests_amd_msan_parallel_2_2, stateless_tests_amd_msan_sequential_1_2, stateless_tests_amd_msan_sequential_2_2, stateless_tests_amd_ubsan_parallel, stateless_tests_amd_ubsan_sequential, stateless_tests_amd_debug_distributed_plan_s3_storage_parallel, stateless_tests_amd_debug_distributed_plan_s3_storage_sequential, stateless_tests_amd_tsan_s3_storage_parallel, stateless_tests_amd_tsan_s3_storage_sequential_1_2, stateless_tests_amd_tsan_s3_storage_sequential_2_2, stateless_tests_arm_binary_parallel, stateless_tests_arm_binary_sequential, bugfix_validation_integration_tests, bugfix_validation_functional_tests, stateless_tests_amd_asan_flaky_check, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_binary_1_5, integration_tests_amd_binary_2_5, integration_tests_amd_binary_3_5, integration_tests_amd_binary_4_5, integration_tests_amd_binary_5_5, integration_tests_arm_binary_distributed_plan_1_4, integration_tests_arm_binary_distributed_plan_2_4, integration_tests_arm_binary_distributed_plan_3_4, integration_tests_arm_binary_distributed_plan_4_4, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, integration_tests_amd_asan_flaky_check, docker_server_image, docker_keeper_image, install_packages_amd_debug, compatibility_check_release, compatibility_check_aarch64, stress_test_amd_debug, stress_test_amd_tsan, stress_test_arm_asan, stress_test_amd_ubsan, stress_test_amd_msan, upgrade_check_amd_asan, upgrade_check_amd_tsan, upgrade_check_amd_msan, upgrade_check_amd_debug, ast_fuzzer_amd_debug, ast_fuzzer_arm_asan, ast_fuzzer_amd_tsan, ast_fuzzer_amd_msan, ast_fuzzer_amd_ubsan, buzzhouse_amd_debug, buzzhouse_arm_asan, buzzhouse_amd_tsan, buzzhouse_amd_msan, buzzhouse_amd_ubsan, performance_comparison_amd_release_master_head_1_3, performance_comparison_amd_release_master_head_2_3, performance_comparison_amd_release_master_head_3_3, performance_comparison_arm_release_master_head_1_3, performance_comparison_arm_release_master_head_2_3, performance_comparison_arm_release_master_head_3_3]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary, unit_tests_asan, unit_tests_tsan, unit_tests_msan, unit_tests_ubsan, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential, stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel, stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential, stateless_tests_amd_debug_asyncinsert_s3_storage_parallel, stateless_tests_amd_debug_asyncinsert_s3_storage_sequential, stateless_tests_amd_debug_parallel, stateless_tests_amd_debug_sequential, stateless_tests_amd_tsan_parallel_1_2, stateless_tests_amd_tsan_parallel_2_2, stateless_tests_amd_tsan_sequential_1_2, stateless_tests_amd_tsan_sequential_2_2, stateless_tests_amd_msan_parallel_1_2, stateless_tests_amd_msan_parallel_2_2, stateless_tests_amd_msan_sequential_1_2, stateless_tests_amd_msan_sequential_2_2, stateless_tests_amd_ubsan_parallel, stateless_tests_amd_ubsan_sequential, stateless_tests_amd_debug_distributed_plan_s3_storage_parallel, stateless_tests_amd_debug_distributed_plan_s3_storage_sequential, stateless_tests_amd_tsan_s3_storage_parallel, stateless_tests_amd_tsan_s3_storage_sequential_1_2, stateless_tests_amd_tsan_s3_storage_sequential_2_2, stateless_tests_arm_binary_parallel, stateless_tests_arm_binary_sequential, stateless_tests_amd_asan_flaky_check, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_binary_1_5, integration_tests_amd_binary_2_5, integration_tests_amd_binary_3_5, integration_tests_amd_binary_4_5, integration_tests_amd_binary_5_5, integration_tests_arm_binary_distributed_plan_1_4, integration_tests_arm_binary_distributed_plan_2_4, integration_tests_arm_binary_distributed_plan_3_4, integration_tests_arm_binary_distributed_plan_4_4, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, integration_tests_amd_asan_flaky_check, docker_server_image, docker_keeper_image, install_packages_amd_debug, compatibility_check_release, compatibility_check_aarch64, stress_test_amd_debug, stress_test_amd_tsan, stress_test_amd_ubsan, stress_test_amd_msan, ast_fuzzer_amd_debug, ast_fuzzer_amd_tsan, ast_fuzzer_amd_msan, ast_fuzzer_amd_ubsan, buzzhouse_amd_debug, buzzhouse_amd_tsan, buzzhouse_amd_msan, buzzhouse_amd_ubsan]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
     outputs:
@@ -4476,6 +3981,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -4500,3 +4012,197 @@ jobs:
           else
             python3 -m praktika run 'Finish Workflow' --workflow "PR" --ci |& tee ./ci/tmp/job.log
           fi
+
+##########################################################################################
+##################################### ALTINITY JOBS ######################################
+##########################################################################################
+
+  GrypeScanServer:
+    needs: [config_workflow, docker_server_image]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        suffix: ['', '-alpine']
+    uses: ./.github/workflows/grype_scan.yml
+    secrets: inherit
+    with:
+      docker_image: altinityinfra/clickhouse-server
+      version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+      tag-suffix: ${{ matrix.suffix }}
+  GrypeScanKeeper:
+      needs: [config_workflow, docker_keeper_image]
+      if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+      uses: ./.github/workflows/grype_scan.yml
+      secrets: inherit
+      with:
+        docker_image: altinityinfra/clickhouse-keeper
+        version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+
+  RegressionTestsRelease:
+    needs: [config_workflow, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
+    uses: ./.github/workflows/regression.yml
+    secrets: inherit
+    with:
+      runner_type: altinity-regression-tester
+      commit: 92f4413c775fc750e826951f5d235766c562a98f
+      arch: x86
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout_minutes: 210
+      workflow_config: ${{ needs.config_workflow.outputs.data }}
+  RegressionTestsAarch64:
+    needs: [config_workflow, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
+    uses: ./.github/workflows/regression.yml
+    secrets: inherit
+    with:
+      runner_type: altinity-regression-tester-aarch64
+      commit: 92f4413c775fc750e826951f5d235766c562a98f
+      arch: aarch64
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout_minutes: 210
+      workflow_config: ${{ needs.config_workflow.outputs.data }}
+
+  FinishCIReport:
+    if: ${{ !cancelled() }}
+    needs:
+      - config_workflow
+      - dockers_build_amd
+      - dockers_build_arm
+      - dockers_build_multiplatform_manifest
+      - fast_test
+      - build_amd_debug
+      - build_amd_release
+      - build_amd_asan
+      - build_amd_tsan
+      - build_amd_msan
+      - build_amd_ubsan
+      - build_amd_binary
+      - build_arm_release
+      - build_arm_coverage
+      - build_arm_binary
+      - unit_tests_asan
+      - unit_tests_tsan
+      - unit_tests_msan
+      - unit_tests_ubsan
+      - stateless_tests_amd_asan_distributed_plan_parallel_1_2
+      - stateless_tests_amd_asan_distributed_plan_parallel_2_2
+      - stateless_tests_amd_asan_distributed_plan_sequential
+      - stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel
+      - stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential
+      - stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel
+      - stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential
+      - stateless_tests_amd_debug_asyncinsert_s3_storage_parallel
+      - stateless_tests_amd_debug_asyncinsert_s3_storage_sequential
+      - stateless_tests_amd_debug_parallel
+      - stateless_tests_amd_debug_sequential
+      - stateless_tests_amd_tsan_parallel_1_2
+      - stateless_tests_amd_tsan_parallel_2_2
+      - stateless_tests_amd_tsan_sequential_1_2
+      - stateless_tests_amd_tsan_sequential_2_2
+      - stateless_tests_amd_msan_parallel_1_2
+      - stateless_tests_amd_msan_parallel_2_2
+      - stateless_tests_amd_msan_sequential_1_2
+      - stateless_tests_amd_msan_sequential_2_2
+      - stateless_tests_amd_ubsan_parallel
+      - stateless_tests_amd_ubsan_sequential
+      - stateless_tests_amd_debug_distributed_plan_s3_storage_parallel
+      - stateless_tests_amd_debug_distributed_plan_s3_storage_sequential
+      - stateless_tests_amd_tsan_s3_storage_parallel
+      - stateless_tests_amd_tsan_s3_storage_sequential_1_2
+      - stateless_tests_amd_tsan_s3_storage_sequential_2_2
+      - stateless_tests_arm_binary_parallel
+      - stateless_tests_arm_binary_sequential
+      - stateless_tests_amd_asan_flaky_check
+      - integration_tests_amd_asan_old_analyzer_1_6
+      - integration_tests_amd_asan_old_analyzer_2_6
+      - integration_tests_amd_asan_old_analyzer_3_6
+      - integration_tests_amd_asan_old_analyzer_4_6
+      - integration_tests_amd_asan_old_analyzer_5_6
+      - integration_tests_amd_asan_old_analyzer_6_6
+      - integration_tests_amd_binary_1_5
+      - integration_tests_amd_binary_2_5
+      - integration_tests_amd_binary_3_5
+      - integration_tests_amd_binary_4_5
+      - integration_tests_amd_binary_5_5
+      - integration_tests_arm_binary_distributed_plan_1_4
+      - integration_tests_arm_binary_distributed_plan_2_4
+      - integration_tests_arm_binary_distributed_plan_3_4
+      - integration_tests_arm_binary_distributed_plan_4_4
+      - integration_tests_amd_tsan_1_6
+      - integration_tests_amd_tsan_2_6
+      - integration_tests_amd_tsan_3_6
+      - integration_tests_amd_tsan_4_6
+      - integration_tests_amd_tsan_5_6
+      - integration_tests_amd_tsan_6_6
+      - integration_tests_amd_asan_flaky_check
+      - docker_server_image
+      - docker_keeper_image
+      - install_packages_amd_debug
+      - compatibility_check_release
+      - compatibility_check_aarch64
+      - stress_test_amd_debug
+      - stress_test_amd_tsan
+      - stress_test_amd_ubsan
+      - stress_test_amd_msan
+      - ast_fuzzer_amd_debug
+      - ast_fuzzer_amd_tsan
+      - ast_fuzzer_amd_msan
+      - ast_fuzzer_amd_ubsan
+      - buzzhouse_amd_debug
+      - buzzhouse_amd_tsan
+      - buzzhouse_amd_msan
+      - buzzhouse_amd_ubsan
+      - finish_workflow
+      - GrypeScanServer
+      - GrypeScanKeeper
+      - RegressionTestsRelease
+      - RegressionTestsAarch64
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+      - name: Finalize workflow report
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/create_workflow_report
+        with:
+          workflow_config: ${{ needs.config_workflow.outputs.data }}
+          final: true
+
+  SourceUpload:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    env:
+        COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+        VERSION: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+          ref: ${{ fromJson(needs.config_workflow.outputs.data).git_ref }}
+          submodules: true
+          fetch-depth: 0
+          filter: tree:0
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+      - name: Create source tar
+        run: |
+          cd .. && tar czf $RUNNER_TEMP/build_source.src.tar.gz ClickHouse/
+      - name: Upload source tar
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+              S3_PATH="REFs/$GITHUB_REF_NAME/$COMMIT_SHA/build_amd_release"
+          else
+              S3_PATH="PRs/$PR_NUMBER/$COMMIT_SHA/build_amd_release"
+          fi
+
+          aws s3 cp $RUNNER_TEMP/build_source.src.tar.gz s3://altinity-build-artifacts/$S3_PATH/clickhouse-$VERSION.src.tar.gz
diff --git a/.github/workflows/pull_request_community.yml b/.github/workflows/pull_request_community.yml
new file mode 100644
index 000000000000..c55136b4ed45
--- /dev/null
+++ b/.github/workflows/pull_request_community.yml
@@ -0,0 +1,3629 @@
+# generated by praktika
+
+name: Community PR
+
+on:
+  workflow_dispatch:
+    inputs:
+      no_cache:
+        description: Run without cache
+        required: false
+        type: boolean
+        default: false
+  pull_request:
+    branches: ['antalya', 'releases/*', 'antalya-*']
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
+  DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
+  DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
+  CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
+
+
+
+jobs:
+
+  config_workflow:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: []
+    if: ${{ github.repository != github.event.pull_request.head.repo.full_name }}
+    name: "Config Workflow"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Config Workflow' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Config Workflow' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  fast_test:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RmFzdCB0ZXN0') }}
+    name: "Fast test"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Fast test"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Fast test' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Fast test' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
+    name: "Build (amd_debug)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_debug)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_debug)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_debug)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact CH_AMD_DEBUG
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_DEBUG
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact DEB_AMD_DEBUG
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_AMD_DEBUG
+          path: ci/tmp/*.deb
+
+  build_amd_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
+    name: "Build (amd_release)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_release)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_release)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_release)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact CH_AMD_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_RELEASE
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact CH_AMD_RELEASE_STRIPPED
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_RELEASE_STRIPPED
+          path: ci/tmp/build/programs/self-extracting/clickhouse-stripped
+
+
+      - name: Upload artifact DEB_AMD_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_AMD_RELEASE
+          path: ci/tmp/*.deb
+
+
+      - name: Upload artifact RPM_AMD_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: RPM_AMD_RELEASE
+          path: ci/tmp/*.rpm
+
+
+      - name: Upload artifact TGZ_AMD_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: TGZ_AMD_RELEASE
+          path: ci/tmp/*64.tgz*
+
+  build_amd_asan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
+    name: "Build (amd_asan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_asan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_asan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_asan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact UNITTEST_AMD_ASAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: UNITTEST_AMD_ASAN
+          path: ci/tmp/build/src/unit_tests_dbms
+
+
+      - name: Upload artifact CH_AMD_ASAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_ASAN
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact DEB_AMD_ASAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_AMD_ASAN
+          path: ci/tmp/*.deb
+
+  build_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
+    name: "Build (amd_tsan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_tsan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_tsan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_tsan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact UNITTEST_AMD_TSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: UNITTEST_AMD_TSAN
+          path: ci/tmp/build/src/unit_tests_dbms
+
+
+      - name: Upload artifact CH_AMD_TSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_TSAN
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact DEB_AMD_TSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_AMD_TSAN
+          path: ci/tmp/*.deb
+
+  build_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
+    name: "Build (amd_msan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_msan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_msan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_msan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact UNITTEST_AMD_MSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: UNITTEST_AMD_MSAN
+          path: ci/tmp/build/src/unit_tests_dbms
+
+
+      - name: Upload artifact CH_AMD_MSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_MSAN
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact DEB_AMD_MSAM
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_AMD_MSAM
+          path: ci/tmp/*.deb
+
+  build_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
+    name: "Build (amd_ubsan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_ubsan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_ubsan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_ubsan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact UNITTEST_AMD_UBSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: UNITTEST_AMD_UBSAN
+          path: ci/tmp/build/src/unit_tests_dbms
+
+
+      - name: Upload artifact CH_AMD_UBSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_UBSAN
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact DEB_AMD_UBSAN
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_AMD_UBSAN
+          path: ci/tmp/*.deb
+
+  build_amd_binary:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
+    name: "Build (amd_binary)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_binary)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_binary)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_binary)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact CH_AMD_BINARY
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_AMD_BINARY
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+  build_arm_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
+    name: "Build (arm_release)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_release)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (arm_release)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (arm_release)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact CH_ARM_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_ARM_RELEASE
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact CH_ARM_RELEASE_STRIPPED
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_ARM_RELEASE_STRIPPED
+          path: ci/tmp/build/programs/self-extracting/clickhouse-stripped
+
+
+      - name: Upload artifact DEB_ARM_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_ARM_RELEASE
+          path: ci/tmp/*.deb
+
+
+      - name: Upload artifact RPM_ARM_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: RPM_ARM_RELEASE
+          path: ci/tmp/*.rpm
+
+
+      - name: Upload artifact TGZ_ARM_RELEASE
+        uses: actions/upload-artifact@v6
+        with:
+          name: TGZ_ARM_RELEASE
+          path: ci/tmp/*64.tgz*
+
+  build_arm_coverage:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
+    name: "Build (arm_coverage)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_coverage)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (arm_coverage)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (arm_coverage)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact CH_COV_BIN
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_COV_BIN
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+
+      - name: Upload artifact DEB_COV
+        uses: actions/upload-artifact@v6
+        with:
+          name: DEB_COV
+          path: ci/tmp/*.deb
+
+  build_arm_binary:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, fast_test]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
+    name: "Build (arm_binary)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_binary)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (arm_binary)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (arm_binary)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+      - name: Upload artifact CH_ARM_BIN
+        uses: actions/upload-artifact@v6
+        with:
+          name: CH_ARM_BIN
+          path: ci/tmp/build/programs/self-extracting/clickhouse
+
+  unit_tests_asan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbik=') }}
+    name: "Unit tests (asan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (asan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact UNITTEST_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: UNITTEST_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Unit tests (asan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Unit tests (asan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  unit_tests_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbik=') }}
+    name: "Unit tests (tsan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (tsan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact UNITTEST_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: UNITTEST_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Unit tests (tsan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Unit tests (tsan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  unit_tests_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbik=') }}
+    name: "Unit tests (msan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (msan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact UNITTEST_AMD_MSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: UNITTEST_AMD_MSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Unit tests (msan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Unit tests (msan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  unit_tests_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'VW5pdCB0ZXN0cyAodWJzYW4p') }}
+    name: "Unit tests (ubsan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Unit tests (ubsan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact UNITTEST_AMD_UBSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: UNITTEST_AMD_UBSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Unit tests (ubsan)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Unit tests (ubsan)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_asan_distributed_plan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_asan_distributed_plan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_asan_distributed_plan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_asan, distributed plan, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_debug_asyncinsert_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_debug_asyncinsert_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIEFzeW5jSW5zZXJ0LCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_debug, AsyncInsert, s3 storage, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_debug_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_debug, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_debug, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_debug_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_debug, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_tsan, parallel, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, parallel, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_tsan, parallel, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, parallel, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 2/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_tsan, sequential, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, sequential, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 1/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_tsan, sequential, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, sequential, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, sequential, 2/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_msan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_msan, parallel, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, parallel, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_MSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_MSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 1/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_msan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_msan, parallel, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, parallel, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_MSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_MSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_msan, parallel, 2/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_msan_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_msan, sequential, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, sequential, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_MSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_MSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 1/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_msan_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_msan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfbXNhbiwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_msan, sequential, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_msan, sequential, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_MSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_MSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_msan, sequential, 2/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_ubsan_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_ubsan, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_ubsan, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_UBSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_UBSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_ubsan, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_ubsan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_ubsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdWJzYW4sIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_ubsan, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_ubsan, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_UBSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_UBSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_ubsan, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_debug_distributed_plan_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHBhcmFsbGVsKQ==') }}
+    name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, distributed plan, s3 storage, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_debug_distributed_plan_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIGRpc3RyaWJ1dGVkIHBsYW4sIHMzIHN0b3JhZ2UsIHNlcXVlbnRpYWwp') }}
+    name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_debug, distributed plan, s3 storage, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_debug, distributed plan, s3 storage, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_tsan, s3 storage, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_s3_storage_sequential_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMS8yKQ==') }}
+    name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, sequential, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 1/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_tsan_s3_storage_sequential_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgczMgc3RvcmFnZSwgc2VxdWVudGlhbCwgMi8yKQ==') }}
+    name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_tsan, s3 storage, sequential, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_tsan, s3 storage, sequential, 2/2)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_arm_binary_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (arm_binary, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_ARM_BIN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_ARM_BIN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_arm_binary_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (arm_binary, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_ARM_BIN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_ARM_BIN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_asan_flaky_check:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZmxha3kgY2hlY2sp') }}
+    name: "Stateless tests (amd_asan, flaky check)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, flaky check)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, flaky check)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, flaky check)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_old_analyzer_1_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 1/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 1/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 1/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_old_analyzer_2_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 2/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 2/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 2/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_old_analyzer_3_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 3/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 3/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 3/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_old_analyzer_4_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 4/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 4/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 4/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_old_analyzer_5_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 5/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 5/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 5/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_old_analyzer_6_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
+    name: "Integration tests (amd_asan, old analyzer, 6/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 6/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, old analyzer, 6/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_binary_1_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDEvNSk=') }}
+    name: "Integration tests (amd_binary, 1/5)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 1/5)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_binary, 1/5)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_binary_2_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDIvNSk=') }}
+    name: "Integration tests (amd_binary, 2/5)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 2/5)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_binary, 2/5)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_binary_3_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDMvNSk=') }}
+    name: "Integration tests (amd_binary, 3/5)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 3/5)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_binary, 3/5)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_binary_4_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDQvNSk=') }}
+    name: "Integration tests (amd_binary, 4/5)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 4/5)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_binary, 4/5)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_binary_5_5:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9iaW5hcnksIDUvNSk=') }}
+    name: "Integration tests (amd_binary, 5/5)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_binary, 5/5)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_BINARY
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_BINARY
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_binary, 5/5)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_arm_binary_distributed_plan_1_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDEvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 1/4)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 1/4)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_ARM_BIN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_ARM_BIN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 1/4)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_arm_binary_distributed_plan_2_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDIvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 2/4)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 2/4)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_ARM_BIN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_ARM_BIN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 2/4)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_arm_binary_distributed_plan_3_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDMvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 3/4)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 3/4)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_ARM_BIN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_ARM_BIN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 3/4)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_arm_binary_distributed_plan_4_4:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFybV9iaW5hcnksIGRpc3RyaWJ1dGVkIHBsYW4sIDQvNCk=') }}
+    name: "Integration tests (arm_binary, distributed plan, 4/4)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (arm_binary, distributed plan, 4/4)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_ARM_BIN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_ARM_BIN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (arm_binary, distributed plan, 4/4)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_tsan_1_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
+    name: "Integration tests (amd_tsan, 1/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 1/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_tsan, 1/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_tsan_2_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
+    name: "Integration tests (amd_tsan, 2/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 2/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_tsan, 2/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_tsan_3_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
+    name: "Integration tests (amd_tsan, 3/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 3/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_tsan, 3/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_tsan_4_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
+    name: "Integration tests (amd_tsan, 4/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 4/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_tsan, 4/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_tsan_5_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
+    name: "Integration tests (amd_tsan, 5/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 5/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_tsan, 5/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_tsan_6_6:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_tsan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
+    name: "Integration tests (amd_tsan, 6/6)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 6/6)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_TSAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_TSAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_tsan, 6/6)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  integration_tests_amd_asan_flaky_check:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBmbGFreSBjaGVjayk=') }}
+    name: "Integration tests (amd_asan, flaky check)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, flaky check)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_ASAN
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_ASAN
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Integration tests (amd_asan, flaky check)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Integration tests (amd_asan, flaky check)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  install_packages_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel, build_amd_debug]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX2RlYnVnKQ==') }}
+    name: "Install packages (amd_debug)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (amd_debug)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Download artifact CH_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: CH_AMD_DEBUG
+          path: ./ci/tmp
+
+
+      - name: Download artifact DEB_AMD_DEBUG
+        uses: actions/download-artifact@v7
+        with:
+          name: DEB_AMD_DEBUG
+          path: ./ci/tmp
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Install packages (amd_debug)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Install packages (amd_debug)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
+          fi
diff --git a/.github/workflows/regression-reusable-suite.yml b/.github/workflows/regression-reusable-suite.yml
new file mode 100644
index 000000000000..2050eb109f36
--- /dev/null
+++ b/.github/workflows/regression-reusable-suite.yml
@@ -0,0 +1,193 @@
+name: Regression suite
+on:
+  workflow_call:
+    inputs:
+      ref:
+        description: "Commit SHA to checkout. Default: current (empty string)."
+        type: string
+        default: ""
+      workflow_config:
+        required: true
+        type: string
+      flags:
+        required: false
+        type: string
+      output_format:
+        required: true
+        type: string
+      extra_args:
+        required: false
+        type: string
+      suite_name:
+        required: true
+        type: string
+      suite_executable:
+        required: false
+        type: string
+        default: "regression.py"
+      timeout_minutes:
+        required: true
+        type: number
+      storage_path:
+        required: false
+        type: string
+        default: ""
+      regression_args:
+        required: false
+        type: string
+        default: ""
+      runner_type:
+        required: false
+        type: string
+        default: ""
+      runner_arch:
+        required: false
+        type: string
+        default: "x86"
+      job_name:
+        required: false
+        type: string
+        default: ""
+      part:
+        required: false
+        type: string
+        default: ""
+      build_sha:
+        required: false
+        type: string
+        default: ""
+      set_commit_status:
+        required: false
+        type: boolean
+        default: false
+jobs:
+  suite:
+    name: ${{ format('{0}{1}', inputs.job_name != '' && inputs.job_name || inputs.suite_name, inputs.part != '' && format('_{0}', inputs.part) || '') }}
+    runs-on: [
+      "self-hosted",
+      "altinity-on-demand",
+      "${{ inputs.runner_type }}",
+    ]
+    timeout-minutes: ${{ inputs.timeout_minutes }}
+    env:
+      SUITE: ${{ inputs.suite_name }}
+      SUITE_EXECUTABLE: ${{ inputs.suite_executable }}
+      STORAGE: ${{ inputs.storage_path }}
+      PART: ${{ inputs.part }}
+      REPORT_JOB_NAME: ${{ format('{0}{1}', inputs.job_name != '' && inputs.job_name || inputs.suite_name, inputs.part != '' && format('_{0}', inputs.part) || '') }}
+      # AWS credentials
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      # Docker credentials
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      # Database credentials
+      CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+      CHECKS_DATABASE_USER: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+      CHECKS_DATABASE_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+      # LocalStack token 
+      LOCALSTACK_AUTH_TOKEN: ${{ secrets.LOCALSTACK_AUTH_TOKEN }}
+      # Python encoding
+      PYTHONIOENCODING: utf-8
+      build_sha: ${{ inputs.build_sha }}
+      pr_number: ${{ github.event.number }}
+      artifacts: builds
+      # Args
+      args: --test-to-end
+        --no-colors
+        --local
+        --collect-service-logs
+        --output ${{ inputs.output_format }}
+        --attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ fromJson(inputs.workflow_config).custom_data.version.string }}" package="$clickhouse_path" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$REPORT_JOB_NAME" job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
+        --cicd
+        --log raw.log
+        ${{ inputs.flags != 'none' && inputs.flags || ''}}
+        ${{ inputs.extra_args }}
+      artifact_paths: |
+        ./report.html
+        ./*.log.txt
+        ./*.log
+        ./*.html
+        ./*/_instances/*.log
+        ./*/_instances/*/logs/*.log
+        ./*/*/_instances/*/logs/*.log
+        ./*/*/_instances/*.log
+
+    steps:
+      - name: ⤵️ Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: Altinity/clickhouse-regression
+          ref: ${{ inputs.ref }}
+
+      - name: ♻️ Cache setup
+        uses: ./.github/actions/cache-setup
+
+      - name: 🛠️ Setup
+        run: .github/setup.sh
+
+      - name: 📦 Get deb url
+        env:
+          S3_BASE_URL: https://altinity-build-artifacts.s3.amazonaws.com/
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+        run: |
+          REPORTS_PATH=${{ runner.temp }}/reports_dir
+          mkdir -p $REPORTS_PATH
+          cat > $REPORTS_PATH/workflow_config.json << 'EOF'
+          ${{ inputs.workflow_config }}
+          EOF
+
+          python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha || github.sha }} --binary
+
+      - name: 🔄 Process regression args
+        run: |
+          REGRESSION_ARGS='${{ inputs.regression_args }}'
+          # AWS replacements
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AWS_BUCKET}}'/${{ secrets.REGRESSION_AWS_S3_BUCKET }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AWS_REGION}}'/${{ secrets.REGRESSION_AWS_S3_REGION }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AWS_KEY_ID}}'/${{ secrets.REGRESSION_AWS_S3_KEY_ID }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AWS_ACCESS_KEY}}'/${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}}"
+          # GCS replacements
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{GCS_URI}}'/${{ secrets.REGRESSION_GCS_URI }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{GCS_KEY_ID}}'/${{ secrets.REGRESSION_GCS_KEY_ID }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{GCS_KEY_SECRET}}'/${{ secrets.REGRESSION_GCS_KEY_SECRET }}}"
+          # Azure replacements
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AZURE_ACCOUNT_NAME}}'/${{ secrets.AZURE_ACCOUNT_NAME }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AZURE_STORAGE_KEY}}'/${{ secrets.AZURE_STORAGE_KEY }}}"
+          REGRESSION_ARGS="${REGRESSION_ARGS//'{{AZURE_CONTAINER_NAME}}'/${{ secrets.AZURE_CONTAINER_NAME }}}"
+          echo "REGRESSION_ARGS=$REGRESSION_ARGS" >> $GITHUB_ENV
+
+      - name: 🧪 Run ${{ env.SUITE }} suite
+        id: run_suite
+        run: python3 
+          -u ${{ env.SUITE }}/${{ env.SUITE_EXECUTABLE }}
+          --clickhouse ${{ env.clickhouse_path }}
+          ${{ env.REGRESSION_ARGS }}
+          ${{ env.args }} || EXITCODE=$?;
+          .github/add_link_to_logs.sh;
+          exit $EXITCODE
+
+      - name: 📊 Set Commit Status
+        if: ${{ !cancelled() && inputs.set_commit_status }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JOB_OUTCOME: ${{ steps.run_suite.outcome }}
+          SUITE_NAME: ${{ format('Regression {0} {1}{2}', inputs.runner_arch, inputs.job_name != '' && inputs.job_name || inputs.suite_name, inputs.part != '' && format('_{0}', inputs.part) || '') }}
+        run: python3 .github/set_builds_status.py
+
+      - name: 📝 Create and upload logs
+        if: ${{ !cancelled() }}
+        run: .github/create_and_upload_logs.sh 1
+
+      - name: 📤 Upload logs to results database
+        if: ${{ !cancelled() }}
+        timeout-minutes: 20
+        run: .github/upload_results_to_database.sh 1
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: ${{ format('{0}{1}-artifacts-{2}{3}', inputs.job_name != '' && inputs.job_name || inputs.suite_name, inputs.part != '' && format('_{0}', inputs.part) || '', inputs.runner_arch, contains(inputs.extra_args, '--use-keeper') && '_keeper' || '_zookeeper') }}
+          path: ${{ env.artifact_paths }}
+
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
new file mode 100644
index 000000000000..9fae87b4e5ed
--- /dev/null
+++ b/.github/workflows/regression.yml
@@ -0,0 +1,488 @@
+name: Regression test workflow - Release
+'on':
+  workflow_call:
+    inputs:
+      runner_type:
+        description: the (meta-)label of runner to use
+        required: true
+        type: string
+      commit:
+        description: commit hash of the regression tests.
+        required: true
+        type: string
+      arch:
+        description: arch to run the tests on.
+        required: true
+        type: string
+      timeout_minutes:
+        description: Maximum number of minutes to let workflow run before GitHub cancels it.
+        default: 210
+        type: number
+      build_sha:
+        description: commit sha of the workflow run for artifact upload.
+        required: true
+        type: string
+      checkout_depth:
+        description: the value of the git shallow checkout
+        required: false
+        type: number
+        default: 1
+      submodules:
+        description: if the submodules should be checked out
+        required: false
+        type: boolean
+        default: false
+      additional_envs:
+        description: additional ENV variables to setup the job
+        type: string
+      workflow_config:
+        description: workflow config for the run
+        required: true
+        type: string
+    secrets:
+      secret_envs:
+        description: if given, it's passed to the environments
+        required: false
+      AWS_SECRET_ACCESS_KEY:
+        description: the access key to the aws param store.
+        required: true
+      AWS_ACCESS_KEY_ID:
+        description: the access key id to the aws param store.
+        required: true
+      AWS_DEFAULT_REGION:
+        description: the region of the aws param store.
+        required: true
+      AWS_REPORT_KEY_ID:
+        description: aws s3 key id used for regression test reports.
+        required: true
+      AWS_REPORT_SECRET_ACCESS_KEY:
+        description: aws s3 secret access key used for regression test reports.
+        required: true
+      AWS_REPORT_REGION:
+        description: aws s3 region used for regression test reports.
+        required: true
+      DOCKER_USERNAME:
+        description: username of the docker user.
+        required: true
+      DOCKER_PASSWORD:
+        description: password to the docker user.
+        required: true
+      REGRESSION_AWS_S3_BUCKET:
+        description: aws s3 bucket used for regression tests.
+        required: true
+      REGRESSION_AWS_S3_KEY_ID:
+        description: aws s3 key id used for regression tests.
+        required: true
+      REGRESSION_AWS_S3_SECRET_ACCESS_KEY:
+        description: aws s3 secret access key used for regression tests.
+        required: true
+      REGRESSION_AWS_S3_REGION:
+        description: aws s3 region used for regression tests.
+        required: true
+      REGRESSION_GCS_KEY_ID:
+        description: gcs key id used for regression tests.
+        required: true
+      REGRESSION_GCS_KEY_SECRET:
+        description: gcs key secret used for regression tests.
+        required: true
+      REGRESSION_GCS_URI:
+        description: gcs uri used for regression tests.
+        required: true
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CHECKS_DATABASE_USER: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CHECKS_DATABASE_PASSWORD:  ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  args: --test-to-end
+    --no-colors
+    --local
+    --collect-service-logs
+    --output new-fails
+    --parallel 1
+    --log raw.log
+    --with-analyzer
+  artifact_paths: |
+    ./report.html
+    ./*.log.txt
+    ./*.log
+    ./*.html
+    ./*/_instances/*.log
+    ./*/_instances/*/logs/*.log
+    ./*/*/_instances/*/logs/*.log
+    ./*/*/_instances/*.log
+
+jobs:
+  Common:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'common')
+    strategy:
+      fail-fast: false
+      matrix:
+        SUITE: [aes_encryption, atomic_insert, base_58, data_types, datetime64_extended_range, disk_level_encryption, dns, engines, example, extended_precision_data_types, functions, kafka, kerberos, key_value, lightweight_delete, memory, part_moves_between_shards, selects, session_timezone, swarms, version, window_functions]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: ${{ matrix.SUITE }}
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: ${{ matrix.SUITE }}
+    secrets: inherit
+
+  AggregateFunctions:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'aggregate_functions')
+    strategy:
+      fail-fast: false
+      matrix:
+        PART: [1, 2, 3]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: aggregate_functions
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: aggregate_functions
+      extra_args: --only "part ${{ matrix.PART }}/*"
+    secrets: inherit
+  Alter:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'alter')
+    strategy:
+      fail-fast: false
+      matrix:
+        ONLY: [replace, move]
+        include:
+          - ONLY: attach
+            PART: 1
+          - ONLY: attach
+            PART: 2
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: alter
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: /${{ matrix.ONLY }}_partition
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: alter_${{ matrix.ONLY }}
+      extra_args: --only "/alter/${{ matrix.ONLY }} partition/${{ matrix.PART && format('part {0}/', matrix.PART) || '' }}*"
+    secrets: inherit
+
+  Benchmark:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'benchmark')
+    strategy:
+      fail-fast: false
+      matrix:
+        STORAGE: [minio, aws_s3, gcs]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: ontime_benchmark
+      suite_executable: benchmark.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: /${{ matrix.STORAGE }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: benchmark_${{ matrix.STORAGE }}
+      regression_args: --storage ${{ matrix.STORAGE }} --gcs-uri {{GCS_URI}} --gcs-key-id {{GCS_KEY_ID}} --gcs-key-secret {{GCS_KEY_SECRET}} --aws-s3-bucket {{AWS_BUCKET}} --aws-s3-region {{AWS_REGION}} --aws-s3-key-id {{AWS_KEY_ID}} --aws-s3-access-key {{AWS_ACCESS_KEY}}
+    secrets: inherit
+
+  ClickHouseKeeper:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'clickhouse_keeper')
+    strategy:
+      fail-fast: false
+      matrix:
+        PART: [1, 2]
+        SSL: [ssl, no_ssl]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: clickhouse_keeper
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: /${{ matrix.SSL }}
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: clickhouse_keeper_${{ matrix.SSL }}
+      extra_args: ${{ matrix.SSL == 'ssl' && '--ssl' || '' }} --only "part ${{ matrix.PART }}/*"
+    secrets: inherit
+
+  Iceberg:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'iceberg')
+    strategy:
+      fail-fast: false
+      matrix:
+        PART: [1, 2]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: iceberg
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: iceberg
+      extra_args: --only ${{ matrix.PART == 1 && '"/iceberg/iceberg engine/rest catalog/*" "/iceberg/s3 table function/*" "/iceberg/icebergS3 table function/*" "/iceberg/iceberg cache/*"' || '"/iceberg/iceberg engine/glue catalog/*" "/iceberg/iceberg table engine/*"' }}
+    secrets: inherit
+  LDAP:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'ldap')
+    strategy:
+      fail-fast: false
+      matrix:
+        SUITE: [authentication, external_user_directory, role_mapping]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: ldap/${{ matrix.SUITE }}
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: ldap_${{ matrix.SUITE }}
+    secrets: inherit
+
+  Parquet:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'parquet')
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: parquet
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: parquet
+    secrets: inherit
+
+  ParquetS3:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'parquet')
+    strategy:
+      fail-fast: false
+      matrix:
+        STORAGE: [minio, aws_s3]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: parquet
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: ${{ matrix.STORAGE }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: parquet_${{ matrix.STORAGE }}
+      regression_args: --storage ${{ matrix.STORAGE }} --aws-s3-bucket {{AWS_BUCKET}} --aws-s3-region {{AWS_REGION}} --aws-s3-key-id {{AWS_KEY_ID}} --aws-s3-access-key {{AWS_ACCESS_KEY}} --only "/parquet/${{ matrix.STORAGE }}/*"
+    secrets: inherit
+
+  RBAC:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'rbac')
+    strategy:
+      fail-fast: false
+      matrix:
+        PART: [1, 2, 3]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: rbac
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: rbac
+      extra_args: --only "/rbac/part ${{ matrix.PART }}/*"
+    secrets: inherit
+  SSLServer:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'ssl_server')
+    strategy:
+      fail-fast: false
+      matrix:
+        PART: [1, 2, 3]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: ssl_server
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: ssl_server
+      extra_args: --only "part ${{ matrix.PART }}/*"
+    secrets: inherit
+
+  S3:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3')
+    strategy:
+      fail-fast: false
+      matrix:
+        STORAGE: [aws_s3, gcs, azure, minio]
+        PART: [1, 2]
+        include:
+          - STORAGE: minio
+            PART: 3
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: s3
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: /${{ matrix.STORAGE }}
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: s3_${{ matrix.STORAGE }}
+      regression_args: --storage ${{ matrix.STORAGE }} --gcs-uri {{GCS_URI}} --gcs-key-id {{GCS_KEY_ID}} --gcs-key-secret {{GCS_KEY_SECRET}} --aws-s3-bucket {{AWS_BUCKET}} --aws-s3-region {{AWS_REGION}} --aws-s3-key-id {{AWS_KEY_ID}} --aws-s3-access-key {{AWS_ACCESS_KEY}} --azure-account-name {{AZURE_ACCOUNT_NAME}} --azure-storage-key {{AZURE_STORAGE_KEY}} --azure-container {{AZURE_CONTAINER_NAME}}
+      extra_args: --only ":/try*" ":/part ${{ matrix.PART }}/*"
+    secrets: inherit
+
+  S3Export:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3')
+    strategy:
+      fail-fast: false
+      matrix:
+        PART: [part, partition]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: s3
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: /minio
+      part: ${{ matrix.PART }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: s3_export
+      regression_args: --storage minio
+      extra_args: --only ":/try*" "minio/export tests/export ${{ matrix.PART }}/*"
+    secrets: inherit
+
+  TieredStorage:
+    if: |
+      fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
+      contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'tiered_storage')
+    strategy:
+      fail-fast: false
+      matrix:
+        STORAGE: [local, minio, s3amazon, s3gcs]
+    uses: ./.github/workflows/regression-reusable-suite.yml
+    with:
+      ref: ${{ inputs.commit }}
+      workflow_config: ${{ inputs.workflow_config }}
+      suite_name: tiered_storage
+      suite_executable: regression.py
+      output_format: new-fails
+      flags: --with-analyzer
+      timeout_minutes: ${{ inputs.timeout_minutes }}
+      runner_arch: ${{ inputs.arch }}
+      runner_type: ${{ inputs.runner_type }}
+      storage_path: /${{ matrix.STORAGE }}
+      build_sha: ${{ inputs.build_sha }}
+      set_commit_status: true
+      job_name: tiered_storage_${{ matrix.STORAGE }}
+      regression_args: --aws-s3-access-key {{AWS_ACCESS_KEY}} --aws-s3-key-id {{AWS_KEY_ID}} --aws-s3-uri https://s3.{{AWS_REGION}}.amazonaws.com/{{AWS_BUCKET}}/data/ --gcs-key-id {{GCS_KEY_ID}} --gcs-key-secret {{GCS_KEY_SECRET}} --gcs-uri {{GCS_URI}}
+      extra_args: ${{ matrix.STORAGE != 'local' && format('--with-{0}', matrix.STORAGE) || '' }}
+    secrets: inherit
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index fc29cc770e7b..03a4001db49c 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -3,21 +3,43 @@
 name: ReleaseBranchCI
 
 on:
+  workflow_dispatch:
+    inputs:
+      no_cache:
+        description: Run without cache
+        required: false
+        type: boolean
+        default: false
   push:
     branches: ['2[1-9].[1-9][0-9]', '2[1-9].[1-9]']
 
 env:
   # Force the stdout and stderr streams to be unbuffered
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
+  DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
   CHECKOUT_REF: ""
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
+  AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
+  AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
+
 
-# Allow updating GH commit statuses and PR comments to post an actual job reports link
-permissions: write-all
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -28,6 +50,27 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -54,7 +97,7 @@ jobs:
           fi
 
   dockers_build_amd:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
     name: "Dockers Build (amd)"
@@ -66,6 +109,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -92,7 +142,7 @@ jobs:
           fi
 
   dockers_build_arm:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
     name: "Dockers Build (arm)"
@@ -104,6 +154,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -130,7 +187,7 @@ jobs:
           fi
 
   build_amd_debug:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
     name: "Build (amd_debug)"
@@ -142,6 +199,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -168,7 +232,7 @@ jobs:
           fi
 
   build_amd_release:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
     name: "Build (amd_release)"
@@ -180,6 +244,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -206,7 +277,7 @@ jobs:
           fi
 
   build_amd_asan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
     name: "Build (amd_asan)"
@@ -218,6 +289,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_asan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -244,7 +322,7 @@ jobs:
           fi
 
   build_amd_tsan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
     name: "Build (amd_tsan)"
@@ -256,6 +334,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_tsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -282,7 +367,7 @@ jobs:
           fi
 
   build_amd_msan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
     name: "Build (amd_msan)"
@@ -294,6 +379,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -320,7 +412,7 @@ jobs:
           fi
 
   build_amd_ubsan:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
     name: "Build (amd_ubsan)"
@@ -332,6 +424,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -358,7 +457,7 @@ jobs:
           fi
 
   build_arm_release:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
     name: "Build (arm_release)"
@@ -370,43 +469,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_release)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Build (arm_release)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  build_arm_asan:
-    runs-on: [self-hosted, builder-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9hc2FuKQ==') }}
-    name: "Build (arm_asan)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Build (arm_release)"
 
       - name: Prepare env script
         run: |
@@ -428,13 +496,13 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Build (arm_asan)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_release)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Build (arm_asan)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Build (arm_release)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
           fi
 
   build_amd_darwin:
-    runs-on: [self-hosted, builder]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kYXJ3aW4p') }}
     name: "Build (amd_darwin)"
@@ -446,6 +514,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_darwin)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -472,7 +547,7 @@ jobs:
           fi
 
   build_arm_darwin:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9kYXJ3aW4p') }}
     name: "Build (arm_darwin)"
@@ -484,6 +559,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_darwin)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -510,7 +592,7 @@ jobs:
           fi
 
   docker_server_image:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
     name: "Docker server image"
@@ -522,6 +604,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker server image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -548,7 +637,7 @@ jobs:
           fi
 
   docker_keeper_image:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
     name: "Docker keeper image"
@@ -560,6 +649,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker keeper image"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -586,7 +682,7 @@ jobs:
           fi
 
   install_packages_amd_release:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX3JlbGVhc2Up') }}
     name: "Install packages (amd_release)"
@@ -598,6 +694,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (amd_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -624,7 +727,7 @@ jobs:
           fi
 
   install_packages_arm_release:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_release]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYXJtX3JlbGVhc2Up') }}
     name: "Install packages (arm_release)"
@@ -636,6 +739,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (arm_release)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -661,8 +771,143 @@ jobs:
             python3 -m praktika run 'Install packages (arm_release)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
           fi
 
+  stateless_tests_amd_asan_distributed_plan_parallel_1_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_asan_distributed_plan_parallel_2_2:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
+    name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_asan_distributed_plan_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_asan, distributed plan, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_asan, distributed plan, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
+          fi
+
   integration_tests_amd_asan_1_4:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCAxLzQp') }}
     name: "Integration tests (amd_asan, 1/4)"
@@ -674,6 +919,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, 1/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -700,7 +952,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_2_4:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCAyLzQp') }}
     name: "Integration tests (amd_asan, 2/4)"
@@ -712,6 +964,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, 2/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -738,7 +997,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_3_4:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCAzLzQp') }}
     name: "Integration tests (amd_asan, 3/4)"
@@ -750,6 +1009,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, 3/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -776,7 +1042,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_4_4:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCA0LzQp') }}
     name: "Integration tests (amd_asan, 4/4)"
@@ -788,6 +1054,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, 4/4)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -814,7 +1087,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_1_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDEvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 1/6)"
@@ -826,6 +1099,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -852,7 +1132,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_2_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDIvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 2/6)"
@@ -864,6 +1144,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -890,7 +1177,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_3_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDMvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 3/6)"
@@ -902,6 +1189,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -928,7 +1222,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_4_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDQvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 4/6)"
@@ -940,6 +1234,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -966,7 +1267,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_5_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDUvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 5/6)"
@@ -978,6 +1279,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1004,7 +1312,7 @@ jobs:
           fi
 
   integration_tests_amd_asan_old_analyzer_6_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF9hc2FuLCBvbGQgYW5hbHl6ZXIsIDYvNik=') }}
     name: "Integration tests (amd_asan, old analyzer, 6/6)"
@@ -1016,6 +1324,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_asan, old analyzer, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1042,7 +1357,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_1_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAxLzYp') }}
     name: "Integration tests (amd_tsan, 1/6)"
@@ -1054,6 +1369,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 1/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1080,7 +1402,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_2_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAyLzYp') }}
     name: "Integration tests (amd_tsan, 2/6)"
@@ -1092,6 +1414,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 2/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1118,7 +1447,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_3_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCAzLzYp') }}
     name: "Integration tests (amd_tsan, 3/6)"
@@ -1130,6 +1459,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 3/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1156,7 +1492,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_4_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA0LzYp') }}
     name: "Integration tests (amd_tsan, 4/6)"
@@ -1168,6 +1504,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 4/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1194,7 +1537,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_5_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA1LzYp') }}
     name: "Integration tests (amd_tsan, 5/6)"
@@ -1206,6 +1549,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 5/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1232,7 +1582,7 @@ jobs:
           fi
 
   integration_tests_amd_tsan_6_6:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW50ZWdyYXRpb24gdGVzdHMgKGFtZF90c2FuLCA2LzYp') }}
     name: "Integration tests (amd_tsan, 6/6)"
@@ -1244,6 +1594,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Integration tests (amd_tsan, 6/6)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1270,7 +1627,7 @@ jobs:
           fi
 
   stress_test_amd_debug:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9kZWJ1Zyk=') }}
     name: "Stress test (amd_debug)"
@@ -1282,6 +1639,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_debug)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1308,7 +1672,7 @@ jobs:
           fi
 
   stress_test_amd_tsan:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF90c2FuKQ==') }}
     name: "Stress test (amd_tsan)"
@@ -1320,43 +1684,12 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Prepare env script
-        run: |
-          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
-          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
-          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
-          export PYTHONPATH=./ci:.:
-          cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
-          ${{ needs.config_workflow.outputs.data }}
-          EOF
-          cat > ./ci/tmp/workflow_status.json << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          ENV_SETUP_SCRIPT_EOF
-
-      - name: Run
-        id: run
-        run: |
-          . ./ci/tmp/praktika_setup_env.sh
-          set -o pipefail
-          if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
-          else
-            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
-          fi
-
-  stress_test_arm_asan:
-    runs-on: [self-hosted, arm-medium]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_asan]
-    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFybV9hc2FuKQ==') }}
-    name: "Stress test (arm_asan)"
-    outputs:
-      data: ${{ steps.run.outputs.DATA }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          test_name: "Stress test (amd_tsan)"
 
       - name: Prepare env script
         run: |
@@ -1378,13 +1711,13 @@ jobs:
           . ./ci/tmp/praktika_setup_env.sh
           set -o pipefail
           if command -v ts &> /dev/null; then
-            python3 -m praktika run 'Stress test (arm_asan)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
           else
-            python3 -m praktika run 'Stress test (arm_asan)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
+            python3 -m praktika run 'Stress test (amd_tsan)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
           fi
 
   stress_test_amd_ubsan:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_ubsan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF91YnNhbik=') }}
     name: "Stress test (amd_ubsan)"
@@ -1396,6 +1729,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_ubsan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1422,7 +1762,7 @@ jobs:
           fi
 
   stress_test_amd_msan:
-    runs-on: [self-hosted, amd-medium]
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
     needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_msan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RyZXNzIHRlc3QgKGFtZF9tc2FuKQ==') }}
     name: "Stress test (amd_msan)"
@@ -1434,6 +1774,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stress test (amd_msan)"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -1460,8 +1807,8 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
-    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_arm_release, build_arm_asan, build_amd_darwin, build_arm_darwin, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, integration_tests_amd_asan_1_4, integration_tests_amd_asan_2_4, integration_tests_amd_asan_3_4, integration_tests_amd_asan_4_4, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, stress_test_amd_debug, stress_test_amd_tsan, stress_test_arm_asan, stress_test_amd_ubsan, stress_test_amd_msan]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_arm_release, build_amd_darwin, build_arm_darwin, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, integration_tests_amd_asan_1_4, integration_tests_amd_asan_2_4, integration_tests_amd_asan_3_4, integration_tests_amd_asan_4_4, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, stress_test_amd_debug, stress_test_amd_tsan, stress_test_amd_ubsan, stress_test_amd_msan]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
     outputs:
@@ -1472,6 +1819,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml
new file mode 100644
index 000000000000..662e642adc19
--- /dev/null
+++ b/.github/workflows/release_builds.yml
@@ -0,0 +1,1268 @@
+# generated by praktika
+
+name: Release Builds
+on:
+  workflow_dispatch:
+    inputs:
+
+env:
+  PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
+  CHECKOUT_REF: ""
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
+  AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
+  AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
+
+
+jobs:
+
+  config_workflow:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: []
+    name: "Config Workflow"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Config Workflow' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Config Workflow' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  dockers_build_amd:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYW1kKQ==') }}
+    name: "Dockers Build (amd)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (amd)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Dockers Build (amd)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Dockers Build (amd)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  dockers_build_arm:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VycyBCdWlsZCAoYXJtKQ==') }}
+    name: "Dockers Build (arm)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Dockers Build (arm)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Dockers Build (arm)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Dockers Build (arm)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_debug:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
+    name: "Build (amd_debug)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_debug)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_debug)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_debug)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
+    name: "Build (amd_release)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_release)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_release)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_release)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_asan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
+    name: "Build (amd_asan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_asan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_asan)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_asan)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_tsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
+    name: "Build (amd_tsan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_tsan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_tsan)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_tsan)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_msan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
+    name: "Build (amd_msan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_msan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_msan)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_msan)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_ubsan:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
+    name: "Build (amd_ubsan)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_ubsan)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_ubsan)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_ubsan)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_amd_binary:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
+    name: "Build (amd_binary)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (amd_binary)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (amd_binary)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (amd_binary)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_arm_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
+    name: "Build (arm_release)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_release)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (arm_release)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (arm_release)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  build_arm_binary:
+    runs-on: [self-hosted, altinity-on-demand, altinity-builder]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
+    name: "Build (arm_binary)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Build (arm_binary)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Build (arm_binary)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Build (arm_binary)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  docker_server_image:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    name: "Docker server image"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker server image"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Docker server image' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Docker server image' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  docker_keeper_image:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+    name: "Docker keeper image"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Docker keeper image"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Docker keeper image' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Docker keeper image' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  install_packages_amd_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYW1kX3JlbGVhc2Up') }}
+    name: "Install packages (amd_release)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (amd_release)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Install packages (amd_release)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Install packages (amd_release)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  install_packages_arm_release:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_release]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYXJtX3JlbGVhc2Up') }}
+    name: "Install packages (arm_release)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Install packages (arm_release)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Install packages (arm_release)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Install packages (arm_release)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgcGFyYWxsZWwp') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBvbGQgYW5hbHl6ZXIsIHMzIHN0b3JhZ2UsIERhdGFiYXNlUmVwbGljYXRlZCwgc2VxdWVudGlhbCk=') }}
+    name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYmluYXJ5LCBQYXJhbGxlbFJlcGxpY2FzLCBzMyBzdG9yYWdlLCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (amd_binary, ParallelReplicas, s3 storage, sequential)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_arm_binary_parallel:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBwYXJhbGxlbCk=') }}
+    name: "Stateless tests (arm_binary, parallel)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, parallel)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (arm_binary, parallel)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  stateless_tests_arm_binary_sequential:
+    runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhcm1fYmluYXJ5LCBzZXF1ZW50aWFsKQ==') }}
+    name: "Stateless tests (arm_binary, sequential)"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Stateless tests (arm_binary, sequential)"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Stateless tests (arm_binary, sequential)' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+  finish_workflow:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_binary, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel, stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential, stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel, stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential, stateless_tests_arm_binary_parallel, stateless_tests_arm_binary_sequential]
+    if: ${{ !cancelled() }}
+    name: "Finish Workflow"
+    outputs:
+      data: ${{ steps.run.outputs.DATA }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
+      - name: Prepare env script
+        run: |
+          rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
+          mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
+          cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
+          export PYTHONPATH=./ci:.:
+          cat > ./ci/tmp/workflow_inputs.json << 'EOF'
+          ${{ toJson(github.event.inputs) }}
+          EOF
+          cat > ./ci/tmp/workflow_config_release_builds.json << 'EOF'
+          ${{ needs.config_workflow.outputs.data }}
+          EOF
+          cat > ./ci/tmp/workflow_status.json << 'EOF'
+          ${{ toJson(needs) }}
+          EOF
+          ENV_SETUP_SCRIPT_EOF
+
+      - name: Run
+        id: run
+        run: |
+          . ./ci/tmp/praktika_setup_env.sh
+          set -o pipefail
+          if command -v ts &> /dev/null; then
+            python3 -m praktika run 'Finish Workflow' --workflow "Release Builds" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
+          else
+            python3 -m praktika run 'Finish Workflow' --workflow "Release Builds" --ci |& tee ./ci/tmp/job.log
+          fi
+
+##########################################################################################
+##################################### ALTINITY JOBS ######################################
+##########################################################################################
+
+  GrypeScanServer:
+    needs: [config_workflow, docker_server_image]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        suffix: ['', '-alpine']
+    uses: ./.github/workflows/grype_scan.yml
+    secrets: inherit
+    with:
+      docker_image: altinityinfra/clickhouse-server
+      version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+      tag-suffix: ${{ matrix.suffix }}
+  GrypeScanKeeper:
+      needs: [config_workflow, docker_keeper_image]
+      if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+      uses: ./.github/workflows/grype_scan.yml
+      secrets: inherit
+      with:
+        docker_image: altinityinfra/clickhouse-keeper
+        version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+
+  SignRelease:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_sign.yml
+    secrets: inherit
+    with:
+      test_name: Sign release
+      runner_type: altinity-style-checker
+      data: ${{ needs.config_workflow.outputs.data }}
+  SignAarch64:
+    needs: [config_workflow, build_arm_release]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_sign.yml
+    secrets: inherit
+    with:
+      test_name: Sign aarch64
+      runner_type: altinity-style-checker-aarch64
+      data: ${{ needs.config_workflow.outputs.data }}
+
+  FinishCIReport:
+    if: ${{ !cancelled() }}
+    needs:
+      - config_workflow
+      - dockers_build_amd
+      - dockers_build_arm
+      - build_amd_debug
+      - build_amd_release
+      - build_amd_asan
+      - build_amd_tsan
+      - build_amd_msan
+      - build_amd_ubsan
+      - build_amd_binary
+      - build_arm_release
+      - build_arm_binary
+      - docker_server_image
+      - docker_keeper_image
+      - install_packages_amd_release
+      - install_packages_arm_release
+      - stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_parallel
+      - stateless_tests_amd_binary_old_analyzer_s3_storage_databasereplicated_sequential
+      - stateless_tests_amd_binary_parallelreplicas_s3_storage_parallel
+      - stateless_tests_amd_binary_parallelreplicas_s3_storage_sequential
+      - stateless_tests_arm_binary_parallel
+      - stateless_tests_arm_binary_sequential
+      - finish_workflow
+      - GrypeScanServer
+      - GrypeScanKeeper
+      - SignRelease
+      - SignAarch64
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+      - name: Finalize workflow report
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/create_workflow_report
+        with:
+          workflow_config: ${{ needs.config_workflow.outputs.data }}
+          final: true
+
+  SourceUpload:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    env:
+        COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+        VERSION: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+          ref: ${{ fromJson(needs.config_workflow.outputs.data).git_ref }}
+          submodules: true
+          fetch-depth: 0
+          filter: tree:0
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+      - name: Create source tar
+        run: |
+          cd .. && tar czf $RUNNER_TEMP/build_source.src.tar.gz ClickHouse/
+      - name: Upload source tar
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+              S3_PATH="REFs/$GITHUB_REF_NAME/$COMMIT_SHA/build_amd_release"
+          else
+              S3_PATH="PRs/$PR_NUMBER/$COMMIT_SHA/build_amd_release"
+          fi
+
+          aws s3 cp $RUNNER_TEMP/build_source.src.tar.gz s3://altinity-build-artifacts/$S3_PATH/clickhouse-$VERSION.src.tar.gz
diff --git a/.github/workflows/repo-sanity-checks.yml b/.github/workflows/repo-sanity-checks.yml
new file mode 100644
index 000000000000..ec50a056b730
--- /dev/null
+++ b/.github/workflows/repo-sanity-checks.yml
@@ -0,0 +1,150 @@
+name: Repository Sanity Checks
+
+on:
+  workflow_dispatch:  # Manual trigger only
+
+  workflow_call:
+    
+jobs:
+  sanity-checks:
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
+    strategy:
+      fail-fast: false  # Continue with other combinations if one fails
+      matrix:
+        include:
+          # Production packages
+          - env: prod
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.altinity.cloud/apt-repo
+          - env: prod
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.altinity.cloud/yum-repo
+          # FIPS Production packages
+          - env: prod-fips
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.altinity.cloud/fips-apt-repo
+          - env: prod-fips
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.altinity.cloud/fips-yum-repo
+          # Staging packages
+          - env: staging
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.staging.altinity.cloud/apt-repo
+          - env: staging
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.staging.altinity.cloud/yum-repo
+          # FIPS Staging packages
+          - env: staging-fips
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.staging.altinity.cloud/fips-apt-repo
+          - env: staging-fips
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.staging.altinity.cloud/fips-yum-repo
+          # Hotfix packages
+          - env: hotfix
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.altinity.cloud/hotfix-apt-repo
+          - env: hotfix
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.altinity.cloud/hotfix-yum-repo
+          # Antalya experimental packages
+          - env: antalya
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.altinity.cloud/antalya-apt-repo
+          - env: antalya
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.altinity.cloud/antalya-yum-repo
+          # Hotfix staging packages
+          - env: hotfix-staging
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.staging.altinity.cloud/hotfix-apt-repo
+          - env: hotfix-staging
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.staging.altinity.cloud/hotfix-yum-repo
+          # Antalya experimental staging packages
+          - env: antalya-staging
+            type: deb
+            base: ubuntu:22.04
+            repo_url: https://builds.staging.altinity.cloud/antalya-apt-repo
+          - env: antalya-staging
+            type: rpm
+            base: centos:8
+            repo_url: https://builds.staging.altinity.cloud/antalya-yum-repo
+
+    steps:
+      - name: Run sanity check
+        run: |
+          cat << 'EOF' > sanity.sh
+          #!/bin/bash
+          set -e -x
+
+          # Package installation commands based on type
+          if [ "${{ matrix.type }}" = "deb" ]; then
+            export DEBIAN_FRONTEND=noninteractive
+            apt-get update && apt-get install -y apt-transport-https ca-certificates curl gnupg2 dialog sudo
+            mkdir -p /usr/share/keyrings
+            curl -s "${REPO_URL}/pubkey.gpg" | gpg --dearmor > /usr/share/keyrings/altinity-archive-keyring.gpg
+            echo "deb [signed-by=/usr/share/keyrings/altinity-archive-keyring.gpg] ${REPO_URL} stable main" > /etc/apt/sources.list.d/altinity.list
+            apt-get update
+            apt-get install -y clickhouse-server clickhouse-client
+          else
+            sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+            sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+            yum install -y curl gnupg2 sudo
+            if [[ "${{ matrix.env }}" == *"staging"* ]]; then
+              curl "${REPO_URL}/altinity-staging.repo" -o /etc/yum.repos.d/altinity-staging.repo
+            else
+              curl "${REPO_URL}/altinity.repo" -o /etc/yum.repos.d/altinity.repo
+            fi
+            yum install -y clickhouse-server clickhouse-client
+          fi
+          
+          # Ensure correct ownership
+          chown -R clickhouse /var/lib/clickhouse/
+          chown -R clickhouse /var/log/clickhouse-server/
+          
+          # Check server version
+          server_version=$(clickhouse-server --version)
+          echo "$server_version" | grep "altinity" || FAILED_SERVER=true
+          
+          # Start server and test
+          sudo -u clickhouse clickhouse-server --config-file /etc/clickhouse-server/config.xml --daemon
+          sleep 10
+          clickhouse-client -q 'SELECT 1'
+          
+          # Check client version
+          client_version=$(clickhouse-client --version)
+          echo "$client_version" | grep "altinity" || FAILED_CLIENT=true
+          
+          # Report results
+          if [ "$FAILED_SERVER" = true ]; then
+            echo "::error::Server check failed - Version: $server_version"
+            exit 1
+          elif [ "$FAILED_CLIENT" = true ]; then
+            echo "::error::Client check failed - Version: $client_version"
+            exit 1
+          else
+            echo "All checks passed successfully!"
+          fi
+          EOF
+          
+          chmod +x sanity.sh
+          docker run --rm \
+            -v $(pwd)/sanity.sh:/sanity.sh \
+            -e REPO_URL="${{ matrix.repo_url }}" \
+            ${{ matrix.base }} \
+            /sanity.sh
diff --git a/.github/workflows/reusable_sign.yml b/.github/workflows/reusable_sign.yml
new file mode 100644
index 000000000000..7bfed2758359
--- /dev/null
+++ b/.github/workflows/reusable_sign.yml
@@ -0,0 +1,166 @@
+name: Sigining workflow
+'on':
+  workflow_call:
+    inputs:
+      test_name:
+        description: the value of test type from tests/ci/ci_config.py, ends up as $CHECK_NAME ENV
+        required: true
+        type: string
+      runner_type:
+        description: the label of runner to use
+        required: true
+        type: string
+      run_command:
+        description: the command to launch the check
+        default: ""
+        required: false
+        type: string
+      checkout_depth:
+        description: the value of the git shallow checkout
+        required: false
+        type: number
+        default: 1
+      submodules:
+        description: if the submodules should be checked out
+        required: false
+        type: boolean
+        default: false
+      additional_envs:
+        description: additional ENV variables to setup the job
+        type: string
+      data:
+        description: ci data
+        type: string
+        required: true
+      working-directory:
+        description: sets custom working directory
+        type: string
+        default: "$GITHUB_WORKSPACE/tests/ci"
+    secrets:
+      secret_envs:
+        description: if given, it's passed to the environments
+        required: false
+      AWS_SECRET_ACCESS_KEY:
+        description: the access key to the aws param store.
+        required: true
+      AWS_ACCESS_KEY_ID:
+        description: the access key id to the aws param store.
+        required: true
+      GPG_BINARY_SIGNING_KEY:
+        description: gpg signing key for packages.
+        required: true
+      GPG_BINARY_SIGNING_PASSPHRASE:
+        description: gpg signing key passphrase.
+        required: true
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+  CHECK_NAME: ${{inputs.test_name}}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
+  CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
+  CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
+
+jobs:
+  runner_labels_setup:
+    name: Compute proper runner labels for the rest of the jobs
+    runs-on: ubuntu-latest
+    outputs:
+      runner_labels: ${{ steps.setVariables.outputs.runner_labels }}
+    steps:
+      - id: setVariables
+        name: Prepare runner_labels variables for the later steps
+        run: |
+
+          # Prepend self-hosted
+          input="self-hosted, altinity-on-demand, ${input}"
+
+          # Remove all whitespace
+          input="$(echo ${input} | tr -d [:space:])"
+          # Make something like a JSON array from comma-separated list
+          input="[ '${input//\,/\'\, \'}' ]"
+
+          echo "runner_labels=$input" >> ${GITHUB_OUTPUT}
+        env:
+          input: ${{ inputs.runner_type }}
+
+  Test:
+    needs: [runner_labels_setup]
+    runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
+    name: ${{inputs.test_name}}${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].num_batches > 1 && format('-{0}',matrix.batch) || '' }}
+    env:
+      GITHUB_JOB_OVERRIDDEN: ${{inputs.test_name}}${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].num_batches > 1 && format('-{0}',matrix.batch) || '' }}
+    strategy:
+      fail-fast: false  # we always wait for entire matrix
+      matrix:
+        batch: ${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].batches }}
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+          ref: ${{ fromJson(inputs.data).git_ref }}
+          submodules: ${{inputs.submodules}}
+          fetch-depth: ${{inputs.checkout_depth}}
+          filter: tree:0
+      - name: Set build envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          CHECK_NAME=${{ inputs.test_name }}
+          ${{inputs.additional_envs}}
+          ${{secrets.secret_envs}}
+          DOCKER_TAG<<DOCKER_JSON
+          ${{ toJson(fromJson(inputs.data).docker_data.images) }}
+          TEMP_PATH=${{runner.temp}}/signed
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          DOCKER_JSON
+          EOF
+      - name: Common setup
+        uses: ./.github/actions/common_setup
+        with:
+          job_type: test
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+      - name: Setup batch
+        if: ${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].num_batches > 1 }}
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          RUN_BY_HASH_NUM=${{matrix.batch}}
+          RUN_BY_HASH_TOTAL=${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].num_batches }}
+          EOF
+      - name: Pre run
+        run: |
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --pre --job-name '${{inputs.test_name}}'
+      - name: Sign release
+        env:
+          GPG_BINARY_SIGNING_KEY: ${{ secrets.GPG_BINARY_SIGNING_KEY }}
+          GPG_BINARY_SIGNING_PASSPHRASE: ${{ secrets.GPG_BINARY_SIGNING_PASSPHRASE }}
+        run: |
+          cd "${{ inputs.working-directory }}"
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" \
+            --infile ${{ toJson(inputs.data) }} \
+            --job-name '${{inputs.test_name}}' \
+            --run \
+            --force \
+            --run-command '''python3 sign_release.py'''
+      - name: Post run
+        if: ${{ !cancelled() }}
+        run: |
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --post --job-name '${{inputs.test_name}}'
+      - name: Mark as done
+        if: ${{ !cancelled() }}
+        run: |
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --mark-success --job-name '${{inputs.test_name}}' --batch ${{matrix.batch}}
+      - name: Upload signed hashes
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{inputs.test_name}} signed-hashes
+          path: ${{ env.TEMP_PATH }}/*.gpg
+      - name: Clean
+        if: always()
+        uses: ./.github/actions/clean
diff --git a/.github/workflows/reusable_simple_job.yml b/.github/workflows/reusable_simple_job.yml
index 247569c4f527..c13b6c88027e 100644
--- a/.github/workflows/reusable_simple_job.yml
+++ b/.github/workflows/reusable_simple_job.yml
@@ -66,7 +66,7 @@ jobs:
       GITHUB_JOB_OVERRIDDEN: ${{inputs.test_name}}
     steps:
       - name: Check out repository code
-        uses: ClickHouse/checkout@v1
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
         with:
           clear-repository: true
           ref: ${{ inputs.git_ref }}
diff --git a/.github/workflows/scheduled_runs.yml b/.github/workflows/scheduled_runs.yml
new file mode 100644
index 000000000000..3dba61453722
--- /dev/null
+++ b/.github/workflows/scheduled_runs.yml
@@ -0,0 +1,67 @@
+name: Scheduled Altinity Stable Builds
+
+on:
+  schedule:
+    - cron: '0 0 * * 6' #Weekly run for stable versions
+    - cron: '0 0 * * *' #Daily run for antalya versions
+  # Make sure that any changes to this file is actually tested with PRs
+  pull_request:
+    types:
+      - synchronize
+      - reopened
+      - opened
+    paths:
+      - '**/scheduled_runs.yml'
+
+jobs:
+  DailyRuns:
+    strategy:
+      fail-fast: false
+      matrix:
+        branch:
+          - antalya-25.8
+    name: ${{ matrix.branch }}
+    if: github.event.schedule != '0 0 * * 6'
+    runs-on: ubuntu-latest
+    steps:
+     - name: Run ${{ matrix.branch }} workflow
+       run: |
+          curl -L \
+          -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/Altinity/ClickHouse/actions/workflows/release_branches.yml/dispatches \
+          -d '{
+            "ref": "${{ matrix.branch }}",
+            "inputs": {
+              "workflow_name": "Scheduled Runs"
+            }
+          }'
+
+  WeeklyRuns:
+    strategy:
+      fail-fast: false
+      matrix:
+        branch:
+          - customizations/24.3.18
+          - customizations/24.8.14
+          - releases/25.3.7
+    name: ${{ matrix.branch }}
+    if: github.event.schedule != '0 0 * * *'
+    runs-on: ubuntu-latest
+    steps:
+     - name: Run ${{ matrix.branch }} workflow
+       run: |
+          curl -L \
+          -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/Altinity/ClickHouse/actions/workflows/release_branches.yml/dispatches \
+          -d '{
+            "ref": "${{ matrix.branch }}",
+            "inputs": {
+              "workflow_name": "Scheduled Runs"
+            }
+          }'
diff --git a/.github/workflows/sign_and_release.yml b/.github/workflows/sign_and_release.yml
new file mode 100644
index 000000000000..21ecd04576fb
--- /dev/null
+++ b/.github/workflows/sign_and_release.yml
@@ -0,0 +1,454 @@
+name: Sign and Release packages
+
+on:
+  workflow_dispatch:
+    inputs:
+      workflow_url:
+        description: 'The URL to the workflow run that produced the packages'
+        required: true
+      release_environment:
+        description: 'The environment to release to. "staging" or "production"'
+        required: true
+        default: 'staging'
+      package_version:
+        description: 'The version of the package to release'
+        required: true
+        type: string
+      docker_release:
+        description: 'Publish Docker images'
+        required: true
+        default: true
+        type: boolean
+      GPG_PASSPHRASE:
+        description: 'GPG passphrase for signing (required for production releases)'
+        required: false
+        type: string
+      folder_time:
+        description: 'Optional timestamp for the release folder. If not provided, one will be generated.'
+        required: false
+        type: string
+
+env:
+  ARTIFACT_NAME: build_report_package_release
+  AWS_REGION: us-east-1
+  SRC_BUCKET: altinity-build-artifacts
+  S3_STORAGE_BUCKET: altinity-test-reports-temp
+
+jobs:
+  extract-package-info:
+    runs-on: [altinity-style-checker-aarch64, altinity-on-demand]
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      FOLDER_TIME: ${{ inputs.folder_time }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    outputs:
+      docker_version: ${{ env.DOCKER_VERSION }}
+      commit_hash: ${{ env.COMMIT_HASH }}
+      folder_time: ${{ env.FOLDER_TIME }}
+      needs_binary_processing: ${{ env.NEEDS_BINARY_PROCESSING }}
+      test_results_src: ${{ env.TEST_RESULTS_SRC }}
+      repo_prefix: ${{ env.REPO_PREFIX }}
+      src_url: ${{ env.SRC_URL }}
+      dest_url: ${{ env.DEST_URL }}
+      major_version: ${{ env.MAJOR_VERSION }}
+      build_dir: ${{ env.BUILD_DIR }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run script
+        run: |
+          python3 tests/ci/release/extract-package-info.py \
+            --artifact-dest-bucket $S3_STORAGE_BUCKET \
+            --artifact-src-bucket $SRC_BUCKET \
+            --package-version ${{ inputs.package_version }} \
+            --workflow-url ${{ inputs.workflow_url }}
+
+      - name: Display Extracted Information
+        run: |
+          echo "Extracted information:"
+          echo "commit_hash: ${COMMIT_HASH}"
+          echo "docker_version: ${DOCKER_VERSION}"
+          echo "folder_time: ${FOLDER_TIME}"
+          echo "needs_binary_processing: ${NEEDS_BINARY_PROCESSING}"
+          echo "repo_prefix: ${REPO_PREFIX}"
+          echo "src_bucket: ${SRC_BUCKET}"
+          echo "test_results_src: ${TEST_RESULTS_SRC}"
+          echo "src_url: ${SRC_URL}"
+          echo "dest_url: ${DEST_URL}"
+          echo "major_version: ${MAJOR_VERSION}"
+
+      - name: Install aws cli
+        if: ${{ env.NEEDS_BINARY_PROCESSING == 'true' }}
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+
+      - name: Process ARM binary
+        if: ${{ env.NEEDS_BINARY_PROCESSING == 'true' }}
+        run: |
+          ARM_PATH=$([ "$BUILD_DIR" = "build_amd_release" ] && echo "build_arm_release" || echo "package_aarch64")
+
+          echo "Downloading clickhouse binary..."
+          if ! aws s3 cp "${SRC_URL}/${ARM_PATH}/clickhouse" clickhouse; then
+            echo "Failed to download clickhouse binary"
+            exit 1
+          fi
+
+          chmod +x clickhouse
+
+          echo "Running clickhouse binary..."
+          ./clickhouse -q'q'
+
+          echo "Downloading clickhouse-stripped binary..."
+          if ! aws s3 cp "${SRC_URL}/${ARM_PATH}/clickhouse-stripped" clickhouse-stripped; then
+            echo "Failed to download clickhouse-stripped binary"
+            exit 1
+          fi
+
+          chmod +x clickhouse-stripped
+
+          echo "Running clickhouse-stripped binary..."
+          ./clickhouse-stripped -q'q'
+
+          echo "Downloading clickhouse-common-static tar..."
+          if ! aws s3 cp "${SRC_URL}/${ARM_PATH}/clickhouse-common-static-${{ inputs.package_version }}-arm64.tgz" clickhouse-common-static.tgz; then
+            echo "Failed to download clickhouse-common-static tar"
+            exit 1
+          fi
+
+          tar -xvf clickhouse-common-static.tgz
+
+          if readelf -S "clickhouse-common-static-${{ inputs.package_version }}/usr/bin/clickhouse" | grep -q '\.symtab'; then
+            echo "✓ Binary has symtable"
+          else
+            echo "✗ Binary is missing symtable"
+            exit 1
+          fi
+
+          echo "Uploading processed binaries..."
+          if ! aws s3 cp clickhouse "${SRC_URL}/${ARM_PATH}/arm64-bin/non-self-extracting/"; then
+            echo "Failed to upload clickhouse binary"
+            exit 1
+          fi
+          if ! aws s3 cp clickhouse-stripped "${SRC_URL}/${ARM_PATH}/arm64-bin/non-self-extracting/"; then
+            echo "Failed to upload stripped clickhouse binary"
+            exit 1
+          fi
+          if ! aws s3 cp "clickhouse-common-static-${{ inputs.package_version }}/usr/bin/clickhouse" "${SRC_URL}/${ARM_PATH}/arm64-bin/non-self-extracting/clickhouse-with-symtable"; then
+            echo "Failed to upload clickhouse-with-symtable binary"
+            exit 1
+          fi
+
+  copy-packages:
+    needs: extract-package-info
+    runs-on: [altinity-func-tester, altinity-on-demand]
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      SRC_URL: ${{ needs.extract-package-info.outputs.src_url }}
+      DEST_URL: ${{ needs.extract-package-info.outputs.dest_url }}
+      NEEDS_BINARY_PROCESSING: ${{ needs.extract-package-info.outputs.needs_binary_processing }}
+      MAJOR_VERSION: ${{ needs.extract-package-info.outputs.major_version }}
+      BUILD_DIR: ${{ needs.extract-package-info.outputs.build_dir }}
+    steps:
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: amd64
+
+      - name: Move verified packages to destination
+        run: |
+          # Move ARM packages
+          ARM_PATH=$([ "$BUILD_DIR" = "build_amd_release" ] && echo "build_arm_release" || echo "package_aarch64")
+          echo "Moving verified ARM packages to destination..."
+          if ! aws s3 sync "${SRC_URL}/${ARM_PATH}/" "${DEST_URL}/packages/ARM_PACKAGES/"; then
+            echo "Failed to move ARM packages to destination"
+            exit 1
+          fi
+
+          # Move AMD packages
+          echo "Moving verified AMD packages to destination..."
+          if ! aws s3 sync "${SRC_URL}/${BUILD_DIR}/" "${DEST_URL}/packages/AMD_PACKAGES/"; then
+            echo "Failed to move AMD packages to destination"
+            exit 1
+          fi
+
+          # Clean up temporary directories
+          rm -rf /tmp/arm_packages /tmp/amd_packages
+
+      - name: Separate ARM binary
+        run: |
+          aws s3 mv "${DEST_URL}/packages/ARM_PACKAGES/clickhouse" "${DEST_URL}/packages/ARM_PACKAGES/arm64-bin/clickhouse"
+          aws s3 mv "${DEST_URL}/packages/ARM_PACKAGES/clickhouse-stripped" "${DEST_URL}/packages/ARM_PACKAGES/arm64-bin/clickhouse-stripped"
+
+      - name: Separate AMD binary
+        run: |
+          aws s3 mv "${DEST_URL}/packages/AMD_PACKAGES/clickhouse" "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/clickhouse"
+          aws s3 mv "${DEST_URL}/packages/AMD_PACKAGES/clickhouse-stripped" "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/clickhouse-stripped"
+
+      - name: Process AMD binary
+        if: ${{ env.NEEDS_BINARY_PROCESSING == 'true' }}
+        run: |
+          echo "Downloading clickhouse binary..."
+          if ! aws s3 cp "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/clickhouse" clickhouse; then
+            echo "Failed to download clickhouse binary"
+            exit 1
+          fi
+
+          chmod +x clickhouse
+
+          echo "Running clickhouse binary..."
+          ./clickhouse -q'q'
+
+          echo "Downloading clickhouse-stripped binary..."
+          if ! aws s3 cp "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/clickhouse-stripped" clickhouse-stripped; then
+            echo "Failed to download clickhouse-stripped binary"
+            exit 1
+          fi
+
+          chmod +x clickhouse-stripped
+
+          echo "Running clickhouse-stripped binary..."
+          ./clickhouse-stripped -q'q'
+
+
+          echo "Downloading clickhouse-common-static tar..."
+          if ! aws s3 cp "${DEST_URL}/packages/AMD_PACKAGES/clickhouse-common-static-${{ inputs.package_version }}-amd64.tgz" clickhouse-common-static.tgz; then
+            echo "Failed to download clickhouse-common-static tar"
+            exit 1
+          fi
+
+          tar -xvf clickhouse-common-static.tgz
+
+          if readelf -S "clickhouse-common-static-${{ inputs.package_version }}/usr/bin/clickhouse" | grep -q '\.symtab'; then
+            echo "✓ Binary has symtable"
+          else
+            echo "✗ Binary is missing symtable"
+            exit 1
+          fi
+
+          echo "Uploading processed binaries..."
+          if ! aws s3 cp clickhouse "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/non-self-extracting/"; then
+            echo "Failed to upload clickhouse binary"
+            exit 1
+          fi
+          if ! aws s3 cp clickhouse-stripped "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/non-self-extracting/"; then
+            echo "Failed to upload stripped clickhouse binary"
+            exit 1
+          fi
+          if ! aws s3 cp clickhouse-common-static-${{ inputs.package_version }}/usr/bin/clickhouse "${DEST_URL}/packages/AMD_PACKAGES/amd64-bin/non-self-extracting/clickhouse-with-symtable"; then
+            echo "Failed to upload stripped clickhouse binary"
+            exit 1
+          fi
+
+  copy-test-results:
+    needs: extract-package-info
+    runs-on: [altinity-style-checker-aarch64, altinity-on-demand]
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      TEST_RESULTS_SRC: ${{ needs.extract-package-info.outputs.test_results_src }}
+      COMMIT_HASH: ${{ needs.extract-package-info.outputs.commit_hash }}
+      DEST_URL: ${{ needs.extract-package-info.outputs.dest_url }}
+    steps:
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+      - name: Copy test results to S3
+        run: |
+          # Copy test results
+          echo "Copying test results..."
+          if ! aws s3 sync "s3://${SRC_BUCKET}/${TEST_RESULTS_SRC}/${COMMIT_HASH}" \
+              "${DEST_URL}/test_results/"; then
+            echo "Failed to copy test results"
+            exit 1
+          fi
+
+  publish-docker:
+    if: ${{ github.event.inputs.docker_release == 'true' }}
+    needs: extract-package-info
+    strategy:
+      matrix:
+        image_type: [server, keeper]
+        variant: ['', '-alpine']
+    uses: ./.github/workflows/docker_publish.yml
+    with:
+      docker_image: altinityinfra/clickhouse-${{ matrix.image_type }}:${{ needs.extract-package-info.outputs.docker_version }}${{ matrix.variant }}
+      release_environment: ${{ inputs.release_environment }}
+      upload_artifacts: false
+      s3_upload_path: "${{ needs.extract-package-info.outputs.dest_url }}/docker_images/${{ matrix.image_type }}${{ matrix.variant }}/"
+    secrets: inherit
+
+  sign-and-publish:
+    needs: [extract-package-info, copy-packages]
+    runs-on: ${{
+      inputs.release_environment == 'staging' && 'arc-runners-clickhouse-signer' ||
+      inputs.release_environment == 'production' && 'arc-runners-clickhouse-signer-prod'
+     }}
+    env:
+      REPO_DNS_NAME: ${{ inputs.release_environment == 'production' && 'builds.altinity.cloud' || 'builds.staging.altinity.cloud' }}
+      REPO_NAME: ${{ inputs.release_environment == 'production' && 'altinity' || 'altinity-staging' }}
+      REPO_SUBTITLE: ${{ inputs.release_environment == 'production' && 'Stable Builds' || 'Staging Builds' }}
+      PACKAGE_VERSION: ${{ inputs.package_version }}
+      FOLDER_TIME: ${{ needs.extract-package-info.outputs.folder_time }}
+      REPO_PREFIX: ${{ needs.extract-package-info.outputs.repo_prefix }}
+      NEEDS_BINARY_PROCESSING: ${{ needs.extract-package-info.outputs.needs_binary_processing }}
+      DEST_URL: ${{ needs.extract-package-info.outputs.dest_url }}
+      RELEASE_ENVIRONMENT: ${{ inputs.release_environment }}
+    steps:
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          repository: Altinity/ClickHouse
+          path: ClickHouse
+
+      - name: Install required packages
+        run: |
+          echo "Installing required packages..."
+          sudo add-apt-repository -y universe
+          sudo apt-get update
+          sudo apt-get install -y software-properties-common python3-pip apt-utils gnupg rpm createrepo-c file wget
+          wget -q http://archive.ubuntu.com/ubuntu/pool/universe/d/dpkg-sig/dpkg-sig_0.13.1+nmu4_all.deb
+          sudo dpkg -i dpkg-sig_0.13.1+nmu4_all.deb || sudo apt-get install -f -y
+          rm dpkg-sig_0.13.1+nmu4_all.deb
+          sudo apt-add-repository --yes --update ppa:ansible/ansible
+          sudo apt-get install -y ansible
+          sudo ln -s /usr/bin/createrepo_c /usr/bin/createrepo
+          pip3 install boto3 botocore natsort --break-system-packages
+
+      - name: Download packages
+        run: |
+          if ! aws s3 sync "${DEST_URL}/packages/ARM_PACKAGES/" /home/runner/.cache/tmp/packages --exact-timestamps; then
+            echo "Failed to download ARM packages"
+            exit 1
+          fi
+          if ! aws s3 sync "${DEST_URL}/packages/AMD_PACKAGES/" /home/runner/.cache/tmp/packages --exact-timestamps; then
+            echo "Failed to download AMD packages"
+            exit 1
+          fi
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+      - name: Set up GPG passphrase
+        run: |
+          if [ "${RELEASE_ENVIRONMENT}" == "production" ]; then
+            if [ -z "${{ inputs.GPG_PASSPHRASE }}" ]; then
+              echo "Error: GPG_PASSPHRASE is required for production releases"
+              exit 1
+            fi
+            echo "${{ inputs.GPG_PASSPHRASE }}" > /tmp/gpg_passphrase
+          else
+            echo "${{ secrets.GPG_PASSPHRASE }}" > /tmp/gpg_passphrase
+          fi
+          chmod 600 /tmp/gpg_passphrase
+
+      - name: Sign and publish packages
+        run: |
+          if [ ! -f /tmp/gpg_passphrase ]; then
+            echo "Error: GPG passphrase file not found"
+            exit 1
+          fi
+
+          echo "Processing GPG key..."
+          if [ "${RELEASE_ENVIRONMENT}" == "production" ]; then
+            if ! aws secretsmanager get-secret-value --secret-id arn:aws:secretsmanager:us-east-1:${{ secrets.SIGNING_PROD_SECRET_ID }} --query SecretString --output text | sed -e "s/^'//" -e "s/'$//" | jq -r '.altinity_prod_gpg | @base64d' | gpg --quiet --batch --import >/dev/null 2>&1; then
+              echo "Failed to import prod GPG key"
+              exit 1
+            fi
+          else
+            if ! aws secretsmanager get-secret-value --secret-id arn:aws:secretsmanager:us-east-1:${{ secrets.SIGNING_STAGING_SECRET_ID }} --query SecretString --output text | sed -e "s/^'//" -e "s/'$//" | jq -r '.altinity_staging_gpg | @base64d' | gpg --quiet --batch --import >/dev/null 2>&1; then
+              echo "Failed to import staging GPG key"
+              exit 1
+            fi
+          fi
+
+          gpg --quiet --list-secret-keys --with-keygrip >/dev/null 2>&1
+          gpgconf --kill gpg-agent >/dev/null 2>&1
+          gpg-agent --daemon --allow-preset-passphrase >/dev/null 2>&1
+
+          if ! aws ssm get-parameter --name /gitlab-runner/key-encrypting-key --with-decryption --query Parameter.Value --output text | sudo tee /root/.key-encrypting-key >/dev/null; then
+            echo "Failed to get key encrypting key"
+            exit 1
+          fi
+
+          GPG_KEY_NAME=$(gpg --quiet --list-secret-keys | grep uid | head --lines 1 | tr -s " " | cut -d " " -f 4-)
+          GPG_KEY_ID=$(gpg --quiet --list-secret-keys --with-keygrip "${GPG_KEY_NAME}" | grep Keygrip | head --lines 1 | tr -s " " | cut -d " " -f 4)
+          cat /tmp/gpg_passphrase | base64 -d | sudo openssl enc -d -aes-256-cbc -pbkdf2 -pass file:/root/.key-encrypting-key -in - -out - | /usr/lib/gnupg/gpg-preset-passphrase --preset $GPG_KEY_ID >/dev/null 2>&1
+
+          echo "Running Ansible playbook for signing and publishing..."
+          echo "ansible-playbook -i ClickHouse/tests/ci/release/packaging/ansible/inventory/localhost.yml -e aws_region=$AWS_REGION -e local_repo_path="/home/runner/.cache/${{ inputs.release_environment }}" -e pkgver=\"${PACKAGE_VERSION}\" -e release_environment=$RELEASE_ENVIRONMENT -e repo_dns_name=$REPO_DNS_NAME -e repo_name=$REPO_NAME -e repo_prefix=\"$REPO_PREFIX\" -e repo_subtitle=\"$REPO_SUBTITLE\" -e s3_pkgs_bucket=$S3_STORAGE_BUCKET -e s3_pkgs_path=\"builds/stable/v${PACKAGE_VERSION}/${FOLDER_TIME}\" -e repo_path=\"/home/runner/.cache/${{ inputs.release_environment }}\" ClickHouse/tests/ci/release/packaging/ansible/sign-and-release.yml "
+          if ! ansible-playbook -i ClickHouse/tests/ci/release/packaging/ansible/inventory/localhost.yml \
+            -e aws_region=$AWS_REGION \
+            -e gpg_key_id="$GPG_KEY_ID" \
+            -e gpg_key_name="$GPG_KEY_NAME" \
+            -e local_repo_path="/home/runner/.cache/${{ inputs.release_environment }}" \
+            -e pkgver="${PACKAGE_VERSION}" \
+            -e release_environment=$RELEASE_ENVIRONMENT \
+            -e repo_dns_name=$REPO_DNS_NAME \
+            -e repo_name=$REPO_NAME \
+            -e repo_prefix="$REPO_PREFIX" \
+            -e repo_subtitle="$REPO_SUBTITLE" \
+            -e s3_pkgs_bucket=$S3_STORAGE_BUCKET \
+            -e s3_pkgs_path="builds/stable/v${PACKAGE_VERSION}/${FOLDER_TIME}" \
+            ClickHouse/tests/ci/release/packaging/ansible/sign-and-release.yml; then
+            echo "Ansible playbook failed"
+            exit 1
+          fi
+          gpgconf --kill gpg-agent
+
+      - name: Cleanup temporary files
+        if: always()
+        run: |
+          echo "Cleaning up temporary files..."
+          rm -rf /home/runner/.cache/tmp/packages || true
+          rm -f /tmp/gpg_passphrase || true
+
+  repo-sanity-check:
+    needs: sign-and-publish
+    uses: ./.github/workflows/repo-sanity-checks.yml
+
+  copy-to-released:
+    needs: [extract-package-info, sign-and-publish]
+    if: ${{ inputs.release_environment == 'production' }}
+    runs-on: [altinity-style-checker-aarch64, altinity-on-demand]
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      PACKAGE_VERSION: ${{ inputs.package_version }}
+      DEST_URL: ${{ needs.extract-package-info.outputs.dest_url }}
+    steps:
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+
+      - name: Copy to released directory
+        run: |
+          echo "Copying to released directory..."
+          echo "Source: ${DEST_URL}/"
+          echo "Destination: s3://${S3_STORAGE_BUCKET}/builds/released/v${PACKAGE_VERSION}/"
+
+          if ! aws s3 sync "${DEST_URL}/" "s3://${S3_STORAGE_BUCKET}/builds/released/v${PACKAGE_VERSION}/" --no-progress; then
+            echo "Failed to copy to released directory"
+            exit 1
+          fi
+
+          echo "Verifying copy operation..."
+          if ! aws s3 ls "s3://${S3_STORAGE_BUCKET}/builds/released/v${PACKAGE_VERSION}/" | grep -q "packages"; then
+            echo "Error: Packages directory not found in destination"
+            exit 1
+          fi
diff --git a/.github/workflows/vectorsearchstress.yml b/.github/workflows/vectorsearchstress.yml
index 38ed3f423696..b151328d44fb 100644
--- a/.github/workflows/vectorsearchstress.yml
+++ b/.github/workflows/vectorsearchstress.yml
@@ -11,12 +11,13 @@ concurrency:
 
 env:
   PYTHONUNBUFFERED: 1
+  GH_TOKEN: ${{ github.token }}
   CHECKOUT_REF: ""
 
 jobs:
 
   config_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: []
     name: "Config Workflow"
     outputs:
@@ -27,6 +28,26 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Config Workflow"
+
+      - name: Note report location to summary
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -53,7 +74,7 @@ jobs:
           fi
 
   vector_search_stress:
-    runs-on: [self-hosted, arm-small]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow]
     name: "Vector Search Stress"
     outputs:
@@ -64,6 +85,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Vector Search Stress"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
@@ -90,7 +118,7 @@ jobs:
           fi
 
   finish_workflow:
-    runs-on: [self-hosted, style-checker-aarch64]
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
     needs: [config_workflow, vector_search_stress]
     if: ${{ !cancelled() }}
     name: "Finish Workflow"
@@ -102,6 +130,13 @@ jobs:
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "Finish Workflow"
+
       - name: Prepare env script
         run: |
           rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
diff --git a/.gitmodules b/.gitmodules
index d10587cec01e..124fb169e411 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/Thalhammer/jwt-cpp
 [submodule "contrib/zstd"]
 	path = contrib/zstd
-	url = https://github.com/facebook/zstd
+	url = https://github.com/ClickHouse/zstd.git
 [submodule "contrib/lz4"]
 	path = contrib/lz4
 	url = https://github.com/lz4/lz4
@@ -45,7 +45,7 @@
 	url = https://github.com/ClickHouse/arrow
 [submodule "contrib/thrift"]
 	path = contrib/thrift
-	url = https://github.com/apache/thrift
+	url = https://github.com/ClickHouse/thrift.git
 [submodule "contrib/libhdfs3"]
 	path = contrib/libhdfs3
 	url = https://github.com/ClickHouse/libhdfs3
@@ -124,7 +124,7 @@
 	url = https://github.com/anrieff/libcpuid
 [submodule "contrib/openldap"]
 	path = contrib/openldap
-	url = https://github.com/ClickHouse/openldap
+	url = https://github.com/openldap/openldap
 [submodule "contrib/AMQP-CPP"]
 	path = contrib/AMQP-CPP
 	url = https://github.com/ClickHouse/AMQP-CPP
diff --git a/ALTINITY_CONTRIBUTIONS.md b/ALTINITY_CONTRIBUTIONS.md
new file mode 100644
index 000000000000..7d0837785161
--- /dev/null
+++ b/ALTINITY_CONTRIBUTIONS.md
@@ -0,0 +1,718 @@
+List of pull requests contributed by Altinity developers to ClickHouse® server. It does not include documentation changes.
+
+
+## 2025
+
+* Few fixes to object storage hive reads & writes	[85538](https://github.com/ClickHouse/ClickHouse/pull/85538)	by @arthurpassos
+* Add support for macro expansion in `remote_fs_zero_copy_zookeeper_path`	[85437](https://github.com/ClickHouse/ClickHouse/pull/85437)	by @mkmkme
+* Rendezvous hashing filesystem cache in (s3/etc)Cluster functions	[82511](https://github.com/ClickHouse/ClickHouse/pull/82511)	by @ianton-ru
+* Limit disks to search for orphaned parts 	[84710](https://github.com/ClickHouse/ClickHouse/pull/84710)	by @ilejn
+* Unify parameter names in ODBC and JDBC	[83410](https://github.com/ClickHouse/ClickHouse/pull/83410)	by @zvonand
+* Bug fix + changes in `extractKeyValuePairs` parsing logic	[80657](https://github.com/ClickHouse/ClickHouse/pull/80657)	by @arthurpassos
+* Fix match(col, '^…') index analysis with escaped metacharacters to avoid wrong results and crashes	[79969](https://github.com/ClickHouse/ClickHouse/pull/79969)	by @filimonov
+* Ignore parse error in system.distributed_ddl_queue	[79369](https://github.com/ClickHouse/ClickHouse/pull/79369)	by @ilejn
+* Add support for Date32, DateTime64 in TTL	[80710](https://github.com/ClickHouse/ClickHouse/pull/80710)	by @zvonand
+* fix description of distinct step after union lift up optimization	[80330](https://github.com/ClickHouse/ClickHouse/pull/80330)	by @UnamedRus
+* Write to Merge storage	[77484](https://github.com/ClickHouse/ClickHouse/pull/77484)	by @ianton-ru
+* Add mapContainsValuesLike/mapContainsValues/mapExtractValuesLike functions	[78171](https://github.com/ClickHouse/ClickHouse/pull/78171)	by @UnamedRus
+* Resolve macros for autodiscovery clusters	[79696](https://github.com/ClickHouse/ClickHouse/pull/79696)	by @ianton-ru
+* Split kafka tests (1)	[79700](https://github.com/ClickHouse/ClickHouse/pull/79700)	by @ilejn
+* Fix LogSeriesLimiter cleanup logic to run only once per interval	[79864](https://github.com/ClickHouse/ClickHouse/pull/79864)	by @filimonov
+* Embed proxy configuration in some HTTP buffers with the help of builders	[77693](https://github.com/ClickHouse/ClickHouse/pull/77693)	by @arthurpassos
+* Improve performance of hive path parsing by using `extractKeyValuePairs` instead of regex	[79067](https://github.com/ClickHouse/ClickHouse/pull/79067)	by @arthurpassos
+* Split kafka tests (1)	[78624](https://github.com/ClickHouse/ClickHouse/pull/78624)	by @ilejn
+* Fix reference in lambda callback	[78174](https://github.com/ClickHouse/ClickHouse/pull/78174)	by @ianton-ru
+* Allow empty value on hive partitioning	[78816](https://github.com/ClickHouse/ClickHouse/pull/78816)	by @arthurpassos
+* Async insert memory preallocation to improve performance	[74945](https://github.com/ClickHouse/ClickHouse/pull/74945)	by @ilejn
+* system.kafka_consumers improvements	[77700](https://github.com/ClickHouse/ClickHouse/pull/77700)	by @ilejn
+* Fix incorrect S3 uri parsing when key is not specified on path style	[78185](https://github.com/ClickHouse/ClickHouse/pull/78185)	by @arthurpassos
+* Fix block device time metrics calculation	[78211](https://github.com/ClickHouse/ClickHouse/pull/78211)	by @filimonov
+* Add support for hasAll function in token_bf index	[77662](https://github.com/ClickHouse/ClickHouse/pull/77662)	by @UnamedRus
+* cppkafka minor change	[77624](https://github.com/ClickHouse/ClickHouse/pull/77624)	by @filimonov
+* librdkafka 2.8	[76621](https://github.com/ClickHouse/ClickHouse/pull/76621)	by @filimonov
+* Autodiscovery dynamic clusters	[76001](https://github.com/ClickHouse/ClickHouse/pull/76001)	by @ianton-ru
+* Better pause / unpause in intergration tests	[76711](https://github.com/ClickHouse/ClickHouse/pull/76711)	by @filimonov
+* Update index.md	[75952](https://github.com/ClickHouse/ClickHouse/pull/75952)	by @filimonov
+* Merge parquet bloom filter and min/max evaluation	[71383](https://github.com/ClickHouse/ClickHouse/pull/71383)	by @arthurpassos
+* Reintroduce respect `ttl_only_drop_parts` on `materialize ttl`, #65488	[72751](https://github.com/ClickHouse/ClickHouse/pull/72751)	by @zvonand
+* Set parquet compression level only if compression codec supports it	[74659](https://github.com/ClickHouse/ClickHouse/pull/74659)	by @arthurpassos
+* Compression level for parquet output format	[73651](https://github.com/ClickHouse/ClickHouse/pull/73651)	by @arthurpassos
+* Fix UBSan error in `ParquetDataBuffer`	[74534](https://github.com/ClickHouse/ClickHouse/pull/74534)	by @arthurpassos
+* Support parquet integer logical types on native reader	[72105](https://github.com/ClickHouse/ClickHouse/pull/72105)	by @arthurpassos
+* add sequenceMatchEvents aggregate function	[72349](https://github.com/ClickHouse/ClickHouse/pull/72349)	by @UnamedRus
+* Fix issue #66112	[74128](https://github.com/ClickHouse/ClickHouse/pull/74128)	by @ianton-ru
+* Fix 03210_variant_with_aggregate_function_type test	[74012](https://github.com/ClickHouse/ClickHouse/pull/74012)	by @ianton-ru
+
+## 2024
+* [Experiment] what if reorder compare of columns in Merge	[63780](https://github.com/ClickHouse/ClickHouse/pull/63780)	by @UnamedRus
+* Fix if condition in #63151	[73504](https://github.com/ClickHouse/ClickHouse/pull/73504)	by @zvonand
+* Make 01086_window_view_cleanup more stable	[72232](https://github.com/ClickHouse/ClickHouse/pull/72232)	by @ilejn
+* Fix #72756 (exception in RemoteQueryExecutor when user does not exist locally)	[72759](https://github.com/ClickHouse/ClickHouse/pull/72759)	by @zvonand
+* Respect `prefer_locahost_replica` in `parallel_distributed_insert_select`	[72190](https://github.com/ClickHouse/ClickHouse/pull/72190)	by @filimonov
+* Auxiliary autodiscovery	[71911](https://github.com/ClickHouse/ClickHouse/pull/71911)	by @ianton-ru
+* Passing external user roles from query originator to other nodes	[70332](https://github.com/ClickHouse/ClickHouse/pull/70332)	by @zvonand
+* Fix flaky test_drop_complex_columns	[71504](https://github.com/ClickHouse/ClickHouse/pull/71504)	by @ilejn
+* Boolean support for parquet native reader	[71055](https://github.com/ClickHouse/ClickHouse/pull/71055)	by @arthurpassos
+* Allow each authentication method to have its own expiration date, remove from user entity.	[70090](https://github.com/ClickHouse/ClickHouse/pull/70090)	by @arthurpassos
+* make numactl respect EPERM error, when get_mempolicy is is restricted by seccomp	[70900](https://github.com/ClickHouse/ClickHouse/pull/70900)	by @filimonov
+* add timeouts for retry loops in test_storage_rabbitmq	[70510](https://github.com/ClickHouse/ClickHouse/pull/70510)	by @filimonov
+* Support for Parquet page V2 on native reader	[70807](https://github.com/ClickHouse/ClickHouse/pull/70807)	by @arthurpassos
+* Add parquet bloom filters support	[62966](https://github.com/ClickHouse/ClickHouse/pull/62966)	by @arthurpassos
+* Thread pool: move thread creation out of lock	[68694](https://github.com/ClickHouse/ClickHouse/pull/68694)	by @filimonov
+* fix Kafka test	[70352](https://github.com/ClickHouse/ClickHouse/pull/70352)	by @filimonov
+* Maybe fix RabbitMQ	[70336](https://github.com/ClickHouse/ClickHouse/pull/70336)	by @filimonov
+* Add getSettingOrDefault() function	[69917](https://github.com/ClickHouse/ClickHouse/pull/69917)	by @shiyer7474
+* Fix REPLACE PARTITION waiting for mutations/merges on unrelated partitions 	[59138](https://github.com/ClickHouse/ClickHouse/pull/59138)	by @Enmk
+* Implement missing decimal cases for `zeroField` function by casting 0 to proper types	[69978](https://github.com/ClickHouse/ClickHouse/pull/69978)	by @arthurpassos
+* alpine docker images - use ubuntu 22.04 as glibc donor	[69033](https://github.com/ClickHouse/ClickHouse/pull/69033)	by @filimonov
+* Read only necessary columns & respect `ttl_only_drop_parts` on `materialize ttl`	[65488](https://github.com/ClickHouse/ClickHouse/pull/65488)	by @zvonand
+* Some fixes for LDAP	[68355](https://github.com/ClickHouse/ClickHouse/pull/68355)	by @zvonand
+* Multi auth methods	[65277](https://github.com/ClickHouse/ClickHouse/pull/65277)	by @arthurpassos
+* Do not use docker pause for Kerberos KDC container in integration tests	[69136](https://github.com/ClickHouse/ClickHouse/pull/69136)	by @ilejn
+* Fix test_role & test_keeper_s3_snapshot integration tests	[69013](https://github.com/ClickHouse/ClickHouse/pull/69013)	by @shiyer7474
+* Thread pool metrics	[68674](https://github.com/ClickHouse/ClickHouse/pull/68674)	by @filimonov
+* Fix subnet in docker_compose_net.yml	[69121](https://github.com/ClickHouse/ClickHouse/pull/69121)	by @ilejn
+* Fix small value DateTime64 constant folding in nested subquery for remote	[68323](https://github.com/ClickHouse/ClickHouse/pull/68323)	by @shiyer7474
+* Building aarch64 builds with '-no-pie' to allow better introspection	[67916](https://github.com/ClickHouse/ClickHouse/pull/67916)	by @filimonov
+* Add `**` to `hdfs` docs, add test for `**` in `hdfs`	[67064](https://github.com/ClickHouse/ClickHouse/pull/67064)	by @zvonand
+* Even better healthcheck for ldap	[67667](https://github.com/ClickHouse/ClickHouse/pull/67667)	by @zvonand
+* Fix serialization of parameterized view parameters	[67654](https://github.com/ClickHouse/ClickHouse/pull/67654)	by @shiyer7474
+* Skip parallel for `test_storage_kerberized_kafka`	[67349](https://github.com/ClickHouse/ClickHouse/pull/67349)	by @zvonand
+* [CI fest] Try to fix `test_broken_projections/test.py::test_broken_ignored_replicated`	[66915](https://github.com/ClickHouse/ClickHouse/pull/66915)	by @zvonand
+* Fix detection of number of CPUs in containers	[66237](https://github.com/ClickHouse/ClickHouse/pull/66237)	by @filimonov
+* Remove host regexp concurrent integration test	[66233](https://github.com/ClickHouse/ClickHouse/pull/66233)	by @arthurpassos
+* Minor: replaced expression with LEGACY_MAX_LEVEL	[61268](https://github.com/ClickHouse/ClickHouse/pull/61268)	by @Enmk
+* Build failure if ENABLE_AWS_S3 is OFF fixed	[66335](https://github.com/ClickHouse/ClickHouse/pull/66335)	by @ilejn
+* Try to make `test_ldap_external_user_directory` less flaky	[65794](https://github.com/ClickHouse/ClickHouse/pull/65794)	by @zvonand
+* Add `no_proxy` support	[63314](https://github.com/ClickHouse/ClickHouse/pull/63314)	by @arthurpassos
+* Add _time virtual column to file alike storages	[64947](https://github.com/ClickHouse/ClickHouse/pull/64947)	by @ilejn
+* Several minor fixes to proxy support in ClickHouse	[63427](https://github.com/ClickHouse/ClickHouse/pull/63427)	by @arthurpassos
+* Remove unused CaresPTRResolver::cancel_requests method	[63754](https://github.com/ClickHouse/ClickHouse/pull/63754)	by @arthurpassos
+* Improve S3 glob performance	[62120](https://github.com/ClickHouse/ClickHouse/pull/62120)	by @zvonand
+* Build kererberized_hadoop image by downloading commons-daemon via https	[62886](https://github.com/ClickHouse/ClickHouse/pull/62886)	by @ilejn
+* Do not allow table to be attached if there already is an active replica path	[61876](https://github.com/ClickHouse/ClickHouse/pull/61876)	by @arthurpassos
+* Add support for S3 access through aws private link interface [#62208](https://github.com/ClickHouse/ClickHouse/pull/62208) by @arthurpassos
+* Fix incorrect CI error message	[62139](https://github.com/ClickHouse/ClickHouse/pull/62139)	by @arthurpassos
+* Crash in Engine Merge if Row Policy does not have expression	[61971](https://github.com/ClickHouse/ClickHouse/pull/61971)	by @ilejn
+* Update storing-data.md	[62094](https://github.com/ClickHouse/ClickHouse/pull/62094)	by @filimonov
+* Reset part level upon attach from disk on MergeTree	[61536](https://github.com/ClickHouse/ClickHouse/pull/61536)	by @arthurpassos
+* update cppkafka to v0.4.1	[61119](https://github.com/ClickHouse/ClickHouse/pull/61119)	by @ilejn
+* Fix typo	[61540](https://github.com/ClickHouse/ClickHouse/pull/61540)	by @arthurpassos
+* Add mode fot topK/topKWeighed function to also include count/error statistics	[54508](https://github.com/ClickHouse/ClickHouse/pull/54508)	by @UnamedRus
+* Add test that validates attach partition fails if structure differs because of materialized column	[60418](https://github.com/ClickHouse/ClickHouse/pull/60418)	by @arthurpassos
+* Stateless test to validate projections work after attach	[60415](https://github.com/ClickHouse/ClickHouse/pull/60415)	by @arthurpassos
+* Allow to define `volume_priority` in `storage_configuration`	[58533](https://github.com/ClickHouse/ClickHouse/pull/58533)	by @zvonand
+* Revert revert attach partition PR	[59122](https://github.com/ClickHouse/ClickHouse/pull/59122)	by @arthurpassos
+* Update rename.md	[59017](https://github.com/ClickHouse/ClickHouse/pull/59017)	by @filimonov
+* Allow to attach partition from table with different partition expression when destination partition expression doesn't re-partition	[39507](https://github.com/ClickHouse/ClickHouse/pull/39507)	by @arthurpassos
+* Fixed potential exception due to stale profile UUID	[57263](https://github.com/ClickHouse/ClickHouse/pull/57263)	by @Enmk
+* Edit docs for toWeek()	[58452](https://github.com/ClickHouse/ClickHouse/pull/58452)	by @zvonand
+
+## 2023
+* Fix `accurateCastOrNull` for out-of-range DateTime	[58139](https://github.com/ClickHouse/ClickHouse/pull/58139)	by @zvonand
+* Try to fix memory leak in StorageHDFS	[57860](https://github.com/ClickHouse/ClickHouse/pull/57860)	by @zvonand
+* Fix ThreadSanitizer data race in librdkafka 	[57791](https://github.com/ClickHouse/ClickHouse/pull/57791)	by @ilejn
+* Introduce `fileCluster` table function	[56868](https://github.com/ClickHouse/ClickHouse/pull/56868)	by @zvonand
+* Engine Merge obeys row policy	[50209](https://github.com/ClickHouse/ClickHouse/pull/50209)	by @ilejn
+* Sign all aws headers	[57001](https://github.com/ClickHouse/ClickHouse/pull/57001)	by @arthurpassos
+* Add transition from reading key to reading quoted key when double quotes are found	[56423](https://github.com/ClickHouse/ClickHouse/pull/56423)	by @arthurpassos
+* Performance enhancement for File, HDFS globs	[56141](https://github.com/ClickHouse/ClickHouse/pull/56141)	by @zvonand
+* Add ClickHouse setting to disable tunneling for HTTPS requests over HTTP proxy	[55033](https://github.com/ClickHouse/ClickHouse/pull/55033)	by @arthurpassos
+* add runOptimize call in bitmap write method( resubmit of #52842)	[55044](https://github.com/ClickHouse/ClickHouse/pull/55044)	by @UnamedRus
+* Introduce setting `date_time_overflow_behavior` to control the overflow behavior when converting to `Date` / `Date32` / `DateTime` / `DateTime64`	[55696](https://github.com/ClickHouse/ClickHouse/pull/55696)	by @zvonand
+* Improve parsing DateTime64 from timestamp represented as string	[55146](https://github.com/ClickHouse/ClickHouse/pull/55146)	by @zvonand
+* Disable logic max_threads=max_distributed_connections when async_socket_for_remote=1	[53504](https://github.com/ClickHouse/ClickHouse/pull/53504)	by @filimonov
+* Properly split remote proxy http https	[55430](https://github.com/ClickHouse/ClickHouse/pull/55430)	by @arthurpassos
+* Add option to set env variables for a single node in integration tests	[55208](https://github.com/ClickHouse/ClickHouse/pull/55208)	by @arthurpassos
+* Add sub-second precision to `formatReadableTimeDelta`	[54250](https://github.com/ClickHouse/ClickHouse/pull/54250)	by @zvonand
+* Refactor and simplify multi-directory globs	[54863](https://github.com/ClickHouse/ClickHouse/pull/54863)	by @zvonand
+* Fix directory permissions for multi-directory globs. Follow-up #50559	[52839](https://github.com/ClickHouse/ClickHouse/pull/52839)	by @zvonand
+* Account for monotonically increasing offsets across multiple batches on arrow-CH conversion	[54370](https://github.com/ClickHouse/ClickHouse/pull/54370)	by @arthurpassos
+* add runOptimize call in bitmap write method	[52842](https://github.com/ClickHouse/ClickHouse/pull/52842)	by @UnamedRus
+* Lower the number of iterations in test_host_regexp_multiple_ptr_records_concurrent	[54307](https://github.com/ClickHouse/ClickHouse/pull/54307)	by @arthurpassos
+* Minor clarifications to the `OPTIMIZE ... DEDUPLICATE` docs	[54257](https://github.com/ClickHouse/ClickHouse/pull/54257)	by @Enmk
+* Fix flaky test_s3_storage_conf_proxy	[54191](https://github.com/ClickHouse/ClickHouse/pull/54191)	by @arthurpassos
+* system.kafka_consumers exception info improvements	[53766](https://github.com/ClickHouse/ClickHouse/pull/53766)	by @ilejn
+* Try to fix bug with NULL::LowCardinality(Nullable(...)) NOT IN	[53706](https://github.com/ClickHouse/ClickHouse/pull/53706)	by @zvonand
+* Add global proxy setting	[51749](https://github.com/ClickHouse/ClickHouse/pull/51749)	by @arthurpassos
+* system.kafka_consumers table to monitor kafka consumers	[50999](https://github.com/ClickHouse/ClickHouse/pull/50999)	by @ilejn
+* Bring back **garbage** dns tests	[53286](https://github.com/ClickHouse/ClickHouse/pull/53286)	by @arthurpassos
+* Add option to switch float parsing methods	[52791](https://github.com/ClickHouse/ClickHouse/pull/52791)	by @zvonand
+* init and destroy ares channel on demand..	[52634](https://github.com/ClickHouse/ClickHouse/pull/52634)	by @arthurpassos
+* Fix `toDecimalString` function	[52520](https://github.com/ClickHouse/ClickHouse/pull/52520)	by @zvonand
+* Fixed inserting into Buffer engine	[52440](https://github.com/ClickHouse/ClickHouse/pull/52440)	by @Enmk
+* Fix typo last_removal_attemp_time	[52104](https://github.com/ClickHouse/ClickHouse/pull/52104)	by @filimonov
+* Basic auth to fetch Avro schema in Kafka	[49664](https://github.com/ClickHouse/ClickHouse/pull/49664)	by @ilejn
+* Add support for multi-directory globs	[50559](https://github.com/ClickHouse/ClickHouse/pull/50559)	by @zvonand
+* Small fix for toDateTime64() for dates after 2283-12-31	[52130](https://github.com/ClickHouse/ClickHouse/pull/52130)	by @zvonand
+* Small docs update for DateTime, DateTime64	[52094](https://github.com/ClickHouse/ClickHouse/pull/52094)	by @zvonand
+* Small docs update for toYearWeek() function	[52090](https://github.com/ClickHouse/ClickHouse/pull/52090)	by @zvonand
+* Accept key value delimiter as part of value	[49760](https://github.com/ClickHouse/ClickHouse/pull/49760)	by @arthurpassos
+* Row policy for database	[47640](https://github.com/ClickHouse/ClickHouse/pull/47640)	by @ilejn
+* Add setting to limit the max number of pairs produced by extractKeyVa…	[49836](https://github.com/ClickHouse/ClickHouse/pull/49836)	by @arthurpassos
+* sequence state fix	[48603](https://github.com/ClickHouse/ClickHouse/pull/48603)	by @ilejn
+* Secure in named collection	[46323](https://github.com/ClickHouse/ClickHouse/pull/46323)	by @ilejn
+* Refactor reading the pool settings from server config	[48055](https://github.com/ClickHouse/ClickHouse/pull/48055)	by @filimonov
+* Add toDecimalString function	[47838](https://github.com/ClickHouse/ClickHouse/pull/47838)	by @zvonand
+* Add unit test to assert arrow lib does not abort on fatal logs	[47958](https://github.com/ClickHouse/ClickHouse/pull/47958)	by @arthurpassos
+* Tests for orphaned role fix	[47002](https://github.com/ClickHouse/ClickHouse/pull/47002)	by @ilejn
+* Simplify clickhouse-test usage with -b	[47578](https://github.com/ClickHouse/ClickHouse/pull/47578)	by @Enmk
+* Modify find_first_symbols so it works as expected for find_first_not_symbols	[47304](https://github.com/ClickHouse/ClickHouse/pull/47304)	by @arthurpassos
+* Add user setting to force select final at query level	[40945](https://github.com/ClickHouse/ClickHouse/pull/40945)	by @arthurpassos
+* Attempt to fix 'Local: No offset stored message' from Kafka	[42391](https://github.com/ClickHouse/ClickHouse/pull/42391)	by @filimonov
+* Cancel c-ares failed requests and retry on system interrupts to prevent callbacks with dangling references and premature resolution failures	[45629](https://github.com/ClickHouse/ClickHouse/pull/45629)	by @arthurpassos
+
+## 2022
+* Fixed exception when user tries to log in	[42641](https://github.com/ClickHouse/ClickHouse/pull/42641)	by @Enmk
+* Flatten list type arrow chunks on parsing	[43297](https://github.com/ClickHouse/ClickHouse/pull/43297)	by @arthurpassos
+* Added precise decimal multiplication and division	[42438](https://github.com/ClickHouse/ClickHouse/pull/42438)	by @zvonand
+* fix LDAP in case of many roles on user	[42461](https://github.com/ClickHouse/ClickHouse/pull/42461)	by @Enmk
+* Add SensitiveDataMasker to exceptions messages	[42940](https://github.com/ClickHouse/ClickHouse/pull/42940)	by @filimonov
+* Allow autoremoval of old parts if detach_not_byte_identical_parts enabled	[43287](https://github.com/ClickHouse/ClickHouse/pull/43287)	by @filimonov
+* Added applied row-level policies to `system.query_log`	[39819](https://github.com/ClickHouse/ClickHouse/pull/39819)	by @quickhouse
+* Fix Polygon dict xml config	[42773](https://github.com/ClickHouse/ClickHouse/pull/42773)	by @UnamedRus
+* Fix c-ares crash	[42234](https://github.com/ClickHouse/ClickHouse/pull/42234)	by @arthurpassos
+* Fix incorrect trace log line on dict reload	[42609](https://github.com/ClickHouse/ClickHouse/pull/42609)	by @filimonov
+* Fix Date from CSV parsing	[42044](https://github.com/ClickHouse/ClickHouse/pull/42044)	by @zvonand
+* Increase request_timeout_ms for s3 disks.	[42321](https://github.com/ClickHouse/ClickHouse/pull/42321)	by @filimonov
+* Test for ignore function in PARTITION KEY	[39875](https://github.com/ClickHouse/ClickHouse/pull/39875)	by @UnamedRus
+* Remove obsolete comment from the config.xml	[41518](https://github.com/ClickHouse/ClickHouse/pull/41518)	by @filimonov
+* Add Parquet Time32/64 conversion to CH DateTime32/64	[41333](https://github.com/ClickHouse/ClickHouse/pull/41333)	by @arthurpassos
+* CaresPTRResolver small safety improvement	[40890](https://github.com/ClickHouse/ClickHouse/pull/40890)	by @arthurpassos
+* Add support for extended (chunked) arrays for Parquet format	[40485](https://github.com/ClickHouse/ClickHouse/pull/40485)	by @arthurpassos
+* Fixed `Unknown identifier (aggregate-function)` exception which appears when a user tries to calculate WINDOW ORDER BY/PARTITION BY expressions over aggregate functions	[39762](https://github.com/ClickHouse/ClickHouse/pull/39762)	by @quickhouse
+* Fix docs for Base58	[40798](https://github.com/ClickHouse/ClickHouse/pull/40798)	by @zvonand
+* Fix CaresPTRResolver not reading hosts file	[40769](https://github.com/ClickHouse/ClickHouse/pull/40769)	by @arthurpassos
+* Fix conversion Date32 / DateTime64 / Date to narrow types	[40217](https://github.com/ClickHouse/ClickHouse/pull/40217)	by @zvonand
+* Base58 fix handling leading 0 / '1'	[40620](https://github.com/ClickHouse/ClickHouse/pull/40620)	by @zvonand
+* Fixed point of origin for exponential decay window functions to the last value in window	[39593](https://github.com/ClickHouse/ClickHouse/pull/39593)	by @quickhouse
+* Check Decimal division overflow based on operands scale	[39600](https://github.com/ClickHouse/ClickHouse/pull/39600)	by @zvonand
+* Fix arrow column dictionary to ch lc	[40037](https://github.com/ClickHouse/ClickHouse/pull/40037)	by @arthurpassos
+* Unwrap LC column in IExecutablefunction::executeWithoutSparseColumns	[39716](https://github.com/ClickHouse/ClickHouse/pull/39716)	by @arthurpassos
+* Fixed regexp in `test_match_process_uid_against_data_owner`	[39085](https://github.com/ClickHouse/ClickHouse/pull/39085)	by @quickhouse
+* Fix timeSlots for DateTime64	[37951](https://github.com/ClickHouse/ClickHouse/pull/37951)	by @zvonand
+* Fixed regexp in `test_quota`	[39084](https://github.com/ClickHouse/ClickHouse/pull/39084)	by @quickhouse
+* Fix bug with maxsplit in the splitByChar	[39552](https://github.com/ClickHouse/ClickHouse/pull/39552)	by @filimonov
+* Uppercase `ROWS`, `GROUPS`, `RANGE` in queries with windows	[39410](https://github.com/ClickHouse/ClickHouse/pull/39410)	by @quickhouse
+* Simplify Base58 encoding/decoding	[39292](https://github.com/ClickHouse/ClickHouse/pull/39292)	by @zvonand
+* Test host_regexp against all PTR records instead of only one	[37827](https://github.com/ClickHouse/ClickHouse/pull/37827)	by @arthurpassos
+* Add check for empty proccessors in AggregatingTransform::expandPipeline	[38584](https://github.com/ClickHouse/ClickHouse/pull/38584)	by @filimonov
+* Fix exception messages in clickhouse su	[38619](https://github.com/ClickHouse/ClickHouse/pull/38619)	by @filimonov
+* Don't spoil return code of integration tests runner with redundant tee	[38548](https://github.com/ClickHouse/ClickHouse/pull/38548)	by @excitoon
+* Add Base58 encoding/decoding	[38159](https://github.com/ClickHouse/ClickHouse/pull/38159)	by @zvonand
+* Fixed comments	[38331](https://github.com/ClickHouse/ClickHouse/pull/38331)	by @excitoon
+* nonNegativeDerivative docs description	[38303](https://github.com/ClickHouse/ClickHouse/pull/38303)	by @zvonand
+* Optimized processing of ORDER BY in window functions	[34632](https://github.com/ClickHouse/ClickHouse/pull/34632)	by @excitoon
+* fix deadlink with the proper one	[37883](https://github.com/ClickHouse/ClickHouse/pull/37883)	by @filimonov
+* Non Negative Derivative window function	[37628](https://github.com/ClickHouse/ClickHouse/pull/37628)	by @zvonand
+* Better parsing of `versionId` in `S3::URI::URI`	[37964](https://github.com/ClickHouse/ClickHouse/pull/37964)	by @excitoon
+* Don't try to kill empty list of containers in `integration/runner`	[37854](https://github.com/ClickHouse/ClickHouse/pull/37854)	by @excitoon
+* Got rid of `S3AuthSigner`	[37769](https://github.com/ClickHouse/ClickHouse/pull/37769)	by @excitoon
+* Fix for exponential time decaying window functions	[36944](https://github.com/ClickHouse/ClickHouse/pull/36944)	by @excitoon
+* Moved `ClientConfigurationPerRequest` to ClickHouse	[37767](https://github.com/ClickHouse/ClickHouse/pull/37767)	by @excitoon
+* Typos	[37773](https://github.com/ClickHouse/ClickHouse/pull/37773)	by @excitoon
+* Implemented changing comment to a ReplicatedMergeTree table	[37416](https://github.com/ClickHouse/ClickHouse/pull/37416)	by @Enmk
+* Fixed error with symbols in key name in S3	[37344](https://github.com/ClickHouse/ClickHouse/pull/37344)	by @excitoon
+* Fixed problem with infs in `quantileTDigest`	[37021](https://github.com/ClickHouse/ClickHouse/pull/37021)	by @excitoon
+* Mention currentDatabase in the Buffer docs	[36962](https://github.com/ClickHouse/ClickHouse/pull/36962)	by @filimonov
+* Fixed missing enum values for ClientInfo::Interface	[36482](https://github.com/ClickHouse/ClickHouse/pull/36482)	by @Enmk
+* Set `ENABLE_BUILD_PATH_MAPPING` to `OFF` by default, if `CMAKE_BUILD_TYPE` is set to `Debug`	[35998](https://github.com/ClickHouse/ClickHouse/pull/35998)	by @traceon
+* Add some metrics to engine Kafka	[35916](https://github.com/ClickHouse/ClickHouse/pull/35916)	by @filimonov
+* Fix cgroups cores detection	[35815](https://github.com/ClickHouse/ClickHouse/pull/35815)	by @filimonov
+* Extended usage of Milliseconds, Microseconds, Nanoseconds 	[34353](https://github.com/ClickHouse/ClickHouse/pull/34353)	by @zvonand
+* asynchronous_inserts engine AsynchronousInserts -> SystemAsynchronousInserts	[34429](https://github.com/ClickHouse/ClickHouse/pull/34429)	by @filimonov
+* Fix fromUnixTimestamp64 functions	[33505](https://github.com/ClickHouse/ClickHouse/pull/33505)	by @zvonand
+* Fix LDAP and Kerberos config handling	[33689](https://github.com/ClickHouse/ClickHouse/pull/33689)	by @traceon
+
+## 2021
+* Kerberos docs - formatting fixes	[33011](https://github.com/ClickHouse/ClickHouse/pull/33011)	by @traceon
+* Views with comment	[31062](https://github.com/ClickHouse/ClickHouse/pull/31062)	by @Enmk
+* Test for issue #26643	[27822](https://github.com/ClickHouse/ClickHouse/pull/27822)	by @filimonov
+* Minor fixes for `StorageMergeTree`	[32037](https://github.com/ClickHouse/ClickHouse/pull/32037)	by @excitoon
+* Skip mutations of unrelated partitions in `StorageMergeTree`	[21326](https://github.com/ClickHouse/ClickHouse/pull/21326)	by @excitoon
+* Give some love to macOS platform	[31957](https://github.com/ClickHouse/ClickHouse/pull/31957)	by @traceon
+* Minor improvements to DUMP macro	[31858](https://github.com/ClickHouse/ClickHouse/pull/31858)	by @Enmk
+* Windowed time decay functions	[29799](https://github.com/ClickHouse/ClickHouse/pull/29799)	by @excitoon
+* Fixed null pointer exception in `MATERIALIZE COLUMN`	[31679](https://github.com/ClickHouse/ClickHouse/pull/31679)	by @excitoon
+* Update string-search-functions.md	[31632](https://github.com/ClickHouse/ClickHouse/pull/31632)	by @filimonov
+* Resolve `nullptr` in STS credentials provider for S3	[31409](https://github.com/ClickHouse/ClickHouse/pull/31409)	by @excitoon
+* (manual backport) Avoid crashes from parallel_view_processing 	[30472](https://github.com/ClickHouse/ClickHouse/pull/30472)	by @filimonov
+* Fixing query performance issue in Live Views	[31006](https://github.com/ClickHouse/ClickHouse/pull/31006)	by @vzakaznikov
+* Better handling of `xtables.lock` in `runner`	[30892](https://github.com/ClickHouse/ClickHouse/pull/30892)	by @excitoon
+* Fixed `--disable-net-host` in `runner`	[30863](https://github.com/ClickHouse/ClickHouse/pull/30863)	by @excitoon
+* Non-recursive implementation for type list and its functions	[29683](https://github.com/ClickHouse/ClickHouse/pull/29683)	by @myrrc
+* Implemented creating databases with comments	[29429](https://github.com/ClickHouse/ClickHouse/pull/29429)	by @Enmk
+* Fix Xcode 13 build	[29682](https://github.com/ClickHouse/ClickHouse/pull/29682)	by @traceon
+* More warning flags for clang	[29668](https://github.com/ClickHouse/ClickHouse/pull/29668)	by @myrrc
+* Introducing Fn concept for function signature checking, simplifying SimpleCache	[29500](https://github.com/ClickHouse/ClickHouse/pull/29500)	by @myrrc
+* Making Monotonicity an aggregate to use with designated initializers	[29540](https://github.com/ClickHouse/ClickHouse/pull/29540)	by @myrrc
+* Implemented modifying table comments with `ALTER TABLE t MODIFY COMMENT 'value'`	[29264](https://github.com/ClickHouse/ClickHouse/pull/29264)	by @Enmk
+* Better exception messages for some String-related functions	[29252](https://github.com/ClickHouse/ClickHouse/pull/29252)	by @Enmk
+* Fixed logging level for message in `S3Common.cpp`	[29308](https://github.com/ClickHouse/ClickHouse/pull/29308)	by @excitoon
+* Removed sub-optimal mutation notifications in `StorageMergeTree` when merges are still going	[27552](https://github.com/ClickHouse/ClickHouse/pull/27552)	by @excitoon
+* Improving CH type system with concepts	[28659](https://github.com/ClickHouse/ClickHouse/pull/28659)	by @myrrc
+* optional<> semantics for parsing MergeTreePartInfo and DetachedPartInfo	[28085](https://github.com/ClickHouse/ClickHouse/pull/28085)	by @myrrc
+* Governance/session log	[22415](https://github.com/ClickHouse/ClickHouse/pull/22415)	by @Enmk
+* `ALTER TABLE ... MATERIALIZE COLUMN`	[27038](https://github.com/ClickHouse/ClickHouse/pull/27038)	by @excitoon
+* Fixed a typo in comments to `SinkToStorage`	[28078](https://github.com/ClickHouse/ClickHouse/pull/28078)	by @excitoon
+* Don't silently ignore errors and don't count delays in `ReadBufferFromS3`	[27484](https://github.com/ClickHouse/ClickHouse/pull/27484)	by @excitoon
+* Partitioned write into s3 table function	[23051](https://github.com/ClickHouse/ClickHouse/pull/23051)	by @excitoon
+* S3 disk unstable reads test	[27176](https://github.com/ClickHouse/ClickHouse/pull/27176)	by @excitoon
+* Avoid nullptr dereference during processing of NULL messages in Kafka for some formats	[27794](https://github.com/ClickHouse/ClickHouse/pull/27794)	by @filimonov
+* less sys calls #2: make vdso work again	[27492](https://github.com/ClickHouse/ClickHouse/pull/27492)	by @filimonov
+* Fixed parsing DateTime64 value from string.	[27605](https://github.com/ClickHouse/ClickHouse/pull/27605)	by @Enmk
+* Less Stopwatch.h	[27569](https://github.com/ClickHouse/ClickHouse/pull/27569)	by @filimonov
+* Changelog for 21.8	[27271](https://github.com/ClickHouse/ClickHouse/pull/27271)	by @filimonov
+* Improved logging of `hwmon` sensor errors in `AsynchronousMetrics`	[27031](https://github.com/ClickHouse/ClickHouse/pull/27031)	by @excitoon
+* Using formatted string literals in clickhouse-test, extracted sort key functions and stacktraces printer	[27228](https://github.com/ClickHouse/ClickHouse/pull/27228)	by @myrrc
+* Fixing reading of /proc/meminfo when kB suffix is not present	[27361](https://github.com/ClickHouse/ClickHouse/pull/27361)	by @myrrc
+* Less clock_gettime calls	[27325](https://github.com/ClickHouse/ClickHouse/pull/27325)	by @filimonov
+* Update changelog/README.md	[27221](https://github.com/ClickHouse/ClickHouse/pull/27221)	by @filimonov
+* Safer `ReadBufferFromS3` for merges and backports	[27168](https://github.com/ClickHouse/ClickHouse/pull/27168)	by @excitoon
+* Moving to TestFlows 1.7.20 that has native support for parallel tests.	[27040](https://github.com/ClickHouse/ClickHouse/pull/27040)	by @vzakaznikov
+* Updated extractAllGroupsHorizontal - flexible limit on number of matches	[26961](https://github.com/ClickHouse/ClickHouse/pull/26961)	by @Enmk
+* Improved `runner` to use `pytest` keyword expressions	[27026](https://github.com/ClickHouse/ClickHouse/pull/27026)	by @excitoon
+* Enabling RBAC TestFlows tests and crossing out new fails.	[26747](https://github.com/ClickHouse/ClickHouse/pull/26747)	by @vzakaznikov
+* Update error message in tests/testflows/window_functions/tests/errors.py	[26744](https://github.com/ClickHouse/ClickHouse/pull/26744)	by @vzakaznikov
+* Fixed wrong error message in `S3Common`	[26738](https://github.com/ClickHouse/ClickHouse/pull/26738)	by @excitoon
+* Enabling all TestFlows modules except LDAP after Kerberos merge.	[26366](https://github.com/ClickHouse/ClickHouse/pull/26366)	by @vzakaznikov
+* Enabling Kerberos Testflows tests	[21659](https://github.com/ClickHouse/ClickHouse/pull/21659)	by @zvonand
+* Fixing RBAC sample by tests in TestFlows.	[26329](https://github.com/ClickHouse/ClickHouse/pull/26329)	by @vzakaznikov
+* Using required columns for block size prediction	[25917](https://github.com/ClickHouse/ClickHouse/pull/25917)	by @excitoon
+* WIP mark subset of tests that depend on specific config modifications	[26105](https://github.com/ClickHouse/ClickHouse/pull/26105)	by @myrrc
+* Disabling TestFlows LDAP module due to test fails.	[26065](https://github.com/ClickHouse/ClickHouse/pull/26065)	by @vzakaznikov
+* Enabling all TestFlows modules and fixing some tests.	[26011](https://github.com/ClickHouse/ClickHouse/pull/26011)	by @vzakaznikov
+* Guidelines for adding new third-party libraries and maintaining custom changes in them	[26009](https://github.com/ClickHouse/ClickHouse/pull/26009)	by @traceon
+* Fix native macOS (Xcode) builds	[25736](https://github.com/ClickHouse/ClickHouse/pull/25736)	by @traceon
+* Changed css theme for code highlighting	[25682](https://github.com/ClickHouse/ClickHouse/pull/25682)	by @myrrc
+* Enabling TestFlows RBAC tests.	[25498](https://github.com/ClickHouse/ClickHouse/pull/25498)	by @vzakaznikov
+* SYSTEM RESTORE REPLICA replica [ON CLUSTER cluster]	[13652](https://github.com/ClickHouse/ClickHouse/pull/13652)	by @myrrc
+* TestFlows: increase LDAP verification cooldown performance tests timeout to 600 sec	[25374](https://github.com/ClickHouse/ClickHouse/pull/25374)	by @vzakaznikov
+* Enable TestFlows LDAP tests	[25278](https://github.com/ClickHouse/ClickHouse/pull/25278)	by @vzakaznikov
+* Kafka failover issue fix	[21267](https://github.com/ClickHouse/ClickHouse/pull/21267)	by @filimonov
+* Improved `test_storage_s3_get_unstable`	[23976](https://github.com/ClickHouse/ClickHouse/pull/23976)	by @excitoon
+* Adding leadInFrame/lagInFrame window functions TestFlows tests	[25144](https://github.com/ClickHouse/ClickHouse/pull/25144)	by @vzakaznikov
+* Fixed problems with double spaces in logs for `S3Common`	[24897](https://github.com/ClickHouse/ClickHouse/pull/24897)	by @excitoon
+* Added support of hasAny function to bloom_filter index.	[24900](https://github.com/ClickHouse/ClickHouse/pull/24900)	by @Enmk
+* Fixed bug with declaring S3 disk at root of bucket	[24898](https://github.com/ClickHouse/ClickHouse/pull/24898)	by @excitoon
+* Disabling extended precision data types TestFlows tests	[25125](https://github.com/ClickHouse/ClickHouse/pull/25125)	by @vzakaznikov
+* Fix using Yandex dockerhub registries for TestFlows.	[25133](https://github.com/ClickHouse/ClickHouse/pull/25133)	by @vzakaznikov
+* Add test issue #23430	[24941](https://github.com/ClickHouse/ClickHouse/pull/24941)	by @filimonov
+* Update CHANGELOG.md	[25083](https://github.com/ClickHouse/ClickHouse/pull/25083)	by @filimonov
+* Fix the test after #20393	[24967](https://github.com/ClickHouse/ClickHouse/pull/24967)	by @filimonov
+* Fix bad error message in docker entrypoint	[24955](https://github.com/ClickHouse/ClickHouse/pull/24955)	by @filimonov
+* Ldap role mapping deadlock fix	[24431](https://github.com/ClickHouse/ClickHouse/pull/24431)	by @traceon
+* Adding support to save clickhouse server logs in TestFlows check	[24504](https://github.com/ClickHouse/ClickHouse/pull/24504)	by @vzakaznikov
+* Try to improve kafka flaky test	[24465](https://github.com/ClickHouse/ClickHouse/pull/24465)	by @filimonov
+* LDAP: user DN detection functionality for role mapping with Active Directory	[22228](https://github.com/ClickHouse/ClickHouse/pull/22228)	by @traceon
+* Different loglevels for different logging channels	[23857](https://github.com/ClickHouse/ClickHouse/pull/23857)	by @filimonov
+* Fixed now64(): added second optional argument for timezone.	[24091](https://github.com/ClickHouse/ClickHouse/pull/24091)	by @Enmk
+* Enabling running of all TestFlows modules in parallel	[23942](https://github.com/ClickHouse/ClickHouse/pull/23942)	by @vzakaznikov
+* Better handling of HTTP errors in `PocoHTTPClient`	[23844](https://github.com/ClickHouse/ClickHouse/pull/23844)	by @excitoon
+* Added `region` parameter for S3 storage and disk	[23846](https://github.com/ClickHouse/ClickHouse/pull/23846)	by @excitoon
+* Documentation fix for `quantileTDigestWeighted`	[23758](https://github.com/ClickHouse/ClickHouse/pull/23758)	by @excitoon
+* Fixing testflows window function distributed tests	[23975](https://github.com/ClickHouse/ClickHouse/pull/23975)	by @vzakaznikov
+* Testflows tests for DateTime64 extended range	[22729](https://github.com/ClickHouse/ClickHouse/pull/22729)	by @zvonand
+* Added solution for host network mode in Ubuntu 20.10+	[23939](https://github.com/ClickHouse/ClickHouse/pull/23939)	by @excitoon
+* TestFlows window functions tests	[23704](https://github.com/ClickHouse/ClickHouse/pull/23704)	by @vzakaznikov
+* Update librdkafka 1.6.0-RC3 to 1.6.1	[23874](https://github.com/ClickHouse/ClickHouse/pull/23874)	by @filimonov
+* autodetect arch of gosu in server dockerfile	[23802](https://github.com/ClickHouse/ClickHouse/pull/23802)	by @filimonov
+* [ci run] Tdigest fix to 21.1	[23360](https://github.com/ClickHouse/ClickHouse/pull/23360)	by @excitoon
+* Fixed `quantile(s)TDigest` inaccuracies	[23314](https://github.com/ClickHouse/ClickHouse/pull/23314)	by @excitoon
+* Fix restart / stop command hanging.	[23552](https://github.com/ClickHouse/ClickHouse/pull/23552)	by @filimonov
+* Adding Map type tests in TestFlows	[21087](https://github.com/ClickHouse/ClickHouse/pull/21087)	by @vzakaznikov
+* Disable clickhouse-odbc-bridge build when ODBC is disabled	[23357](https://github.com/ClickHouse/ClickHouse/pull/23357)	by @traceon
+* Fix AppleClang build	[23358](https://github.com/ClickHouse/ClickHouse/pull/23358)	by @traceon
+* Retries on HTTP connection drops during reads from S3	[22988](https://github.com/ClickHouse/ClickHouse/pull/22988)	by @excitoon
+* Added insecure IMDS credentials provider for S3	[21852](https://github.com/ClickHouse/ClickHouse/pull/21852)	by @excitoon
+* Consistent AWS timeouts	[22594](https://github.com/ClickHouse/ClickHouse/pull/22594)	by @excitoon
+* Fixed erroneus failure of extractAllGroupsHorizontal on large columns	[23036](https://github.com/ClickHouse/ClickHouse/pull/23036)	by @Enmk
+* Fixes: formatDateTime and toDateTime64	[22937](https://github.com/ClickHouse/ClickHouse/pull/22937)	by @Enmk
+* Fixed dateDiff for DateTime64	[22931](https://github.com/ClickHouse/ClickHouse/pull/22931)	by @Enmk
+* Updated toStartOf* docs	[22935](https://github.com/ClickHouse/ClickHouse/pull/22935)	by @zvonand
+* Fix vanilla GCC compilation in macOS	[22885](https://github.com/ClickHouse/ClickHouse/pull/22885)	by @traceon
+* Fix issue with quorum retries behaviour	[18215](https://github.com/ClickHouse/ClickHouse/pull/18215)	by @filimonov
+* Better tests for finalize in nested writers	[22110](https://github.com/ClickHouse/ClickHouse/pull/22110)	by @excitoon
+* AppleClang compilation fix	[22561](https://github.com/ClickHouse/ClickHouse/pull/22561)	by @traceon
+* Revisit macOS build instructions	[22508](https://github.com/ClickHouse/ClickHouse/pull/22508)	by @traceon
+* Lookup parts/partitions in replica's own detached/ folder before downloading them from other replicas	[18978](https://github.com/ClickHouse/ClickHouse/pull/18978)	by @myrrc
+* Fix native macOS build for ALL_BUILD (Xcode/AppleClang)	[22289](https://github.com/ClickHouse/ClickHouse/pull/22289)	by @traceon
+* Add suffixes for dockerfile arguments	[22301](https://github.com/ClickHouse/ClickHouse/pull/22301)	by @filimonov
+* Add possibility to customize the source for clickhouse-server docker image builds.	[21977](https://github.com/ClickHouse/ClickHouse/pull/21977)	by @filimonov
+* Update column.md	[22061](https://github.com/ClickHouse/ClickHouse/pull/22061)	by @filimonov
+* docker: avoid chown of .	[22102](https://github.com/ClickHouse/ClickHouse/pull/22102)	by @filimonov
+* Adding documentation for Kerberos external authenticator.	[21328](https://github.com/ClickHouse/ClickHouse/pull/21328)	by @zvonand
+* Updating docker/test/testflows/runner/dockerd-entrypoint.sh to use Yandex dockerhub-proxy	[21551](https://github.com/ClickHouse/ClickHouse/pull/21551)	by @vzakaznikov
+* Documentation on OPTIMIZE DEDUPLICATE BY expression.	[21739](https://github.com/ClickHouse/ClickHouse/pull/21739)	by @Enmk
+* Date time64 extended range	[9404](https://github.com/ClickHouse/ClickHouse/pull/9404)	by @Enmk
+* Reverted S3 connection pools	[21737](https://github.com/ClickHouse/ClickHouse/pull/21737)	by @excitoon
+* Updating TestFlows to 1.6.74	[21673](https://github.com/ClickHouse/ClickHouse/pull/21673)	by @vzakaznikov
+* Added Grant, Revoke and System query_kind for system.query_log	[21102](https://github.com/ClickHouse/ClickHouse/pull/21102)	by @Enmk
+* Fixed open behavior of remote host filter in case when there is `remote_url_allow_hosts` section in configuration but no entries there	[20058](https://github.com/ClickHouse/ClickHouse/pull/20058)	by @excitoon
+* Add Kerberos support for authenticating existing users when accessing over HTTP	[14995](https://github.com/ClickHouse/ClickHouse/pull/14995)	by @traceon
+* Fixing LDAP authentication performance test by removing assertion	[21507](https://github.com/ClickHouse/ClickHouse/pull/21507)	by @vzakaznikov
+* Adjust prewhere_with_row_level_filter performance test	[21442](https://github.com/ClickHouse/ClickHouse/pull/21442)	by @traceon
+* avoid race in librdkafka	[21452](https://github.com/ClickHouse/ClickHouse/pull/21452)	by @filimonov
+* Case-insensitive compression methods for table functions	[21416](https://github.com/ClickHouse/ClickHouse/pull/21416)	by @excitoon
+* Allow row policies with PREWHERE	[19576](https://github.com/ClickHouse/ClickHouse/pull/19576)	by @traceon
+* Better kafka tests	[21111](https://github.com/ClickHouse/ClickHouse/pull/21111)	by @filimonov
+* Adding documentation for LIVE VIEWs	[20217](https://github.com/ClickHouse/ClickHouse/pull/20217)	by @vzakaznikov
+* Adding documentation on how to use LDAP server as external user authenticator or directory	[20208](https://github.com/ClickHouse/ClickHouse/pull/20208)	by @vzakaznikov
+* Added Server Side Encryption Customer Keys support in S3 client	[19748](https://github.com/ClickHouse/ClickHouse/pull/19748)	by @excitoon
+* Add libnss_files to alpine image	[20336](https://github.com/ClickHouse/ClickHouse/pull/20336)	by @filimonov
+* Add example of client configuration adjustments	[20275](https://github.com/ClickHouse/ClickHouse/pull/20275)	by @filimonov
+* Update entrypoint.sh	[20012](https://github.com/ClickHouse/ClickHouse/pull/20012)	by @filimonov
+* Adding support for periodically refreshed LIVE VIEW tables	[14822](https://github.com/ClickHouse/ClickHouse/pull/14822)	by @vzakaznikov
+* Adding retries for docker-compose start, stop and restart in TestFlows tests	[19852](https://github.com/ClickHouse/ClickHouse/pull/19852)	by @vzakaznikov
+* Try to make test_dir.tar smaller	[19833](https://github.com/ClickHouse/ClickHouse/pull/19833)	by @filimonov
+* Used global region for accessing S3 if can't determine exactly	[19750](https://github.com/ClickHouse/ClickHouse/pull/19750)	by @excitoon
+* Fixed table function S3 `auto` compression mode	[19793](https://github.com/ClickHouse/ClickHouse/pull/19793)	by @excitoon
+* Updated docs on encrypt/decrypt functions	[19819](https://github.com/ClickHouse/ClickHouse/pull/19819)	by @Enmk
+* Update of AWS C++ SDK	[17870](https://github.com/ClickHouse/ClickHouse/pull/17870)	by @excitoon
+* Updating TestFlows AES encryption tests to support changes to the encrypt plaintext parameter.	[19674](https://github.com/ClickHouse/ClickHouse/pull/19674)	by @vzakaznikov
+* Added prefix-based S3 endpoint settings	[18812](https://github.com/ClickHouse/ClickHouse/pull/18812)	by @excitoon
+* LDAP group to local role mapping support	[17211](https://github.com/ClickHouse/ClickHouse/pull/17211)	by @traceon
+* Kafka for arm64	[19369](https://github.com/ClickHouse/ClickHouse/pull/19369)	by @filimonov
+* Allow docker to be executed with arbitrary uid	[19374](https://github.com/ClickHouse/ClickHouse/pull/19374)	by @filimonov
+* Allow building librdkafka without ssl	[19337](https://github.com/ClickHouse/ClickHouse/pull/19337)	by @filimonov
+* Update librdkafka to v1.6.0-RC2	[18671](https://github.com/ClickHouse/ClickHouse/pull/18671)	by @filimonov
+* Connection pools for S3	[13405](https://github.com/ClickHouse/ClickHouse/pull/13405)	by @excitoon
+* Docker: fix uid/gid of the clickhouse user	[19096](https://github.com/ClickHouse/ClickHouse/pull/19096)	by @filimonov
+* Update test containers	[19058](https://github.com/ClickHouse/ClickHouse/pull/19058)	by @filimonov
+* Docker: better clickhouse-server  entrypoint	[18954](https://github.com/ClickHouse/ClickHouse/pull/18954)	by @filimonov
+* arrayMin/Max/Sum - fix bad description, add examples	[18833](https://github.com/ClickHouse/ClickHouse/pull/18833)	by @filimonov
+* Fixed GCC coverage build	[18846](https://github.com/ClickHouse/ClickHouse/pull/18846)	by @myrrc
+* TestFlows: fixes to LDAP tests that fail due to slow test execution	[18790](https://github.com/ClickHouse/ClickHouse/pull/18790)	by @vzakaznikov
+* Check if XCODE_IDE is true and avoid enforcing ninja in that case	[18773](https://github.com/ClickHouse/ClickHouse/pull/18773)	by @traceon
+* Fix AppleClang compilation - Remove auto in function parameters	[18674](https://github.com/ClickHouse/ClickHouse/pull/18674)	by @traceon
+
+## 2020
+* Update build instructions for clang-11	[18642](https://github.com/ClickHouse/ClickHouse/pull/18642)	by @filimonov
+* Allow caching of successful "bind" attempts to LDAP server for configurable period of time	[15988](https://github.com/ClickHouse/ClickHouse/pull/15988)	by @traceon
+* Allow multiplication of Decimal and Float	[18145](https://github.com/ClickHouse/ClickHouse/pull/18145)	by @myrrc
+* Docs for table, column, database names passed as parameters.	[18519](https://github.com/ClickHouse/ClickHouse/pull/18519)	by @UnamedRus
+* Allow AppleClang builds	[18488](https://github.com/ClickHouse/ClickHouse/pull/18488)	by @traceon
+* Fix exception text from Pipe.cpp	[18396](https://github.com/ClickHouse/ClickHouse/pull/18396)	by @filimonov
+* Perf test for ColumnMap	[18317](https://github.com/ClickHouse/ClickHouse/pull/18317)	by @Enmk
+* Fixed Date vs DateTime64 comparison	[18050](https://github.com/ClickHouse/ClickHouse/pull/18050)	by @Enmk
+* Fixed flaky test	[18313](https://github.com/ClickHouse/ClickHouse/pull/18313)	by @Enmk
+* Fixes in ODBC dictionary reload and ODBC bridge reachability	[18278](https://github.com/ClickHouse/ClickHouse/pull/18278)	by @traceon
+* OPTIMIZE DEDUPLICATE BY COLUMNS	[17846](https://github.com/ClickHouse/ClickHouse/pull/17846)	by @Enmk
+* Merging TestFlows requirements for AES encryption functions.	[18221](https://github.com/ClickHouse/ClickHouse/pull/18221)	by @vzakaznikov
+* Updating TestFlows version to the latest 1.6.72	[18208](https://github.com/ClickHouse/ClickHouse/pull/18208)	by @vzakaznikov
+* DETACH TABLE PERMANENTLY	[17642](https://github.com/ClickHouse/ClickHouse/pull/17642)	by @filimonov
+* Fixed `std::out_of_range: basic_string` in S3 URL parsing	[18059](https://github.com/ClickHouse/ClickHouse/pull/18059)	by @excitoon
+* kafka test_premature_flush_on_eof flap	[18000](https://github.com/ClickHouse/ClickHouse/pull/18000)	by @filimonov
+* Decrease log verbosity of disconnecting clients	[18005](https://github.com/ClickHouse/ClickHouse/pull/18005)	by @filimonov
+* dict notes	[17864](https://github.com/ClickHouse/ClickHouse/pull/17864)	by @filimonov
+* Added proper authentication for S3 client	[16856](https://github.com/ClickHouse/ClickHouse/pull/16856)	by @excitoon
+* Date vs DateTime64 comparison	[17895](https://github.com/ClickHouse/ClickHouse/pull/17895)	by @Enmk
+* Fixed comparison of DateTime64 with different scales	[16952](https://github.com/ClickHouse/ClickHouse/pull/16952)	by @Enmk
+* Updating TestFlows README.md to include "How To Debug Why Test Failed" section.	[17808](https://github.com/ClickHouse/ClickHouse/pull/17808)	by @vzakaznikov
+* Attempt to use IOStream in AWS SDK	[17794](https://github.com/ClickHouse/ClickHouse/pull/17794)	by @excitoon
+* Document JSONAsString	[17467](https://github.com/ClickHouse/ClickHouse/pull/17467)	by @filimonov
+* add a note for copier docs	[17468](https://github.com/ClickHouse/ClickHouse/pull/17468)	by @filimonov
+* Fix CMake generation and build for native Xcode and AppleClang	[17501](https://github.com/ClickHouse/ClickHouse/pull/17501)	by @traceon
+* Allow different types in avgWeighted. Allow avg and avgWeighed to operate on extended integral types.	[15419](https://github.com/ClickHouse/ClickHouse/pull/15419)	by @myrrc
+* Update cctz to the latest master, update tzdb to 2020d.	[17204](https://github.com/ClickHouse/ClickHouse/pull/17204)	by @filimonov
+* execute_merges_on_single_replica	[16424](https://github.com/ClickHouse/ClickHouse/pull/16424)	by @filimonov
+* Fixing unstable test in tests/testflows/ldap/external_user_directory/tests/authentications.py	[17161](https://github.com/ClickHouse/ClickHouse/pull/17161)	by @vzakaznikov
+* Fixed wrong result in big integers (128, 256 bit) when casting from double to int64_t.	[16986](https://github.com/ClickHouse/ClickHouse/pull/16986)	by @myrrc
+* Fix ROCKSDB_ERROR value	[17047](https://github.com/ClickHouse/ClickHouse/pull/17047)	by @traceon
+* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. 	[16985](https://github.com/ClickHouse/ClickHouse/pull/16985)	by @filimonov
+* Install script should always create subdirs in config folders. 	[16936](https://github.com/ClickHouse/ClickHouse/pull/16936)	by @filimonov
+* SNI for tcp secure	[16938](https://github.com/ClickHouse/ClickHouse/pull/16938)	by @filimonov
+* Fix for issue #16862	[16865](https://github.com/ClickHouse/ClickHouse/pull/16865)	by @filimonov
+* Backport #16865 to 20.3.	[16927](https://github.com/ClickHouse/ClickHouse/pull/16927)	by @filimonov
+* Remove timeSeriesGroupRateSum from docs	[16901](https://github.com/ClickHouse/ClickHouse/pull/16901)	by @filimonov
+* `ALTER UPDATE/DELETE ... IN PARTITION` with partition pruning in `ReplicatedMergeTree`	[13403](https://github.com/ClickHouse/ClickHouse/pull/13403)	by @excitoon
+* Create adding_test_queries.md	[16822](https://github.com/ClickHouse/ClickHouse/pull/16822)	by @filimonov
+* Test for the issue #12615	[16762](https://github.com/ClickHouse/ClickHouse/pull/16762)	by @filimonov
+* Update clickhouse-copier.md	[16663](https://github.com/ClickHouse/ClickHouse/pull/16663)	by @filimonov
+* Remove redundant diagnostics and fixed `test_jbod_overflow`	[16411](https://github.com/ClickHouse/ClickHouse/pull/16411)	by @excitoon
+* Update date-time-functions.md	[16549](https://github.com/ClickHouse/ClickHouse/pull/16549)	by @filimonov
+* Fixing the inability to deserialize AVRO into table if it contains LowCardinality columns	[16521](https://github.com/ClickHouse/ClickHouse/pull/16521)	by @myrrc
+* docker: clickhouse-server on the top of alpine	[16479](https://github.com/ClickHouse/ClickHouse/pull/16479)	by @filimonov
+* Update other-functions.md	[16480](https://github.com/ClickHouse/ClickHouse/pull/16480)	by @filimonov
+* Fix typos reported by codespell	[16425](https://github.com/ClickHouse/ClickHouse/pull/16425)	by @filimonov
+* Fix LDAP tests by grabbing log size after container is stopped	[16440](https://github.com/ClickHouse/ClickHouse/pull/16440)	by @vzakaznikov
+* Fixed flappy `test_multiple_disks`	[16235](https://github.com/ClickHouse/ClickHouse/pull/16235)	by @excitoon
+* clickhouse-local can work without tmp directory	[16280](https://github.com/ClickHouse/ClickHouse/pull/16280)	by @filimonov
+* Fixing another issue in LDAP tests	[16365](https://github.com/ClickHouse/ClickHouse/pull/16365)	by @vzakaznikov
+* Fixing fails in LDAP external user directory tests.	[16363](https://github.com/ClickHouse/ClickHouse/pull/16363)	by @vzakaznikov
+* Add a log message after an access storage is added	[16249](https://github.com/ClickHouse/ClickHouse/pull/16249)	by @traceon
+* Add setTemporaryStorage to clickhouse-local to make OPTIMIZE work	[16192](https://github.com/ClickHouse/ClickHouse/pull/16192)	by @filimonov
+* Fixing tests/queries/0_stateless/01446_json_strings_each_row.sql test	[16247](https://github.com/ClickHouse/ClickHouse/pull/16247)	by @vzakaznikov
+* encrypt and decrypt functions	[11844](https://github.com/ClickHouse/ClickHouse/pull/11844)	by @Enmk
+* Added `disable_merges` option for volumes in multi-disk configuration	[13956](https://github.com/ClickHouse/ClickHouse/pull/13956)	by @excitoon
+* Add LDAP user directory support for locally non-existent users	[12736](https://github.com/ClickHouse/ClickHouse/pull/12736)	by @traceon
+* Fixing arrayIndex functions when right operand is LC but left is not	[16038](https://github.com/ClickHouse/ClickHouse/pull/16038)	by @myrrc
+* ProtobufSingle format	[15199](https://github.com/ClickHouse/ClickHouse/pull/15199)	by @filimonov
+* Fix the bug when NOTHING_TO_DO events wrongly increment count_no_work_done	[15987](https://github.com/ClickHouse/ClickHouse/pull/15987)	by @filimonov
+* Better initialization of S3 storage	[15646](https://github.com/ClickHouse/ClickHouse/pull/15646)	by @excitoon
+* fix flap in no_holes_when_write_suffix_failed	[15757](https://github.com/ClickHouse/ClickHouse/pull/15757)	by @filimonov
+* Mention core_dump size limit in docs	[15416](https://github.com/ClickHouse/ClickHouse/pull/15416)	by @filimonov
+* Fixed compression in S3 storage	[15376](https://github.com/ClickHouse/ClickHouse/pull/15376)	by @excitoon
+* Fixing options' names' links in cmake docs generator	[15410](https://github.com/ClickHouse/ClickHouse/pull/15410)	by @myrrc
+* CMake flags reference generator, the guide for adding new options, and the attempt to correct the existing options	[14711](https://github.com/ClickHouse/ClickHouse/pull/14711)	by @myrrc
+* Better debug message from MergeTreeDataSelectExecutor	[15169](https://github.com/ClickHouse/ClickHouse/pull/15169)	by @filimonov
+* Fixing tests/integration/test_distributed_over_live_view/test.py	[14892](https://github.com/ClickHouse/ClickHouse/pull/14892)	by @vzakaznikov
+* Fix enable_optimize_predicate_expression for finalizeAggregation	[14937](https://github.com/ClickHouse/ClickHouse/pull/14937)	by @filimonov
+* Update clickhouse-benchmark.md	[14803](https://github.com/ClickHouse/ClickHouse/pull/14803)	by @filimonov
+* Extracted the debug info generation for functions into a cmake option	[14657](https://github.com/ClickHouse/ClickHouse/pull/14657)	by @myrrc
+* Correct nullability checker for LowCardinality nested columns	[14591](https://github.com/ClickHouse/ClickHouse/pull/14591)	by @myrrc
+* MySql datatypes dateTime64 and decimal	[11512](https://github.com/ClickHouse/ClickHouse/pull/11512)	by @Enmk
+* Fix a build for old some OS with old find	[14215](https://github.com/ClickHouse/ClickHouse/pull/14215)	by @filimonov
+* testflows: adding retry logic when bringing up docker-compose cluster	[14112](https://github.com/ClickHouse/ClickHouse/pull/14112)	by @vzakaznikov
+* tzdata improvements	[13648](https://github.com/ClickHouse/ClickHouse/pull/13648)	by @filimonov
+* Optimising has(), indexOf(), and countEqual() for Array(LowCardinality(T)) and constant right arguments	[12550](https://github.com/ClickHouse/ClickHouse/pull/12550)	by @myrrc
+* CI checks md file	[13615](https://github.com/ClickHouse/ClickHouse/pull/13615)	by @myrrc
+* Fixed flappy `test_multiple_disks::test_start_stop_moves`	[13759](https://github.com/ClickHouse/ClickHouse/pull/13759)	by @excitoon
+* Testflows LDAP module: adding missing certificates and dhparam.pem for openldap4	[13780](https://github.com/ClickHouse/ClickHouse/pull/13780)	by @vzakaznikov
+* Updating LDAP user authentication suite to check that it works with RBAC	[13656](https://github.com/ClickHouse/ClickHouse/pull/13656)	by @vzakaznikov
+* testflows: increasing health-check timeouts for clickhouse nodes	[13612](https://github.com/ClickHouse/ClickHouse/pull/13612)	by @vzakaznikov
+* Removed `-DENABLE_CURL_CLIENT` for `contrib/aws`	[13628](https://github.com/ClickHouse/ClickHouse/pull/13628)	by @excitoon
+* Proper remote host checking in S3 redirects	[13404](https://github.com/ClickHouse/ClickHouse/pull/13404)	by @excitoon
+* Fix for test_kafka_flush_by_block_size after rdkafka 1.5	[13285](https://github.com/ClickHouse/ClickHouse/pull/13285)	by @filimonov
+* Keep original query_masking_rules.xml when performing fasttests	[13382](https://github.com/ClickHouse/ClickHouse/pull/13382)	by @Enmk
+* Applying LDAP authentication test fixes	[13310](https://github.com/ClickHouse/ClickHouse/pull/13310)	by @vzakaznikov
+* Add test for macros usage in some kafka settings.	[13103](https://github.com/ClickHouse/ClickHouse/pull/13103)	by @filimonov
+* Volumes related refactorings	[12670](https://github.com/ClickHouse/ClickHouse/pull/12670)	by @excitoon
+* Small fixes to the RBAC SRS	[13152](https://github.com/ClickHouse/ClickHouse/pull/13152)	by @vzakaznikov
+* Fixing 00960_live_view_watch_events_live.py test	[13108](https://github.com/ClickHouse/ClickHouse/pull/13108)	by @vzakaznikov
+* Adding RBAC syntax tests.	[12642](https://github.com/ClickHouse/ClickHouse/pull/12642)	by @vzakaznikov
+* Adding extra xfails for some ldap tests.	[13054](https://github.com/ClickHouse/ClickHouse/pull/13054)	by @vzakaznikov
+* increasing timeouts in testflows tests	[12949](https://github.com/ClickHouse/ClickHouse/pull/12949)	by @vzakaznikov
+* Updated broken link in `asynchronous_metric_log.md`	[12766](https://github.com/ClickHouse/ClickHouse/pull/12766)	by @excitoon
+* Add LDAP authentication support	[11234](https://github.com/ClickHouse/ClickHouse/pull/11234)	by @traceon
+* Retain existing config.d/query_masking_rules.xml from server package	[12526](https://github.com/ClickHouse/ClickHouse/pull/12526)	by @Enmk
+* Fixing race condition in live view tables which could cause data duplication and live view tests	[12519](https://github.com/ClickHouse/ClickHouse/pull/12519)	by @vzakaznikov
+* Separated `AWSAuthV4Signer` into different logger, removed "AWSClient: AWSClient"	[12320](https://github.com/ClickHouse/ClickHouse/pull/12320)	by @excitoon
+* `min_bytes_for_seek` setting for `DiskS3`	[12434](https://github.com/ClickHouse/ClickHouse/pull/12434)	by @excitoon
+* Resolve #12098	[12397](https://github.com/ClickHouse/ClickHouse/pull/12397)	by @myrrc
+* Increasing default timeout for live view tests from 20 sec to 120 sec	[12416](https://github.com/ClickHouse/ClickHouse/pull/12416)	by @vzakaznikov
+* Backport #12120 to 20.4	[12396](https://github.com/ClickHouse/ClickHouse/pull/12396)	by @filimonov
+* Backport #12120 to 20.3	[12395](https://github.com/ClickHouse/ClickHouse/pull/12395)	by @filimonov
+* Implemented single part uploads for DiskS3	[12026](https://github.com/ClickHouse/ClickHouse/pull/12026)	by @excitoon
+* Adding a simple example of using TestFlows.	[12090](https://github.com/ClickHouse/ClickHouse/pull/12090)	by @vzakaznikov
+* Tests for fixed issues #10846, #7347, #3767	[12193](https://github.com/ClickHouse/ClickHouse/pull/12193)	by @filimonov
+* Add query context for system logs and to Buffer	[12120](https://github.com/ClickHouse/ClickHouse/pull/12120)	by @filimonov
+* Switched paths in S3 metadata to relative	[11892](https://github.com/ClickHouse/ClickHouse/pull/11892)	by @excitoon
+* ILIKE operator	[12125](https://github.com/ClickHouse/ClickHouse/pull/12125)	by @myrrc
+* Test for input_format_allow_errors_num in CSV	[12105](https://github.com/ClickHouse/ClickHouse/pull/12105)	by @filimonov
+* max_rows_to_read remove note about 'applied on each thread separately'	[12070](https://github.com/ClickHouse/ClickHouse/pull/12070)	by @filimonov
+* Moved useless S3 logging to TRACE level	[12067](https://github.com/ClickHouse/ClickHouse/pull/12067)	by @excitoon
+* Moves task shall be started if new storage policy needs them	[11893](https://github.com/ClickHouse/ClickHouse/pull/11893)	by @excitoon
+* Kafka work with formats based on PeekableReadBuffer and other improvements	[11599](https://github.com/ClickHouse/ClickHouse/pull/11599)	by @filimonov
+* Remove note about experimental from skipping indexes docs	[11704](https://github.com/ClickHouse/ClickHouse/pull/11704)	by @filimonov
+* extractAllGroupsHorizontal and extractAllGroupsVertical	[11554](https://github.com/ClickHouse/ClickHouse/pull/11554)	by @Enmk
+* Fix corner case (only) for exit code overflow	[11601](https://github.com/ClickHouse/ClickHouse/pull/11601)	by @filimonov
+* Adding support for PREWHERE in live view tables.	[11495](https://github.com/ClickHouse/ClickHouse/pull/11495)	by @vzakaznikov
+* backport #9884 to 20.3	[11552](https://github.com/ClickHouse/ClickHouse/pull/11552)	by @filimonov
+* 20.1 kafka backports	[11519](https://github.com/ClickHouse/ClickHouse/pull/11519)	by @filimonov
+* 20.3 kafka backports	[11520](https://github.com/ClickHouse/ClickHouse/pull/11520)	by @filimonov
+* Fixed using nullptr source and dest buffers in codecs, fixed test	[11471](https://github.com/ClickHouse/ClickHouse/pull/11471)	by @Enmk
+* Added tests for improved S3 URL parsing	[11174](https://github.com/ClickHouse/ClickHouse/pull/11174)	by @excitoon
+* Better settings for Kafka	[11388](https://github.com/ClickHouse/ClickHouse/pull/11388)	by @filimonov
+* Fixed geohashesInBox argument range	[11403](https://github.com/ClickHouse/ClickHouse/pull/11403)	by @Enmk
+* Virtual columns for Kafka headers	[11283](https://github.com/ClickHouse/ClickHouse/pull/11283)	by @filimonov
+* Add _timestamp_ms virtual columns to Kafka engine	[11260](https://github.com/ClickHouse/ClickHouse/pull/11260)	by @filimonov
+* Kafka clientid (finishing #11073)	[11252](https://github.com/ClickHouse/ClickHouse/pull/11252)	by @filimonov
+* Update librdkafka to version 1.4.2	[11256](https://github.com/ClickHouse/ClickHouse/pull/11256)	by @filimonov
+* Add libsasl2-dev and heimdal-multidev in CI Docker image	[11310](https://github.com/ClickHouse/ClickHouse/pull/11310)	by @traceon
+* Add prefix & facility to librdkafka logs	[11261](https://github.com/ClickHouse/ClickHouse/pull/11261)	by @filimonov
+* Fixed reschedule issue in Kafka	[11149](https://github.com/ClickHouse/ClickHouse/pull/11149)	by @filimonov
+* {to,from}UnixTimestamp64{Milli,Micro,Nano} functions	[10923](https://github.com/ClickHouse/ClickHouse/pull/10923)	by @Enmk
+* Fixed S3 globbing which could fail in case of more than 1000 keys and some backends	[11179](https://github.com/ClickHouse/ClickHouse/pull/11179)	by @excitoon
+* Fix for the hang during deletion of engine=Kafka (one more time)	[11145](https://github.com/ClickHouse/ClickHouse/pull/11145)	by @filimonov
+* Revert "Disable some flappy tests"	[8840](https://github.com/ClickHouse/ClickHouse/pull/8840)	by @excitoon
+* Fixed parsing of S3 URL	[11036](https://github.com/ClickHouse/ClickHouse/pull/11036)	by @excitoon
+* Fixed parseDateTime64BestEffort implementation	[11038](https://github.com/ClickHouse/ClickHouse/pull/11038)	by @Enmk
+* Fixes the potential missed data during termination of Kafka engine table	[11048](https://github.com/ClickHouse/ClickHouse/pull/11048)	by @filimonov
+* Added `move_ttl_info` to `system.parts`	[10591](https://github.com/ClickHouse/ClickHouse/pull/10591)	by @excitoon
+* Fixed link to external dictionaries	[11020](https://github.com/ClickHouse/ClickHouse/pull/11020)	by @excitoon
+* Fixing 00979_live_view_watch_continuous_aggregates test	[11024](https://github.com/ClickHouse/ClickHouse/pull/11024)	by @vzakaznikov
+* Fix for the hang during deletion of engine=Kafka	[10910](https://github.com/ClickHouse/ClickHouse/pull/10910)	by @filimonov
+* Adding support for ALTER RENAME COLUMN query to Distributed table engine	[10727](https://github.com/ClickHouse/ClickHouse/pull/10727)	by @vzakaznikov
+* Add OpenLDAP third-party library integration (system or contrib/build)	[10861](https://github.com/ClickHouse/ClickHouse/pull/10861)	by @traceon
+* function toStartOfSecond(DateTime64) -> DateTime64	[10722](https://github.com/ClickHouse/ClickHouse/pull/10722)	by @Enmk
+* Fixed DateLUTImpl constructors to avoid accidental copying	[10809](https://github.com/ClickHouse/ClickHouse/pull/10809)	by @Enmk
+* Fixed handling condition variable for synchronous mutations	[10588](https://github.com/ClickHouse/ClickHouse/pull/10588)	by @excitoon
+* Fixing and re-enabling 00979_live_view_watch_continuous_aggregates.py test.	[10658](https://github.com/ClickHouse/ClickHouse/pull/10658)	by @vzakaznikov
+* extractAllGroups(haystack, re_needle) function	[10534](https://github.com/ClickHouse/ClickHouse/pull/10534)	by @Enmk
+* Cleaned up AppleClang version check	[10708](https://github.com/ClickHouse/ClickHouse/pull/10708)	by @traceon
+* Blind fix for AppleClang version and char8_t support check	[10705](https://github.com/ClickHouse/ClickHouse/pull/10705)	by @traceon
+* Trying to fix tests/queries/0_stateless/01246_insert_into_watch_live_view.py test	[10670](https://github.com/ClickHouse/ClickHouse/pull/10670)	by @vzakaznikov
+* Fixing hard coded timeouts in new live view tests.	[10604](https://github.com/ClickHouse/ClickHouse/pull/10604)	by @vzakaznikov
+* Xcode generator build fix	[10541](https://github.com/ClickHouse/ClickHouse/pull/10541)	by @traceon
+* Fixed comparing DateTime64 in WHERE against String value	[10560](https://github.com/ClickHouse/ClickHouse/pull/10560)	by @Enmk
+* Increasing timeout when opening a client in tests/0_stateless/helpers/client.py	[10599](https://github.com/ClickHouse/ClickHouse/pull/10599)	by @vzakaznikov
+* Adding support for INSERT INTO table WATCH query to build streaming systems using LIVE VIEW tables	[10498](https://github.com/ClickHouse/ClickHouse/pull/10498)	by @vzakaznikov
+* add CA certificates to clickhouse-server docker image	[10476](https://github.com/ClickHouse/ClickHouse/pull/10476)	by @filimonov
+* Allowed to alter column in non-modifying data mode when the same type is specified	[10382](https://github.com/ClickHouse/ClickHouse/pull/10382)	by @excitoon
+* Fixing 00964_live_view_watch_events_heartbeat.py test	[10356](https://github.com/ClickHouse/ClickHouse/pull/10356)	by @vzakaznikov
+* Initial support for live view tables over distributed	[10179](https://github.com/ClickHouse/ClickHouse/pull/10179)	by @vzakaznikov
+* Splitting string into Alpha-Num tokens with SIMD intrinsics.	[9968](https://github.com/ClickHouse/ClickHouse/pull/9968)	by @Enmk
+* clickhouse-docker-util	[10151](https://github.com/ClickHouse/ClickHouse/pull/10151)	by @filimonov
+* allow_nondeterministic_mutations	[10186](https://github.com/ClickHouse/ClickHouse/pull/10186)	by @filimonov
+* 19.16 backports	[10156](https://github.com/ClickHouse/ClickHouse/pull/10156)	by @excitoon
+* Backport #9884 to 19.16 [Kafka retry commits on failure]	[10144](https://github.com/ClickHouse/ClickHouse/pull/10144)	by @excitoon
+* Fixing 00964_live_view_watch_events_heartbeat.py test to avoid race condition	[9944](https://github.com/ClickHouse/ClickHouse/pull/9944)	by @vzakaznikov
+* Fixed `DeleteOnDestroy` logic in `ATTACH PART` and added few tests	[9410](https://github.com/ClickHouse/ClickHouse/pull/9410)	by @excitoon
+* Kafka retry commits on failure	[9884](https://github.com/ClickHouse/ClickHouse/pull/9884)	by @filimonov
+* Date time various timezone fixes	[9574](https://github.com/ClickHouse/ClickHouse/pull/9574)	by @Enmk
+* Added MATERIALIZE TTL IN PARTITION	[9581](https://github.com/ClickHouse/ClickHouse/pull/9581)	by @excitoon
+* Try newer version of odbc driver	[9484](https://github.com/ClickHouse/ClickHouse/pull/9484)	by @filimonov
+* Date time formatting tests	[9567](https://github.com/ClickHouse/ClickHouse/pull/9567)	by @Enmk
+* Fixed wrong log messages about missing default disk or policy	[9530](https://github.com/ClickHouse/ClickHouse/pull/9530)	by @excitoon
+* Added reloading storage configuration from configuration file	[8594](https://github.com/ClickHouse/ClickHouse/pull/8594)	by @excitoon
+* Kafka exceptions from destructors	[9513](https://github.com/ClickHouse/ClickHouse/pull/9513)	by @filimonov
+*  Set X-ClickHouse-Timezone HTTP response header to the server's timezone	[9493](https://github.com/ClickHouse/ClickHouse/pull/9493)	by @traceon
+* Backport 8549 to 19.16 [Do not allow to merge data moving it against storage policy volume order]	[9496](https://github.com/ClickHouse/ClickHouse/pull/9496)	by @excitoon
+* Backport 8549 to 19.16 [Do not allow to merge data moving it against storage policy volume order]	[9486](https://github.com/ClickHouse/ClickHouse/pull/9486)	by @excitoon
+* Little typo fixed	[9397](https://github.com/ClickHouse/ClickHouse/pull/9397)	by @excitoon
+* Added a check for storage policy in `cloneAndLoadDataPartOnSameDisk()`	[9383](https://github.com/ClickHouse/ClickHouse/pull/9383)	by @excitoon
+* adjust dockerfile used in tests to allow odbc roundtrip	[9348](https://github.com/ClickHouse/ClickHouse/pull/9348)	by @filimonov
+* Pass TTL rule info with block to other replicas	[8598](https://github.com/ClickHouse/ClickHouse/pull/8598)	by @excitoon
+* key and timestamp in Kafka producer	[8969](https://github.com/ClickHouse/ClickHouse/pull/8969)	by @filimonov
+* 19.17 backports	[8992](https://github.com/ClickHouse/ClickHouse/pull/8992)	by @filimonov
+* 20.1 few backports	[8993](https://github.com/ClickHouse/ClickHouse/pull/8993)	by @filimonov
+* Fixed buffer overflow on decoding small sequences with Gorilla and DoubleDelta	[9028](https://github.com/ClickHouse/ClickHouse/pull/9028)	by @Enmk
+* 19.16 few fixes backported	[8991](https://github.com/ClickHouse/ClickHouse/pull/8991)	by @filimonov
+* IN with function result	[5342](https://github.com/ClickHouse/ClickHouse/pull/5342)	by @Enmk
+* Added globs/wildcards for s3	[8851](https://github.com/ClickHouse/ClickHouse/pull/8851)	by @excitoon
+* Kafka fixes part2	[8917](https://github.com/ClickHouse/ClickHouse/pull/8917)	by @filimonov
+* Fixed `StorageInput::StorageInput` a little bit	[8850](https://github.com/ClickHouse/ClickHouse/pull/8850)	by @excitoon
+* "Atomically" remove parts on destroy.	[8402](https://github.com/ClickHouse/ClickHouse/pull/8402)	by @excitoon
+* Reworking fix for issue 7878 (version 2)	[8788](https://github.com/ClickHouse/ClickHouse/pull/8788)	by @vzakaznikov
+* Fixed bug with `MergeTreeReadPool`	[8791](https://github.com/ClickHouse/ClickHouse/pull/8791)	by @excitoon
+* Set X-ClickHouse-Format HTTP response header to the format name	[8769](https://github.com/ClickHouse/ClickHouse/pull/8769)	by @traceon
+* Fix issue #7878	[8766](https://github.com/ClickHouse/ClickHouse/pull/8766)	by @vzakaznikov
+* Kafka fixes backport 19 17	[8763](https://github.com/ClickHouse/ClickHouse/pull/8763)	by @filimonov
+* Test for incremental filling with feedback	[8744](https://github.com/ClickHouse/ClickHouse/pull/8744)	by @filimonov
+* Fixed `ALTER MODIFY TTL`	[8422](https://github.com/ClickHouse/ClickHouse/pull/8422)	by @excitoon
+* Fixed `MergeTreeData::areBackgroundMovesNeeded` according to move TTL feature	[8672](https://github.com/ClickHouse/ClickHouse/pull/8672)	by @excitoon
+* Fixed a bug with double move which corrupt original part	[8680](https://github.com/ClickHouse/ClickHouse/pull/8680)	by @excitoon
+* typo fix	[8666](https://github.com/ClickHouse/ClickHouse/pull/8666)	by @filimonov
+* Fixed deduplication issues in more `test_multiple_disks` tests	[8671](https://github.com/ClickHouse/ClickHouse/pull/8671)	by @excitoon
+* Fixed deduplication issue in `test_multiple_disks::test_concurrent_alter_move`	[8642](https://github.com/ClickHouse/ClickHouse/pull/8642)	by @excitoon
+* Allow to change `storage_policy` to not less rich one	[8107](https://github.com/ClickHouse/ClickHouse/pull/8107)	by @excitoon
+* Do not allow to merge data moving it against storage policy volume order	[8549](https://github.com/ClickHouse/ClickHouse/pull/8549)	by @excitoon
+* Fixed codec performance test	[8615](https://github.com/ClickHouse/ClickHouse/pull/8615)	by @Enmk
+* fix printing changelog with non-ascii chars	[8611](https://github.com/ClickHouse/ClickHouse/pull/8611)	by @filimonov
+* Increased number of rows to make tests results noticeable.	[8574](https://github.com/ClickHouse/ClickHouse/pull/8574)	by @Enmk
+* Live View storage engine refactoring of getNewBlocks() and writeIntoLiveView() methods.	[8519](https://github.com/ClickHouse/ClickHouse/pull/8519)	by @vzakaznikov
+* make_changelog.py::process_unknown_commits unicode fix	[8565](https://github.com/ClickHouse/ClickHouse/pull/8565)	by @filimonov
+* Added creation of user and working directory to Arch Linux install script	[8534](https://github.com/ClickHouse/ClickHouse/pull/8534)	by @excitoon
+* Gorilla and doubledelta performance	[8019](https://github.com/ClickHouse/ClickHouse/pull/8019)	by @Enmk
+* Fixed build of `openssl` with `make`	[8528](https://github.com/ClickHouse/ClickHouse/pull/8528)	by @excitoon
+* Improved extracting of GCC version.	[8516](https://github.com/ClickHouse/ClickHouse/pull/8516)	by @excitoon
+* Live view support for subquery	[7792](https://github.com/ClickHouse/ClickHouse/pull/7792)	by @vzakaznikov
+
+## 2019
+* Improved check for parts on different disks	[8440](https://github.com/ClickHouse/ClickHouse/pull/8440)	by @excitoon
+* Fixed ALTER TTL for replicated tables	[8318](https://github.com/ClickHouse/ClickHouse/pull/8318)	by @excitoon
+* Added check for valid destination in a move TTL rule	[8410](https://github.com/ClickHouse/ClickHouse/pull/8410)	by @excitoon
+* Check extra parts of `MergeTree` at different disks, in order to not allow to miss data parts at undefined disks	[8118](https://github.com/ClickHouse/ClickHouse/pull/8118)	by @excitoon
+* Added `test_ttl_move::test_ttls_do_not_work_after_alter` test	[8407](https://github.com/ClickHouse/ClickHouse/pull/8407)	by @excitoon
+* Perf tests for all supported codecs against Float64 and UInt64.	[8349](https://github.com/ClickHouse/ClickHouse/pull/8349)	by @Enmk
+* Fixed type check in toDateTime64	[8375](https://github.com/ClickHouse/ClickHouse/pull/8375)	by @Enmk
+* Handling error from clock_gettime properly	[8291](https://github.com/ClickHouse/ClickHouse/pull/8291)	by @Enmk
+* now64() tests	[8274](https://github.com/ClickHouse/ClickHouse/pull/8274)	by @Enmk
+* Fixed crash in now64() when it argument is a result of function call.	[8270](https://github.com/ClickHouse/ClickHouse/pull/8270)	by @Enmk
+* Added english documentation for extended TTL syntax	[8261](https://github.com/ClickHouse/ClickHouse/pull/8261)	by @excitoon
+* Kafka fixes backport 19.16	[8249](https://github.com/ClickHouse/ClickHouse/pull/8249)	by @filimonov
+* Added documentation for extended TTL syntax	[8059](https://github.com/ClickHouse/ClickHouse/pull/8059)	by @excitoon
+* Init query context for Kafka to make subqueries work	[8197](https://github.com/ClickHouse/ClickHouse/pull/8197)	by @filimonov
+* Improved performance of max(), min(), argMin(), argMax() for DateTime64	[8199](https://github.com/ClickHouse/ClickHouse/pull/8199)	by @Enmk
+* Fixed `test_multiple_disks::test_kill_while_insert` a little	[8135](https://github.com/ClickHouse/ClickHouse/pull/8135)	by @excitoon
+* Test for issue #5142	[8190](https://github.com/ClickHouse/ClickHouse/pull/8190)	by @filimonov
+* Better logging in background move task.	[8192](https://github.com/ClickHouse/ClickHouse/pull/8192)	by @excitoon
+* Fixed metrics in `BackgroundProcessingPool`	[8194](https://github.com/ClickHouse/ClickHouse/pull/8194)	by @excitoon
+* Fixed flapping `test_ttl_move::test_moves_after_merges_work`	[8173](https://github.com/ClickHouse/ClickHouse/pull/8173)	by @excitoon
+* DateTime64 data type	[7170](https://github.com/ClickHouse/ClickHouse/pull/7170)	by @Enmk
+* Move parts between storage volumes according to configured TTL expressions	[8140](https://github.com/ClickHouse/ClickHouse/pull/8140)	by @excitoon
+* Fixed linker searching logic	[8139](https://github.com/ClickHouse/ClickHouse/pull/8139)	by @excitoon
+* Move parts between storage volumes according to configured TTL expressions	[7420](https://github.com/ClickHouse/ClickHouse/pull/7420)	by @excitoon
+* Fixed a typo	[8134](https://github.com/ClickHouse/ClickHouse/pull/8134)	by @excitoon
+* Better linking	[8115](https://github.com/ClickHouse/ClickHouse/pull/8115)	by @excitoon
+* FIxed behavior with ALTER MOVE ran immediately after merge finish moves superpart of specified	[8104](https://github.com/ClickHouse/ClickHouse/pull/8104)	by @excitoon
+* Ignore redundant copies of parts after move and restart	[7810](https://github.com/ClickHouse/ClickHouse/pull/7810)	by @excitoon
+* Removed `localtime` from `HTTPDictionarySource::getUpdateFieldAndDate…	[8042](https://github.com/ClickHouse/ClickHouse/pull/8042)	by @excitoon
+* Added `-D LINKER_NAME=lld` to instruction to sanitizers.	[8025](https://github.com/ClickHouse/ClickHouse/pull/8025)	by @excitoon
+* Kafka fixes	[8016](https://github.com/ClickHouse/ClickHouse/pull/8016)	by @filimonov
+* Added information about paths to `system.merges`.	[8043](https://github.com/ClickHouse/ClickHouse/pull/8043)	by @excitoon
+* Authentication in S3 table function and storage	[7623](https://github.com/ClickHouse/ClickHouse/pull/7623)	by @excitoon
+* Fix build with Poco Redis	[7835](https://github.com/ClickHouse/ClickHouse/pull/7835)	by @filimonov
+* [wip] attempt to improve kafka parsing performance 	[7935](https://github.com/ClickHouse/ClickHouse/pull/7935)	by @filimonov
+* ALTER to LowCardinality was leading to segfault on empty parts	[7985](https://github.com/ClickHouse/ClickHouse/pull/7985)	by @filimonov
+* Separated pool for background moves	[7670](https://github.com/ClickHouse/ClickHouse/pull/7670)	by @excitoon
+* Removed check for using `Date` or `DateTime` column from TTL expressions	[7920](https://github.com/ClickHouse/ClickHouse/pull/7920)	by @excitoon
+* Added disk info to `system.detached_parts`	[7833](https://github.com/ClickHouse/ClickHouse/pull/7833)	by @excitoon
+* Fixed errors with space reservation introduced in #7558 and #7602	[7873](https://github.com/ClickHouse/ClickHouse/pull/7873)	by @excitoon
+* Disable DwarfFDECache in libunwind	[7838](https://github.com/ClickHouse/ClickHouse/pull/7838)	by @filimonov
+* odbc table function now respects external_table_functions_use_nulls	[7506](https://github.com/ClickHouse/ClickHouse/pull/7506)	by @Enmk
+* Fixed bug with `keep_free_space_ratio` not being read from disks configuration	[7645](https://github.com/ClickHouse/ClickHouse/pull/7645)	by @excitoon
+* Fixed exception in case of using 1 argument while defining S3, URL and HDFS storages	[7618](https://github.com/ClickHouse/ClickHouse/pull/7618)	by @excitoon
+* Fixed comment in configuration of `test_multiple_disks`.	[7636](https://github.com/ClickHouse/ClickHouse/pull/7636)	by @excitoon
+* Fixed comment in configuration of `test_multiple_disks`.	[7636](https://github.com/ClickHouse/ClickHouse/pull/7636)	by @excitoon
+* Made `MergeTreeData::cloneAndLoadDataPart` only work for the same disk.	[7602](https://github.com/ClickHouse/ClickHouse/pull/7602)	by @excitoon
+* Made mutation to choose the same disk in `ReplicatedMergeTree`.	[7558](https://github.com/ClickHouse/ClickHouse/pull/7558)	by @excitoon
+* remove some obsolete notes about mutations	[7483](https://github.com/ClickHouse/ClickHouse/pull/7483)	by @filimonov
+* Add handling of SQL_TINYINT and SQL_BIGINT, fix SQL_FLOAT in ODBC Bridge	[7491](https://github.com/ClickHouse/ClickHouse/pull/7491)	by @traceon
+* Allowed to have some parts on destination disk or volume in MOVE PARTITION	[7434](https://github.com/ClickHouse/ClickHouse/pull/7434)	by @excitoon
+* Added integration test for #7414 (validation of `max_data_part_size_bytes`).	[7450](https://github.com/ClickHouse/ClickHouse/pull/7450)	by @excitoon
+* Fixed erroneous warning `max_data_part_size is too low`	[7423](https://github.com/ClickHouse/ClickHouse/pull/7423)	by @excitoon
+* Fixed NULL-values in nullable columns through ODBC-bridge	[7402](https://github.com/ClickHouse/ClickHouse/pull/7402)	by @Enmk
+* Fixing ThreadSanitizer data race error in the LIVE VIEW when accessing no_users_thread variable	[7353](https://github.com/ClickHouse/ClickHouse/pull/7353)	by @vzakaznikov
+* Fixing AddressSanitizer error in the LIVE VIEW getHeader() method.	[7271](https://github.com/ClickHouse/ClickHouse/pull/7271)	by @vzakaznikov
+* Fixed issue of using HTTP timeout as TCP timeout value.	[7351](https://github.com/ClickHouse/ClickHouse/pull/7351)	by @Enmk
+* Improved readability a little bit (`MergeTreeData::getActiveContainingPart`).	[7361](https://github.com/ClickHouse/ClickHouse/pull/7361)	by @excitoon
+* More performance test for Date and DateTime	[7332](https://github.com/ClickHouse/ClickHouse/pull/7332)	by @Enmk
+* A quick fix to resolve crash in LIVE VIEW table and re-enabling all LIVE VIEW tests.	[7201](https://github.com/ClickHouse/ClickHouse/pull/7201)	by @vzakaznikov
+* Minor doc fixes.	[7199](https://github.com/ClickHouse/ClickHouse/pull/7199)	by @excitoon
+* Fixed time calculation in `MergeTreeData`.	[7172](https://github.com/ClickHouse/ClickHouse/pull/7172)	by @excitoon
+* rpm: preserve existing configs on package upgrade	[7103](https://github.com/ClickHouse/ClickHouse/pull/7103)	by @filimonov
+* add obsoletes section to clickhouse-server spec	[7073](https://github.com/ClickHouse/ClickHouse/pull/7073)	by @filimonov
+* Adding performance test for huge pk (issue #6924)	[6980](https://github.com/ClickHouse/ClickHouse/pull/6980)	by @filimonov
+* performance test for lowcardinality array	[6930](https://github.com/ClickHouse/ClickHouse/pull/6930)	by @filimonov
+* Docs cleanup	[6859](https://github.com/ClickHouse/ClickHouse/pull/6859)	by @Enmk
+* Improvements for failover of Distributed queries	[6399](https://github.com/ClickHouse/ClickHouse/pull/6399)	by @Enmk
+* Better objects ownership in QueryMaskingRules	[6810](https://github.com/ClickHouse/ClickHouse/pull/6810)	by @filimonov
+* Fix some pvs reported issues	[6837](https://github.com/ClickHouse/ClickHouse/pull/6837)	by @filimonov
+* Ability to change history path by changing env	[6840](https://github.com/ClickHouse/ClickHouse/pull/6840)	by @filimonov
+* Query masking rules	[5710](https://github.com/ClickHouse/ClickHouse/pull/5710)	by @filimonov
+* Reduced children_mutex lock scope in IBlockInputStream	[6740](https://github.com/ClickHouse/ClickHouse/pull/6740)	by @Enmk
+* Fix live view no users thread	[6656](https://github.com/ClickHouse/ClickHouse/pull/6656)	by @vzakaznikov
+* Implemented hasTokenCaseInsensitive function	[6662](https://github.com/ClickHouse/ClickHouse/pull/6662)	by @Enmk
+* hasToken function implementation	[6596](https://github.com/ClickHouse/ClickHouse/pull/6596)	by @Enmk
+* remove doubled const TABLE_IS_READ_ONLY	[6566](https://github.com/ClickHouse/ClickHouse/pull/6566)	by @filimonov
+* Uninstrusive implementation of LIVE VIEW tables	[5541](https://github.com/ClickHouse/ClickHouse/pull/5541)	by @vzakaznikov
+* Fixed Gorilla encoding error on small sequences.	[6444](https://github.com/ClickHouse/ClickHouse/pull/6444)	by @Enmk
+* geohashesInbox(lon_min, lat_min, lon_max, lat_max, precision) function	[6127](https://github.com/ClickHouse/ClickHouse/pull/6127)	by @Enmk
+* Fixed Gorilla and DoubleDelta codec performance tests.	[6179](https://github.com/ClickHouse/ClickHouse/pull/6179)	by @Enmk
+* Docs enable optimize predicate expression	[6122](https://github.com/ClickHouse/ClickHouse/pull/6122)	by @filimonov
+* cmake - disallow switching ENABLE_MONGODB separate from ENABLE_POCO_MONGODB	[6077](https://github.com/ClickHouse/ClickHouse/pull/6077)	by @filimonov
+* configs for query masking rules tests	[6009](https://github.com/ClickHouse/ClickHouse/pull/6009)	by @filimonov
+* Fixed DoubleDelta encoding cases for random Int32 and Int64.	[5998](https://github.com/ClickHouse/ClickHouse/pull/5998)	by @Enmk
+* Fixed DoubleDelta codec edge case	[5824](https://github.com/ClickHouse/ClickHouse/pull/5824)	by @Enmk
+* fix macos build after #4828	[5830](https://github.com/ClickHouse/ClickHouse/pull/5830)	by @filimonov
+* fix build on macosx and gcc9	[5822](https://github.com/ClickHouse/ClickHouse/pull/5822)	by @filimonov
+* Gorilla column encoding	[5600](https://github.com/ClickHouse/ClickHouse/pull/5600)	by @Enmk
+* Small improvements for docs of Engine=Join	[5433](https://github.com/ClickHouse/ClickHouse/pull/5433)	by @filimonov
+* Changelog renames issues	[5428](https://github.com/ClickHouse/ClickHouse/pull/5428)	by @filimonov
+* more fixes for integration tests dockerfiles 	[5360](https://github.com/ClickHouse/ClickHouse/pull/5360)	by @filimonov
+* Several improvements in integration tests runner	[5340](https://github.com/ClickHouse/ClickHouse/pull/5340)	by @filimonov
+* Implementation of geohashEncode and geohashDecode functions;	[5003](https://github.com/ClickHouse/ClickHouse/pull/5003)	by @Enmk
+* IPv4 and IPv6 domain docs.	[5210](https://github.com/ClickHouse/ClickHouse/pull/5210)	by @Enmk
+* insert_sample_with_metadata small fixes in doc	[5121](https://github.com/ClickHouse/ClickHouse/pull/5121)	by @filimonov
+* add clickhouse-benchmark accepted stages names	[5006](https://github.com/ClickHouse/ClickHouse/pull/5006)	by @filimonov
+* Fixed test failures when running clickhouse-server on different host	[4713](https://github.com/ClickHouse/ClickHouse/pull/4713)	by @Enmk
+* Test runner script and corresponding Dockerfile and docker-compose.	[4347](https://github.com/ClickHouse/ClickHouse/pull/4347)	by @Enmk
+
+## 2018
+* Added support of int-based types: Int\UInt(8,16,32), Date, DateTime f…	[3123](https://github.com/ClickHouse/ClickHouse/pull/3123)	by @Enmk
+
+<hr>
+
+*© 2024-2026 Altinity Inc. All rights reserved. Altinity®, Altinity.Cloud®, and Altinity Stable Builds® are registered trademarks of Altinity, Inc. ClickHouse® is a registered trademark of ClickHouse, Inc.*
diff --git a/Antalya.md b/Antalya.md
new file mode 100644
index 000000000000..0d02ff8432c5
--- /dev/null
+++ b/Antalya.md
@@ -0,0 +1,92 @@
+| Feature                                                                    |                                          Altinity PR                                           | First Altinity Release | upstream PR | First upstream Release |
+|----------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------:|:----------------------:| :---: | :---: |
+|:arrow_forward:  SECURITY|                                                                                                |                        ||
+| Token-based authentication and authorization                               |https://github.com/Altinity/ClickHouse/pull/1078|        25.8.12         ||
+| ---                                                                        |
+|:arrow_forward:  PERFORMANCE|                                                                                                |                        ||
+| Distributed execution: better split tasks by row groups IDs                |https://github.com/Altinity/ClickHouse/pull/1237                        |        25.8.12         |https://github.com/ClickHouse/ClickHouse/pull/87508|25.11.1|
+| Enable parquet reader v3 by default                                        |https://github.com/Altinity/ClickHouse/pull/1232                        |        25.8.12         |https://github.com/ClickHouse/ClickHouse/pull/88827|25.11.1|
+| Set max message size on parquet v3 reader                                  |https://github.com/Altinity/ClickHouse/pull/1198                        |        25.8.12         |https://github.com/ClickHouse/ClickHouse/pull/91737|25.12.1|
+| ListObjectsV2 cache                                                        |https://github.com/Altinity/ClickHouse/pull/743                         |         25.2.2         ||
+| Lazy load metadata for metadata for DataLake                               |https://github.com/Altinity/ClickHouse/pull/742                         |         25.2.2         ||
+| Parquet file metadata caching: clear cache                                 |https://github.com/Altinity/ClickHouse/pull/713                         |         25.2.2         ||
+| Parquet file metadata caching                                              |https://github.com/Altinity/ClickHouse/pull/586                         |        24.12.2         ||
+| Parquet file metadata caching: use cache for parquetmetadata format        |https://github.com/Altinity/ClickHouse/pull/636                         |        24.12.2         ||
+| Parquet file metadata caching: turn cache on by default                    |https://github.com/Altinity/ClickHouse/pull/669, https://github.com/Altinity/ClickHouse/pull/674|        24.12.2         ||
+| ---                                                                        |
+|:arrow_forward:  SWARMS|                                                                                                |                        ||
+|Profile events for task distribution in ObjectStorageCluster requests|https://github.com/Altinity/ClickHouse/pull/1172|25.8.12||
+| SYSTEM STOP SWARM MODE command for graceful shutdown of swarm node|https://github.com/Altinity/ClickHouse/pull/1014|25.6.5||
+| JOIN with *Cluster table functions and swarm queries|https://github.com/Altinity/ClickHouse/pull/972|25.6.5||
+| Restart cluster tasks on connection lost|https://github.com/Altinity/ClickHouse/pull/780|25.6.5||
+| Add iceberg_metadata_file_path to query when send it to swarm nodes|https://github.com/Altinity/ClickHouse/pull/898|25.3.3||
+| Setting `lock_object_storage_task_distribution_ms` to improve cache locality with swarm cluster|https://github.com/Altinity/ClickHouse/pull/866|25.3.3||
+| Setting object_storage_max_nodes                                           |                        https://github.com/Altinity/ClickHouse/pull/677                         |         25.2.2         ||
+| Convert functions with object_storage_cluster setting to cluster functions |                        https://github.com/Altinity/ClickHouse/pull/712                         |         25.2.2         ||
+| Fix remote call of s3Cluster function                                      |                        https://github.com/Altinity/ClickHouse/pull/583                         |        24.12.2         ||
+| Limit parsing threads for distributed case                                  |                        https://github.com/Altinity/ClickHouse/pull/648                         |        24.12.2         ||
+| Distributed request to tables with Object Storage Engines                  |                        https://github.com/Altinity/ClickHouse/pull/615                         |        24.12.2         ||
+| ---                                                                        |
+|:arrow_forward:  CATALOGS|                                                                                                |                        ||
+|Google cloud storage support for data lakes|https://github.com/Altinity/ClickHouse/pull/1318|25.8.14|https://github.com/ClickHouse/ClickHouse/pull/93866|26.1.1||
+|Add metrics for Iceberg, S3, and Azure|https://github.com/Altinity/ClickHouse/pull/1123|25.8.9|https://github.com/ClickHouse/ClickHouse/pull/93332|
+|Add `icebergLocalCluster` table function to allow cluster reads from shared disk|https://github.com/Altinity/ClickHouse/pull/1120|25.8.9|https://github.com/ClickHouse/ClickHouse/pull/93323|26.1.1|
+|Setting `iceberg_timezone_for_timestamptz` for Iceberg TimestampTZ type|https://github.com/Altinity/ClickHouse/pull/1103|25.8.9||
+|Allow to read Iceberg data from any location|https://github.com/Altinity/ClickHouse/pull/1092|25.8.9||
+|Read optimization using Iceberg metadata|https://github.com/Altinity/ClickHouse/pull/1019|25.8.9||
+|Lazy load metadata for metadata for DataLake|https://github.com/Altinity/ClickHouse/pull/742|25.8.9||
+| Expose IcebergS3 table metainformation in system.tables|https://github.com/Altinity/ClickHouse/pull/959|25.6.5||
+| Support different warehouses behind Iceberg REST catalog|https://github.com/Altinity/ClickHouse/pull/860|25.3.3||
+| General engine definition for Iceberg tables                               |                        https://github.com/Altinity/ClickHouse/pull/675                         |         25.2.2         ||
+| RBAC for S3                                                                |                        https://github.com/Altinity/ClickHouse/pull/688                         |         25.2.2         ||
+| ---                                                                        |
+|:arrow_forward:  TIERED STORAGE|                                                                                                |                        ||
+|Add query id to system.part_log, system_exports and system.replicated_partition_exports|https://github.com/Altinity/ClickHouse/pull/1330|25.8.14||
+|Allow merge tree materialized / alias columns to be exported through part export|https://github.com/Altinity/ClickHouse/pull/1324|25.8.14||
+|Accept table function as destination for part export|https://github.com/Altinity/ClickHouse/pull/1320|25.8.14||
+|Add settings to control the behavior of pending mutations / patch parts on the export part feature|https://github.com/Altinity/ClickHouse/pull/1294|25.8.14||
+|Add support for ALIAS columns in segments for `engine=Hybrid`|https://github.com/Altinity/ClickHouse/pull/1272|25.8.14||
+|Add ability to split large parquet files on part export|https://github.com/Altinity/ClickHouse/pull/1229|25.8.12||
+|Add experimental support to automatically reconcile column-type mismatches across segments in Hybrid table engine |https://github.com/Altinity/ClickHouse/pull/1156|25.8.9||
+|Preserve the entire format settings object in export part manifest|https://github.com/Altinity/ClickHouse/pull/1144|25.8.9||
+|Export partition support for ReplicatedMergeTree engine|https://github.com/Altinity/ClickHouse/pull/1124|25.8.9||
+|Allow any partition strategy to accept part export|https://github.com/Altinity/ClickHouse/pull/1083|25.8.9||
+|`Engine=hybrid` implementation|https://github.com/Altinity/ClickHouse/pull/1071|25.8.9||
+|Add observability for EXPORT PART|https://github.com/Altinity/ClickHouse/pull/1017|25.6.5||
+| Simple MergeTree part export to object storage|https://github.com/Altinity/ClickHouse/pull/1009|25.6.5||
+| s3Cluster hive partitioning for old analyzer                               |                        https://github.com/Altinity/ClickHouse/pull/703                         |         25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/93284|
+| s3Cluster hive partitioning                                                |                        https://github.com/Altinity/ClickHouse/pull/584                         |        24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/73910|
+| ---                                                                        |
+|:left_right_arrow:  Feature parity in the latest Antalya release  :left_right_arrow:|||       
+| ---                                                                        |
+| Allow key-value arguments in s3/s3cluster engine                  |https://github.com/Altinity/ClickHouse/pull/1028					 |25.6.5|https://github.com/ClickHouse/ClickHouse/pull/85134|25.8.1|
+| AWS S3 authentication with an explicitly provided IAM role        |https://github.com/Altinity/ClickHouse/pull/986           |25.6.5         |https://github.com/ClickHouse/ClickHouse/pull/84011|25.8.1|
+| Support for hive partition style reads and writes                 |https://github.com/Altinity/ClickHouse/pull/934					 |25.6.5|https://github.com/ClickHouse/ClickHouse/pull/76802|25.8.1|
+| Support compressed metadata in Iceberg                            |https://github.com/Altinity/ClickHouse/pull/1005					 |25.6.5|https://github.com/ClickHouse/ClickHouse/pull/81451|25.7.1|
+| Support TimestampTZ in Glue catalog                               |https://github.com/Altinity/ClickHouse/pull/992					 |25.6.5|https://github.com/ClickHouse/ClickHouse/issues/83132|25.7.1|
+| Support writing parquet enum as byte array                        |https://github.com/Altinity/ClickHouse/pull/989           |25.6.5         |https://github.com/ClickHouse/ClickHouse/pull/81090|25.7.1|
+| Iceberg table pruning in cluster requests                         |https://github.com/Altinity/ClickHouse/pull/770           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/82131|25.7.1|
+| Support for Iceberg partition pruning bucket transform            |https://github.com/Altinity/ClickHouse/pull/786					 |25.3.3|https://github.com/ClickHouse/ClickHouse/pull/79262|25.5.1|
+| Improve performance of hive path parsing                          |https://github.com/Altinity/ClickHouse/pull/734           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/79067|25.5.1|
+| Iceberg metadata files cache                                      |https://github.com/Altinity/ClickHouse/pull/733           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/77156 |25.5.1|
+| Rendezvous hashing filesystem cache                               |https://github.com/Altinity/ClickHouse/pull/709           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/77326|25.5.1|
+| Better S3 URL parsing for Hive partitioning                       |https://github.com/Altinity/ClickHouse/pull/700           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/78185|25.5.1|
+| Support MinMax index for Iceberg                                  |https://github.com/Altinity/ClickHouse/pull/733           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/78242|25.4.1|
+| Support partition pruning in DeltaLake engine                     |https://github.com/Altinity/ClickHouse/pull/733           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/78486|25.4.1|
+| Iceberg time travel by snapshots                                  |https://github.com/Altinity/ClickHouse/pull/733           |25.2.2         |https://github.com/ClickHouse/ClickHouse/pull/77439|25.4.1|
+| Cluster auto discovery                                            |https://github.com/Altinity/ClickHouse/pull/629           |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/76001|25.3.1|
+| Alternative syntax for object storage cluster functions           |https://github.com/Altinity/ClickHouse/pull/592           |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/70659|25.3.1|
+| Unity catalog integration                                         |same as upstream =>                                       |25.3.3         |https://github.com/ClickHouse/ClickHouse/pull/76988|25.3.1|
+| Glue catalog integration                                          |same as upstream =>                                       |25.3.3         |https://github.com/ClickHouse/ClickHouse/pull/77257|25.3.1|
+| Parquet: merge bloom filter and min/max evaluation                |https://github.com/Altinity/ClickHouse/pull/590           |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/71383|25.2.1|
+| Parquet: Int logical type support on native reader                |https://github.com/Altinity/ClickHouse/pull/589           |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/72105|25.1.1|
+| Iceberg REST Catalog integration                                  |same as upstream =>                                       |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/71542|24.12.1|
+| Parquet: boolean support on native reader                         |same as upstream =>                                       |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/71055|24.11.1|
+| Auxiliary autodiscovery                                           |https://github.com/Altinity/ClickHouse/pull/531           |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/71911|24.11.1|
+| Parquet: bloom filters support                                    |same as upstream =>                                       |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/62966|24.10.1|
+| Parquet: page header v2 support on native reader                  |same as upstream =>                                       |24.12.2         |https://github.com/ClickHouse/ClickHouse/pull/70807|24.10.1|
+
+
+<hr>
+
+*© 2024-2026 Altinity Inc. All rights reserved. Altinity®, Altinity.Cloud®, and Altinity Stable Builds® are registered trademarks of Altinity, Inc. ClickHouse® is a registered trademark of ClickHouse, Inc.*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aef325675c83..80e84e5061c6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,22 +1,86 @@
-# Contributing to ClickHouse
+# Contributing to The Antalya Project
 
-ClickHouse is an open project to which you can contribute in many ways, for example, with ideas, code, or documentation.
-We appreciate all efforts that help to make the project better.
+The Antalya branch of ClickHouse is an open project, and you can contribute to it in many ways. You can help with ideas, code, or documentation. We appreciate any efforts that help us to make the project better. 
 
 Thank you!
 
 ## Legal Info
 
-When you open your first pull request in the ClickHouse repository, a bot will ask to accept the ClickHouse Individual CLA (Contributor License Agreement).
-Please review and sign it.
+The Antalya Project uses a [Developer Certificate of Origin (DCO)](https://developercertificate.org/) to sign off that you have the right to contribute the code being contributed. The full text of the DCO reads:
 
-Optionally, to make contributions even more tight legally, your employer as a legal entity may want to sign a ClickHouse Corporate CLA with ClickHouse, Inc.
-If you're interested to do so, contact us at [legal@clickhouse.com](mailto:legal@clickhouse.com).
+```text
+Developer Certificate of Origin
+Version 1.1
 
-## Technical Information
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
 
-See [ClickHouse - Lightning Fast Analytics for Everyone](https://www.vldb.org/pvldb/vol17/p3731-schulze.pdf) and [Architecture](https://clickhouse.com/docs/development/architecture/) for an overview of ClickHouse's internals.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 
-[This](https://clickhouse.com/docs/development/developer-instruction) and [this](https://clickhouse.com/docs/development/build) document describe how to check out and compile the source code of ClickHouse.
 
-If you want to contribute to documentation, please see the [documentation repository](https://github.com/ClickHouse/clickhouse-docs).
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+Every commit needs to have `signed-off-by` added to it with a message like:
+
+```text
+Signed-off-by: Joe Smith <joe.smith@example.com>
+```
+
+Git makes doing this fairly straightforward. First, please use your real name (sorry, no pseudonyms or anonymous contributions).
+
+If you set your `user.name` and `user.email` in your git configuration, you can sign your commit automatically with `git commit -s` or `git commit --signoff`.
+
+Signed commits in the git log will look something like:
+
+```text
+Author: Joe Smith <joe.smith@example.com>
+Date:   Thu Jan 2 11:41:15 2026 -0800
+
+    Update README
+
+    Signed-off-by: Joe Smith <joe.smith@example.com>
+```
+
+Notice how the `Author` and `Signed-off-by` lines match. If they do not match the PR will be rejected by the automated DCO check.
+
+If more than one person contributed to a commit, there can be more than one `Signed-off-by` line where each line is a sign-off from a different person who contributed to the commit.
+
+Optionally, to make contributions even more tight legally, your employer as a legal entity may want to sign an Altinity Corporate DCO with Altinity, Inc. If you're interested to do so, contact us at [legal@altinity.com](mailto:legal@altinity.com).
+
+## Technical Info
+
+There is a [developer's guide](https://clickhouse.com/docs/en/development/developer_instruction/) for writing code for ClickHouse. Besides this guide, you can find an [Overview of ClickHouse Architecture](https://clickhouse.com/docs/en/development/architecture/) and instructions on how to build ClickHouse in different environments.
+
+If you want to contribute to documentation, read the [Contributing to ClickHouse Documentation](docs/README.md) guide.
+
+<hr> 
+
+*© 2024-2026 Altinity Inc. All rights reserved. Altinity®, Altinity.Cloud®, and Altinity Stable Builds® are registered trademarks of Altinity, Inc. ClickHouse® is a registered trademark of ClickHouse, Inc.*
diff --git a/README.md b/README.md
index a50b27c7d7c3..6593042cc2c0 100644
--- a/README.md
+++ b/README.md
@@ -1,114 +1,97 @@
 <div align=center>
 
-[![Website](https://img.shields.io/website?up_message=AVAILABLE&down_message=DOWN&url=https%3A%2F%2Fclickhouse.com&style=for-the-badge)](https://clickhouse.com)
+[![Website](https://img.shields.io/website?up_message=AVAILABLE&down_message=DOWN&url=https://docs.altinity.com/altinitystablebuilds&style=for-the-badge)](https://docs.altinity.com/altinitystablebuilds/)
 [![Apache 2.0 License](https://img.shields.io/badge/license-Apache%202.0-blueviolet?style=for-the-badge)](https://www.apache.org/licenses/LICENSE-2.0)
 
 <picture align=center>
-    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/ClickHouse/clickhouse-docs/assets/9611008/4ef9c104-2d3f-4646-b186-507358d2fe28">
-    <source media="(prefers-color-scheme: light)" srcset="https://github.com/ClickHouse/clickhouse-docs/assets/9611008/b001dc7b-5a45-4dcd-9275-e03beb7f9177">
-    <img alt="The ClickHouse company logo." src="https://github.com/ClickHouse/clickhouse-docs/assets/9611008/b001dc7b-5a45-4dcd-9275-e03beb7f9177">
+    <source media="(prefers-color-scheme: dark)" srcset="/docs/logo_horizontal_blue_white.png">
+    <source media="(prefers-color-scheme: light)" srcset="/docs/logo_horizontal_blue_black.png">
+    <img alt="Altinity company logo" src="/docs/logo_horizontal_blue_black.png">
 </picture>
 
-<h4>ClickHouse® is an open-source column-oriented database management system that allows generating analytical data reports in real-time.</h4>
-
 </div>
 
-## How To Install (Linux, macOS, FreeBSD)
 
-```
-curl https://clickhouse.com/ | sh
-```
+<h1>Project Antalya Builds</h1>
+
+**Project Antalya Builds** extend ClickHouse® code to improve cost-efficiency, performance, and scalability of real-time analytic systems through deep integration with data lakes. We're delivering a new foundation of real-time analytics that will operate for the next decade.
+
+- Fast I/O for Parquet files on S3 to match MergeTree performance
+- Iceberg tables as performant shared storage that is 10x cheaper than replicated block storage
+- Swarm clusters of stateless servers for scalable, cheap, and fast query response
+- Tiered storage to archive MergeTree cold data automatically to efficient, fast Iceberg data (In Development)
+- 100% open source with full compatibility with existing ClickHouse features
+
+Here are links for more information.
+- [Getting Started with Altinity’s Project Antalya blog article](https://altinity.com/blog/getting-started-with-altinitys-project-antalya)
+- [Project Antalya official documentation](https://docs.altinity.com/altinityantalya/)
+- [Feature matrix](Antalya.md)
+- Project roadmap
+  - [2026](https://github.com/Altinity/ClickHouse/issues/1359)
+  - [2025](https://github.com/Altinity/ClickHouse/issues/804)
+- [Github releases](https://github.com/Altinity/ClickHouse/releases?q=altinityantalya&expanded=false)
+- [Docker images](https://hub.docker.com/r/altinity/clickhouse-server/tags?page=1&name=altinityantalya)
+- [Packages](https://builds.altinity.cloud/#altinityantalya)
+- [Log an Issue](https://github.com/Altinity/ClickHouse/issues)
+
+We gladly welcome pull requests. Join the [AltinityDB slack workspace](https://altinity.com/slack)
+for help getting started.
+
+<h1>Altinity Stable Builds®</h1>
+
+**Altinity Stable Builds** are builds of ClickHouse® intended for reliable enterprise use with long intervals
+between major upgrades. Builds undergo rigorous testing to verify security and readiness for production
+use. Among other things, they are:
+
+* Supported for three years
+* Validated against client libraries and visualization tools
+* Supplied with careful release notes, with special attention to upgrade
+* Tested for cloud use, including Kubernetes
+* 100% open source and 100% compatible with ClickHouse upstream builds
+* Available in FIPS-compatible versions
+
+Here links for more information.
+
+- [Altinity Stable official documentation](https://docs.altinity.com/altinitystablebuilds/)
+- [github releases](https://github.com/Altinity/ClickHouse/releases?q=altinitystable&expanded=false)
+- [docker images](https://hub.docker.com/r/altinity/clickhouse-server/tags?page=1&name=altinitystable)
+- [packages](https://builds.altinity.cloud/#altinitystable)
+
+**We encourage you to use Altinity Stable Builds whether you're an Altinity Support customer or not.**
+
+## Acknowledgement
+
+We at Altinity, Inc. are thoroughly grateful to the worldwide ClickHouse community, including the core committers who make ClickHouse the world's best analytics database.
+
+## What should I do if I find a bug in an Altinity Stable Build?
+
+ClickHouse’s thousands of core features are all well-tested and stable. To maintain that stability, Altinity Stable Builds are built with a CI system that runs tens of thousands of tests against every commit. But of course, things can always go wrong. If that happens, let us know! **We stand behind our work.**
+
+### If you're an Altinity customer:
+
+1. [Contact Altinity support](https://docs.altinity.com/support/) to file an issue.
+
+### If you're not an Altinity customer:
+
+1. Try to upgrade to the latest bugfix release. If you’re using v23.8.8 but you know that v23.8.11.29 exists, start by upgrading to the bugfix. Upgrades to the latest maintenance releases are smooth and safe.
+2. Look for similar issues in the [Altinity/ClickHouse](https://github.com/Altinity/ClickHouse/issues) or [ClickHouse/ClickHouse](https://github.com/ClickHouse/ClickHouse/issues) repos; it's possible the problem has been logged and a fix is on the way.
+3. If you can reproduce the bug, try to isolate it. For example, remove pieces of a failing query one by one, creating the simplest scenario where the error still occurs. Creating [a minimal reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) is a huge step towards a solution.
+4. [File an issue](https://github.com/Altinity/ClickHouse/issues/new/choose) in the Altinity/ClickHouse repo.
 
 ## Useful Links
 
-* [Official website](https://clickhouse.com/) has a quick high-level overview of ClickHouse on the main page.
-* [ClickHouse Cloud](https://clickhouse.cloud) ClickHouse as a service, built by the creators and maintainers.
-* [Tutorial](https://clickhouse.com/docs/getting_started/tutorial/) shows how to set up and query a small ClickHouse cluster.
-* [Documentation](https://clickhouse.com/docs/) provides more in-depth information.
-* [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
-* [Slack](https://clickhouse.com/slack) and [Telegram](https://telegram.me/clickhouse_en) allow chatting with ClickHouse users in real-time.
-* [Blog](https://clickhouse.com/blog/) contains various ClickHouse-related articles, as well as announcements and reports about events.
-* [Bluesky](https://bsky.app/profile/clickhouse.com) and [X](https://x.com/ClickHouseDB) for short news.
-* [Code Browser (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlighting, powered by github.dev.
-* [Contacts](https://clickhouse.com/company/contact) can help to get your questions answered if there are any.
-
-## Monthly Release & Community Call
-
-Join us for the [ClickHouse **25.8** Community Call](https://clickhouse.com/company/events/v25-8-community-release-call) happening on August 28.
-
-ClickHouse **Release 25.7** is published! This release included [Lightweight Updates](https://clickhouse.com/docs/sql-reference/statements/update), Iceberg INSERT support, AI for clickhouse-client and many more. [Presentation](https://presentations.clickhouse.com/2025-release-25.7/), [Video](https://www.youtube.com/watch?v=P1TsTzktl0Q), [Changelog](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md#257).
-
-## Upcoming Events
-
-Keep an eye out for upcoming meetups and events around the world.
-Somewhere else you want us to be?
-Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
-You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
-
-Upcoming meetups
-* [San Francisco Meetup](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/310320777) - August 26,2025
-* [Toronto Meetup](https://www.meetup.com/clickhouse-toronto-user-group/events/310164482/) - September 3, 2025
-* [Raleigh Meetup](https://www.meetup.com/clickhouse-nc-meetup-group/events/310348573/) - September 4, 2025
-* [New York AI Meetup + Docker](https://www.meetup.com/clickhouse-new-york-user-group/events/310320693) - September 9, 2025
-* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/309165659) - September 9, 2025
-* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/310122820) - September 16, 2025
-* [Boston Meetup](https://www.meetup.com/clickhouse-boston-user-group/events/310536674) - September 16,2025
-* [Madrid Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/310124151) - September 30, 2025
-* [Barcelona Meetup](https://www.meetup.com/clickhouse-barcelona-user-group/events/310123657) - October 1, 2025
-* [Iceberg SF Meetup](https://lu.ma/hbt7ahud) - October 1,2025
-* [Zurich Meetup](https://www.meetup.com/clickhouse-switzerland-meetup-group/events/310154432) - October 9, 2025
-* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/310154576) - October 15, 2025
-* [Cyprus Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/310154624) - November 20, 2025
-
-Recent meetups
-* [Manaila Meetup w/ Confluent](https://www.meetup.com/clickhouse-philippines-meetup-group/events/310101137/) - August 13, 2025
-* [Sao Paulo Meetup](https://www.meetup.com/clickhouse-brasil-user-group/events/309874439) - August 12, 2025
-* [Buenos Aires Meetup](https://www.meetup.com/clickhouse-latinoamerica/events/308819423/) - August 7, 2025
-* [Seoul Meetup w/ Druid](https://www.meetup.com/druid-seoul/events/310099732/) - August 7, 2025
-* [Jakarta Meetup](https://www.meetup.com/clickhouse-indonesia-user-group/events/309468074/) - August 6, 2025
-* [Bogota Meetup](https://www.meetup.com/clickhouse-latinoamerica/events/308819394/) - August 5, 2025
-* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/309004297/) - July 29, 2025
-* [Hong Kong Meetup](https://www.meetup.com/clickhouse-hong-kong-meetup-group/events/308568412/) - July 17, 2025
-* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/307627675/) - July 15, 2025
-* [Los Gatos Meetup](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/308546075) - July 10, 2025
-* [Philadelphia Meetup](https://www.meetup.com/clickhouse-philadelphia-user-group/events/308333554/) - July 10, 2025
-* [Atlanta Meetup](https://www.meetup.com/clickhouse-atlanta-meetup-group/events/307627590/) - July 8, 2025
-* [Perth Meetup](https://www.meetup.com/clickhouse-perth-user-group/events/308421971/) - July 2, 2025
-* [ClickHouse + Docker AI Night](https://lu.ma/g9nhgnlh) - July 1st 2025
-* [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/308323519/) - June 27, 2025
-* [Denver Meetup](https://lu.ma/j7qm8o6i) - June 26, 2025
-* [Amsterdam Meetup](https://www.meetup.com/clickhouse-netherlands-user-group/events/308053051/) - June 25, 2025
-* [Berlin Meetup](https://www.meetup.com/clickhouse-berlin-user-group/events/307866586/) - June 24, 2025
-* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/308248552/) - June 19, 2025
-* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/308053030/) - June 19, 2025
-* [Singapore Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/307819236) - June 17, 2025
-* [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/307622954/) - June 12, 2025
-* [Cyprus Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/307819236) - June 10, 2025
-* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/307689645/) - June 5, 2025
-* [Belgium Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/307818346/) - May 20, 2025
-* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
-* [Shenzhen Meetup](https://www.huodongxing.com/event/7803892350511) - May 17, 2025
-* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
-* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
-* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
-
-
-
-
-
-
-## Recent Recordings
-
-* **Recent Meetup Videos**: [Meetup Playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3iNDUzpY1S3L_iV4nARda_U) Whenever possible recordings of the ClickHouse Community Meetups are edited and presented as individual talks. 
-* **Recording available**: [**v25.3 LTS Release Call**](https://www.youtube.com/watch?v=iCKEzp0_Z2Q) All the features of 25.3 LTS, one convenient video! Watch it now!
-
- ## Interested in joining ClickHouse and making it your full-time job?
-
-We are a globally diverse and distributed team, united behind a common goal of creating industry-leading, real-time analytics.
-Here, you will have an opportunity to solve some of the technical challenges and have direct ownership of your work and vision.
-If you are a contributor by nature, a thinker and a doer - we’ll definitely click!
-
-Check out our **current openings** here: https://clickhouse.com/company/careers
-
-Can't find what you are looking for, but want to let us know you are interested in joining ClickHouse?
-Email careers@clickhouse.com!
+* [Release notes](https://docs.altinity.com/releasenotes/altinity-stable-release-notes/) - Complete details on the changes and fixes in each Altinity Stable Build release
+* [Builds page](https://builds.altinity.cloud/) - Download and installation instructions for Altinity Stable Builds
+* [Dockerhub page](https://hub.docker.com/r/altinity/clickhouse-server) - Home of the Altinity Stable Build container images
+* [Knowledge base](https://kb.altinity.com/) - Insight, knowledge, and advice from the Altinity Engineering and Support teams
+* [Documentation](https://docs.altinity.com/altinitystablebuilds/) - A list of current releases and their lifecycles
+* [Altinity support for ClickHouse](https://altinity.com/clickhouse-support/) - The best ClickHouse support in the industry, delivered by the most knowledgeable ClickHouse team in the industry
+* [Altinity administrator training for ClickHouse](https://altinity.com/clickhouse-training/) - Understand how ClickHouse works, not just how to use it
+* [Altinity blog](https://altinity.com/blog/) - The latest news on Altinity's ClickHouse-related projects, release notes, tutorials, and more
+* [Altinity YouTube channel](https://www.youtube.com/@AltinityB) - ClickHouse tutorials, webinars, conference presentations, and other useful things
+* [Altinity Slack channel](https://altinitydbworkspace.slack.com/join/shared_invite/zt-1togw9b4g-N0ZOXQyEyPCBh_7IEHUjdw#/shared-invite/email) - The Altinity Slack channel
+
+
+<hr>
+
+*© 2024-2026 Altinity Inc. All rights reserved. Altinity®, Altinity.Cloud®, and Altinity Stable® are registered trademarks of Altinity, Inc. ClickHouse® is a registered trademark of ClickHouse, Inc.; Altinity is not affiliated with or associated with ClickHouse, Inc.*
diff --git a/SECURITY.md b/SECURITY.md
index c5eafb5d086b..dd7f45f18bcf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,87 +1,34 @@
-<!--
-the file is autogenerated by utils/security-generator/generate_security.py
--->
+# Altinity Security Policy
 
-# ClickHouse Security Vulnerability Response Policy
-
-## Security Change Log and Support
-
-Details regarding security fixes are publicly reported in our [security changelog](https://clickhouse.com/docs/whats-new/security-changelog/). A summary of known security vulnerabilities is shown at the bottom of this page.
-
-Vulnerability notifications pre-release or during embargo periods are available to open source users and support customers registered for vulnerability alerts. Refer to our [Embargo Policy](#embargo-policy) below.
-
-The following versions of ClickHouse server are currently supported with security updates:
-
-| Version | Supported |
-|:-|:-|
-| 25.7 | ✔️ |
-| 25.6 | ✔️ |
-| 25.5 | ✔️ |
-| 25.4 | ❌ |
-| 25.3 | ✔️ |
-| 25.2 | ❌ |
-| 25.1 | ❌ |
-| 24.12 | ❌ |
-| 24.11 | ❌ |
-| 24.10 | ❌ |
-| 24.9 | ❌ |
-| 24.8 | ✔️ |
-| 24.7 | ❌ |
-| 24.6 | ❌ |
-| 24.5 | ❌ |
-| 24.4 | ❌ |
-| 24.3 | ❌ |
-| 24.2 | ❌ |
-| 24.1 | ❌ |
-| 23.* | ❌ |
-| 22.* | ❌ |
-| 21.* | ❌ |
-| 20.* | ❌ |
-| 19.* | ❌ |
-| 18.* | ❌ |
-| 1.* | ❌ |
+We're extremely grateful for security researchers and users that report vulnerabilities to the ClickHouse® Open Source Community in general and Altinity in particular. All reports are thoroughly investigated by developers.
 
 ## Reporting a Vulnerability
 
-We're extremely grateful for security researchers and users that report vulnerabilities to the ClickHouse Open Source Community. All reports are thoroughly investigated by developers.
-
-To report a potential vulnerability in ClickHouse please send the details about it through our public bug bounty program hosted by [Bugcrowd](https://bugcrowd.com/clickhouse) and be rewarded for it as per the program scope and rules of engagement.
+To report a potential vulnerability, send the details of the potential vulnerability to [security@altinity.com](mailto:security@altinity.com).
 
 ### When Should I Report a Vulnerability?
 
-- You think you discovered a potential security vulnerability in ClickHouse
-- You are unsure how a vulnerability affects ClickHouse
+- You think you discovered a potential security vulnerability in an Altinity Stable Build
+- You are unsure how a vulnerability affects ClickHouse or an Altinity Stable Build
 
 ### When Should I NOT Report a Vulnerability?
 
-- You need help tuning ClickHouse components for security
+- You need help tuning your system for security
 - You need help applying security related updates
 - Your issue is not security related
 
 ## Security Vulnerability Response
 
-Each report is acknowledged and analyzed by ClickHouse maintainers within 5 working days.
-As the security issue moves from triage, to identified fix, to release planning we will keep the reporter updated.
+Each report sent to Altinity is acknowledged and analyzed within five working days. The result of our analysis may be to pass the report on to ClickHouse.com, at which point [their security policies](https://github.com/clickhouse/clickhouse/SECURITY.md) apply.
 
 ## 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 the report date to disclosure date to be on the order of 7 days.
-
-## Embargo Policy
-
-Open source users and support customers may subscribe to receive alerts during the embargo period by visiting [https://trust.clickhouse.com/?product=clickhouseoss](https://trust.clickhouse.com/?product=clickhouseoss), requesting access and subscribing for alerts. Subscribers agree not to make these notifications public, issue communications, share this information with others, or issue public patches before the disclosure date. Accidental disclosures must be reported immediately to trust@clickhouse.com. Failure to follow this policy or repeated leaks may result in removal from the subscriber list.
+If the vulnerability is verified as a threat and it applies only to code maintained by Altinity, a public disclosure date will be negotiated by Altinity and the bug submitter. We prefer to fully disclose the vulnerability as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the vulnerability, fix, or mitigation 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.
 
-Participation criteria:
-1. Be a current open source user or support customer with a valid corporate email domain (no @gmail.com, @azure.com, etc.).
-1. Sign up to the ClickHouse OSS Trust Center at [https://trust.clickhouse.com](https://trust.clickhouse.com).
-1. Accept the ClickHouse Security Vulnerability Response Policy as outlined above.
-1. Subscribe to ClickHouse OSS Trust Center alerts.
+## Scope and Supported Versions
 
-Removal criteria:
-1. Members may be removed for failure to follow this policy or repeated leaks.
-1. Members may be removed for bounced messages (mail delivery failure).
-1. Members may unsubscribe at any time.
+For complete information about which Altinity Stable Builds are available and supported, see [the Altinity Stable Builds Lifecycle Table](https://docs.altinity.com/altinitystablebuilds/#altinity-stable-builds-lifecycle-table) in the Altinity Documentation. 
 
-Notification process:
-ClickHouse will post notifications within our OSS Trust Center and notify subscribers. Subscribers must log in to the Trust Center to download the notification. The notification will include the timeframe for public disclosure.
+<hr>
 
+*© 2024-2026 Altinity Inc. All rights reserved. Altinity®, Altinity.Cloud®, and Altinity Stable Builds® are registered trademarks of Altinity, Inc. ClickHouse® is a registered trademark of ClickHouse, Inc.*
diff --git a/base/poco/Foundation/include/Poco/Exception.h b/base/poco/Foundation/include/Poco/Exception.h
index 59a31e77c3cb..9efd824ebec0 100644
--- a/base/poco/Foundation/include/Poco/Exception.h
+++ b/base/poco/Foundation/include/Poco/Exception.h
@@ -84,7 +84,7 @@ class Foundation_API Exception : public std::exception
     /// The copy can later be thrown again by
     /// invoking rethrow() on it.
 
-    virtual void rethrow() const;
+    [[noreturn]] virtual void rethrow() const;
     /// (Re)Throws the exception.
     ///
     /// This is useful for temporarily storing a
diff --git a/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h b/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h
index d5263319ed38..604e66da5786 100644
--- a/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h
+++ b/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h
@@ -45,7 +45,7 @@ namespace Net
         ~HTTPChunkedStreamBuf();
         void close();
 
-        bool isComplete(bool read_from_device_to_check_eof = false);
+        bool isComplete(bool read_from_device_to_check_eof = false) noexcept;
 
     protected:
         int readFromDevice(char * buffer, std::streamsize length);
diff --git a/base/poco/Net/include/Poco/Net/SocketImpl.h b/base/poco/Net/include/Poco/Net/SocketImpl.h
index 03aba600c349..3fe1813f2bd1 100644
--- a/base/poco/Net/include/Poco/Net/SocketImpl.h
+++ b/base/poco/Net/include/Poco/Net/SocketImpl.h
@@ -487,6 +487,7 @@ namespace Net
         bool _isBrokenTimeout;
 
         static constexpr size_t THROTTLER_QUANTUM = 32 * 1024;
+        static constexpr size_t THROTTLER_MAX_BLOCK_NS = 20'000'000'000ull;
         size_t _recvThrottlerBudget;
         size_t _sndThrottlerBudget;
         ThrottlerPtr _recvThrottler;
diff --git a/base/poco/Net/src/HTTPChunkedStream.cpp b/base/poco/Net/src/HTTPChunkedStream.cpp
index 043c38ce9e71..ca0b73128ff4 100644
--- a/base/poco/Net/src/HTTPChunkedStream.cpp
+++ b/base/poco/Net/src/HTTPChunkedStream.cpp
@@ -140,7 +140,7 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 }
 
 
-bool HTTPChunkedStreamBuf::isComplete(bool read_from_device_to_check_eof)
+bool HTTPChunkedStreamBuf::isComplete(bool read_from_device_to_check_eof) noexcept
 {
 	if (read_from_device_to_check_eof)
 	{
@@ -150,7 +150,7 @@ bool HTTPChunkedStreamBuf::isComplete(bool read_from_device_to_check_eof)
 			/// "Unexpected EOF" exception would be thrown
 			readFromDevice(nullptr, 0);
 		}
-		catch (Poco::Net::MessageException &)
+		catch (...)
 		{
 			return false;
 		}
diff --git a/base/poco/Net/src/SocketImpl.cpp b/base/poco/Net/src/SocketImpl.cpp
index a92556f1b235..046bb3a667cd 100644
--- a/base/poco/Net/src/SocketImpl.cpp
+++ b/base/poco/Net/src/SocketImpl.cpp
@@ -1073,12 +1073,7 @@ void SocketImpl::throttleSend(size_t length, bool blocking)
 	{
 		size_t amount = length < THROTTLER_QUANTUM ? THROTTLER_QUANTUM : length;
 		if (blocking)
-		{
-			if (_sndTimeout.totalMicroseconds() != 0) // Avoid throttling over socket send timeout
-				_sndThrottler->throttle(amount, _sndTimeout.totalMicroseconds() * 1000 / 2);
-			else
-				_sndThrottler->throttle(amount);
-		}
+			_sndThrottler->throttle(amount, THROTTLER_MAX_BLOCK_NS);
 		else
 			_sndThrottler->throttle(amount, 0);
 		_sndThrottlerBudget += amount;
@@ -1092,12 +1087,7 @@ void SocketImpl::throttleRecv(size_t length, bool blocking)
 	{
 		size_t amount = length < THROTTLER_QUANTUM ? THROTTLER_QUANTUM : length;
 		if (blocking)
-		{
-			if (_recvTimeout.totalMicroseconds() != 0) // Avoid throttling over socket receive timeout
-				_recvThrottler->throttle(amount, _recvTimeout.totalMicroseconds() * 1000 / 2);
-			else
-				_recvThrottler->throttle(amount);
-		}
+			_recvThrottler->throttle(amount, THROTTLER_MAX_BLOCK_NS);
 		else
 			_recvThrottler->throttle(amount, 0);
 		_recvThrottlerBudget += amount;
diff --git a/base/poco/XML/include/Poco/XML/expat.h b/base/poco/XML/include/Poco/XML/expat.h
index 30c7de08cbb0..f1f91a8376ed 100644
--- a/base/poco/XML/include/Poco/XML/expat.h
+++ b/base/poco/XML/include/Poco/XML/expat.h
@@ -19,10 +19,11 @@
    Copyright (c) 2023      Hanno Böck <hanno@gentoo.org>
    Copyright (c) 2023      Sony Corporation / Snild Dolkow <snild@sony.com>
    Copyright (c) 2024      Taichi Haradaguchi <20001722@ymail.ne.jp>
+   Copyright (c) 2025      Matthew Fernandez <matthew.fernandez@gmail.com>
    Licensed under the MIT license:
 
    Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software  and associated documentation files (the
+   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
@@ -42,21 +43,21 @@
 */
 
 #ifndef Expat_INCLUDED
-#define Expat_INCLUDED 1
+#  define Expat_INCLUDED 1
 
-#include <stdlib.h>
-#include "expat_external.h"
+#  include <stdlib.h>
+#  include "expat_external.h"
 
-#ifdef __cplusplus
+#  ifdef __cplusplus
 extern "C" {
-#endif
+#  endif
 
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct *XML_Parser;
 
 typedef unsigned char XML_Bool;
-#define XML_TRUE ((XML_Bool)1)
-#define XML_FALSE ((XML_Bool)0)
+#  define XML_TRUE ((XML_Bool)1)
+#  define XML_FALSE ((XML_Bool)0)
 
 /* The XML_Status enum gives the possible return values for several
    API functions.  The preprocessor #defines are included so this
@@ -73,11 +74,11 @@ typedef unsigned char XML_Bool;
 */
 enum XML_Status {
   XML_STATUS_ERROR = 0,
-#define XML_STATUS_ERROR XML_STATUS_ERROR
+#  define XML_STATUS_ERROR XML_STATUS_ERROR
   XML_STATUS_OK = 1,
-#define XML_STATUS_OK XML_STATUS_OK
+#  define XML_STATUS_OK XML_STATUS_OK
   XML_STATUS_SUSPENDED = 2
-#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
+#  define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
 };
 
 enum XML_Error {
@@ -276,7 +277,7 @@ XML_ParserCreate_MM(const XML_Char *encoding,
 
 /* Prepare a parser object to be reused.  This is particularly
    valuable when memory allocation overhead is disproportionately high,
-   such as when a large number of small documnents need to be parsed.
+   such as when a large number of small documents need to be parsed.
    All handlers are cleared from the parser, except for the
    unknownEncodingHandler. The parser's external state is re-initialized
    except for the values of ns and ns_triplets.
@@ -680,7 +681,7 @@ XMLPARSEAPI(void)
 XML_SetUserData(XML_Parser parser, void *userData);
 
 /* Returns the last value set by XML_SetUserData or NULL. */
-#define XML_GetUserData(parser) (*(void **)(parser))
+#  define XML_GetUserData(parser) (*(void **)(parser))
 
 /* This is equivalent to supplying an encoding argument to
    XML_ParserCreate. On success XML_SetEncoding returns non-zero,
@@ -752,7 +753,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 XMLPARSEAPI(int)
 XML_GetIdAttributeIndex(XML_Parser parser);
 
-#ifdef XML_ATTR_INFO
+#  ifdef XML_ATTR_INFO
 /* Source file byte offsets for the start and end of attribute names and values.
    The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
    file an attribute value of "blah" will yield:
@@ -773,7 +774,7 @@ typedef struct {
 */
 XMLPARSEAPI(const XML_AttrInfo *)
 XML_GetAttributeInfo(XML_Parser parser);
-#endif
+#  endif
 
 /* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
    detected.  The last call to XML_Parse must have isFinal true; len
@@ -970,9 +971,9 @@ XMLPARSEAPI(const char *)
 XML_GetInputContext(XML_Parser parser, int *offset, int *size);
 
 /* For backwards compatibility with previous versions. */
-#define XML_GetErrorLineNumber XML_GetCurrentLineNumber
-#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
-#define XML_GetErrorByteIndex XML_GetCurrentByteIndex
+#  define XML_GetErrorLineNumber XML_GetCurrentLineNumber
+#  define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
+#  define XML_GetErrorByteIndex XML_GetCurrentByteIndex
 
 /* Frees the content model passed to the element declaration handler */
 XMLPARSEAPI(void)
@@ -1032,7 +1033,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
   XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
   /* Added in Expat 2.6.0. */
-  XML_FEATURE_GE
+  XML_FEATURE_GE,
+  /* Added in Expat 2.7.2. */
+  XML_FEATURE_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT,
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1045,7 +1049,7 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
-#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
+#  if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
 /* Added in Expat 2.4.0 for XML_DTD defined and
  * added in Expat 2.6.0 for XML_GE == 1. */
 XMLPARSEAPI(XML_Bool)
@@ -1057,7 +1061,17 @@ XML_SetBillionLaughsAttackProtectionMaximumAmplification(
 XMLPARSEAPI(XML_Bool)
 XML_SetBillionLaughsAttackProtectionActivationThreshold(
     XML_Parser parser, unsigned long long activationThresholdBytes);
-#endif
+
+/* Added in Expat 2.7.2. */
+XMLPARSEAPI(XML_Bool)
+XML_SetAllocTrackerMaximumAmplification(XML_Parser parser,
+                                        float maximumAmplificationFactor);
+
+/* Added in Expat 2.7.2. */
+XMLPARSEAPI(XML_Bool)
+XML_SetAllocTrackerActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#  endif
 
 /* Added in Expat 2.6.0. */
 XMLPARSEAPI(XML_Bool)
@@ -1066,12 +1080,12 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
 /* Expat follows the semantic versioning convention.
    See https://semver.org
 */
-#define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 7
-#define XML_MICRO_VERSION 1
+#  define XML_MAJOR_VERSION 2
+#  define XML_MINOR_VERSION 7
+#  define XML_MICRO_VERSION 3
 
-#ifdef __cplusplus
+#  ifdef __cplusplus
 }
-#endif
+#  endif
 
 #endif /* not Expat_INCLUDED */
diff --git a/base/poco/XML/include/Poco/XML/expat_external.h b/base/poco/XML/include/Poco/XML/expat_external.h
index 0dabf7113414..b365fec2ede3 100644
--- a/base/poco/XML/include/Poco/XML/expat_external.h
+++ b/base/poco/XML/include/Poco/XML/expat_external.h
@@ -38,7 +38,7 @@
 */
 
 #ifndef Expat_External_INCLUDED
-#define Expat_External_INCLUDED 1
+#  define Expat_External_INCLUDED 1
 
 /* External API definitions */
 
@@ -64,12 +64,12 @@
    compiled with the cdecl calling convention as the default since
    system headers may assume the cdecl convention.
 */
-#ifndef XMLCALL
-#  if defined(_MSC_VER)
-#    define XMLCALL __cdecl
-#  elif defined(__GNUC__) && defined(__i386) && ! defined(__INTEL_COMPILER)
-#    define XMLCALL __attribute__((cdecl))
-#  else
+#  ifndef XMLCALL
+#    if defined(_MSC_VER)
+#      define XMLCALL __cdecl
+#    elif defined(__GNUC__) && defined(__i386) && ! defined(__INTEL_COMPILER)
+#      define XMLCALL __attribute__((cdecl))
+#    else
 /* For any platform which uses this definition and supports more than
    one calling convention, we need to extend this definition to
    declare the convention used on that platform, if it's possible to
@@ -80,86 +80,86 @@
    pre-processor and how to specify the same calling convention as the
    platform's malloc() implementation.
 */
-#    define XMLCALL
-#  endif
-#endif /* not defined XMLCALL */
+#      define XMLCALL
+#    endif
+#  endif /* not defined XMLCALL */
 
-#if ! defined(XML_STATIC) && ! defined(XMLIMPORT)
-#  ifndef XML_BUILDING_EXPAT
+#  if ! defined(XML_STATIC) && ! defined(XMLIMPORT)
+#    ifndef XML_BUILDING_EXPAT
 /* using Expat from an application */
 
-#    if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
-#      define XMLIMPORT __declspec(dllimport)
+#      if defined(_MSC_VER) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
+#        define XMLIMPORT __declspec(dllimport)
+#      endif
+
 #    endif
+#  endif /* not defined XML_STATIC */
 
+#  ifndef XML_ENABLE_VISIBILITY
+#    define XML_ENABLE_VISIBILITY 0
 #  endif
-#endif /* not defined XML_STATIC */
-
-#ifndef XML_ENABLE_VISIBILITY
-#  define XML_ENABLE_VISIBILITY 0
-#endif
 
-#if ! defined(XMLIMPORT) && XML_ENABLE_VISIBILITY
-#  define XMLIMPORT __attribute__((visibility("default")))
-#endif
+#  if ! defined(XMLIMPORT) && XML_ENABLE_VISIBILITY
+#    define XMLIMPORT __attribute__((visibility("default")))
+#  endif
 
 /* If we didn't define it above, define it away: */
-#ifndef XMLIMPORT
-#  define XMLIMPORT
-#endif
-
-#if defined(__GNUC__)                                                          \
-    && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
-#  define XML_ATTR_MALLOC __attribute__((__malloc__))
-#else
-#  define XML_ATTR_MALLOC
-#endif
-
-#if defined(__GNUC__)                                                          \
-    && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-#  define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
-#else
-#  define XML_ATTR_ALLOC_SIZE(x)
-#endif
-
-#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#  ifndef XMLIMPORT
+#    define XMLIMPORT
+#  endif
+
+#  if defined(__GNUC__)                                                        \
+      && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#    define XML_ATTR_MALLOC __attribute__((__malloc__))
+#  else
+#    define XML_ATTR_MALLOC
+#  endif
 
-#ifdef XML_UNICODE_WCHAR_T
-#  ifndef XML_UNICODE
-#    define XML_UNICODE
+#  if defined(__GNUC__)                                                        \
+      && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+#    define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
+#  else
+#    define XML_ATTR_ALLOC_SIZE(x)
 #  endif
-#  if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2)
-#    error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc"
+
+#  define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
+
+#  ifdef __cplusplus
+extern "C" {
 #  endif
-#endif
 
-#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
 #  ifdef XML_UNICODE_WCHAR_T
+#    ifndef XML_UNICODE
+#      define XML_UNICODE
+#    endif
+#    if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2)
+#      error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc"
+#    endif
+#  endif
+
+#  ifdef XML_UNICODE /* Information is UTF-16 encoded. */
+#    ifdef XML_UNICODE_WCHAR_T
 typedef wchar_t XML_Char;
 typedef wchar_t XML_LChar;
-#  else
+#    else
 typedef unsigned short XML_Char;
 typedef char XML_LChar;
-#  endif /* XML_UNICODE_WCHAR_T */
-#else    /* Information is UTF-8 encoded. */
+#    endif /* XML_UNICODE_WCHAR_T */
+#  else    /* Information is UTF-8 encoded. */
 typedef char XML_Char;
 typedef char XML_LChar;
-#endif   /* XML_UNICODE */
+#  endif   /* XML_UNICODE */
 
-#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
+#  ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
 typedef long long XML_Index;
 typedef unsigned long long XML_Size;
-#else
+#  else
 typedef long XML_Index;
 typedef unsigned long XML_Size;
-#endif /* XML_LARGE_SIZE */
+#  endif /* XML_LARGE_SIZE */
 
-#ifdef __cplusplus
+#  ifdef __cplusplus
 }
-#endif
+#  endif
 
 #endif /* not Expat_External_INCLUDED */
diff --git a/base/poco/XML/src/internal.h b/base/poco/XML/src/internal.h
index 73b622224d5d..697c4a473b8f 100644
--- a/base/poco/XML/src/internal.h
+++ b/base/poco/XML/src/internal.h
@@ -108,6 +108,7 @@
 #endif
 
 #include <limits.h> // ULONG_MAX
+#include <stddef.h> // size_t
 
 #if defined(_WIN32)                                                            \
     && (! defined(__USE_MINGW_ANSI_STDIO)                                      \
@@ -127,7 +128,7 @@
 #  elif ULONG_MAX == 18446744073709551615u // 2^64-1
 #    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
 #    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
-#  elif defined(EMSCRIPTEN) // 32bit mode Emscripten
+#  elif defined(__wasm32__) // 32bit mode Emscripten or WASI SDK
 #    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
 #    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "zu"
 #  else
@@ -148,6 +149,16 @@
   100.0f
 #define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
   8388608 // 8 MiB, 2^23
+
+#define EXPAT_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT 100.0f
+#define EXPAT_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT                       \
+  67108864 // 64 MiB, 2^26
+
+// NOTE: If function expat_alloc was user facing, EXPAT_MALLOC_ALIGNMENT would
+//       have to take sizeof(long double) into account
+#define EXPAT_MALLOC_ALIGNMENT sizeof(long long) // largest parser (sub)member
+#define EXPAT_MALLOC_PADDING ((EXPAT_MALLOC_ALIGNMENT) - sizeof(size_t))
+
 /* NOTE END */
 
 #include "Poco/XML/expat.h" // so we can use type XML_Parser below
@@ -171,6 +182,9 @@ extern
 #endif
     XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c
 #if defined(XML_TESTING)
+void *expat_malloc(XML_Parser parser, size_t size, int sourceLine);
+void expat_free(XML_Parser parser, void *ptr, int sourceLine);
+void *expat_realloc(XML_Parser parser, void *ptr, size_t size, int sourceLine);
 extern unsigned int g_bytesScanned; // used for testing only
 #endif
 
diff --git a/base/poco/XML/src/xmlparse.cpp b/base/poco/XML/src/xmlparse.cpp
index 7368e1702494..98d1d55a7d3d 100644
--- a/base/poco/XML/src/xmlparse.cpp
+++ b/base/poco/XML/src/xmlparse.cpp
@@ -1,4 +1,4 @@
-/* d19ae032c224863c1527ba44d228cc34b99192c3a4c5a27af1f4e054d45ee031 (2.7.1+)
+/* 28bcd8b1ba7eb595d82822908257fd9c3589b4243e3c922d0369f35bfcd7b506 (2.7.3+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -41,6 +41,7 @@
    Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com>
    Copyright (c) 2024-2025 Berkay Eren Ürün <berkay.ueruen@siemens.com>
    Copyright (c) 2024      Hanno Böck <hanno@gentoo.org>
+   Copyright (c) 2025      Matthew Fernandez <matthew.fernandez@gmail.com>
    Licensed under the MIT license:
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -97,7 +98,7 @@
 #include <stddef.h>
 #include <string.h> /* memset(), memcpy() */
 #include <assert.h>
-#include <limits.h> /* UINT_MAX */
+#include <limits.h> /* INT_MAX, UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
 #include <stdint.h> /* uintptr_t */
@@ -122,8 +123,6 @@
 #  include "winconfig.h"
 #endif
 
-#include "expat_config.h"
-
 #include "ascii.h"
 #include "Poco/XML/expat.h"
 #include "siphash.h"
@@ -241,7 +240,7 @@ typedef struct {
   unsigned char power;
   size_t size;
   size_t used;
-  const XML_Memory_Handling_Suite *mem;
+  XML_Parser parser;
 } HASH_TABLE;
 
 static size_t keylen(KEY s);
@@ -364,7 +363,7 @@ typedef struct {
   const XML_Char *end;
   XML_Char *ptr;
   XML_Char *start;
-  const XML_Memory_Handling_Suite *mem;
+  XML_Parser parser;
 } STRING_POOL;
 
 /* The XML_Char before the name is used to determine whether
@@ -459,6 +458,14 @@ typedef struct accounting {
   unsigned long long activationThresholdBytes;
 } ACCOUNTING;
 
+typedef struct MALLOC_TRACKER {
+  XmlBigCount bytesAllocated;
+  XmlBigCount peakBytesAllocated; // updated live only for debug level >=2
+  unsigned long debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  XmlBigCount activationThresholdBytes;
+} MALLOC_TRACKER;
+
 typedef struct entity_stats {
   unsigned int countEverOpened;
   unsigned int currentDepth;
@@ -562,27 +569,24 @@ static XML_Bool setContext(XML_Parser parser, const XML_Char *context);
 
 static void FASTCALL normalizePublicId(XML_Char *s);
 
-static DTD *dtdCreate(const XML_Memory_Handling_Suite *ms);
+static DTD *dtdCreate(XML_Parser parser);
 /* do not call if m_parentParser != NULL */
-static void dtdReset(DTD *p, const XML_Memory_Handling_Suite *ms);
-static void dtdDestroy(DTD *p, XML_Bool isDocEntity,
-                       const XML_Memory_Handling_Suite *ms);
+static void dtdReset(DTD *p, XML_Parser parser);
+static void dtdDestroy(DTD *p, XML_Bool isDocEntity, XML_Parser parser);
 static int dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd,
-                   const XML_Memory_Handling_Suite *ms);
+                   XML_Parser parser);
 static int copyEntityTable(XML_Parser oldParser, HASH_TABLE *newTable,
                            STRING_POOL *newPool, const HASH_TABLE *oldTable);
 static NAMED *lookup(XML_Parser parser, HASH_TABLE *table, KEY name,
                      size_t createSize);
-static void FASTCALL hashTableInit(HASH_TABLE *table,
-                                   const XML_Memory_Handling_Suite *ms);
+static void FASTCALL hashTableInit(HASH_TABLE *table, XML_Parser parser);
 static void FASTCALL hashTableClear(HASH_TABLE *table);
 static void FASTCALL hashTableDestroy(HASH_TABLE *table);
 static void FASTCALL hashTableIterInit(HASH_TABLE_ITER *iter,
                                        const HASH_TABLE *table);
 static NAMED *FASTCALL hashTableIterNext(HASH_TABLE_ITER *iter);
 
-static void FASTCALL poolInit(STRING_POOL *pool,
-                              const XML_Memory_Handling_Suite *ms);
+static void FASTCALL poolInit(STRING_POOL *pool, XML_Parser parser);
 static void FASTCALL poolClear(STRING_POOL *pool);
 static void FASTCALL poolDestroy(STRING_POOL *pool);
 static XML_Char *poolAppend(STRING_POOL *pool, const ENCODING *enc,
@@ -602,15 +606,15 @@ static XML_Content *build_model(XML_Parser parser);
 static ELEMENT_TYPE *getElementType(XML_Parser parser, const ENCODING *enc,
                                     const char *ptr, const char *end);
 
-static XML_Char *copyString(const XML_Char *s,
-                            const XML_Memory_Handling_Suite *memsuite);
+static XML_Char *copyString(const XML_Char *s, XML_Parser parser);
 
 static unsigned long generate_hash_secret_salt(XML_Parser parser);
 static XML_Bool startParsing(XML_Parser parser);
 
 static XML_Parser parserCreate(const XML_Char *encodingName,
                                const XML_Memory_Handling_Suite *memsuite,
-                               const XML_Char *nameSep, DTD *dtd);
+                               const XML_Char *nameSep, DTD *dtd,
+                               XML_Parser parentParser);
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
@@ -634,10 +638,10 @@ static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
                                  int sourceLine);
 static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
                                   int sourceLine);
+#endif /* XML_GE == 1 */
 
 static XML_Parser getRootParserOf(XML_Parser parser,
                                   unsigned int *outLevelDiff);
-#endif /* XML_GE == 1 */
 
 static unsigned long getDebugLevel(const char *variableName,
                                    unsigned long defaultDebugLevel);
@@ -780,14 +784,238 @@ struct XML_ParserStruct {
   unsigned long m_hash_secret_salt;
 #if XML_GE == 1
   ACCOUNTING m_accounting;
+  MALLOC_TRACKER m_alloc_tracker;
   ENTITY_STATS m_entity_stats;
 #endif
   XML_Bool m_reenter;
 };
 
-#define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
-#define REALLOC(parser, p, s) (parser->m_mem.realloc_fcn((p), (s)))
-#define FREE(parser, p) (parser->m_mem.free_fcn((p)))
+#if XML_GE == 1
+#  define MALLOC(parser, s) (expat_malloc((parser), (s), __LINE__))
+#  define REALLOC(parser, p, s) (expat_realloc((parser), (p), (s), __LINE__))
+#  define FREE(parser, p) (expat_free((parser), (p), __LINE__))
+#else
+#  define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
+#  define REALLOC(parser, p, s) (parser->m_mem.realloc_fcn((p), (s)))
+#  define FREE(parser, p) (parser->m_mem.free_fcn((p)))
+#endif
+
+#if XML_GE == 1
+static void
+expat_heap_stat(XML_Parser rootParser, char op, XmlBigCount absDiff,
+                XmlBigCount newTotal, XmlBigCount peakTotal, int sourceLine) {
+  // NOTE: This can be +infinity or -nan
+  const float amplification
+      = (float)newTotal / (float)rootParser->m_accounting.countBytesDirect;
+  fprintf(
+      stderr,
+      "expat: Allocations(%p): Direct " EXPAT_FMT_ULL("10") ", allocated %c" EXPAT_FMT_ULL(
+          "10") " to " EXPAT_FMT_ULL("10") " (" EXPAT_FMT_ULL("10") " peak), amplification %8.2f (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_accounting.countBytesDirect, op,
+      absDiff, newTotal, peakTotal, (double)amplification, sourceLine);
+}
+
+static bool
+expat_heap_increase_tolerable(XML_Parser rootParser, XmlBigCount increase,
+                              int sourceLine) {
+  assert(rootParser != NULL);
+  assert(increase > 0);
+
+  XmlBigCount newTotal = 0;
+  bool tolerable = true;
+
+  // Detect integer overflow
+  if ((XmlBigCount)-1 - rootParser->m_alloc_tracker.bytesAllocated < increase) {
+    tolerable = false;
+  } else {
+    newTotal = rootParser->m_alloc_tracker.bytesAllocated + increase;
+
+    if (newTotal >= rootParser->m_alloc_tracker.activationThresholdBytes) {
+      assert(newTotal > 0);
+      // NOTE: This can be +infinity when dividing by zero but not -nan
+      const float amplification
+          = (float)newTotal / (float)rootParser->m_accounting.countBytesDirect;
+      if (amplification
+          > rootParser->m_alloc_tracker.maximumAmplificationFactor) {
+        tolerable = false;
+      }
+    }
+  }
+
+  if (! tolerable && (rootParser->m_alloc_tracker.debugLevel >= 1)) {
+    expat_heap_stat(rootParser, '+', increase, newTotal, newTotal, sourceLine);
+  }
+
+  return tolerable;
+}
+
+#  if defined(XML_TESTING)
+void *
+#  else
+static void *
+#  endif
+expat_malloc(XML_Parser parser, size_t size, int sourceLine) {
+  // Detect integer overflow
+  if (SIZE_MAX - size < sizeof(size_t) + EXPAT_MALLOC_PADDING) {
+    return NULL;
+  }
+
+  const XML_Parser rootParser = getRootParserOf(parser, NULL);
+  assert(rootParser->m_parentParser == NULL);
+
+  const size_t bytesToAllocate = sizeof(size_t) + EXPAT_MALLOC_PADDING + size;
+
+  if ((XmlBigCount)-1 - rootParser->m_alloc_tracker.bytesAllocated
+      < bytesToAllocate) {
+    return NULL; // i.e. signal integer overflow as out-of-memory
+  }
+
+  if (! expat_heap_increase_tolerable(rootParser, bytesToAllocate,
+                                      sourceLine)) {
+    return NULL; // i.e. signal violation as out-of-memory
+  }
+
+  // Actually allocate
+  void *const mallocedPtr = parser->m_mem.malloc_fcn(bytesToAllocate);
+
+  if (mallocedPtr == NULL) {
+    return NULL;
+  }
+
+  // Update in-block recorded size
+  *(size_t *)mallocedPtr = size;
+
+  // Update accounting
+  rootParser->m_alloc_tracker.bytesAllocated += bytesToAllocate;
+
+  // Report as needed
+  if (rootParser->m_alloc_tracker.debugLevel >= 2) {
+    if (rootParser->m_alloc_tracker.bytesAllocated
+        > rootParser->m_alloc_tracker.peakBytesAllocated) {
+      rootParser->m_alloc_tracker.peakBytesAllocated
+          = rootParser->m_alloc_tracker.bytesAllocated;
+    }
+    expat_heap_stat(rootParser, '+', bytesToAllocate,
+                    rootParser->m_alloc_tracker.bytesAllocated,
+                    rootParser->m_alloc_tracker.peakBytesAllocated, sourceLine);
+  }
+
+  return (char *)mallocedPtr + sizeof(size_t) + EXPAT_MALLOC_PADDING;
+}
+
+#  if defined(XML_TESTING)
+void
+#  else
+static void
+#  endif
+expat_free(XML_Parser parser, void *ptr, int sourceLine) {
+  assert(parser != NULL);
+
+  if (ptr == NULL) {
+    return;
+  }
+
+  const XML_Parser rootParser = getRootParserOf(parser, NULL);
+  assert(rootParser->m_parentParser == NULL);
+
+  // Extract size (to the eyes of malloc_fcn/realloc_fcn) and
+  // the original pointer returned by malloc/realloc
+  void *const mallocedPtr = (char *)ptr - EXPAT_MALLOC_PADDING - sizeof(size_t);
+  const size_t bytesAllocated
+      = sizeof(size_t) + EXPAT_MALLOC_PADDING + *(size_t *)mallocedPtr;
+
+  // Update accounting
+  assert(rootParser->m_alloc_tracker.bytesAllocated >= bytesAllocated);
+  rootParser->m_alloc_tracker.bytesAllocated -= bytesAllocated;
+
+  // Report as needed
+  if (rootParser->m_alloc_tracker.debugLevel >= 2) {
+    expat_heap_stat(rootParser, '-', bytesAllocated,
+                    rootParser->m_alloc_tracker.bytesAllocated,
+                    rootParser->m_alloc_tracker.peakBytesAllocated, sourceLine);
+  }
+
+  // NOTE: This may be freeing rootParser, so freeing has to come last
+  parser->m_mem.free_fcn(mallocedPtr);
+}
+
+#  if defined(XML_TESTING)
+void *
+#  else
+static void *
+#  endif
+expat_realloc(XML_Parser parser, void *ptr, size_t size, int sourceLine) {
+  assert(parser != NULL);
+
+  if (ptr == NULL) {
+    return expat_malloc(parser, size, sourceLine);
+  }
+
+  if (size == 0) {
+    expat_free(parser, ptr, sourceLine);
+    return NULL;
+  }
+
+  const XML_Parser rootParser = getRootParserOf(parser, NULL);
+  assert(rootParser->m_parentParser == NULL);
+
+  // Extract original size (to the eyes of the caller) and the original
+  // pointer returned by malloc/realloc
+  void *mallocedPtr = (char *)ptr - EXPAT_MALLOC_PADDING - sizeof(size_t);
+  const size_t prevSize = *(size_t *)mallocedPtr;
+
+  // Classify upcoming change
+  const bool isIncrease = (size > prevSize);
+  const size_t absDiff
+      = (size > prevSize) ? (size - prevSize) : (prevSize - size);
+
+  // Ask for permission from accounting
+  if (isIncrease) {
+    if (! expat_heap_increase_tolerable(rootParser, absDiff, sourceLine)) {
+      return NULL; // i.e. signal violation as out-of-memory
+    }
+  }
+
+  // NOTE: Integer overflow detection has already been done for us
+  //       by expat_heap_increase_tolerable(..) above
+  assert(SIZE_MAX - sizeof(size_t) - EXPAT_MALLOC_PADDING >= size);
+
+  // Actually allocate
+  mallocedPtr = parser->m_mem.realloc_fcn(
+      mallocedPtr, sizeof(size_t) + EXPAT_MALLOC_PADDING + size);
+
+  if (mallocedPtr == NULL) {
+    return NULL;
+  }
+
+  // Update accounting
+  if (isIncrease) {
+    assert((XmlBigCount)-1 - rootParser->m_alloc_tracker.bytesAllocated
+           >= absDiff);
+    rootParser->m_alloc_tracker.bytesAllocated += absDiff;
+  } else { // i.e. decrease
+    assert(rootParser->m_alloc_tracker.bytesAllocated >= absDiff);
+    rootParser->m_alloc_tracker.bytesAllocated -= absDiff;
+  }
+
+  // Report as needed
+  if (rootParser->m_alloc_tracker.debugLevel >= 2) {
+    if (rootParser->m_alloc_tracker.bytesAllocated
+        > rootParser->m_alloc_tracker.peakBytesAllocated) {
+      rootParser->m_alloc_tracker.peakBytesAllocated
+          = rootParser->m_alloc_tracker.bytesAllocated;
+    }
+    expat_heap_stat(rootParser, isIncrease ? '+' : '-', absDiff,
+                    rootParser->m_alloc_tracker.bytesAllocated,
+                    rootParser->m_alloc_tracker.peakBytesAllocated, sourceLine);
+  }
+
+  // Update in-block recorded size
+  *(size_t *)mallocedPtr = size;
+
+  return (char *)mallocedPtr + sizeof(size_t) + EXPAT_MALLOC_PADDING;
+}
+#endif // XML_GE == 1
 
 XML_Parser XMLCALL
 XML_ParserCreate(const XML_Char *encodingName) {
@@ -831,11 +1059,14 @@ writeRandomBytes_getrandom_nonblock(void *target, size_t count) {
     void *const currentTarget = (void *)((char *)target + bytesWrittenTotal);
     const size_t bytesToWrite = count - bytesWrittenTotal;
 
+    assert(bytesToWrite <= INT_MAX);
+
     const int bytesWrittenMore =
 #    if defined(HAVE_GETRANDOM)
-        getrandom(currentTarget, bytesToWrite, getrandomFlags);
+        (int)getrandom(currentTarget, bytesToWrite, getrandomFlags);
 #    else
-        syscall(SYS_getrandom, currentTarget, bytesToWrite, getrandomFlags);
+        (int)syscall(SYS_getrandom, currentTarget, bytesToWrite,
+                     getrandomFlags);
 #    endif
 
     if (bytesWrittenMore > 0) {
@@ -1030,9 +1261,10 @@ generate_hash_secret_salt(XML_Parser parser) {
 
 static unsigned long
 get_hash_secret_salt(XML_Parser parser) {
-  if (parser->m_parentParser != NULL)
-    return get_hash_secret_salt(parser->m_parentParser);
-  return parser->m_hash_secret_salt;
+  const XML_Parser rootParser = getRootParserOf(parser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  return rootParser->m_hash_secret_salt;
 }
 
 static enum XML_Error
@@ -1118,19 +1350,43 @@ XML_Parser XMLCALL
 XML_ParserCreate_MM(const XML_Char *encodingName,
                     const XML_Memory_Handling_Suite *memsuite,
                     const XML_Char *nameSep) {
-  return parserCreate(encodingName, memsuite, nameSep, NULL);
+  return parserCreate(encodingName, memsuite, nameSep, NULL, NULL);
 }
 
 static XML_Parser
 parserCreate(const XML_Char *encodingName,
              const XML_Memory_Handling_Suite *memsuite, const XML_Char *nameSep,
-             DTD *dtd) {
-  XML_Parser parser;
+             DTD *dtd, XML_Parser parentParser) {
+  XML_Parser parser = NULL;
+
+#if XML_GE == 1
+  const size_t increase
+      = sizeof(size_t) + EXPAT_MALLOC_PADDING + sizeof(struct XML_ParserStruct);
+
+  if (parentParser != NULL) {
+    const XML_Parser rootParser = getRootParserOf(parentParser, NULL);
+    if (! expat_heap_increase_tolerable(rootParser, increase, __LINE__)) {
+      return NULL;
+    }
+  }
+#else
+  UNUSED_P(parentParser);
+#endif
 
   if (memsuite) {
     XML_Memory_Handling_Suite *mtemp;
+#if XML_GE == 1
+    void *const sizeAndParser
+        = memsuite->malloc_fcn(sizeof(size_t) + EXPAT_MALLOC_PADDING
+                               + sizeof(struct XML_ParserStruct));
+    if (sizeAndParser != NULL) {
+      *(size_t *)sizeAndParser = sizeof(struct XML_ParserStruct);
+      parser = (XML_Parser)((char *)sizeAndParser + sizeof(size_t)
+                            + EXPAT_MALLOC_PADDING);
+#else
     parser = (XML_Parser)memsuite->malloc_fcn(sizeof(struct XML_ParserStruct));
     if (parser != NULL) {
+#endif
       mtemp = (XML_Memory_Handling_Suite *)&(parser->m_mem);
       mtemp->malloc_fcn = memsuite->malloc_fcn;
       mtemp->realloc_fcn = memsuite->realloc_fcn;
@@ -1138,39 +1394,86 @@ parserCreate(const XML_Char *encodingName,
     }
   } else {
     XML_Memory_Handling_Suite *mtemp;
+#if XML_GE == 1
+    void *const sizeAndParser = malloc(sizeof(size_t) + EXPAT_MALLOC_PADDING
+                                       + sizeof(struct XML_ParserStruct));
+    if (sizeAndParser != NULL) {
+      *(size_t *)sizeAndParser = sizeof(struct XML_ParserStruct);
+      parser = (XML_Parser)((char *)sizeAndParser + sizeof(size_t)
+                            + EXPAT_MALLOC_PADDING);
+#else
     parser = (XML_Parser)malloc(sizeof(struct XML_ParserStruct));
     if (parser != NULL) {
+#endif
       mtemp = (XML_Memory_Handling_Suite *)&(parser->m_mem);
       mtemp->malloc_fcn = malloc;
       mtemp->realloc_fcn = realloc;
       mtemp->free_fcn = free;
     }
-  }
+  } // cppcheck-suppress[memleak symbolName=sizeAndParser] // Cppcheck >=2.18.0
 
   if (! parser)
     return parser;
 
+#if XML_GE == 1
+  // Initialize .m_alloc_tracker
+  memset(&parser->m_alloc_tracker, 0, sizeof(MALLOC_TRACKER));
+  if (parentParser == NULL) {
+    parser->m_alloc_tracker.debugLevel
+        = getDebugLevel("EXPAT_MALLOC_DEBUG", 0u);
+    parser->m_alloc_tracker.maximumAmplificationFactor
+        = EXPAT_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT;
+    parser->m_alloc_tracker.activationThresholdBytes
+        = EXPAT_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT;
+
+    // NOTE: This initialization needs to come this early because these fields
+    //       are read by allocation tracking code
+    parser->m_parentParser = NULL;
+    parser->m_accounting.countBytesDirect = 0;
+  } else {
+    parser->m_parentParser = parentParser;
+  }
+
+  // Record XML_ParserStruct allocation we did a few lines up before
+  const XML_Parser rootParser = getRootParserOf(parser, NULL);
+  assert(rootParser->m_parentParser == NULL);
+  assert(SIZE_MAX - rootParser->m_alloc_tracker.bytesAllocated >= increase);
+  rootParser->m_alloc_tracker.bytesAllocated += increase;
+
+  // Report on allocation
+  if (rootParser->m_alloc_tracker.debugLevel >= 2) {
+    if (rootParser->m_alloc_tracker.bytesAllocated
+        > rootParser->m_alloc_tracker.peakBytesAllocated) {
+      rootParser->m_alloc_tracker.peakBytesAllocated
+          = rootParser->m_alloc_tracker.bytesAllocated;
+    }
+
+    expat_heap_stat(rootParser, '+', increase,
+                    rootParser->m_alloc_tracker.bytesAllocated,
+                    rootParser->m_alloc_tracker.peakBytesAllocated, __LINE__);
+  }
+#else
+  parser->m_parentParser = NULL;
+#endif // XML_GE == 1
+
   parser->m_buffer = NULL;
   parser->m_bufferLim = NULL;
 
   parser->m_attsSize = INIT_ATTS_SIZE;
-  parser->m_atts
-      = (ATTRIBUTE *)MALLOC(parser, parser->m_attsSize * sizeof(ATTRIBUTE));
+  parser->m_atts = (ATTRIBUTE*)MALLOC(parser, parser->m_attsSize * sizeof(ATTRIBUTE));
   if (parser->m_atts == NULL) {
     FREE(parser, parser);
     return NULL;
   }
 #ifdef XML_ATTR_INFO
-  parser->m_attInfo = (XML_AttrInfo *)MALLOC(
-      parser, parser->m_attsSize * sizeof(XML_AttrInfo));
+  parser->m_attInfo = (XML_AttrInfo*)MALLOC(parser, parser->m_attsSize * sizeof(XML_AttrInfo));
   if (parser->m_attInfo == NULL) {
     FREE(parser, parser->m_atts);
     FREE(parser, parser);
     return NULL;
   }
 #endif
-  parser->m_dataBuf
-      = (XML_Char *)MALLOC(parser, INIT_DATA_BUF_SIZE * sizeof(XML_Char));
+  parser->m_dataBuf = (XML_Char*)MALLOC(parser, INIT_DATA_BUF_SIZE * sizeof(XML_Char));
   if (parser->m_dataBuf == NULL) {
     FREE(parser, parser->m_atts);
 #ifdef XML_ATTR_INFO
@@ -1184,7 +1487,7 @@ parserCreate(const XML_Char *encodingName,
   if (dtd)
     parser->m_dtd = dtd;
   else {
-    parser->m_dtd = dtdCreate(&parser->m_mem);
+    parser->m_dtd = dtdCreate(parser);
     if (parser->m_dtd == NULL) {
       FREE(parser, parser->m_dataBuf);
       FREE(parser, parser->m_atts);
@@ -1218,8 +1521,8 @@ parserCreate(const XML_Char *encodingName,
 
   parser->m_protocolEncodingName = NULL;
 
-  poolInit(&parser->m_tempPool, &(parser->m_mem));
-  poolInit(&parser->m_temp2Pool, &(parser->m_mem));
+  poolInit(&parser->m_tempPool, parser);
+  poolInit(&parser->m_temp2Pool, parser);
   parserInit(parser, encodingName);
 
   if (encodingName && ! parser->m_protocolEncodingName) {
@@ -1251,7 +1554,7 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_processor = prologInitProcessor;
   XmlPrologStateInit(&parser->m_prologState);
   if (encodingName != NULL) {
-    parser->m_protocolEncodingName = copyString(encodingName, &(parser->m_mem));
+    parser->m_protocolEncodingName = copyString(encodingName, parser);
   }
   parser->m_curBase = NULL;
   XmlInitEncoding(&parser->m_initEncoding, &parser->m_encoding, 0);
@@ -1313,7 +1616,6 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_unknownEncodingMem = NULL;
   parser->m_unknownEncodingRelease = NULL;
   parser->m_unknownEncodingData = NULL;
-  parser->m_parentParser = NULL;
   parser->m_parsingStatus.parsing = XML_INITIALIZED;
   // Reentry can only be triggered inside m_processor calls
   parser->m_reenter = XML_FALSE;
@@ -1403,7 +1705,7 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName) {
   FREE(parser, (void *)parser->m_protocolEncodingName);
   parser->m_protocolEncodingName = NULL;
   parserInit(parser, encodingName);
-  dtdReset(parser->m_dtd, &parser->m_mem);
+  dtdReset(parser->m_dtd, parser);
   return XML_TRUE;
 }
 
@@ -1439,7 +1741,7 @@ XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName) {
     parser->m_protocolEncodingName = NULL;
   else {
     /* Copy the new encoding name into allocated memory */
-    parser->m_protocolEncodingName = copyString(encodingName, &(parser->m_mem));
+    parser->m_protocolEncodingName = copyString(encodingName, parser);
     if (! parser->m_protocolEncodingName)
       return XML_STATUS_ERROR;
   }
@@ -1548,9 +1850,10 @@ XML_ExternalEntityParserCreate(XML_Parser oldParser, const XML_Char *context,
   */
   if (parser->m_ns) {
     XML_Char tmp[2] = {parser->m_namespaceSeparator, 0};
-    parser = parserCreate(encodingName, &parser->m_mem, tmp, newDtd);
+    parser = parserCreate(encodingName, &parser->m_mem, tmp, newDtd, oldParser);
   } else {
-    parser = parserCreate(encodingName, &parser->m_mem, NULL, newDtd);
+    parser
+        = parserCreate(encodingName, &parser->m_mem, NULL, newDtd, oldParser);
   }
 
   if (! parser)
@@ -1594,7 +1897,7 @@ XML_ExternalEntityParserCreate(XML_Parser oldParser, const XML_Char *context,
   parser->m_prologState.inEntityValue = oldInEntityValue;
   if (context) {
 #endif /* XML_DTD */
-    if (! dtdCopy(oldParser, parser->m_dtd, oldDtd, &parser->m_mem)
+    if (! dtdCopy(oldParser, parser->m_dtd, oldDtd, parser)
         || ! setContext(parser, context)) {
       XML_ParserFree(parser);
       return NULL;
@@ -1706,14 +2009,16 @@ XML_ParserFree(XML_Parser parser) {
 #else
   if (parser->m_dtd)
 #endif /* XML_DTD */
-    dtdDestroy(parser->m_dtd, (XML_Bool)! parser->m_parentParser,
-               &parser->m_mem);
-  FREE(parser, (void *)parser->m_atts);
+    dtdDestroy(parser->m_dtd, (XML_Bool)! parser->m_parentParser, parser);
+  FREE(parser, parser->m_atts);
 #ifdef XML_ATTR_INFO
-  FREE(parser, (void *)parser->m_attInfo);
+  FREE(parser, parser->m_attInfo);
 #endif
   FREE(parser, parser->m_groupConnector);
-  FREE(parser, parser->m_buffer);
+  // NOTE: We are avoiding FREE(..) here because parser->m_buffer
+  //       is not being allocated with MALLOC(..) but with plain
+  //       .malloc_fcn(..).
+  parser->m_mem.free_fcn(parser->m_buffer);
   FREE(parser, parser->m_dataBuf);
   FREE(parser, parser->m_nsAtts);
   FREE(parser, parser->m_unknownEncodingMem);
@@ -2032,12 +2337,14 @@ int XMLCALL
 XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt) {
   if (parser == NULL)
     return 0;
-  if (parser->m_parentParser)
-    return XML_SetHashSalt(parser->m_parentParser, hash_salt);
+
+  const XML_Parser rootParser = getRootParserOf(parser, NULL);
+  assert(! rootParser->m_parentParser);
+
   /* block after XML_Parse()/XML_ParseBuffer() has been called */
-  if (parserBusy(parser))
+  if (parserBusy(rootParser))
     return 0;
-  parser->m_hash_secret_salt = hash_salt;
+  rootParser->m_hash_secret_salt = hash_salt;
   return 1;
 }
 
@@ -2305,7 +2612,9 @@ XML_GetBuffer(XML_Parser parser, int len) {
         parser->m_errorCode = XML_ERROR_NO_MEMORY;
         return NULL;
       }
-      newBuf = (char *)MALLOC(parser, bufferSize);
+      // NOTE: We are avoiding MALLOC(..) here to leave limiting
+      //       the input size to the application using Expat.
+      newBuf = (char*)parser->m_mem.malloc_fcn(bufferSize);
       if (newBuf == 0) {
         parser->m_errorCode = XML_ERROR_NO_MEMORY;
         return NULL;
@@ -2316,7 +2625,10 @@ XML_GetBuffer(XML_Parser parser, int len) {
         memcpy(newBuf, &parser->m_bufferPtr[-keep],
                EXPAT_SAFE_PTR_DIFF(parser->m_bufferEnd, parser->m_bufferPtr)
                    + keep);
-        FREE(parser, parser->m_buffer);
+        // NOTE: We are avoiding FREE(..) here because parser->m_buffer
+        //       is not being allocated with MALLOC(..) but with plain
+        //       .malloc_fcn(..).
+        parser->m_mem.free_fcn(parser->m_buffer);
         parser->m_buffer = newBuf;
         parser->m_bufferEnd
             = parser->m_buffer
@@ -2332,7 +2644,10 @@ XML_GetBuffer(XML_Parser parser, int len) {
       if (parser->m_bufferPtr) {
         memcpy(newBuf, parser->m_bufferPtr,
                EXPAT_SAFE_PTR_DIFF(parser->m_bufferEnd, parser->m_bufferPtr));
-        FREE(parser, parser->m_buffer);
+        // NOTE: We are avoiding FREE(..) here because parser->m_buffer
+        //       is not being allocated with MALLOC(..) but with plain
+        //       .malloc_fcn(..).
+        parser->m_mem.free_fcn(parser->m_buffer);
         parser->m_bufferEnd
             = newBuf
               + EXPAT_SAFE_PTR_DIFF(parser->m_bufferEnd, parser->m_bufferPtr);
@@ -2510,28 +2825,43 @@ XML_GetCurrentColumnNumber(XML_Parser parser) {
 
 void XMLCALL
 XML_FreeContentModel(XML_Parser parser, XML_Content *model) {
-  if (parser != NULL)
-    FREE(parser, model);
+  if (parser == NULL)
+    return;
+
+  // NOTE: We are avoiding FREE(..) here because the content model
+  //       has been created using plain .malloc_fcn(..) rather than MALLOC(..).
+  parser->m_mem.free_fcn(model);
 }
 
 void *XMLCALL
 XML_MemMalloc(XML_Parser parser, size_t size) {
   if (parser == NULL)
     return NULL;
-  return MALLOC(parser, size);
+
+  // NOTE: We are avoiding MALLOC(..) here to not include
+  //       user allocations with allocation tracking and limiting.
+  return parser->m_mem.malloc_fcn(size);
 }
 
 void *XMLCALL
 XML_MemRealloc(XML_Parser parser, void *ptr, size_t size) {
   if (parser == NULL)
     return NULL;
-  return REALLOC(parser, ptr, size);
+
+  // NOTE: We are avoiding REALLOC(..) here to not include
+  //       user allocations with allocation tracking and limiting.
+  return parser->m_mem.realloc_fcn(ptr, size);
 }
 
 void XMLCALL
 XML_MemFree(XML_Parser parser, void *ptr) {
-  if (parser != NULL)
-    FREE(parser, ptr);
+  if (parser == NULL)
+    return;
+
+  // NOTE: We are avoiding FREE(..) here because XML_MemMalloc and
+  //       XML_MemRealloc are not using MALLOC(..) and REALLOC(..)
+  //       but plain .malloc_fcn(..) and .realloc_fcn(..), internally.
+  parser->m_mem.free_fcn(ptr);
 }
 
 void XMLCALL
@@ -2731,6 +3061,13 @@ XML_GetFeatureList(void) {
        EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
       /* Added in Expat 2.6.0. */
       {XML_FEATURE_GE, XML_L("XML_GE"), 0},
+      /* Added in Expat 2.7.2. */
+      {XML_FEATURE_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_AT_MAX_AMP"),
+       (long int)EXPAT_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_AT_ACT_THRES"),
+       (long int)EXPAT_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
       {XML_FEATURE_END, NULL, 0}};
 
@@ -2759,6 +3096,29 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold(
   parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
   return XML_TRUE;
 }
+
+XML_Bool XMLCALL
+XML_SetAllocTrackerMaximumAmplification(XML_Parser parser,
+                                        float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_alloc_tracker.maximumAmplificationFactor
+      = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetAllocTrackerActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_alloc_tracker.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
 #endif /* XML_GE == 1 */
 
 XML_Bool XMLCALL
@@ -2779,8 +3139,8 @@ static XML_Bool
 storeRawNames(XML_Parser parser) {
   TAG *tag = parser->m_tagStack;
   while (tag) {
-    int bufSize;
-    int nameLen = sizeof(XML_Char) * (tag->name.strLen + 1);
+    size_t bufSize;
+    size_t nameLen = sizeof(XML_Char) * (tag->name.strLen + 1);
     size_t rawNameLen;
     char *rawNameBuf = tag->buf + nameLen;
     /* Stop if already stored.  Since m_tagStack is a stack, we can stop
@@ -2797,9 +3157,9 @@ storeRawNames(XML_Parser parser) {
     /* Detect and prevent integer overflow. */
     if (rawNameLen > (size_t)INT_MAX - nameLen)
       return XML_FALSE;
-    bufSize = nameLen + (int)rawNameLen;
-    if (bufSize > tag->bufEnd - tag->buf) {
-      char *temp = (char *)REALLOC(parser, tag->buf, bufSize);
+    bufSize = nameLen + rawNameLen;
+    if (bufSize > (size_t)(tag->bufEnd - tag->buf)) {
+      char *temp = (char*)REALLOC(parser, tag->buf, bufSize);
       if (temp == NULL)
         return XML_FALSE;
       /* if tag->name.str points to tag->buf (only when namespace
@@ -3125,10 +3485,10 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
         tag = parser->m_freeTagList;
         parser->m_freeTagList = parser->m_freeTagList->parent;
       } else {
-        tag = (TAG *)MALLOC(parser, sizeof(TAG));
+        tag = (TAG*)MALLOC(parser, sizeof(TAG));
         if (! tag)
           return XML_ERROR_NO_MEMORY;
-        tag->buf = (char *)MALLOC(parser, INIT_TAG_BUF_SIZE);
+        tag->buf = (char*)MALLOC(parser, INIT_TAG_BUF_SIZE);
         if (! tag->buf) {
           FREE(parser, tag);
           return XML_ERROR_NO_MEMORY;
@@ -3161,7 +3521,7 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           }
           bufSize = (int)(tag->bufEnd - tag->buf) << 1;
           {
-            char *temp = (char *)REALLOC(parser, tag->buf, bufSize);
+            char *temp = (char*)REALLOC(parser, tag->buf, bufSize);
             if (temp == NULL)
               return XML_ERROR_NO_MEMORY;
             tag->buf = temp;
@@ -3540,8 +3900,8 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
     }
 #endif
 
-    temp = (ATTRIBUTE *)REALLOC(parser, (void *)parser->m_atts,
-                                parser->m_attsSize * sizeof(ATTRIBUTE));
+    temp = (ATTRIBUTE*)REALLOC(parser, parser->m_atts,
+                   parser->m_attsSize * sizeof(ATTRIBUTE));
     if (temp == NULL) {
       parser->m_attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
@@ -3559,8 +3919,8 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
     }
 #  endif
 
-    temp2 = (XML_AttrInfo *)REALLOC(parser, (void *)parser->m_attInfo,
-                                    parser->m_attsSize * sizeof(XML_AttrInfo));
+    temp2 = (XML_AttrInfo*)REALLOC(parser, parser->m_attInfo,
+                    parser->m_attsSize * sizeof(XML_AttrInfo));
     if (temp2 == NULL) {
       parser->m_attsSize = oldAttsSize;
       return XML_ERROR_NO_MEMORY;
@@ -3695,7 +4055,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
      and clear flags that say whether attributes were specified */
   i = 0;
   if (nPrefixes) {
-    int j; /* hash table index */
+    unsigned int j; /* hash table index */
     unsigned long version = parser->m_nsAttsVersion;
 
     /* Detect and prevent invalid shift */
@@ -3736,8 +4096,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       }
 #endif
 
-      temp = (NS_ATT *)REALLOC(parser, parser->m_nsAtts,
-                               nsAttsSize * sizeof(NS_ATT));
+      temp = (NS_ATT*)REALLOC(parser, parser->m_nsAtts, nsAttsSize * sizeof(NS_ATT));
       if (! temp) {
         /* Restore actual size of memory in m_nsAtts */
         parser->m_nsAttsPower = oldNsAttsPower;
@@ -3790,7 +4149,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
         if (! b)
           return XML_ERROR_UNBOUND_PREFIX;
 
-        for (j = 0; j < b->uriLen; j++) {
+        for (j = 0; j < (unsigned int)b->uriLen; j++) {
           const XML_Char c = b->uri[j];
           if (! poolAppendChar(&parser->m_tempPool, c))
             return XML_ERROR_NO_MEMORY;
@@ -3884,7 +4243,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
     return XML_ERROR_NONE;
   prefixLen = 0;
   if (parser->m_ns_triplets && binding->prefix->name) {
-    for (; binding->prefix->name[prefixLen++];)
+    while (binding->prefix->name[prefixLen++])
       ; /* prefixLen includes null terminator */
   }
   tagNamePtr->localPart = localPart;
@@ -3918,7 +4277,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
     }
 #endif
 
-    uri = (XML_Char *)MALLOC(parser, (n + EXPAND_SPARE) * sizeof(XML_Char));
+    uri = (XML_Char*)MALLOC(parser, (n + EXPAND_SPARE) * sizeof(XML_Char));
     if (! uri)
       return XML_ERROR_NO_MEMORY;
     binding->uriAlloc = n + EXPAND_SPARE;
@@ -4164,8 +4523,8 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
       }
 #endif
 
-      XML_Char *temp = (XML_Char *)REALLOC(
-          parser, b->uri, sizeof(XML_Char) * (len + EXPAND_SPARE));
+      XML_Char *temp
+          = (XML_Char*)REALLOC(parser, b->uri, sizeof(XML_Char) * (len + EXPAND_SPARE));
       if (temp == NULL)
         return XML_ERROR_NO_MEMORY;
       b->uri = temp;
@@ -4173,7 +4532,7 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
     }
     parser->m_freeBindingList = b->nextTagBinding;
   } else {
-    b = (BINDING *)MALLOC(parser, sizeof(BINDING));
+    b = (BINDING*)MALLOC(parser, sizeof(BINDING));
     if (! b)
       return XML_ERROR_NO_MEMORY;
 
@@ -4191,8 +4550,7 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
     }
 #endif
 
-    b->uri
-        = (XML_Char *)MALLOC(parser, sizeof(XML_Char) * (len + EXPAND_SPARE));
+    b->uri = (XML_Char*)MALLOC(parser, sizeof(XML_Char) * (len + EXPAND_SPARE));
     if (! b->uri) {
       FREE(parser, b);
       return XML_ERROR_NO_MEMORY;
@@ -4612,7 +4970,7 @@ handleUnknownEncoding(XML_Parser parser, const XML_Char *encodingName) {
     if (parser->m_unknownEncodingHandler(parser->m_unknownEncodingHandlerData,
                                          encodingName, &info)) {
       ENCODING *enc;
-      parser->m_unknownEncodingMem = MALLOC(parser, XmlSizeOfUnknownEncoding());
+      parser->m_unknownEncodingMem = (void*)MALLOC(parser, XmlSizeOfUnknownEncoding());
       if (! parser->m_unknownEncodingMem) {
         if (info.release)
           info.release(info.data);
@@ -5563,7 +5921,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
               return XML_ERROR_NO_MEMORY;
             }
 
-            char *const new_connector = (char *)REALLOC(
+            char *const new_connector = (char*)REALLOC(
                 parser, parser->m_groupConnector, parser->m_groupSize *= 2);
             if (new_connector == NULL) {
               parser->m_groupSize /= 2;
@@ -5583,15 +5941,14 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
             }
 #endif
 
-            int *const new_scaff_index = (int *)REALLOC(
+            int *const new_scaff_index = (int*)REALLOC(
                 parser, dtd->scaffIndex, parser->m_groupSize * sizeof(int));
             if (new_scaff_index == NULL)
               return XML_ERROR_NO_MEMORY;
             dtd->scaffIndex = new_scaff_index;
           }
         } else {
-          parser->m_groupConnector
-              = (char *)MALLOC(parser, parser->m_groupSize = 32);
+          parser->m_groupConnector = (char*)MALLOC(parser, parser->m_groupSize = 32);
           if (! parser->m_groupConnector) {
             parser->m_groupSize = 0;
             return XML_ERROR_NO_MEMORY;
@@ -5748,8 +6105,11 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
     case XML_ROLE_CONTENT_EMPTY:
       if (dtd->in_eldecl) {
         if (parser->m_elementDeclHandler) {
-          XML_Content *content
-              = (XML_Content *)MALLOC(parser, sizeof(XML_Content));
+          // NOTE: We are avoiding MALLOC(..) here to so that
+          //       applications that are not using XML_FreeContentModel but
+          //       plain free(..) or .free_fcn() to free the content model's
+          //       memory are safe.
+          XML_Content *content = (XML_Content*)parser->m_mem.malloc_fcn(sizeof(XML_Content));
           if (! content)
             return XML_ERROR_NO_MEMORY;
           content->quant = XML_CQUANT_NONE;
@@ -5805,7 +6165,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         name = el->name;
         dtd->scaffold[myindex].name = name;
         nameLen = 0;
-        for (; name[nameLen++];)
+        while (name[nameLen++])
           ;
 
         /* Detect and prevent integer overflow */
@@ -6026,8 +6386,7 @@ processEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl,
     openEntity = *freeEntityList;
     *freeEntityList = openEntity->next;
   } else {
-    openEntity
-        = (OPEN_INTERNAL_ENTITY *)MALLOC(parser, sizeof(OPEN_INTERNAL_ENTITY));
+    openEntity = (OPEN_INTERNAL_ENTITY*)MALLOC(parser, sizeof(OPEN_INTERNAL_ENTITY));
     if (! openEntity)
       return XML_ERROR_NO_MEMORY;
   }
@@ -6105,6 +6464,10 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     // process its possible inner entities (which are added to the
     // m_openInternalEntities during doProlog or doContent calls above)
     entity->hasMore = XML_FALSE;
+    if (! entity->is_param
+        && (openEntity->startTagLevel != parser->m_tagLevel)) {
+      return XML_ERROR_ASYNC_ENTITY;
+    }
     triggerReenter(parser);
     return result;
   } // End of entity processing, "if" block will return here
@@ -6295,7 +6658,7 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
     case XML_TOK_ENTITY_REF: {
       const XML_Char *name;
       ENTITY *entity;
-      char checkEntityDecl;
+      bool checkEntityDecl;
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
@@ -6822,8 +7185,8 @@ defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata,
   if (type->nDefaultAtts == type->allocDefaultAtts) {
     if (type->allocDefaultAtts == 0) {
       type->allocDefaultAtts = 8;
-      type->defaultAtts = (DEFAULT_ATTRIBUTE *)MALLOC(
-          parser, type->allocDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
+      type->defaultAtts
+          = (DEFAULT_ATTRIBUTE*)MALLOC(parser, type->allocDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
       if (! type->defaultAtts) {
         type->allocDefaultAtts = 0;
         return 0;
@@ -6848,8 +7211,8 @@ defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata,
       }
 #endif
 
-      temp = (DEFAULT_ATTRIBUTE *)REALLOC(parser, type->defaultAtts,
-                                          (count * sizeof(DEFAULT_ATTRIBUTE)));
+      temp = (DEFAULT_ATTRIBUTE*)REALLOC(parser, type->defaultAtts,
+                     (count * sizeof(DEFAULT_ATTRIBUTE)));
       if (temp == NULL)
         return 0;
       type->allocDefaultAtts = count;
@@ -7140,19 +7503,19 @@ normalizePublicId(XML_Char *publicId) {
 }
 
 static DTD *
-dtdCreate(const XML_Memory_Handling_Suite *ms) {
-  DTD *p = (DTD*) ms->malloc_fcn(sizeof(DTD));
+dtdCreate(XML_Parser parser) {
+  DTD *p = (DTD*)MALLOC(parser, sizeof(DTD));
   if (p == NULL)
     return p;
-  poolInit(&(p->pool), ms);
-  poolInit(&(p->entityValuePool), ms);
-  hashTableInit(&(p->generalEntities), ms);
-  hashTableInit(&(p->elementTypes), ms);
-  hashTableInit(&(p->attributeIds), ms);
-  hashTableInit(&(p->prefixes), ms);
+  poolInit(&(p->pool), parser);
+  poolInit(&(p->entityValuePool), parser);
+  hashTableInit(&(p->generalEntities), parser);
+  hashTableInit(&(p->elementTypes), parser);
+  hashTableInit(&(p->attributeIds), parser);
+  hashTableInit(&(p->prefixes), parser);
 #ifdef XML_DTD
   p->paramEntityRead = XML_FALSE;
-  hashTableInit(&(p->paramEntities), ms);
+  hashTableInit(&(p->paramEntities), parser);
 #endif /* XML_DTD */
   p->defaultPrefix.name = NULL;
   p->defaultPrefix.binding = NULL;
@@ -7172,7 +7535,7 @@ dtdCreate(const XML_Memory_Handling_Suite *ms) {
 }
 
 static void
-dtdReset(DTD *p, const XML_Memory_Handling_Suite *ms) {
+dtdReset(DTD *p, XML_Parser parser) {
   HASH_TABLE_ITER iter;
   hashTableIterInit(&iter, &(p->elementTypes));
   for (;;) {
@@ -7180,7 +7543,7 @@ dtdReset(DTD *p, const XML_Memory_Handling_Suite *ms) {
     if (! e)
       break;
     if (e->allocDefaultAtts != 0)
-      ms->free_fcn(e->defaultAtts);
+      FREE(parser, e->defaultAtts);
   }
   hashTableClear(&(p->generalEntities));
 #ifdef XML_DTD
@@ -7197,9 +7560,9 @@ dtdReset(DTD *p, const XML_Memory_Handling_Suite *ms) {
 
   p->in_eldecl = XML_FALSE;
 
-  ms->free_fcn(p->scaffIndex);
+  FREE(parser, p->scaffIndex);
   p->scaffIndex = NULL;
-  ms->free_fcn(p->scaffold);
+  FREE(parser, p->scaffold);
   p->scaffold = NULL;
 
   p->scaffLevel = 0;
@@ -7213,7 +7576,7 @@ dtdReset(DTD *p, const XML_Memory_Handling_Suite *ms) {
 }
 
 static void
-dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms) {
+dtdDestroy(DTD *p, XML_Bool isDocEntity, XML_Parser parser) {
   HASH_TABLE_ITER iter;
   hashTableIterInit(&iter, &(p->elementTypes));
   for (;;) {
@@ -7221,7 +7584,7 @@ dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms) {
     if (! e)
       break;
     if (e->allocDefaultAtts != 0)
-      ms->free_fcn(e->defaultAtts);
+      FREE(parser, e->defaultAtts);
   }
   hashTableDestroy(&(p->generalEntities));
 #ifdef XML_DTD
@@ -7233,10 +7596,10 @@ dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms) {
   poolDestroy(&(p->pool));
   poolDestroy(&(p->entityValuePool));
   if (isDocEntity) {
-    ms->free_fcn(p->scaffIndex);
-    ms->free_fcn(p->scaffold);
+    FREE(parser, p->scaffIndex);
+    FREE(parser, p->scaffold);
   }
-  ms->free_fcn(p);
+  FREE(parser, p);
 }
 
 /* Do a deep copy of the DTD. Return 0 for out of memory, non-zero otherwise.
@@ -7244,7 +7607,7 @@ dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms) {
 */
 static int
 dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd,
-        const XML_Memory_Handling_Suite *ms) {
+        XML_Parser parser) {
   HASH_TABLE_ITER iter;
 
   /* Copy the prefix table. */
@@ -7325,7 +7688,7 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd,
       }
 #endif
       newE->defaultAtts
-          = (DEFAULT_ATTRIBUTE*) ms->malloc_fcn(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
+          = (DEFAULT_ATTRIBUTE*)MALLOC(parser, oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
       if (! newE->defaultAtts) {
         return 0;
       }
@@ -7487,7 +7850,7 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) {
     /* table->size is a power of 2 */
     table->size = (size_t)1 << INIT_POWER;
     tsize = table->size * sizeof(NAMED *);
-    table->v = (NAMED**) table->mem->malloc_fcn(tsize);
+    table->v = (NAMED**)MALLOC(table->parser, tsize);
     if (! table->v) {
       table->size = 0;
       return NULL;
@@ -7527,7 +7890,7 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) {
       }
 
       size_t tsize = newSize * sizeof(NAMED *);
-      NAMED **newV = (NAMED**) table->mem->malloc_fcn(tsize);
+      NAMED **newV = (NAMED**)MALLOC(table->parser, tsize);
       if (! newV)
         return NULL;
       memset(newV, 0, tsize);
@@ -7543,7 +7906,7 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) {
           }
           newV[j] = table->v[i];
         }
-      table->mem->free_fcn(table->v);
+      FREE(table->parser, table->v);
       table->v = newV;
       table->power = newPower;
       table->size = newSize;
@@ -7556,7 +7919,7 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) {
       }
     }
   }
-  table->v[i] = (NAMED*) table->mem->malloc_fcn(createSize);
+  table->v[i] = (NAMED*)MALLOC(table->parser, createSize);
   if (! table->v[i])
     return NULL;
   memset(table->v[i], 0, createSize);
@@ -7569,7 +7932,7 @@ static void FASTCALL
 hashTableClear(HASH_TABLE *table) {
   size_t i;
   for (i = 0; i < table->size; i++) {
-    table->mem->free_fcn(table->v[i]);
+    FREE(table->parser, table->v[i]);
     table->v[i] = NULL;
   }
   table->used = 0;
@@ -7579,17 +7942,17 @@ static void FASTCALL
 hashTableDestroy(HASH_TABLE *table) {
   size_t i;
   for (i = 0; i < table->size; i++)
-    table->mem->free_fcn(table->v[i]);
-  table->mem->free_fcn(table->v);
+    FREE(table->parser, table->v[i]);
+  FREE(table->parser, table->v);
 }
 
 static void FASTCALL
-hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
+hashTableInit(HASH_TABLE *p, XML_Parser parser) {
   p->power = 0;
   p->size = 0;
   p->used = 0;
   p->v = NULL;
-  p->mem = ms;
+  p->parser = parser;
 }
 
 static void FASTCALL
@@ -7609,13 +7972,13 @@ hashTableIterNext(HASH_TABLE_ITER *iter) {
 }
 
 static void FASTCALL
-poolInit(STRING_POOL *pool, const XML_Memory_Handling_Suite *ms) {
+poolInit(STRING_POOL *pool, XML_Parser parser) {
   pool->blocks = NULL;
   pool->freeBlocks = NULL;
   pool->start = NULL;
   pool->ptr = NULL;
   pool->end = NULL;
-  pool->mem = ms;
+  pool->parser = parser;
 }
 
 static void FASTCALL
@@ -7642,13 +8005,13 @@ poolDestroy(STRING_POOL *pool) {
   BLOCK *p = pool->blocks;
   while (p) {
     BLOCK *tem = p->next;
-    pool->mem->free_fcn(p);
+    FREE(pool->parser, p);
     p = tem;
   }
   p = pool->freeBlocks;
   while (p) {
     BLOCK *tem = p->next;
-    pool->mem->free_fcn(p);
+    FREE(pool->parser, p);
     p = tem;
   }
 }
@@ -7803,8 +8166,7 @@ poolGrow(STRING_POOL *pool) {
     if (bytesToAllocate == 0)
       return XML_FALSE;
 
-    temp = (BLOCK *)pool->mem->realloc_fcn(pool->blocks,
-                                           (unsigned)bytesToAllocate);
+    temp = (BLOCK*)REALLOC(pool->parser, pool->blocks, bytesToAllocate);
     if (temp == NULL)
       return XML_FALSE;
     pool->blocks = temp;
@@ -7844,7 +8206,7 @@ poolGrow(STRING_POOL *pool) {
     if (bytesToAllocate == 0)
       return XML_FALSE;
 
-    tem = (BLOCK*) pool->mem->malloc_fcn(bytesToAllocate);
+    tem = (BLOCK*)MALLOC(pool->parser, bytesToAllocate);
     if (! tem)
       return XML_FALSE;
     tem->size = blockSize;
@@ -7875,12 +8237,17 @@ nextScaffoldPart(XML_Parser parser) {
       return -1;
     }
 #endif
-    dtd->scaffIndex = (int *)MALLOC(parser, parser->m_groupSize * sizeof(int));
+    dtd->scaffIndex = (int*)MALLOC(parser, parser->m_groupSize * sizeof(int));
     if (! dtd->scaffIndex)
       return -1;
     dtd->scaffIndex[0] = 0;
   }
 
+  // Will casting to int be safe further down?
+  if (dtd->scaffCount > INT_MAX) {
+    return -1;
+  }
+
   if (dtd->scaffCount >= dtd->scaffSize) {
     CONTENT_SCAFFOLD *temp;
     if (dtd->scaffold) {
@@ -7898,21 +8265,20 @@ nextScaffoldPart(XML_Parser parser) {
       }
 #endif
 
-      temp = (CONTENT_SCAFFOLD *)REALLOC(
-          parser, dtd->scaffold, dtd->scaffSize * 2 * sizeof(CONTENT_SCAFFOLD));
+      temp = (CONTENT_SCAFFOLD*)REALLOC(parser, dtd->scaffold,
+                     dtd->scaffSize * 2 * sizeof(CONTENT_SCAFFOLD));
       if (temp == NULL)
         return -1;
       dtd->scaffSize *= 2;
     } else {
-      temp = (CONTENT_SCAFFOLD *)MALLOC(parser, INIT_SCAFFOLD_ELEMENTS
-                                                    * sizeof(CONTENT_SCAFFOLD));
+      temp = (CONTENT_SCAFFOLD*)MALLOC(parser, INIT_SCAFFOLD_ELEMENTS * sizeof(CONTENT_SCAFFOLD));
       if (temp == NULL)
         return -1;
       dtd->scaffSize = INIT_SCAFFOLD_ELEMENTS;
     }
     dtd->scaffold = temp;
   }
-  next = dtd->scaffCount++;
+  next = (int)dtd->scaffCount++;
   me = &dtd->scaffold[next];
   if (dtd->scaffLevel) {
     CONTENT_SCAFFOLD *parent
@@ -7959,7 +8325,10 @@ build_model(XML_Parser parser) {
   const size_t allocsize = (dtd->scaffCount * sizeof(XML_Content)
                             + (dtd->contentStringLen * sizeof(XML_Char)));
 
-  ret = (XML_Content *)MALLOC(parser, allocsize);
+  // NOTE: We are avoiding MALLOC(..) here to so that
+  //       applications that are not using XML_FreeContentModel but plain
+  //       free(..) or .free_fcn() to free the content model's memory are safe.
+  ret = (XML_Content*)parser->m_mem.malloc_fcn(allocsize);
   if (! ret)
     return NULL;
 
@@ -8080,7 +8449,7 @@ getElementType(XML_Parser parser, const ENCODING *enc, const char *ptr,
 }
 
 static XML_Char *
-copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
+copyString(const XML_Char *s, XML_Parser parser) {
   size_t charsRequired = 0;
   XML_Char *result;
 
@@ -8092,7 +8461,7 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   charsRequired++;
 
   /* Now allocate space for the copy */
-  result = (XML_Char*) memsuite->malloc_fcn(charsRequired * sizeof(XML_Char));
+  result = (XML_Char*)MALLOC(parser, charsRequired * sizeof(XML_Char));
   if (result == NULL)
     return NULL;
   /* Copy the original into place */
@@ -8111,10 +8480,10 @@ accountingGetCurrentAmplification(XML_Parser rootParser) {
         + rootParser->m_accounting.countBytesIndirect;
   const float amplificationFactor
       = rootParser->m_accounting.countBytesDirect
-            ? (countBytesOutput
+            ? ((float)countBytesOutput
                / (float)(rootParser->m_accounting.countBytesDirect))
-            : ((lenOfShortestInclude
-                + rootParser->m_accounting.countBytesIndirect)
+            : ((float)(lenOfShortestInclude
+                       + rootParser->m_accounting.countBytesIndirect)
                / (float)lenOfShortestInclude);
   assert(! rootParser->m_parentParser);
   return amplificationFactor;
@@ -8298,6 +8667,8 @@ entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
   rootParser->m_entity_stats.currentDepth--;
 }
 
+#endif /* XML_GE == 1 */
+
 static XML_Parser
 getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
   XML_Parser rootParser = parser;
@@ -8313,6 +8684,8 @@ getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
   return rootParser;
 }
 
+#if XML_GE == 1
+
 const char *
 unsignedCharToPrintable(unsigned char c) {
   switch (c) {
diff --git a/base/poco/XML/src/xmlrole.c b/base/poco/XML/src/xmlrole.c
index 6300dcfad179..2c6133f236a9 100644
--- a/base/poco/XML/src/xmlrole.c
+++ b/base/poco/XML/src/xmlrole.c
@@ -42,11 +42,10 @@
 
 #include <stddef.h>
 
-#ifdef EXPAT_WIN32
-#include "winconfig.h"
+#ifdef _WIN32
+#  include "winconfig.h"
 #endif
 
-#include "Poco/XML/expat_external.h"
 #include "internal.h"
 #include "xmlrole.h"
 #include "ascii.h"
diff --git a/base/poco/XML/src/xmlrole.h b/base/poco/XML/src/xmlrole.h
index a5ad4f7dca35..4cb28ddf9ca4 100644
--- a/base/poco/XML/src/xmlrole.h
+++ b/base/poco/XML/src/xmlrole.h
@@ -10,7 +10,7 @@
    Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
    Copyright (c) 2002      Karl Waclawek <karl@waclawek.net>
    Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-   Copyright (c) 2017-2024 Sebastian Pipping <sebastian@pipping.org>
+   Copyright (c) 2017-2025 Sebastian Pipping <sebastian@pipping.org>
    Licensed under the MIT license:
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -34,19 +34,13 @@
 */
 
 #ifndef XmlRole_INCLUDED
-#define XmlRole_INCLUDED 1
+#  define XmlRole_INCLUDED 1
 
-#ifdef __VMS
-/*      0        1         2         3      0        1         2         3
-        1234567890123456789012345678901     1234567890123456789012345678901 */
-#  define XmlPrologStateInitExternalEntity XmlPrologStateInitExternalEnt
-#endif
+#  include "xmltok.h"
 
-#include "xmltok.h"
-
-#ifdef __cplusplus
+#  ifdef __cplusplus
 extern "C" {
-#endif
+#  endif
 
 enum {
   XML_ROLE_ERROR = -1,
@@ -107,11 +101,11 @@ enum {
   XML_ROLE_CONTENT_ELEMENT_PLUS,
   XML_ROLE_PI,
   XML_ROLE_COMMENT,
-#ifdef XML_DTD
+#  ifdef XML_DTD
   XML_ROLE_TEXT_DECL,
   XML_ROLE_IGNORE_SECT,
   XML_ROLE_INNER_PARAM_ENTITY_REF,
-#endif /* XML_DTD */
+#  endif /* XML_DTD */
   XML_ROLE_PARAM_ENTITY_REF
 };
 
@@ -120,23 +114,23 @@ typedef struct prolog_state {
                         const char *end, const ENCODING *enc);
   unsigned level;
   int role_none;
-#ifdef XML_DTD
+#  ifdef XML_DTD
   unsigned includeLevel;
   int documentEntity;
   int inEntityValue;
-#endif /* XML_DTD */
+#  endif /* XML_DTD */
 } PROLOG_STATE;
 
 void XmlPrologStateInit(PROLOG_STATE *state);
-#ifdef XML_DTD
+#  ifdef XML_DTD
 void XmlPrologStateInitExternalEntity(PROLOG_STATE *state);
-#endif /* XML_DTD */
+#  endif /* XML_DTD */
 
-#define XmlTokenRole(state, tok, ptr, end, enc)                                \
-  (((state)->handler)(state, tok, ptr, end, enc))
+#  define XmlTokenRole(state, tok, ptr, end, enc)                              \
+    (((state)->handler)(state, tok, ptr, end, enc))
 
-#ifdef __cplusplus
+#  ifdef __cplusplus
 }
-#endif
+#  endif
 
 #endif /* not XmlRole_INCLUDED */
diff --git a/base/poco/XML/src/xmltok.c b/base/poco/XML/src/xmltok.c
index 0b5c234c2af2..19626ea7f195 100644
--- a/base/poco/XML/src/xmltok.c
+++ b/base/poco/XML/src/xmltok.c
@@ -52,7 +52,7 @@
 #include <string.h> /* memcpy */
 #include <stdbool.h>
 
-#ifdef EXPAT_WIN32
+#ifdef _WIN32
 #  include "winconfig.h"
 #endif
 
@@ -1398,7 +1398,7 @@ unknown_toUtf16(const ENCODING *enc, const char **fromP, const char *fromLim,
 }
 
 ENCODING *
-XmlInitUnknownEncoding(void *mem, int *table, CONVERTER convert,
+XmlInitUnknownEncoding(void *mem, const int *table, CONVERTER convert,
                        void *userData) {
   int i;
   struct unknown_encoding *e = (struct unknown_encoding *)mem;
@@ -1661,7 +1661,7 @@ initScan(const ENCODING *const *encodingTable, const INIT_ENCODING *enc,
 #  undef ns
 
 ENCODING *
-XmlInitUnknownEncodingNS(void *mem, int *table, CONVERTER convert,
+XmlInitUnknownEncodingNS(void *mem, const int *table, CONVERTER convert,
                          void *userData) {
   ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData);
   if (enc)
diff --git a/base/poco/XML/src/xmltok.h b/base/poco/XML/src/xmltok.h
index 73bef31a6d9f..f949ebf9c171 100644
--- a/base/poco/XML/src/xmltok.h
+++ b/base/poco/XML/src/xmltok.h
@@ -35,113 +35,113 @@
 */
 
 #ifndef XmlTok_INCLUDED
-#define XmlTok_INCLUDED 1
+#  define XmlTok_INCLUDED 1
 
-#ifdef __cplusplus
+#  ifdef __cplusplus
 extern "C" {
-#endif
+#  endif
 
 /* The following token may be returned by XmlContentTok */
-#define XML_TOK_TRAILING_RSQB                                                  \
-  -5 /* ] or ]] at the end of the scan; might be                               \
-        start of illegal ]]> sequence */
+#  define XML_TOK_TRAILING_RSQB                                                \
+    -5 /* ] or ]] at the end of the scan; might be                             \
+          start of illegal ]]> sequence */
 /* The following tokens may be returned by both XmlPrologTok and
    XmlContentTok.
 */
-#define XML_TOK_NONE -4 /* The string to be scanned is empty */
-#define XML_TOK_TRAILING_CR                                                    \
-  -3                            /* A CR at the end of the scan;                \
-                                   might be part of CRLF sequence */
-#define XML_TOK_PARTIAL_CHAR -2 /* only part of a multibyte sequence */
-#define XML_TOK_PARTIAL -1      /* only part of a token */
-#define XML_TOK_INVALID 0
+#  define XML_TOK_NONE -4 /* The string to be scanned is empty */
+#  define XML_TOK_TRAILING_CR                                                  \
+    -3                            /* A CR at the end of the scan;              \
+                                     might be part of CRLF sequence */
+#  define XML_TOK_PARTIAL_CHAR -2 /* only part of a multibyte sequence */
+#  define XML_TOK_PARTIAL -1      /* only part of a token */
+#  define XML_TOK_INVALID 0
 
 /* The following tokens are returned by XmlContentTok; some are also
    returned by XmlAttributeValueTok, XmlEntityTok, XmlCdataSectionTok.
 */
-#define XML_TOK_START_TAG_WITH_ATTS 1
-#define XML_TOK_START_TAG_NO_ATTS 2
-#define XML_TOK_EMPTY_ELEMENT_WITH_ATTS 3 /* empty element tag <e/> */
-#define XML_TOK_EMPTY_ELEMENT_NO_ATTS 4
-#define XML_TOK_END_TAG 5
-#define XML_TOK_DATA_CHARS 6
-#define XML_TOK_DATA_NEWLINE 7
-#define XML_TOK_CDATA_SECT_OPEN 8
-#define XML_TOK_ENTITY_REF 9
-#define XML_TOK_CHAR_REF 10 /* numeric character reference */
+#  define XML_TOK_START_TAG_WITH_ATTS 1
+#  define XML_TOK_START_TAG_NO_ATTS 2
+#  define XML_TOK_EMPTY_ELEMENT_WITH_ATTS 3 /* empty element tag <e/> */
+#  define XML_TOK_EMPTY_ELEMENT_NO_ATTS 4
+#  define XML_TOK_END_TAG 5
+#  define XML_TOK_DATA_CHARS 6
+#  define XML_TOK_DATA_NEWLINE 7
+#  define XML_TOK_CDATA_SECT_OPEN 8
+#  define XML_TOK_ENTITY_REF 9
+#  define XML_TOK_CHAR_REF 10 /* numeric character reference */
 
 /* The following tokens may be returned by both XmlPrologTok and
    XmlContentTok.
 */
-#define XML_TOK_PI 11       /* processing instruction */
-#define XML_TOK_XML_DECL 12 /* XML decl or text decl */
-#define XML_TOK_COMMENT 13
-#define XML_TOK_BOM 14 /* Byte order mark */
+#  define XML_TOK_PI 11       /* processing instruction */
+#  define XML_TOK_XML_DECL 12 /* XML decl or text decl */
+#  define XML_TOK_COMMENT 13
+#  define XML_TOK_BOM 14 /* Byte order mark */
 
 /* The following tokens are returned only by XmlPrologTok */
-#define XML_TOK_PROLOG_S 15
-#define XML_TOK_DECL_OPEN 16  /* <!foo */
-#define XML_TOK_DECL_CLOSE 17 /* > */
-#define XML_TOK_NAME 18
-#define XML_TOK_NMTOKEN 19
-#define XML_TOK_POUND_NAME 20 /* #name */
-#define XML_TOK_OR 21         /* | */
-#define XML_TOK_PERCENT 22
-#define XML_TOK_OPEN_PAREN 23
-#define XML_TOK_CLOSE_PAREN 24
-#define XML_TOK_OPEN_BRACKET 25
-#define XML_TOK_CLOSE_BRACKET 26
-#define XML_TOK_LITERAL 27
-#define XML_TOK_PARAM_ENTITY_REF 28
-#define XML_TOK_INSTANCE_START 29
+#  define XML_TOK_PROLOG_S 15
+#  define XML_TOK_DECL_OPEN 16  /* <!foo */
+#  define XML_TOK_DECL_CLOSE 17 /* > */
+#  define XML_TOK_NAME 18
+#  define XML_TOK_NMTOKEN 19
+#  define XML_TOK_POUND_NAME 20 /* #name */
+#  define XML_TOK_OR 21         /* | */
+#  define XML_TOK_PERCENT 22
+#  define XML_TOK_OPEN_PAREN 23
+#  define XML_TOK_CLOSE_PAREN 24
+#  define XML_TOK_OPEN_BRACKET 25
+#  define XML_TOK_CLOSE_BRACKET 26
+#  define XML_TOK_LITERAL 27
+#  define XML_TOK_PARAM_ENTITY_REF 28
+#  define XML_TOK_INSTANCE_START 29
 
 /* The following occur only in element type declarations */
-#define XML_TOK_NAME_QUESTION 30        /* name? */
-#define XML_TOK_NAME_ASTERISK 31        /* name* */
-#define XML_TOK_NAME_PLUS 32            /* name+ */
-#define XML_TOK_COND_SECT_OPEN 33       /* <![ */
-#define XML_TOK_COND_SECT_CLOSE 34      /* ]]> */
-#define XML_TOK_CLOSE_PAREN_QUESTION 35 /* )? */
-#define XML_TOK_CLOSE_PAREN_ASTERISK 36 /* )* */
-#define XML_TOK_CLOSE_PAREN_PLUS 37     /* )+ */
-#define XML_TOK_COMMA 38
+#  define XML_TOK_NAME_QUESTION 30        /* name? */
+#  define XML_TOK_NAME_ASTERISK 31        /* name* */
+#  define XML_TOK_NAME_PLUS 32            /* name+ */
+#  define XML_TOK_COND_SECT_OPEN 33       /* <![ */
+#  define XML_TOK_COND_SECT_CLOSE 34      /* ]]> */
+#  define XML_TOK_CLOSE_PAREN_QUESTION 35 /* )? */
+#  define XML_TOK_CLOSE_PAREN_ASTERISK 36 /* )* */
+#  define XML_TOK_CLOSE_PAREN_PLUS 37     /* )+ */
+#  define XML_TOK_COMMA 38
 
 /* The following token is returned only by XmlAttributeValueTok */
-#define XML_TOK_ATTRIBUTE_VALUE_S 39
+#  define XML_TOK_ATTRIBUTE_VALUE_S 39
 
 /* The following token is returned only by XmlCdataSectionTok */
-#define XML_TOK_CDATA_SECT_CLOSE 40
+#  define XML_TOK_CDATA_SECT_CLOSE 40
 
 /* With namespace processing this is returned by XmlPrologTok for a
    name with a colon.
 */
-#define XML_TOK_PREFIXED_NAME 41
+#  define XML_TOK_PREFIXED_NAME 41
 
-#ifdef XML_DTD
-#  define XML_TOK_IGNORE_SECT 42
-#endif /* XML_DTD */
+#  ifdef XML_DTD
+#    define XML_TOK_IGNORE_SECT 42
+#  endif /* XML_DTD */
 
-#ifdef XML_DTD
-#  define XML_N_STATES 4
-#else /* not XML_DTD */
-#  define XML_N_STATES 3
-#endif /* not XML_DTD */
+#  ifdef XML_DTD
+#    define XML_N_STATES 4
+#  else /* not XML_DTD */
+#    define XML_N_STATES 3
+#  endif /* not XML_DTD */
 
-#define XML_PROLOG_STATE 0
-#define XML_CONTENT_STATE 1
-#define XML_CDATA_SECTION_STATE 2
-#ifdef XML_DTD
-#  define XML_IGNORE_SECTION_STATE 3
-#endif /* XML_DTD */
+#  define XML_PROLOG_STATE 0
+#  define XML_CONTENT_STATE 1
+#  define XML_CDATA_SECTION_STATE 2
+#  ifdef XML_DTD
+#    define XML_IGNORE_SECTION_STATE 3
+#  endif /* XML_DTD */
 
-#define XML_N_LITERAL_TYPES 2
-#define XML_ATTRIBUTE_VALUE_LITERAL 0
-#define XML_ENTITY_VALUE_LITERAL 1
+#  define XML_N_LITERAL_TYPES 2
+#  define XML_ATTRIBUTE_VALUE_LITERAL 0
+#  define XML_ENTITY_VALUE_LITERAL 1
 
 /* The size of the buffer passed to XmlUtf8Encode must be at least this. */
-#define XML_UTF8_ENCODE_MAX 4
+#  define XML_UTF8_ENCODE_MAX 4
 /* The size of the buffer passed to XmlUtf16Encode must be at least this. */
-#define XML_UTF16_ENCODE_MAX 2
+#  define XML_UTF16_ENCODE_MAX 2
 
 typedef struct position {
   /* first line and first column are 0 not 1 */
@@ -220,63 +220,63 @@ struct encoding {
    the prolog outside literals, comments and processing instructions.
 */
 
-#define XmlTok(enc, state, ptr, end, nextTokPtr)                               \
-  (((enc)->scanners[state])(enc, ptr, end, nextTokPtr))
+#  define XmlTok(enc, state, ptr, end, nextTokPtr)                             \
+    (((enc)->scanners[state])(enc, ptr, end, nextTokPtr))
 
-#define XmlPrologTok(enc, ptr, end, nextTokPtr)                                \
-  XmlTok(enc, XML_PROLOG_STATE, ptr, end, nextTokPtr)
+#  define XmlPrologTok(enc, ptr, end, nextTokPtr)                              \
+    XmlTok(enc, XML_PROLOG_STATE, ptr, end, nextTokPtr)
 
-#define XmlContentTok(enc, ptr, end, nextTokPtr)                               \
-  XmlTok(enc, XML_CONTENT_STATE, ptr, end, nextTokPtr)
+#  define XmlContentTok(enc, ptr, end, nextTokPtr)                             \
+    XmlTok(enc, XML_CONTENT_STATE, ptr, end, nextTokPtr)
 
-#define XmlCdataSectionTok(enc, ptr, end, nextTokPtr)                          \
-  XmlTok(enc, XML_CDATA_SECTION_STATE, ptr, end, nextTokPtr)
+#  define XmlCdataSectionTok(enc, ptr, end, nextTokPtr)                        \
+    XmlTok(enc, XML_CDATA_SECTION_STATE, ptr, end, nextTokPtr)
 
-#ifdef XML_DTD
+#  ifdef XML_DTD
 
-#  define XmlIgnoreSectionTok(enc, ptr, end, nextTokPtr)                       \
-    XmlTok(enc, XML_IGNORE_SECTION_STATE, ptr, end, nextTokPtr)
+#    define XmlIgnoreSectionTok(enc, ptr, end, nextTokPtr)                     \
+      XmlTok(enc, XML_IGNORE_SECTION_STATE, ptr, end, nextTokPtr)
 
-#endif /* XML_DTD */
+#  endif /* XML_DTD */
 
 /* This is used for performing a 2nd-level tokenization on the content
    of a literal that has already been returned by XmlTok.
 */
-#define XmlLiteralTok(enc, literalType, ptr, end, nextTokPtr)                  \
-  (((enc)->literalScanners[literalType])(enc, ptr, end, nextTokPtr))
+#  define XmlLiteralTok(enc, literalType, ptr, end, nextTokPtr)                \
+    (((enc)->literalScanners[literalType])(enc, ptr, end, nextTokPtr))
 
-#define XmlAttributeValueTok(enc, ptr, end, nextTokPtr)                        \
-  XmlLiteralTok(enc, XML_ATTRIBUTE_VALUE_LITERAL, ptr, end, nextTokPtr)
+#  define XmlAttributeValueTok(enc, ptr, end, nextTokPtr)                      \
+    XmlLiteralTok(enc, XML_ATTRIBUTE_VALUE_LITERAL, ptr, end, nextTokPtr)
 
-#define XmlEntityValueTok(enc, ptr, end, nextTokPtr)                           \
-  XmlLiteralTok(enc, XML_ENTITY_VALUE_LITERAL, ptr, end, nextTokPtr)
+#  define XmlEntityValueTok(enc, ptr, end, nextTokPtr)                         \
+    XmlLiteralTok(enc, XML_ENTITY_VALUE_LITERAL, ptr, end, nextTokPtr)
 
-#define XmlNameMatchesAscii(enc, ptr1, end1, ptr2)                             \
-  (((enc)->nameMatchesAscii)(enc, ptr1, end1, ptr2))
+#  define XmlNameMatchesAscii(enc, ptr1, end1, ptr2)                           \
+    (((enc)->nameMatchesAscii)(enc, ptr1, end1, ptr2))
 
-#define XmlNameLength(enc, ptr) (((enc)->nameLength)(enc, ptr))
+#  define XmlNameLength(enc, ptr) (((enc)->nameLength)(enc, ptr))
 
-#define XmlSkipS(enc, ptr) (((enc)->skipS)(enc, ptr))
+#  define XmlSkipS(enc, ptr) (((enc)->skipS)(enc, ptr))
 
-#define XmlGetAttributes(enc, ptr, attsMax, atts)                              \
-  (((enc)->getAtts)(enc, ptr, attsMax, atts))
+#  define XmlGetAttributes(enc, ptr, attsMax, atts)                            \
+    (((enc)->getAtts)(enc, ptr, attsMax, atts))
 
-#define XmlCharRefNumber(enc, ptr) (((enc)->charRefNumber)(enc, ptr))
+#  define XmlCharRefNumber(enc, ptr) (((enc)->charRefNumber)(enc, ptr))
 
-#define XmlPredefinedEntityName(enc, ptr, end)                                 \
-  (((enc)->predefinedEntityName)(enc, ptr, end))
+#  define XmlPredefinedEntityName(enc, ptr, end)                               \
+    (((enc)->predefinedEntityName)(enc, ptr, end))
 
-#define XmlUpdatePosition(enc, ptr, end, pos)                                  \
-  (((enc)->updatePosition)(enc, ptr, end, pos))
+#  define XmlUpdatePosition(enc, ptr, end, pos)                                \
+    (((enc)->updatePosition)(enc, ptr, end, pos))
 
-#define XmlIsPublicId(enc, ptr, end, badPtr)                                   \
-  (((enc)->isPublicId)(enc, ptr, end, badPtr))
+#  define XmlIsPublicId(enc, ptr, end, badPtr)                                 \
+    (((enc)->isPublicId)(enc, ptr, end, badPtr))
 
-#define XmlUtf8Convert(enc, fromP, fromLim, toP, toLim)                        \
-  (((enc)->utf8Convert)(enc, fromP, fromLim, toP, toLim))
+#  define XmlUtf8Convert(enc, fromP, fromLim, toP, toLim)                      \
+    (((enc)->utf8Convert)(enc, fromP, fromLim, toP, toLim))
 
-#define XmlUtf16Convert(enc, fromP, fromLim, toP, toLim)                       \
-  (((enc)->utf16Convert)(enc, fromP, fromLim, toP, toLim))
+#  define XmlUtf16Convert(enc, fromP, fromLim, toP, toLim)                     \
+    (((enc)->utf16Convert)(enc, fromP, fromLim, toP, toLim))
 
 typedef struct {
   ENCODING initEnc;
@@ -299,7 +299,7 @@ int XmlSizeOfUnknownEncoding(void);
 
 typedef int(XMLCALL *CONVERTER)(void *userData, const char *p);
 
-ENCODING *XmlInitUnknownEncoding(void *mem, int *table, CONVERTER convert,
+ENCODING *XmlInitUnknownEncoding(void *mem, const int *table, CONVERTER convert,
                                  void *userData);
 
 int XmlParseXmlDeclNS(int isGeneralTextEntity, const ENCODING *enc,
@@ -312,10 +312,10 @@ int XmlInitEncodingNS(INIT_ENCODING *p, const ENCODING **encPtr,
                       const char *name);
 const ENCODING *XmlGetUtf8InternalEncodingNS(void);
 const ENCODING *XmlGetUtf16InternalEncodingNS(void);
-ENCODING *XmlInitUnknownEncodingNS(void *mem, int *table, CONVERTER convert,
-                                   void *userData);
-#ifdef __cplusplus
+ENCODING *XmlInitUnknownEncodingNS(void *mem, const int *table,
+                                   CONVERTER convert, void *userData);
+#  ifdef __cplusplus
 }
-#endif
+#  endif
 
 #endif /* not XmlTok_INCLUDED */
diff --git a/base/poco/XML/src/xmltok_ns.c b/base/poco/XML/src/xmltok_ns.c
index 746d6c18b8a0..0a23d7e8c498 100644
--- a/base/poco/XML/src/xmltok_ns.c
+++ b/base/poco/XML/src/xmltok_ns.c
@@ -98,13 +98,13 @@ NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end) {
   int i;
   XmlUtf8Convert(enc, &ptr, end, &p, p + ENCODING_MAX - 1);
   if (ptr != end)
-    return 0;
+    return NULL;
   *p = 0;
   if (streqci(buf, KW_UTF_16) && enc->minBytesPerChar == 2)
     return enc;
   i = getEncodingIndex(buf);
   if (i == UNKNOWN_ENC)
-    return 0;
+    return NULL;
   return NS(encodings)[i];
 }
 
diff --git a/ci/defs/defs.py b/ci/defs/defs.py
index d3bf1fd567b3..53bee36e16e4 100644
--- a/ci/defs/defs.py
+++ b/ci/defs/defs.py
@@ -1,38 +1,47 @@
 from praktika import Artifact, Docker, Job, Secret
 from praktika.utils import MetaClasses, Utils
+from settings import altinity_overrides
 
 # i.e. "ClickHouse/ci/tmp"
 TEMP_DIR = f"{Utils.cwd()}/ci/tmp"  # == _Settings.TEMP_DIR != env_helper.TEMP_PATH
 
-SYNC = "CH Inc sync"
+SYNC = "Altinity sync"
 
-S3_BUCKET_NAME = "clickhouse-builds"
-S3_REPORT_BUCKET_NAME = "clickhouse-test-reports"
-S3_BUCKET_HTTP_ENDPOINT = "clickhouse-builds.s3.amazonaws.com"
-S3_REPORT_BUCKET_HTTP_ENDPOINT = "s3.amazonaws.com/clickhouse-test-reports"
+S3_BUCKET_NAME = altinity_overrides.S3_BUCKET_NAME
+S3_REPORT_BUCKET_NAME = altinity_overrides.S3_REPORT_BUCKET_NAME
+S3_BUCKET_HTTP_ENDPOINT = altinity_overrides.S3_BUCKET_HTTP_ENDPOINT
+S3_REPORT_BUCKET_HTTP_ENDPOINT = altinity_overrides.S3_REPORT_BUCKET_HTTP_ENDPOINT
 
 
 class RunnerLabels:
     CI_SERVICES = "ci_services"
     CI_SERVICES_EBS = "ci_services_ebs"
-    BUILDER_AMD = ["self-hosted", "builder"]
-    BUILDER_ARM = ["self-hosted", "builder-aarch64"]
-    FUNC_TESTER_AMD = ["self-hosted", "amd-medium"]
-    FUNC_TESTER_ARM = ["self-hosted", "arm-medium"]
-    AMD_LARGE = ["self-hosted", "amd-large"]
-    ARM_LARGE = ["self-hosted", "arm-large"]
-    AMD_MEDIUM = ["self-hosted", "amd-medium"]
-    ARM_MEDIUM = ["self-hosted", "arm-medium"]
-    AMD_MEDIUM_CPU = ["self-hosted", "amd-medium-cpu"]
-    ARM_MEDIUM_CPU = ["self-hosted", "arm-medium-cpu"]
-    AMD_MEDIUM_MEM = ["self-hosted", "amd-medium-mem"]
-    ARM_MEDIUM_MEM = ["self-hosted", "arm-medium-mem"]
-    AMD_SMALL = ["self-hosted", "amd-small"]
-    ARM_SMALL = ["self-hosted", "arm-small"]
-    AMD_SMALL_MEM = ["self-hosted", "amd-small-mem"]
-    ARM_SMALL_MEM = ["self-hosted", "arm-small-mem"]
-    STYLE_CHECK_AMD = ["self-hosted", "style-checker"]
-    STYLE_CHECK_ARM = ["self-hosted", "style-checker-aarch64"]
+    BUILDER_AMD = ["self-hosted", "altinity-on-demand", "altinity-builder"]
+    BUILDER_ARM = ["self-hosted", "altinity-on-demand", "altinity-builder"]
+    FUNC_TESTER_AMD = ["self-hosted", "altinity-on-demand", "altinity-func-tester"]
+    FUNC_TESTER_ARM = [
+        "self-hosted",
+        "altinity-on-demand",
+        "altinity-func-tester-aarch64",
+    ]
+    AMD_LARGE = ["self-hosted", "altinity-on-demand", "altinity-func-tester"]
+    ARM_LARGE = ["self-hosted", "altinity-on-demand", "altinity-func-tester-aarch64"]
+    AMD_MEDIUM = ["self-hosted", "altinity-on-demand", "altinity-func-tester"]
+    ARM_MEDIUM = ["self-hosted", "altinity-on-demand", "altinity-func-tester-aarch64"]
+    AMD_MEDIUM_CPU = ["self-hosted", "altinity-on-demand", "altinity-func-tester"]
+    ARM_MEDIUM_CPU = ["self-hosted", "altinity-on-demand", "altinity-func-tester-aarch64"]
+    AMD_MEDIUM_MEM = ["self-hosted", "altinity-on-demand", "altinity-func-tester"]
+    ARM_MEDIUM_MEM = ["self-hosted", "altinity-on-demand", "altinity-func-tester-aarch64"]
+    AMD_SMALL = ["self-hosted", "altinity-on-demand", "altinity-style-checker"]
+    ARM_SMALL = ["self-hosted", "altinity-on-demand", "altinity-style-checker-aarch64"]
+    AMD_SMALL_MEM = ["self-hosted", "altinity-on-demand", "altinity-style-checker"]
+    ARM_SMALL_MEM = ["self-hosted", "altinity-on-demand", "altinity-style-checker-aarch64"]
+    STYLE_CHECK_AMD = ["self-hosted", "altinity-on-demand", "altinity-style-checker"]
+    STYLE_CHECK_ARM = [
+        "self-hosted",
+        "altinity-on-demand",
+        "altinity-style-checker-aarch64",
+    ]
 
 
 class CIFiles:
@@ -40,7 +49,7 @@ class CIFiles:
     UNIT_TESTS_BIN = f"{TEMP_DIR}/build/src/unit_tests_dbms"
 
 
-BASE_BRANCH = "master"
+BASE_BRANCH = altinity_overrides.MAIN_BRANCH
 
 azure_secret = Secret.Config(
     name="azure_connection_string",
@@ -49,233 +58,241 @@ class CIFiles:
 
 SECRETS = [
     Secret.Config(
-        name="dockerhub_robot_password",
-        type=Secret.Type.AWS_SSM_VAR,
+        name=altinity_overrides.DOCKERHUB_SECRET,
+        type=Secret.Type.GH_SECRET,
     ),
     Secret.Config(
-        name="clickhouse-test-stat-url",
-        type=Secret.Type.AWS_SSM_VAR,
+        name=altinity_overrides.SECRET_CI_DB_URL,
+        type=Secret.Type.GH_SECRET,
     ),
     Secret.Config(
-        name="clickhouse-test-stat-login",
-        type=Secret.Type.AWS_SSM_VAR,
+        name=altinity_overrides.SECRET_CI_DB_USER,
+        type=Secret.Type.GH_SECRET,
     ),
     Secret.Config(
-        name="clickhouse-test-stat-password",
-        type=Secret.Type.AWS_SSM_VAR,
-    ),
-    azure_secret,
+        name=altinity_overrides.SECRET_CI_DB_PASSWORD,
+        type=Secret.Type.GH_SECRET,
+    ),
+    # azure_secret,
+    # Secret.Config(
+    #     name="woolenwolf_gh_app.clickhouse-app-id",
+    #     type=Secret.Type.AWS_SSM_SECRET,
+    # ),
+    # Secret.Config(
+    #     name="woolenwolf_gh_app.clickhouse-app-key",
+    #     type=Secret.Type.AWS_SSM_SECRET,
+    # ),
     Secret.Config(
-        name="woolenwolf_gh_app.clickhouse-app-id",
-        type=Secret.Type.AWS_SSM_SECRET,
+        name="AWS_ACCESS_KEY_ID",
+        type=Secret.Type.GH_SECRET,
     ),
     Secret.Config(
-        name="woolenwolf_gh_app.clickhouse-app-key",
-        type=Secret.Type.AWS_SSM_SECRET,
+        name="AWS_SECRET_ACCESS_KEY",
+        type=Secret.Type.GH_SECRET,
     ),
 ]
 
 DOCKERS = [
     Docker.Config(
-        name="clickhouse/style-test",
+        name="altinityinfra/style-test",
         path="./ci/docker/style-test",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/fasttest",
+        name="altinityinfra/fasttest",
         path="./ci/docker/fasttest",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/binary-builder",
+        name="altinityinfra/binary-builder",
         path="./ci/docker/binary-builder",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/fasttest"],
+        depends_on=["altinityinfra/fasttest"],
     ),
     Docker.Config(
-        name="clickhouse/test-old-centos",
+        name="altinityinfra/test-old-centos",
         path="./ci/docker/compatibility/centos",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/test-old-ubuntu",
+        name="altinityinfra/test-old-ubuntu",
         path="./ci/docker/compatibility/ubuntu",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/stateless-test",
+        name="altinityinfra/stateless-test",
         path="./ci/docker/stateless-test",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/cctools",
+        name="altinityinfra/cctools",
         path="./ci/docker/cctools",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/fasttest"],
+        depends_on=["altinityinfra/fasttest"],
     ),
     Docker.Config(
-        name="clickhouse/test-base",
+        name="altinityinfra/test-base",
         path="./ci/docker/test-base",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/stress-test",
+        name="altinityinfra/stress-test",
         path="./ci/docker/stress-test",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/stateless-test"],
+        depends_on=["altinityinfra/stateless-test"],
     ),
     Docker.Config(
-        name="clickhouse/fuzzer",
+        name="altinityinfra/fuzzer",
         path="./ci/docker/fuzzer",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/performance-comparison",
+        name="altinityinfra/performance-comparison",
         path="./ci/docker/performance-comparison",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/keeper-jepsen-test",
+        name="altinityinfra/keeper-jepsen-test",
         path="./ci/docker/keeper-jepsen-test",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/server-jepsen-test",
+        name="altinityinfra/server-jepsen-test",
         path="./ci/docker/server-jepsen-test",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/integration-test",
+        name="altinityinfra/integration-test",
         path="./ci/docker/integration/base",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/integration-tests-runner",
+        name="altinityinfra/integration-tests-runner",
         path="./ci/docker/integration/runner",
         platforms=Docker.Platforms.arm_amd,
-        depends_on=["clickhouse/test-base"],
+        depends_on=["altinityinfra/test-base"],
     ),
     Docker.Config(
-        name="clickhouse/integration-test-with-unity-catalog",
+        name="altinityinfra/integration-test-with-unity-catalog",
         path="./ci/docker/integration/clickhouse_with_unity_catalog",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/integration-test-with-hms",
+        name="altinityinfra/integration-test-with-hms",
         path="./ci/docker/integration/clickhouse_with_hms_catalog",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/integration-helper",
+        name="altinityinfra/integration-helper",
         path="./ci/docker/integration/helper_container",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/kerberos-kdc",
+        name="altinityinfra/kerberos-kdc",
         path="./ci/docker/integration/kerberos_kdc",
         platforms=[Docker.Platforms.AMD],
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/mysql-golang-client",
+        name="altinityinfra/mysql-golang-client",
         path="./ci/docker/integration/mysql_golang_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/mysql-java-client",
+        name="altinityinfra/mysql-java-client",
         path="./ci/docker/integration/mysql_java_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/mysql-js-client",
+        name="altinityinfra/mysql-js-client",
         path="./ci/docker/integration/mysql_js_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/arrowflight-server-test",
+        name="altinityinfra/arrowflight-server-test",
         path="./ci/docker/integration/arrowflight",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/dotnet-client",
+        name="altinityinfra/dotnet-client",
         path="./ci/docker/integration/dotnet_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/mysql-php-client",
+        name="altinityinfra/mysql-php-client",
         path="./ci/docker/integration/mysql_php_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/nginx-dav",
+        name="altinityinfra/nginx-dav",
         path="./ci/docker/integration/nginx_dav",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/postgresql-java-client",
+        name="altinityinfra/postgresql-java-client",
         path="./ci/docker/integration/postgresql_java_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/python-bottle",
+        name="altinityinfra/python-bottle",
         path="./ci/docker/integration/resolver",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/s3-proxy",
+        name="altinityinfra/s3-proxy",
         path="./ci/docker/integration/s3_proxy",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
+    # Docker.Config(
+    #    name="clickhouse/docs-builder",
+    #     path="./ci/docker/docs-builder",
+    #     platforms=Docker.Platforms.arm_amd,
+    #     depends_on=[],
+    # ),
     Docker.Config(
-        name="clickhouse/docs-builder",
-        path="./ci/docker/docs-builder",
-        platforms=Docker.Platforms.arm_amd,
-        depends_on=[],
-    ),
-    Docker.Config(
-        name="clickhouse/install-deb-test",
+        name="altinityinfra/install-deb-test",
         path="./ci/docker/install/deb",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/install-rpm-test",
+        name="altinityinfra/install-rpm-test",
         path="./ci/docker/install/rpm",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/sqlancer-test",
+        name="altinityinfra/sqlancer-test",
         path="./ci/docker/sqlancer-test",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
     ),
     Docker.Config(
-        name="clickhouse/mysql_dotnet_client",
+        name="altinityinfra/mysql_dotnet_client",
         path="./ci/docker/integration/mysql_dotnet_client",
         platforms=Docker.Platforms.arm_amd,
         depends_on=[],
@@ -351,12 +368,14 @@ class ToolSet:
 class ArtifactNames:
     CH_AMD_DEBUG = "CH_AMD_DEBUG"
     CH_AMD_RELEASE = "CH_AMD_RELEASE"
+    CH_AMD_RELEASE_STRIPPED = "CH_AMD_RELEASE_STRIPPED"
     CH_AMD_ASAN = "CH_AMD_ASAN"
     CH_AMD_TSAN = "CH_AMD_TSAN"
     CH_AMD_MSAN = "CH_AMD_MSAN"
     CH_AMD_UBSAN = "CH_AMD_UBSAN"
     CH_AMD_BINARY = "CH_AMD_BINARY"
     CH_ARM_RELEASE = "CH_ARM_RELEASE"
+    CH_ARM_RELEASE_STRIPPED = "CH_ARM_RELEASE_STRIPPED"
     CH_ARM_ASAN = "CH_ARM_ASAN"
 
     CH_COV_BIN = "CH_COV_BIN"
@@ -430,6 +449,16 @@ class ArtifactConfigs:
             ArtifactNames.CH_LOONGARCH64,
         ]
     )
+    clickhouse_stripped_binaries = Artifact.Config(
+        name="...",
+        type=Artifact.Type.S3,
+        path=f"{TEMP_DIR}/build/programs/self-extracting/clickhouse-stripped",
+    ).parametrize(
+        names=[
+            ArtifactNames.CH_AMD_RELEASE_STRIPPED,
+            ArtifactNames.CH_ARM_RELEASE_STRIPPED,
+        ]
+    )
     clickhouse_debians = Artifact.Config(
         name="*",
         type=Artifact.Type.S3,
diff --git a/ci/defs/job_configs.py b/ci/defs/job_configs.py
index 8cf465351790..257320aaf2f8 100644
--- a/ci/defs/job_configs.py
+++ b/ci/defs/job_configs.py
@@ -16,7 +16,7 @@
         "./programs",
         "./rust",
         "./ci/jobs/build_clickhouse.py",
-        "./ci/jobs/scripts/job_hooks/build_profile_hook.py",
+        # "./ci/jobs/scripts/job_hooks/build_profile_hook.py",
         "./utils/list-licenses",
     ],
     with_git_submodules=True,
@@ -28,7 +28,7 @@
     command='python3 ./ci/jobs/functional_tests.py --options "{PARAMETER}"',
     # some tests can be flaky due to very slow disks - use tmpfs for temporary ClickHouse files
     # --cap-add=SYS_PTRACE and --privileged for gdb in docker
-    run_in_docker=f"clickhouse/stateless-test+--memory={LIMITED_MEM}+--cap-add=SYS_PTRACE+--privileged+--security-opt seccomp=unconfined+--tmpfs /tmp/clickhouse+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/etc/clickhouse-server1:/etc/clickhouse-server1+--volume=./ci/tmp/etc/clickhouse-server2:/etc/clickhouse-server2+--volume=./ci/tmp/var/log:/var/log",
+    run_in_docker="altinityinfra/stateless-test+--cap-add=SYS_PTRACE+--privileged+--security-opt seccomp=unconfined+--tmpfs /tmp/clickhouse+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/etc/clickhouse-server1:/etc/clickhouse-server1+--volume=./ci/tmp/etc/clickhouse-server2:/etc/clickhouse-server2+--volume=./ci/tmp/var/log:/var/log+--env=AZURE_STORAGE_KEY=$AZURE_STORAGE_KEY+--env=AZURE_ACCOUNT_NAME=$AZURE_ACCOUNT_NAME+--env=AZURE_CONTAINER_NAME=$AZURE_CONTAINER_NAME+--env=AZURE_STORAGE_ACCOUNT_URL=$AZURE_STORAGE_ACCOUNT_URL",
     digest_config=Job.CacheDigestConfig(
         include_paths=[
             "./ci/jobs/functional_tests.py",
@@ -39,15 +39,17 @@
             "./tests/config",
             "./tests/*.txt",
             "./ci/docker/stateless-test",
+            "./tests/broken_tests.yaml",
         ],
     ),
     result_name_for_cidb="Tests",
 )
 
 BINARY_DOCKER_COMMAND = (
-    "clickhouse/binary-builder+--network=host+"
+    "altinityinfra/binary-builder+--network=host+"
     f"--memory={Utils.physical_memory() * 95 // 100}+"
     f"--memory-reservation={Utils.physical_memory() * 9 // 10}"
+    '+--env=AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID"+--env=AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY"'
 )
 
 
@@ -56,7 +58,7 @@ class JobConfigs:
         name=JobNames.STYLE_CHECK,
         runs_on=RunnerLabels.STYLE_CHECK_ARM,
         command="python3 ./ci/jobs/check_style.py",
-        run_in_docker="clickhouse/style-test",
+        run_in_docker="altinityinfra/style-test",
         enable_commit_status=True,
     )
     fast_test = Job.Config(
@@ -64,7 +66,7 @@ class JobConfigs:
         runs_on=RunnerLabels.BUILDER_AMD,
         command="python3 ./ci/jobs/fast_test.py",
         # --network=host required for ec2 metadata http endpoint to work
-        run_in_docker="clickhouse/fasttest+--network=host+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/var/log:/var/log",
+        run_in_docker='altinityinfra/fasttest+--network=host+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/var/log:/var/log+--env=AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID"+--env=AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY"',
         digest_config=Job.CacheDigestConfig(
             include_paths=[
                 "./ci/jobs/fast_test.py",
@@ -124,7 +126,7 @@ class JobConfigs:
         digest_config=build_digest_config,
         post_hooks=[
             "python3 ./ci/jobs/scripts/job_hooks/build_master_head_hook.py",
-            "python3 ./ci/jobs/scripts/job_hooks/build_profile_hook.py",
+            # "python3 ./ci/jobs/scripts/job_hooks/build_profile_hook.py",
         ],
     ).parametrize(
         Job.ParamSet(
@@ -136,6 +138,7 @@ class JobConfigs:
             parameter=BuildTypes.AMD_RELEASE,
             provides=[
                 ArtifactNames.CH_AMD_RELEASE,
+                ArtifactNames.CH_AMD_RELEASE_STRIPPED,
                 ArtifactNames.DEB_AMD_RELEASE,
                 ArtifactNames.RPM_AMD_RELEASE,
                 ArtifactNames.TGZ_AMD_RELEASE,
@@ -187,20 +190,22 @@ class JobConfigs:
             parameter=BuildTypes.ARM_RELEASE,
             provides=[
                 ArtifactNames.CH_ARM_RELEASE,
+                ArtifactNames.CH_ARM_RELEASE_STRIPPED,
                 ArtifactNames.DEB_ARM_RELEASE,
                 ArtifactNames.RPM_ARM_RELEASE,
                 ArtifactNames.TGZ_ARM_RELEASE,
             ],
             runs_on=RunnerLabels.BUILDER_ARM,
         ),
-        Job.ParamSet(
-            parameter=BuildTypes.ARM_ASAN,
-            provides=[
-                ArtifactNames.CH_ARM_ASAN,
-                ArtifactNames.DEB_ARM_ASAN,
-            ],
-            runs_on=RunnerLabels.BUILDER_ARM,
-        ),
+        # NOTE (strtgbb): This build is difficult to cross-compile
+        # Job.ParamSet(
+        #     parameter=BuildTypes.ARM_ASAN,
+        #     provides=[
+        #         ArtifactNames.CH_ARM_ASAN,
+        #         ArtifactNames.DEB_ARM_ASAN,
+        #     ],
+        #     runs_on=RunnerLabels.BUILDER_ARM,
+        # ),
         Job.ParamSet(
             parameter=BuildTypes.ARM_COVERAGE,
             provides=[
@@ -300,7 +305,7 @@ class JobConfigs:
     ).parametrize(
         Job.ParamSet(
             parameter="amd_debug",
-            runs_on=RunnerLabels.STYLE_CHECK_AMD,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[
                 ArtifactNames.DEB_AMD_DEBUG,
                 ArtifactNames.CH_AMD_DEBUG,
@@ -321,7 +326,7 @@ class JobConfigs:
     ).parametrize(
         Job.ParamSet(
             parameter="amd_release",
-            runs_on=RunnerLabels.STYLE_CHECK_AMD,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[
                 ArtifactNames.DEB_AMD_RELEASE,
                 ArtifactNames.RPM_AMD_RELEASE,
@@ -331,7 +336,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="arm_release",
-            runs_on=RunnerLabels.STYLE_CHECK_ARM,
+            runs_on=RunnerLabels.FUNC_TESTER_ARM,
             requires=[
                 ArtifactNames.DEB_ARM_RELEASE,
                 ArtifactNames.RPM_ARM_RELEASE,
@@ -343,7 +348,7 @@ class JobConfigs:
     stateless_tests_flaky_pr_jobs = common_ft_job_config.parametrize(
         Job.ParamSet(
             parameter="amd_asan, flaky check",
-            runs_on=RunnerLabels.AMD_SMALL_MEM,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_ASAN],
         ),
     )
@@ -352,7 +357,7 @@ class JobConfigs:
         runs_on=RunnerLabels.FUNC_TESTER_ARM,
         command="python3 ./ci/jobs/functional_tests.py --options BugfixValidation",
         # some tests can be flaky due to very slow disks - use tmpfs for temporary ClickHouse files
-        run_in_docker="clickhouse/stateless-test+--network=host+--security-opt seccomp=unconfined+--tmpfs /tmp/clickhouse",
+        run_in_docker="altinityinfra/stateless-test+--network=host+--security-opt seccomp=unconfined+--tmpfs /tmp/clickhouse",
         digest_config=Job.CacheDigestConfig(
             include_paths=[
                 "./ci/jobs/functional_tests.py",
@@ -376,7 +381,7 @@ class JobConfigs:
         ],
         Job.ParamSet(
             parameter="amd_asan, distributed plan, sequential",
-            runs_on=RunnerLabels.AMD_SMALL_MEM,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_ASAN],
         ),
         Job.ParamSet(
@@ -386,7 +391,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="amd_binary, old analyzer, s3 storage, DatabaseReplicated, sequential",
-            runs_on=RunnerLabels.AMD_SMALL,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_BINARY],
         ),
         Job.ParamSet(
@@ -396,7 +401,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="amd_binary, ParallelReplicas, s3 storage, sequential",
-            runs_on=RunnerLabels.AMD_SMALL,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_BINARY],
         ),
         Job.ParamSet(
@@ -406,7 +411,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="amd_debug, AsyncInsert, s3 storage, sequential",
-            runs_on=RunnerLabels.AMD_SMALL,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_DEBUG],
         ),
         Job.ParamSet(
@@ -416,13 +421,13 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="amd_debug, sequential",
-            runs_on=RunnerLabels.AMD_SMALL,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_DEBUG],
         ),
         *[
             Job.ParamSet(
                 parameter=f"amd_tsan, parallel, {batch}/{total_batches}",
-                runs_on=RunnerLabels.AMD_LARGE,
+                runs_on=RunnerLabels.FUNC_TESTER_AMD,
                 requires=[ArtifactNames.CH_AMD_TSAN],
             )
             for total_batches in (2,)
@@ -431,7 +436,7 @@ class JobConfigs:
         *[
             Job.ParamSet(
                 parameter=f"amd_tsan, sequential, {batch}/{total_batches}",
-                runs_on=RunnerLabels.AMD_SMALL,
+                runs_on=RunnerLabels.FUNC_TESTER_AMD,
                 requires=[ArtifactNames.CH_AMD_TSAN],
             )
             for total_batches in (2,)
@@ -440,7 +445,7 @@ class JobConfigs:
         *[
             Job.ParamSet(
                 parameter=f"amd_msan, parallel, {batch}/{total_batches}",
-                runs_on=RunnerLabels.AMD_LARGE,
+                runs_on=RunnerLabels.FUNC_TESTER_AMD,
                 requires=[ArtifactNames.CH_AMD_MSAN],
             )
             for total_batches in (2,)
@@ -449,7 +454,7 @@ class JobConfigs:
         *[
             Job.ParamSet(
                 parameter=f"amd_msan, sequential, {batch}/{total_batches}",
-                runs_on=RunnerLabels.AMD_SMALL_MEM,
+                runs_on=RunnerLabels.FUNC_TESTER_AMD,
                 requires=[ArtifactNames.CH_AMD_MSAN],
             )
             for total_batches in (2,)
@@ -462,7 +467,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="amd_ubsan, sequential",
-            runs_on=RunnerLabels.AMD_SMALL_MEM,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_UBSAN],
         ),
         Job.ParamSet(
@@ -472,7 +477,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="amd_debug, distributed plan, s3 storage, sequential",
-            runs_on=RunnerLabels.AMD_SMALL,
+            runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_DEBUG],
         ),
         Job.ParamSet(
@@ -483,7 +488,7 @@ class JobConfigs:
         *[
             Job.ParamSet(
                 parameter=f"amd_tsan, s3 storage, sequential, {batch}/{total_batches}",
-                runs_on=RunnerLabels.AMD_SMALL_MEM,
+                runs_on=RunnerLabels.FUNC_TESTER_AMD,
                 requires=[ArtifactNames.CH_AMD_TSAN],
             )
             for total_batches in (2,)
@@ -496,7 +501,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter="arm_binary, sequential",
-            runs_on=RunnerLabels.ARM_SMALL,
+            runs_on=RunnerLabels.FUNC_TESTER_ARM,
             requires=[ArtifactNames.CH_ARM_BINARY],
         ),
     )
@@ -510,7 +515,7 @@ class JobConfigs:
         ),
         Job.ParamSet(
             parameter=f"arm_coverage, sequential",
-            runs_on=RunnerLabels.ARM_SMALL_MEM,
+            runs_on=RunnerLabels.FUNC_TESTER_ARM,
             requires=[ArtifactNames.CH_COV_BIN],
         ),
     )
@@ -537,7 +542,7 @@ class JobConfigs:
         name=JobNames.UNITTEST,
         runs_on=[],  # from parametrize()
         command=f"python3 ./ci/jobs/unit_tests_job.py",
-        run_in_docker="clickhouse/fasttest+--privileged",
+        run_in_docker="altinityinfra/fasttest+--privileged",
         digest_config=Job.CacheDigestConfig(
             include_paths=["./ci/jobs/unit_tests_job.py"],
         ),
@@ -591,11 +596,11 @@ class JobConfigs:
             runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=["Build (amd_tsan)"],
         ),
-        Job.ParamSet(
-            parameter="arm_asan",
-            runs_on=RunnerLabels.FUNC_TESTER_ARM,
-            requires=["Build (arm_asan)"],
-        ),
+        # Job.ParamSet(
+        #     parameter="arm_asan",
+        #     runs_on=RunnerLabels.FUNC_TESTER_ARM,
+        #     requires=["Build (arm_asan)"],
+        # ),
         Job.ParamSet(
             parameter="amd_ubsan",
             runs_on=RunnerLabels.FUNC_TESTER_AMD,
@@ -681,6 +686,7 @@ class JobConfigs:
                 "./ci/jobs/scripts/integration_tests_runner.py",
                 "./tests/integration/",
                 "./ci/docker/integration",
+                "./tests/broken_tests.yaml",
             ],
         ),
     ).parametrize(
@@ -704,6 +710,7 @@ class JobConfigs:
                 "./ci/jobs/scripts/integration_tests_runner.py",
                 "./tests/integration/",
                 "./ci/docker/integration",
+                "./tests/broken_tests.yaml",
             ],
         ),
     ).parametrize(
@@ -745,6 +752,7 @@ class JobConfigs:
                 "./ci/jobs/scripts/integration_tests_runner.py",
                 "./tests/integration/",
                 "./ci/docker/integration",
+                "./tests/broken_tests.yaml",
             ],
         ),
         allow_merge_on_failure=True,
@@ -769,6 +777,7 @@ class JobConfigs:
                 "./ci/jobs/scripts/integration_tests_runner.py",
                 "./tests/integration/",
                 "./ci/docker/integration",
+                "./tests/broken_tests.yaml",
             ],
         ),
         requires=[ArtifactNames.CH_AMD_ASAN],
@@ -815,11 +824,11 @@ class JobConfigs:
             runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_DEBUG],
         ),
-        Job.ParamSet(
-            parameter="arm_asan",
-            runs_on=RunnerLabels.FUNC_TESTER_ARM,
-            requires=[ArtifactNames.CH_ARM_ASAN],
-        ),
+        # Job.ParamSet(
+        #     parameter="arm_asan",
+        #     runs_on=RunnerLabels.FUNC_TESTER_ARM,
+        #     requires=[ArtifactNames.CH_ARM_ASAN],
+        # ),
         Job.ParamSet(
             parameter="amd_tsan",
             runs_on=RunnerLabels.FUNC_TESTER_AMD,
@@ -854,11 +863,11 @@ class JobConfigs:
             runs_on=RunnerLabels.FUNC_TESTER_AMD,
             requires=[ArtifactNames.CH_AMD_DEBUG],
         ),
-        Job.ParamSet(
-            parameter="arm_asan",
-            runs_on=RunnerLabels.FUNC_TESTER_ARM,
-            requires=[ArtifactNames.CH_ARM_ASAN],
-        ),
+        # Job.ParamSet(
+        #     parameter="arm_asan",
+        #     runs_on=RunnerLabels.FUNC_TESTER_ARM,
+        #     requires=[ArtifactNames.CH_ARM_ASAN],
+        # ),
         Job.ParamSet(
             parameter="amd_tsan",
             runs_on=RunnerLabels.FUNC_TESTER_AMD,
@@ -880,7 +889,7 @@ class JobConfigs:
         runs_on=["#from param"],
         command='python3 ./ci/jobs/performance_tests.py --test-options "{PARAMETER}"',
         # TODO: switch to stateless-test image
-        run_in_docker="clickhouse/performance-comparison",
+        run_in_docker="altinityinfra/performance-comparison",
         digest_config=Job.CacheDigestConfig(
             include_paths=[
                 "./tests/performance/",
@@ -949,7 +958,7 @@ class JobConfigs:
                 "./ci/jobs/scripts/functional_tests/setup_log_cluster.sh",
             ],
         ),
-        run_in_docker="clickhouse/stateless-test+--shm-size=16g+--network=host",
+        run_in_docker="altinityinfra/stateless-test+--shm-size=16g+--network=host",
     ).parametrize(
         Job.ParamSet(
             parameter=BuildTypes.AMD_RELEASE,
@@ -974,7 +983,7 @@ class JobConfigs:
                 "CHANGELOG.md",
             ],
         ),
-        run_in_docker="clickhouse/docs-builder",
+        run_in_docker="altinityinfra/docs-builder",
         requires=[JobNames.STYLE_CHECK, ArtifactNames.CH_ARM_BINARY],
     )
     docker_sever = Job.Config(
@@ -987,6 +996,8 @@ class JobConfigs:
                 "tests/ci/docker_images_helper.py",
                 "./docker/server",
                 "./docker/keeper",
+                ".github/grype",
+                ".github/workflows/grype_scan.yml",
             ],
         ),
         requires=["Build (amd_release)", "Build (arm_release)"],
@@ -1002,6 +1013,8 @@ class JobConfigs:
                 "tests/ci/docker_images_helper.py",
                 "./docker/server",
                 "./docker/keeper",
+                ".github/grype",
+                ".github/workflows/grype_scan.yml",
             ],
         ),
         requires=["Build (amd_release)", "Build (arm_release)"],
@@ -1014,7 +1027,7 @@ class JobConfigs:
         digest_config=Job.CacheDigestConfig(
             include_paths=["./ci/jobs/sqlancer_job.sh", "./ci/docker/sqlancer-test"],
         ),
-        run_in_docker="clickhouse/sqlancer-test",
+        run_in_docker="altinityinfra/sqlancer-test",
         timeout=3600,
     ).parametrize(
         Job.ParamSet(
@@ -1033,7 +1046,7 @@ class JobConfigs:
             ],
         ),
         requires=[ArtifactNames.CH_ARM_RELEASE],
-        run_in_docker="clickhouse/stateless-test",
+        run_in_docker="altinityinfra/stateless-test",
         timeout=10800,
     )
     jepsen_keeper = Job.Config(
diff --git a/ci/docker/binary-builder/Dockerfile b/ci/docker/binary-builder/Dockerfile
index 90f438c9a077..00134c7a57ff 100644
--- a/ci/docker/binary-builder/Dockerfile
+++ b/ci/docker/binary-builder/Dockerfile
@@ -1,14 +1,14 @@
-# docker build -t clickhouse/binary-builder .
+# docker build -t altinityinfra/binary-builder .
 ARG FROM_TAG
-FROM clickhouse/fasttest:$FROM_TAG
+FROM altinityinfra/fasttest:$FROM_TAG
 ENV CC=clang-${LLVM_VERSION}
 ENV CXX=clang++-${LLVM_VERSION}
 
 # If the cctools is updated, then first build it in the CI, then update here in a different commit
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /cctools /cctools
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /cctools /cctools
 
 # We need OpenSSL FIPS in permissive mode for build on MasterCI
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad \
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 \
   /opt/openssl-fips/openssl.cnf \
   /opt/openssl-fips/fipsmodule.cnf \
   /opt/openssl-fips/fips.so \
diff --git a/ci/docker/cctools/Dockerfile b/ci/docker/cctools/Dockerfile
index 3a77e61187ab..b3bfab7a805c 100644
--- a/ci/docker/cctools/Dockerfile
+++ b/ci/docker/cctools/Dockerfile
@@ -1,10 +1,10 @@
-# docker build -t clickhouse/cctools .
+# docker build -t altinityinfra/cctools .
 
 # This is a hack to significantly reduce the build time of the clickhouse/binary-builder
 # It's based on the assumption that we don't care of the cctools version so much
 # It even does not depend on the clickhouse/fasttest in the `docker/images.json`
 ARG FROM_TAG=latest
-FROM clickhouse/fasttest:$FROM_TAG AS builder
+FROM altinityinfra/fasttest:$FROM_TAG AS builder
 
 ENV CC=clang-${LLVM_VERSION}
 ENV CXX=clang++-${LLVM_VERSION}
diff --git a/ci/docker/compatibility/centos/Dockerfile b/ci/docker/compatibility/centos/Dockerfile
index 628609e374f6..1edb42422b1f 100644
--- a/ci/docker/compatibility/centos/Dockerfile
+++ b/ci/docker/compatibility/centos/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/test-old-centos .
+# docker build -t altinityinfra/test-old-centos .
 FROM centos:5
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/ci/docker/compatibility/ubuntu/Dockerfile b/ci/docker/compatibility/ubuntu/Dockerfile
index ddd0a76bd446..0eb283ff3daf 100644
--- a/ci/docker/compatibility/ubuntu/Dockerfile
+++ b/ci/docker/compatibility/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/test-old-ubuntu .
+# docker build -t altinityinfra/test-old-ubuntu .
 FROM ubuntu:12.04
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/ci/docker/docs-builder/Dockerfile b/ci/docker/docs-builder/Dockerfile
index 8835fe3a7070..59793ae16b7d 100644
--- a/ci/docker/docs-builder/Dockerfile
+++ b/ci/docker/docs-builder/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/docs-builder .
+# docker build -t altinityinfra/docs-builder .
 FROM node:20-bookworm-slim
 
 RUN apt-get update && \
diff --git a/ci/docker/fasttest/Dockerfile b/ci/docker/fasttest/Dockerfile
index 9ec9a6c1b352..4782a5a394d7 100644
--- a/ci/docker/fasttest/Dockerfile
+++ b/ci/docker/fasttest/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/fasttest .
+# docker build -t altinityinfra/fasttest .
 FROM ubuntu:22.04
 
 # ARG for quick switch to a given ubuntu mirror
@@ -74,7 +74,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # Note, libmpfr6 is also a requirement for gdb
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /opt/gdb /opt/gdb
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /opt/gdb /opt/gdb
 # Give suid to gdb to grant it attach permissions
 RUN chmod u+s /opt/gdb/bin/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"
diff --git a/ci/docker/fuzzer/Dockerfile b/ci/docker/fuzzer/Dockerfile
index 303dfc59fb5f..1cedc0437a03 100644
--- a/ci/docker/fuzzer/Dockerfile
+++ b/ci/docker/fuzzer/Dockerfile
@@ -1,7 +1,7 @@
 # rebuild in #33610
 # docker build -t clickhouse/fuzzer .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 ENV LANG=C.UTF-8
 
diff --git a/ci/docker/integration/arrowflight/Dockerfile b/ci/docker/integration/arrowflight/Dockerfile
index 0efaf07cad5f..6a26f07a05dd 100644
--- a/ci/docker/integration/arrowflight/Dockerfile
+++ b/ci/docker/integration/arrowflight/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/arrowflight-server-test .
+# docker build -t altinityinfra/arrowflight-server-test .
 FROM python:3.9-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1
diff --git a/ci/docker/integration/base/Dockerfile b/ci/docker/integration/base/Dockerfile
index 29af698b293c..4260bf6c85dd 100644
--- a/ci/docker/integration/base/Dockerfile
+++ b/ci/docker/integration/base/Dockerfile
@@ -1,7 +1,7 @@
 # rebuild in #33610
-# docker build -t clickhouse/integration-test .
+# docker build -t altinityinfra/integration-test .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 SHELL ["/bin/bash", "-c"]
 
@@ -73,10 +73,10 @@ maxClientCnxns=80' > /opt/zookeeper/conf/zoo.cfg && \
 ENV TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /opt/gdb /opt/gdb
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /opt/gdb /opt/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad \
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 \
   /opt/openssl-fips/openssl.cnf \
   /opt/openssl-fips/fipsmodule.cnf \
   /opt/openssl-fips/fips.so \
diff --git a/ci/docker/integration/clickhouse_with_hms_catalog/Dockerfile b/ci/docker/integration/clickhouse_with_hms_catalog/Dockerfile
index 40d107d0c28b..9337e28926a2 100644
--- a/ci/docker/integration/clickhouse_with_hms_catalog/Dockerfile
+++ b/ci/docker/integration/clickhouse_with_hms_catalog/Dockerfile
@@ -1,4 +1,4 @@
-#  docker build -t clickhouse/integration-test-with-hms .
+#  docker build -t altinityinfra/integration-test-with-hms .
 ARG FROM_TAG=latest
 FROM openjdk:8-jre-slim AS build
 
diff --git a/ci/docker/integration/clickhouse_with_unity_catalog/Dockerfile b/ci/docker/integration/clickhouse_with_unity_catalog/Dockerfile
index f711d7258a9e..526b9e4f30fa 100644
--- a/ci/docker/integration/clickhouse_with_unity_catalog/Dockerfile
+++ b/ci/docker/integration/clickhouse_with_unity_catalog/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/integration-test-with-unity-catalog .
+# docker build -t altinityinfra/integration-test-with-unity-catalog .
 ARG FROM_TAG=latest
 FROM clickhouse/integration-test:$FROM_TAG
 
diff --git a/ci/docker/integration/helper_container/Dockerfile b/ci/docker/integration/helper_container/Dockerfile
index 1084d087e53b..81d658705836 100644
--- a/ci/docker/integration/helper_container/Dockerfile
+++ b/ci/docker/integration/helper_container/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/integration-helper .
+# docker build -t altinityinfra/integration-helper .
 # Helper docker container to run iptables without sudo
 
 FROM alpine:3.18
diff --git a/ci/docker/integration/kerberos_kdc/Dockerfile b/ci/docker/integration/kerberos_kdc/Dockerfile
index a203c33a3313..a7f989bf4a56 100644
--- a/ci/docker/integration/kerberos_kdc/Dockerfile
+++ b/ci/docker/integration/kerberos_kdc/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/kerberos-kdc .
+# docker build -t altinityinfra/kerberos-kdc .
 FROM centos:6
 
 RUN sed -i '/^mirrorlist/s/^/#/;/^#baseurl/{s/#//;s/mirror.centos.org\/centos\/$releasever/vault.centos.org\/6.10/}' /etc/yum.repos.d/*B*
diff --git a/ci/docker/integration/mysql_dotnet_client/Dockerfile b/ci/docker/integration/mysql_dotnet_client/Dockerfile
index 92d0c6ae585e..d1e38db65613 100644
--- a/ci/docker/integration/mysql_dotnet_client/Dockerfile
+++ b/ci/docker/integration/mysql_dotnet_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/mysql_dotnet_client .
+# docker build -t altinityinfra/mysql_dotnet_client .
 
 FROM ubuntu:22.04
 
diff --git a/ci/docker/integration/mysql_golang_client/Dockerfile b/ci/docker/integration/mysql_golang_client/Dockerfile
index 5281f786ae2d..52be68126e47 100644
--- a/ci/docker/integration/mysql_golang_client/Dockerfile
+++ b/ci/docker/integration/mysql_golang_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/mysql-golang-client .
+# docker build -t altinityinfra/mysql-golang-client .
 # MySQL golang client docker container
 
 FROM golang:1.17
diff --git a/ci/docker/integration/mysql_java_client/Dockerfile b/ci/docker/integration/mysql_java_client/Dockerfile
index 38fefac070e7..5826ee77d501 100644
--- a/ci/docker/integration/mysql_java_client/Dockerfile
+++ b/ci/docker/integration/mysql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/mysql-java-client .
+# docker build -t altinityinfra/mysql-java-client .
 # MySQL Java client docker container
 
 FROM openjdk:8-jdk-alpine
diff --git a/ci/docker/integration/mysql_js_client/Dockerfile b/ci/docker/integration/mysql_js_client/Dockerfile
index 4c9df10ace1c..2b821f243234 100644
--- a/ci/docker/integration/mysql_js_client/Dockerfile
+++ b/ci/docker/integration/mysql_js_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/mysql-js-client .
+# docker build -t altinityinfra/mysql-js-client .
 # MySQL JavaScript client docker container
 
 FROM node:16.14.2
diff --git a/ci/docker/integration/mysql_php_client/Dockerfile b/ci/docker/integration/mysql_php_client/Dockerfile
index 0e11ae023e63..b060e93f70a3 100644
--- a/ci/docker/integration/mysql_php_client/Dockerfile
+++ b/ci/docker/integration/mysql_php_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/mysql-php-client .
+# docker build -t altinityinfra/mysql-php-client .
 # MySQL PHP client docker container
 
 FROM php:8-cli-alpine
diff --git a/ci/docker/integration/postgresql_java_client/Dockerfile b/ci/docker/integration/postgresql_java_client/Dockerfile
index c5583085ef37..5a7458cc1d2f 100644
--- a/ci/docker/integration/postgresql_java_client/Dockerfile
+++ b/ci/docker/integration/postgresql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/postgresql-java-client .
+# docker build -t altinityinfra/postgresql-java-client .
 # PostgreSQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/ci/docker/integration/resolver/Dockerfile b/ci/docker/integration/resolver/Dockerfile
index 423faf835ae1..1f639bb2793d 100644
--- a/ci/docker/integration/resolver/Dockerfile
+++ b/ci/docker/integration/resolver/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/python-bottle .
+# docker build -t altinityinfra/python-bottle .
 # Helper docker container to run python bottle apps
 
 # python cgi module is dropped in 3.13 - pin to 3.12
diff --git a/ci/docker/integration/runner/Dockerfile b/ci/docker/integration/runner/Dockerfile
index 91aa33c06ab9..4b3f8b290d71 100644
--- a/ci/docker/integration/runner/Dockerfile
+++ b/ci/docker/integration/runner/Dockerfile
@@ -1,6 +1,6 @@
-# docker build -t clickhouse/integration-tests-runner .
+# docker build -t altinityinfra/integration-tests-runner .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 # ARG for quick switch to a given ubuntu mirror
 ARG apt_archive="http://archive.ubuntu.com"
@@ -90,10 +90,10 @@ COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
 COPY misc/ /misc/
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /opt/gdb /opt/gdb
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /opt/gdb /opt/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad \
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 \
   /opt/openssl-fips/openssl.cnf \
   /opt/openssl-fips/fipsmodule.cnf \
   /opt/openssl-fips/fips.so \
diff --git a/ci/docker/integration/runner/dockerd-entrypoint.sh b/ci/docker/integration/runner/dockerd-entrypoint.sh
index f4501d23ca48..607d1c13bdf5 100755
--- a/ci/docker/integration/runner/dockerd-entrypoint.sh
+++ b/ci/docker/integration/runner/dockerd-entrypoint.sh
@@ -8,8 +8,8 @@ echo '{
     "ip-forward": true,
     "log-level": "debug",
     "storage-driver": "overlay2",
-    "insecure-registries" : ["dockerhub-proxy.dockerhub-proxy-zone:5000"],
-    "registry-mirrors" : ["http://dockerhub-proxy.dockerhub-proxy-zone:5000"]
+    "insecure-registries" : ["65.108.242.32:5000"],
+    "registry-mirrors" : ["http://65.108.242.32:5000"]
 }' | dd of=/etc/docker/daemon.json 2>/dev/null
 
 if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
diff --git a/ci/docker/integration/runner/requirements.txt b/ci/docker/integration/runner/requirements.txt
index 31caff7b4a2c..bfe93b8d89b6 100644
--- a/ci/docker/integration/runner/requirements.txt
+++ b/ci/docker/integration/runner/requirements.txt
@@ -15,8 +15,8 @@ azure-core==1.30.1
 azure-storage-blob==12.19.0
 bcrypt==4.1.3
 beautifulsoup4==4.12.3
-boto3[all]==1.37.7
-botocore==1.37.7
+boto3==1.39.11
+botocore==1.39.11
 bs4==0.0.2
 cassandra-driver==3.29.0
 certifi==2025.4.26
@@ -97,7 +97,8 @@ redis==5.0.1
 requests-kerberos==0.14.0
 requests==2.32.4
 rich==13.9.4
-s3transfer==0.11.4
+s3fs==2024.12.0
+s3transfer==0.13.0
 setuptools==78.1.1
 simplejson==3.19.2
 sortedcontainers==2.4.0
diff --git a/ci/docker/integration/s3_proxy/Dockerfile b/ci/docker/integration/s3_proxy/Dockerfile
index 5858218e4e4c..df8d8f00f216 100644
--- a/ci/docker/integration/s3_proxy/Dockerfile
+++ b/ci/docker/integration/s3_proxy/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/s3-proxy .
+# docker build -t altinityinfra/s3-proxy .
 FROM nginx:alpine
 
 COPY run.sh /run.sh
diff --git a/ci/docker/keeper-jepsen-test/Dockerfile b/ci/docker/keeper-jepsen-test/Dockerfile
index 3c5d0a6ecb42..6633d81193d5 100644
--- a/ci/docker/keeper-jepsen-test/Dockerfile
+++ b/ci/docker/keeper-jepsen-test/Dockerfile
@@ -1,7 +1,7 @@
 # rebuild in #33610
 # docker build -t clickhouse/keeper-jepsen-test .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CLOJURE_VERSION=1.10.3.814
diff --git a/ci/docker/libfuzzer/Dockerfile b/ci/docker/libfuzzer/Dockerfile
index 26201e81def2..0da78bee9a67 100644
--- a/ci/docker/libfuzzer/Dockerfile
+++ b/ci/docker/libfuzzer/Dockerfile
@@ -1,6 +1,6 @@
 # docker build -t clickhouse/libfuzzer .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 # ARG for quick switch to a given ubuntu mirror
 ARG apt_archive="http://archive.ubuntu.com"
diff --git a/ci/docker/performance-comparison/Dockerfile b/ci/docker/performance-comparison/Dockerfile
index 3a0794eab35f..0e853677c3bb 100644
--- a/ci/docker/performance-comparison/Dockerfile
+++ b/ci/docker/performance-comparison/Dockerfile
@@ -1,7 +1,7 @@
 # docker build -t clickhouse/performance-comparison .
 
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
@@ -42,7 +42,7 @@ RUN pip3 --no-cache-dir install -r requirements.txt
 
 COPY run.sh /
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /opt/gdb /opt/gdb
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /opt/gdb /opt/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"
 
 # aws cli to acquire secrets and params from ssm
diff --git a/ci/docker/server-jepsen-test/Dockerfile b/ci/docker/server-jepsen-test/Dockerfile
index fd70fc457020..54a4626e2892 100644
--- a/ci/docker/server-jepsen-test/Dockerfile
+++ b/ci/docker/server-jepsen-test/Dockerfile
@@ -1,7 +1,7 @@
 # rebuild in #33610
 # docker build -t clickhouse/server-jepsen-test .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CLOJURE_VERSION=1.10.3.814
diff --git a/ci/docker/sqlancer-test/Dockerfile b/ci/docker/sqlancer-test/Dockerfile
index 2aa5aba9788d..3c5cea2ef7e0 100644
--- a/ci/docker/sqlancer-test/Dockerfile
+++ b/ci/docker/sqlancer-test/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/sqlancer-test .
+# docker build -t altinityinfra/sqlancer-test .
 FROM ubuntu:22.04
 
 # ARG for quick switch to a given ubuntu mirror
diff --git a/ci/docker/stateless-test/Dockerfile b/ci/docker/stateless-test/Dockerfile
index 108bf19bab6b..cf3491b826db 100644
--- a/ci/docker/stateless-test/Dockerfile
+++ b/ci/docker/stateless-test/Dockerfile
@@ -1,6 +1,6 @@
-# docker build -t clickhouse/stateless-test .
+# docker build -t altinityinfra/stateless-test .
 ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
+FROM altinityinfra/test-base:$FROM_TAG
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.6.20200320/clickhouse-odbc-1.1.6-Linux.tar.gz"
 
@@ -111,10 +111,10 @@ ENV PYTHONPATH=".:./ci"
 # A directory for cache
 RUN mkdir /dev/shm/clickhouse
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /opt/gdb /opt/gdb
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /opt/gdb /opt/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad \
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 \
   /opt/openssl-fips/openssl.cnf \
   /opt/openssl-fips/fipsmodule.cnf \
   /opt/openssl-fips/fips.so \
diff --git a/ci/docker/stress-test/Dockerfile b/ci/docker/stress-test/Dockerfile
index 866480f27a8b..66f41f3cdea5 100644
--- a/ci/docker/stress-test/Dockerfile
+++ b/ci/docker/stress-test/Dockerfile
@@ -1,7 +1,7 @@
 # rebuild in #33610
 # docker build -t clickhouse/stress-test .
 ARG FROM_TAG=latest
-FROM clickhouse/stateless-test:$FROM_TAG
+FROM altinityinfra/stateless-test:$FROM_TAG
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/ci/docker/style-test/Dockerfile b/ci/docker/style-test/Dockerfile
index 9c83329c0db7..7bb4e502cc4b 100644
--- a/ci/docker/style-test/Dockerfile
+++ b/ci/docker/style-test/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t clickhouse/style-test .
+# docker build -t altinityinfra/style-test .
 FROM ubuntu:22.04
 
 RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
diff --git a/ci/docker/test-base/Dockerfile b/ci/docker/test-base/Dockerfile
index 6bccbe7f918f..205fdb136f06 100644
--- a/ci/docker/test-base/Dockerfile
+++ b/ci/docker/test-base/Dockerfile
@@ -1,5 +1,5 @@
 # rebuild in #33610
-# docker build -t clickhouse/test-base .
+# docker build -t altinityinfra/test-base .
 FROM ubuntu:22.04
 
 # ARG for quick switch to a given ubuntu mirror
@@ -74,10 +74,10 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # Note, libmpfr6 is also a requirement for gdb
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad /opt/gdb /opt/gdb
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 /opt/gdb /opt/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"
 
-COPY --from=clickhouse/cctools:859fb360308eb8ac47ad \
+COPY --from=altinityinfra/cctools:7c093c1cde57d744be57 \
   /opt/openssl-fips/openssl.cnf \
   /opt/openssl-fips/fipsmodule.cnf \
   /opt/openssl-fips/fips.so \
diff --git a/ci/jobs/build_clickhouse.py b/ci/jobs/build_clickhouse.py
index e334f383a15c..4dbd505c3604 100644
--- a/ci/jobs/build_clickhouse.py
+++ b/ci/jobs/build_clickhouse.py
@@ -20,12 +20,12 @@
     BuildTypes.AMD_TSAN: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=thread    -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON",
     BuildTypes.AMD_MSAN: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=memory    -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON",
     BuildTypes.AMD_UBSAN: f"    cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=undefined -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON",
-    BuildTypes.ARM_RELEASE: f"  cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=1 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DSPLIT_DEBUG_SYMBOLS=ON -DBUILD_STANDALONE_KEEPER=1",
+    BuildTypes.ARM_RELEASE: f"  cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=1 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DSPLIT_DEBUG_SYMBOLS=ON -DBUILD_STANDALONE_KEEPER=1 -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/linux/toolchain-aarch64.cmake",
     BuildTypes.ARM_ASAN: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=address   -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/linux/toolchain-aarch64.cmake",
-    BuildTypes.ARM_COVERAGE: f" cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DSANITIZE_COVERAGE=1",
-    BuildTypes.ARM_BINARY: f"   cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON",
+    BuildTypes.ARM_COVERAGE: f" cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DSANITIZE_COVERAGE=1 -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/linux/toolchain-aarch64.cmake",
+    BuildTypes.ARM_BINARY: f"   cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/linux/toolchain-aarch64.cmake",
     BuildTypes.AMD_TIDY: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=Debug -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=0 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=1 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DENABLE_CLANG_TIDY=1 -DENABLE_EXAMPLES=1 -DENABLE_BUZZHOUSE=1",
-    BuildTypes.ARM_TIDY: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=Debug -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=0 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=1 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DENABLE_CLANG_TIDY=1 -DENABLE_EXAMPLES=1 -DENABLE_BUZZHOUSE=1",
+    BuildTypes.ARM_TIDY: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=Debug -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=0 -DENABLE_TESTS=1 -DENABLE_LEXER_TEST=1 -DENABLE_UTILS=1 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DENABLE_CLANG_TIDY=1 -DENABLE_EXAMPLES=1 -DENABLE_BUZZHOUSE=1 -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/linux/toolchain-aarch64.cmake",
     BuildTypes.AMD_DARWIN: f"   cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/darwin/toolchain-x86_64.cmake -DCMAKE_AR:FILEPATH=/cctools/bin/x86_64-apple-darwin-ar -DCMAKE_INSTALL_NAME_TOOL=/cctools/bin/x86_64-apple-darwin-install_name_tool -DCMAKE_RANLIB:FILEPATH=/cctools/bin/x86_64-apple-darwin-ranlib -DLINKER_NAME=/cctools/bin/x86_64-apple-darwin-ld",
     BuildTypes.ARM_DARWIN: f"   cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/darwin/toolchain-aarch64.cmake -DCMAKE_AR:FILEPATH=/cctools/bin/aarch64-apple-darwin-ar -DCMAKE_INSTALL_NAME_TOOL=/cctools/bin/aarch64-apple-darwin-install_name_tool -DCMAKE_RANLIB:FILEPATH=/cctools/bin/aarch64-apple-darwin-ranlib -DLINKER_NAME=/cctools/bin/aarch64-apple-darwin-ld",
     BuildTypes.ARM_V80COMPAT: f"cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DBUILD_STRIPPED_BINARY=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_LEXER_TEST=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_TOOLCHAIN_FILE={current_directory}/cmake/linux/toolchain-aarch64.cmake -DNO_ARMV81_OR_HIGHER=1",
@@ -113,6 +113,13 @@ def main():
         os.environ["SCCACHE_IDLE_TIMEOUT"] = "7200"
         os.environ["SCCACHE_BUCKET"] = Settings.S3_ARTIFACT_PATH
         os.environ["SCCACHE_S3_KEY_PREFIX"] = "ccache/sccache"
+        if info.is_community_pr:
+            print("NOTE: Community contribution - set sccache to run without AWS credentials")
+            os.environ["SCCACHE_S3_NO_CREDENTIALS"] = "1"
+            # NOTE (strtgbb): sccache will throw an error if AWS credentials are present with SCCACHE_S3_NO_CREDENTIALS=1
+            os.environ.pop("AWS_SECRET_ACCESS_KEY", None)
+            os.environ.pop("AWS_ACCESS_KEY_ID", None)
+
         os.environ["CTCACHE_LOG_LEVEL"] = "debug"
         os.environ["CTCACHE_DIR"] = f"{build_dir}/ccache/clang-tidy-cache"
         os.environ["CTCACHE_S3_BUCKET"] = Settings.S3_ARTIFACT_PATH
@@ -141,10 +148,13 @@ def do_checkout():
         )
         res = results[-1].is_ok()
 
-    if info.pr_number == 0 and info.is_push_event:
-        version_dict = info.get_kv_data("version")
-    else:
-        version_dict = CHVersion.get_current_version_as_dict()
+    # NOTE(vnemkov): always getting pre-calcutated version from custom_data
+    version_dict = info.get_kv_data("version")
+
+    # if info.pr_number == 0 and info.is_push_event:
+    #     version_dict = info.get_kv_data("version")
+    # else:
+    #     version_dict = CHVersion.get_current_version_as_dict()
 
     if res and JobStages.CMAKE in stages:
         assert version_dict, "Failed to determine build version"
@@ -188,6 +198,8 @@ def do_checkout():
             targets = "fuzzers"
         elif build_type in (BuildTypes.AMD_TIDY, BuildTypes.ARM_TIDY):
             targets = "-k0 all"
+        elif build_type in (BuildTypes.AMD_RELEASE, BuildTypes.ARM_RELEASE):
+            targets = "clickhouse-bundle clickhouse-stripped"
         else:
             targets = "clickhouse-bundle"
         results.append(
diff --git a/ci/jobs/clickbench.py b/ci/jobs/clickbench.py
index 97492b427f6e..714fb0bd41ba 100644
--- a/ci/jobs/clickbench.py
+++ b/ci/jobs/clickbench.py
@@ -19,7 +19,7 @@ def install():
             res = ch.install_clickbench_config()
             if Info().is_local_run:
                 return res
-            return res and ch.create_log_export_config()
+            return res # and ch.create_log_export_config()
 
         results.append(
             Result.from_commands_run(name="Install ClickHouse", command=install)
@@ -33,7 +33,7 @@ def start():
             res = ch.start_light()
             if Info().is_local_run:
                 return res
-            return res and ch.start_log_exports(check_start_time=stop_watch.start_time)
+            return res # and ch.start_log_exports(check_start_time=stop_watch.start_time)
 
         results.append(
             Result.from_commands_run(
diff --git a/ci/jobs/fast_test.py b/ci/jobs/fast_test.py
index edf59fee9971..6f5f33f15e03 100644
--- a/ci/jobs/fast_test.py
+++ b/ci/jobs/fast_test.py
@@ -145,6 +145,13 @@ def main():
         os.environ["SCCACHE_IDLE_TIMEOUT"] = "7200"
         os.environ["SCCACHE_BUCKET"] = Settings.S3_ARTIFACT_PATH
         os.environ["SCCACHE_S3_KEY_PREFIX"] = "ccache/sccache"
+        if Info().is_community_pr:
+            print("NOTE: Community contribution - set sccache to run without AWS credentials")
+            os.environ["SCCACHE_S3_NO_CREDENTIALS"] = "1"
+            # NOTE (strtgbb): sccache will throw an error if AWS credentials are present with SCCACHE_S3_NO_CREDENTIALS=1
+            os.environ.pop("AWS_SECRET_ACCESS_KEY", None)
+            os.environ.pop("AWS_ACCESS_KEY_ID", None)
+
         Shell.check("sccache --show-stats", verbose=True)
 
     Utils.add_to_PATH(f"{build_dir}/programs:{current_directory}/tests")
@@ -246,7 +253,9 @@ def main():
         print(step_name)
         res = res and CH.run_fast_test(test=args.test or "")
         if res:
-            results.append(FTResultsProcessor(wd=Settings.OUTPUT_DIR).run())
+            results.append(
+                FTResultsProcessor(wd=Settings.OUTPUT_DIR, test_options=["fast"]).run()
+            )
             results[-1].set_timing(stopwatch=stop_watch_)
         else:
             results.append(
diff --git a/ci/jobs/functional_tests.py b/ci/jobs/functional_tests.py
index 84a13960318f..fd8e5c5bd79d 100644
--- a/ci/jobs/functional_tests.py
+++ b/ci/jobs/functional_tests.py
@@ -121,6 +121,7 @@ def run_specific_tests(tests, runs=1, extra_args=""):
     "azure": " --azure-blob-storage --no-random-settings --no-random-merge-tree-settings",  # azurite is slow, with randomization it can be super slow
     "parallel": "--no-sequential",
     "sequential": "--no-parallel",
+    "amd_tsan": " --timeout 1200",  # NOTE (strtgbb): tsan is slow, increase the timeout to avoid timeout errors
 }
 
 
@@ -190,11 +191,22 @@ def main():
     runner_options += f" --jobs {nproc}"
 
     if not info.is_local_run:
+        # NOTE(strtgbb): We pass azure credentials through the docker command, not SSM.
         # TODO: find a way to work with Azure secret so it's ok for local tests as well, for now keep azure disabled
-        os.environ["AZURE_CONNECTION_STRING"] = Shell.get_output(
-            f"aws ssm get-parameter --region us-east-1 --name azure_connection_string --with-decryption --output text --query Parameter.Value",
-            verbose=True,
-        )
+        # os.environ["AZURE_CONNECTION_STRING"] = Shell.get_output(
+        #     f"aws ssm get-parameter --region us-east-1 --name azure_connection_string --with-decryption --output text --query Parameter.Value",
+        #     verbose=True,
+        # )
+
+        # NOTE(strtgbb): Azure credentials don't exist in community workflow
+        if info.is_community_pr:
+            print(
+                "NOTE: No azure credentials provided for community PR - disable azure storage"
+            )
+            config_installs_args += " --no-azure"
+
+            # NOTE(strtgbb): With the above, some tests are still trying to use azure, try this:
+            os.environ["USE_AZURE_STORAGE_FOR_MERGE_TREE"] = "0"
     else:
         print("Disable azure for a local run")
         config_installs_args += " --no-azure"
@@ -247,12 +259,13 @@ def main():
 
     if res and JobStages.INSTALL_CLICKHOUSE in stages:
 
-        def configure_log_export():
-            if not info.is_local_run:
-                print("prepare log export config")
-                return CH.create_log_export_config()
-            else:
-                print("skip log export config for local run")
+        # NOTE (strtgbb): Disable log export throughout this file, it depends on aws ssm, which we don't have configured
+        # def configure_log_export():
+        #     if not info.is_local_run:
+        #         print("prepare log export config")
+        #         return CH.create_log_export_config()
+        #     else:
+        #         print("skip log export config for local run")
 
         commands = [
             f"chmod +x {ch_path}/clickhouse",
@@ -298,7 +311,7 @@ def configure_log_export():
             f"prof_active:true,prof_prefix:{temp_dir}/jemalloc_profiles/clickhouse.jemalloc"
         )
 
-        commands.append(configure_log_export)
+        # commands.append(configure_log_export)
 
         results.append(
             Result.from_commands_run(name="Install ClickHouse", command=commands)
@@ -319,12 +332,13 @@ def start():
             res = res and CH.start()
             res = res and CH.wait_ready()
             if res:
-                if not Info().is_local_run:
-                    if not CH.start_log_exports(stop_watch.start_time):
-                        info.add_workflow_report_message(
-                            "WARNING: Failed to start log export"
-                        )
-                        print("Failed to start log export")
+                # Note (strtgbb): We don't use this
+                # if not Info().is_local_run:
+                #     if not CH.start_log_exports(stop_watch.start_time):
+                #         info.add_workflow_report_message(
+                #             "WARNING: Failed to start log export"
+                #         )
+                #         print("Failed to start log export")
                 if not CH.create_minio_log_tables():
                     info.add_workflow_report_message(
                         "WARNING: Failed to create minio log tables"
@@ -350,6 +364,8 @@ def start():
         )
         res = results[-1].is_ok()
 
+    runner_options += f" --known-fails-file-path tests/broken_tests.yaml"
+
     test_result = None
     if res and JobStages.TEST in stages:
         stop_watch_ = Utils.Stopwatch()
@@ -367,9 +383,9 @@ def start():
                 tests=tests, runs=50 if is_flaky_check else 1, extra_args=runner_options
             )
 
-        if not info.is_local_run:
-            CH.stop_log_exports()
-        ft_res_processor = FTResultsProcessor(wd=temp_dir)
+        # if not info.is_local_run:
+        #     CH.stop_log_exports()
+        ft_res_processor = FTResultsProcessor(wd=temp_dir, test_options=test_options)
         results.append(ft_res_processor.run())
         debug_files += ft_res_processor.debug_files
         test_result = results[-1]
@@ -443,6 +459,10 @@ def collect_logs():
             )
             force_ok_exit = True
 
+    broken_tests_handler_log = os.path.join(temp_dir, "broken_tests_handler.log")
+    if os.path.exists(broken_tests_handler_log):
+        debug_files.append(broken_tests_handler_log)
+
     Result.create_from(
         results=results,
         stopwatch=stop_watch,
diff --git a/ci/jobs/fuzzers_job.py b/ci/jobs/fuzzers_job.py
index dff608979dac..0f1996526f68 100644
--- a/ci/jobs/fuzzers_job.py
+++ b/ci/jobs/fuzzers_job.py
@@ -31,8 +31,9 @@ def start():
             # TODO: attach gdb
             # and ch.attach_gdb()
 
-        if ch.create_log_export_config():
-            ch.start_log_exports(check_start_time=stop_watch.start_time)
+        # Note (strtgbb): We don't use this
+        # if ch.create_log_export_config():
+        #     ch.start_log_exports(check_start_time=stop_watch.start_time)
 
     if res:
         print("AST Fuzzer")
diff --git a/ci/jobs/install_check.py b/ci/jobs/install_check.py
index 3a7c1d348330..7abf1d2166fa 100644
--- a/ci/jobs/install_check.py
+++ b/ci/jobs/install_check.py
@@ -6,8 +6,8 @@
 from ci.praktika.result import Result
 from ci.praktika.utils import Shell, Utils
 
-RPM_IMAGE = "clickhouse/install-rpm-test"
-DEB_IMAGE = "clickhouse/install-deb-test"
+RPM_IMAGE = "altinityinfra/install-rpm-test"
+DEB_IMAGE = "altinityinfra/install-deb-test"
 REPO_PATH = Utils.cwd()
 TEMP_PATH = Path(f"{REPO_PATH}/ci/tmp/")
 
@@ -20,7 +20,10 @@ def prepare_test_scripts():
 echo "$test_env" >> /etc/default/clickhouse
 systemctl restart clickhouse-server
 clickhouse-client -q 'SELECT version()'
-grep "$test_env" /proc/$(cat /var/run/clickhouse-server/clickhouse-server.pid)/environ"""
+grep "$test_env" /proc/$(cat /var/run/clickhouse-server/clickhouse-server.pid)/environ
+echo "Check Stacktrace"
+output=$(clickhouse-local --stacktrace --query="SELECT throwIf(1,'throw')" 2>&1 >/dev/null || true)
+echo "$output" | grep 'FunctionThrowIf::executeImpl'"""
     initd_test = r"""#!/bin/bash
 set -e
 trap "bash -ex /packages/preserve_logs.sh" ERR
diff --git a/ci/jobs/integration_test_check.py b/ci/jobs/integration_test_check.py
index 824df6b4e411..2bb9c190d5e7 100644
--- a/ci/jobs/integration_test_check.py
+++ b/ci/jobs/integration_test_check.py
@@ -273,7 +273,11 @@ def main():
     logging.info(
         "ENV parameters for runner:\n%s",
         "\n".join(
-            [f"{k}={v}" for k, v in my_env.items() if k.startswith("CLICKHOUSE_")]
+            [
+                f"{k}={v}"
+                for k, v in my_env.items()
+                if k.startswith("CLICKHOUSE_") and "TEST_STAT" not in k
+            ]
         ),
     )
 
diff --git a/ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt b/ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt
index 9fd8799053eb..6fcc43b0c674 100644
--- a/ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt
+++ b/ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt
@@ -291,6 +291,8 @@ DoubleDelta
 Doxygen
 Dresseler
 Durre
+ECDSA
+EdDSA
 ECMA
 ETag
 EachRow
@@ -539,6 +541,8 @@ JoinAlgorithm
 JoinStrictness
 JumpConsistentHash
 Jupyter
+jwks
+JWKS
 KDevelop
 KafkaAssignedPartitions
 KafkaBackgroundReads
@@ -3379,6 +3383,7 @@ uuid
 uuids
 uuidv
 vCPU
+validators
 varPop
 varPopStable
 varSamp
@@ -3396,6 +3401,8 @@ vectorscan
 vendoring
 verificationDepth
 verificationMode
+verifier
+verifiers
 versionedcollapsingmergetree
 vhost
 virtualized
diff --git a/ci/jobs/scripts/check_style/experimental_settings_ignore.txt b/ci/jobs/scripts/check_style/experimental_settings_ignore.txt
index b0725ec451fa..e598029cf75d 100644
--- a/ci/jobs/scripts/check_style/experimental_settings_ignore.txt
+++ b/ci/jobs/scripts/check_style/experimental_settings_ignore.txt
@@ -53,5 +53,10 @@ allow_settings_after_format_in_insert
 allow_statistic_optimize
 allow_statistics_optimize
 allow_unrestricted_reads_from_keeper
+allow_reorder_prewhere_conditions
+allow_general_join_planning
+allow_experimental_variant_type
+allow_experimental_dynamic_type
+allow_experimental_json_type
 allow_experimental_vector_similarity_index
 enable_vector_similarity_index
diff --git a/ci/jobs/scripts/clickhouse_proc.py b/ci/jobs/scripts/clickhouse_proc.py
index 5b41ba8b5e38..6fb171fda90c 100644
--- a/ci/jobs/scripts/clickhouse_proc.py
+++ b/ci/jobs/scripts/clickhouse_proc.py
@@ -131,14 +131,16 @@ def start_minio(self, test_type):
             )
         print(f"Started setup_minio.sh asynchronously with PID {self.minio_proc.pid}")
 
-        for _ in range(20):
+        print("Waiting for minio to start...")
+        for _ in range(10):
             res = Shell.check(
                 "/mc ls clickminio/test | grep -q .",
                 verbose=True,
             )
             if res:
+                print("Minio started successfully")
                 return True
-            time.sleep(1)
+            time.sleep(3)
         print("Failed to start minio")
         return False
 
@@ -621,16 +623,17 @@ def run_fast_test(self, test=""):
         return exit_code == 0
 
     def terminate(self):
-        if self.minio_proc:
-            # remove the webhook so it doesn't spam with errors once we stop ClickHouse
-            Shell.check(
-                "/mc admin config reset clickminio logger_webhook:ch_server_webhook",
-                verbose=True,
-            )
-            Shell.check(
-                "/mc admin config reset clickminio audit_webhook:ch_audit_webhook",
-                verbose=True,
-            )
+        # NOTE (strtgbb): Log tables are disabled, we don't use them
+        # if self.minio_proc:
+        #     # remove the webhook so it doesn't spam with errors once we stop ClickHouse
+        #     Shell.check(
+        #         "/mc admin config reset clickminio logger_webhook:ch_server_webhook",
+        #         verbose=True,
+        #     )
+        #     Shell.check(
+        #         "/mc admin config reset clickminio audit_webhook:ch_audit_webhook",
+        #         verbose=True,
+        #     )
 
         self._flush_system_logs()
         print("Terminate ClickHouse processes")
@@ -938,8 +941,8 @@ def dump_system_tables(self):
             "error_log",
             "query_metric_log",
             "part_log",
-            "minio_audit_logs",
-            "minio_server_logs",
+            # "minio_audit_logs", # NOTE (strtgbb): we do not use these logs
+            # "minio_server_logs",
         ]
 
         command_args = self.LOGS_SAVER_CLIENT_OPTIONS
@@ -1036,8 +1039,10 @@ def set_random_timezone():
             # FIXME: the start_time must be preserved globally in ENV or something like that
             # to get the same values in different DBs
             # As a wild idea, it could be stored in a Info.check_start_timestamp
+            exit(0) # Note (strtgbb): We don't use log exports
             res = ch.start_log_exports(check_start_time=Utils.timestamp())
         elif command == "logs_export_stop":
+            exit(0) # Note (strtgbb): We don't use log exports
             res = ch.stop_log_exports()
         elif command == "start_minio":
             param = sys.argv[2]
diff --git a/ci/jobs/scripts/clickhouse_version.py b/ci/jobs/scripts/clickhouse_version.py
index f6f403fe7352..46ec5fd80f64 100644
--- a/ci/jobs/scripts/clickhouse_version.py
+++ b/ci/jobs/scripts/clickhouse_version.py
@@ -1,9 +1,20 @@
 import re
+import sys
+import os
 from pathlib import Path
 
 from praktika.info import Info
 from praktika.utils import Shell
 
+# NOTE(vnemkov): extremely hackish, buts allows to reuse code from version_helper and git_helper with our modifications.
+
+# allow to import other packages that are located in `tests/ci` directory, like `git_helper`
+import tests.ci
+sys.path.append(os.path.abspath(tests.ci.__path__._path[0]))
+from tests.ci.version_helper import (
+    read_versions,
+    get_version_from_repo
+)
 
 class CHVersion:
     FILE_WITH_VERSION_PATH = "./cmake/autogenerated_versions.txt"
@@ -15,67 +26,21 @@ class CHVersion:
 SET(VERSION_MINOR {minor})
 SET(VERSION_PATCH {patch})
 SET(VERSION_GITHASH {githash})
+SET(VERSION_TWEAK {tweak})
+SET(VERSION_FLAVOUR {flavour})
 SET(VERSION_DESCRIBE {describe})
 SET(VERSION_STRING {string})
 """
 
     @classmethod
     def get_release_version_as_dict(cls):
-        versions = {}
-        for line in (
-            Path(cls.FILE_WITH_VERSION_PATH).read_text(encoding="utf-8").splitlines()
-        ):
-            line = line.strip()
-            if not line.startswith("SET("):
-                continue
-
-            name, value = line[4:-1].split(maxsplit=1)
-            name = name.removeprefix("VERSION_").lower()
-            if name in ("major", "minor", "patch"):
-                value = int(value)
-            versions[name] = value
-
-        result = {
-            "major": versions["major"],
-            "minor": versions["minor"],
-            "patch": versions["patch"],
-            "revision": versions["revision"],
-            "githash": versions["githash"],
-            "describe": versions["describe"],
-            "string": versions["string"],
-        }
-        return result
+        return read_versions()
 
     @classmethod
     def get_current_version_as_dict(cls):
-        version = cls.get_release_version_as_dict()
-        info = Info()
-        try:
-            tweak = int(
-                Shell.get_output(
-                    f"git rev-list --count {version['githash']}..HEAD", verbose=True
-                )
-            )
-        except ValueError:
-            # Shallow checkout
-            tweak = 1
-        version_type = "testing"
-        if info.pr_number == 0 and bool(
-            re.match(r"^\d{2}\.\d+$", info.git_branch.removeprefix("release/"))
-        ):
-            if version["minor"] % 5 == 3:
-                version_type = "lts"
-            else:
-                version_type = "stable"
-        version_string = (
-            f'{version["major"]}.{version["minor"]}.{version["patch"]}.{tweak}'
-        )
-        version_description = f"v{version_string}-{version_type}"
-        version["githash"] = info.sha
-        version["tweak"] = tweak
-        version["describe"] = version_description
-        version["string"] = version_string
-        return version
+        version = get_version_from_repo()
+        version = version.with_description(version.flavour)
+        return version.as_dict()
 
     @classmethod
     def get_version(cls):
@@ -95,3 +60,8 @@ def get_release_sha(cls):
     @classmethod
     def store_version_data_in_ci_pipeline(cls):
         Info().store_kv_data("version", cls.get_current_version_as_dict())
+
+
+if __name__ == "__main__":
+    # test;
+    print(CHVersion.get_current_version_as_dict())
diff --git a/ci/jobs/scripts/functional_tests_results.py b/ci/jobs/scripts/functional_tests_results.py
index 254991cc5ea4..cc3378d7b72f 100755
--- a/ci/jobs/scripts/functional_tests_results.py
+++ b/ci/jobs/scripts/functional_tests_results.py
@@ -9,6 +9,7 @@
 TIMEOUT_SIGN = "[ Timeout! "
 UNKNOWN_SIGN = "[ UNKNOWN "
 SKIPPED_SIGN = "[ SKIPPED "
+BROKEN_SIGN = "[ BROKEN "
 HUNG_SIGN = "Found hung queries in processlist"
 SERVER_DIED_SIGN = "Server died, terminating all processes"
 SERVER_DIED_SIGN2 = "Server does not respond to health check"
@@ -36,6 +37,7 @@ class Summary:
         unknown: int
         failed: int
         success: int
+        broken: int
         test_results: List[Result]
         hung: bool = False
         server_died: bool = False
@@ -43,9 +45,10 @@ class Summary:
         success_finish: bool = False
         test_end: bool = True
 
-    def __init__(self, wd):
+    def __init__(self, wd, test_options):
         self.tests_output_file = f"{wd}/test_result.txt"
         self.debug_files = []
+        self.test_options = test_options
 
     def _process_test_output(self):
         total = 0
@@ -53,6 +56,7 @@ def _process_test_output(self):
         unknown = 0
         failed = 0
         success = 0
+        broken = 0
         hung = False
         server_died = False
         retries = False
@@ -78,7 +82,13 @@ def _process_test_output(self):
                     retries = True
                 if any(
                     sign in line
-                    for sign in (OK_SIGN, FAIL_SIGN, UNKNOWN_SIGN, SKIPPED_SIGN)
+                    for sign in (
+                        OK_SIGN,
+                        FAIL_SIGN,
+                        UNKNOWN_SIGN,
+                        SKIPPED_SIGN,
+                        BROKEN_SIGN,
+                    )
                 ):
                     test_name = line.split(" ")[2].split(":")[0]
 
@@ -111,13 +121,16 @@ def _process_test_output(self):
                     elif SKIPPED_SIGN in line:
                         skipped += 1
                         test_results.append((test_name, "SKIPPED", test_time, []))
+                    elif BROKEN_SIGN in line:
+                        broken += 1
+                        test_results.append((test_name, "BROKEN", test_time, []))
                     else:
                         success += int(OK_SIGN in line)
                         test_results.append((test_name, "OK", test_time, []))
                     test_end = False
                 elif (
                     len(test_results) > 0
-                    and test_results[-1][1] in ("FAIL", "SKIPPED")
+                    and test_results[-1][1] in ("FAIL", "SKIPPED", "BROKEN")
                     and not test_end
                 ):
                     test_results[-1][3].append(original_line)
@@ -140,6 +153,7 @@ def _process_test_output(self):
                         info="".join(test[3])[:16384],
                     )
                 )
+
             except Exception as e:
                 print(f"ERROR: Failed to parse test results: {test}")
                 traceback.print_exc()
@@ -165,6 +179,7 @@ def _process_test_output(self):
             unknown=unknown,
             failed=failed,
             success=success,
+            broken=broken,
             test_results=test_results,
             hung=hung,
             server_died=server_died,
@@ -232,7 +247,7 @@ def run(self):
             pass
 
         if not info:
-            info = f"Failed: {s.failed}, Passed: {s.success}, Skipped: {s.skipped}"
+            info = f"Failed: {s.failed}, Passed: {s.success}, Skipped: {s.skipped}, Broken: {s.broken}"
 
         result = Result.create_from(
             name="Tests",
diff --git a/ci/jobs/scripts/fuzzer/run-fuzzer.sh b/ci/jobs/scripts/fuzzer/run-fuzzer.sh
index e8989e227420..91bc5827d847 100755
--- a/ci/jobs/scripts/fuzzer/run-fuzzer.sh
+++ b/ci/jobs/scripts/fuzzer/run-fuzzer.sh
@@ -58,8 +58,8 @@ EOL
     <core_path>$PWD</core_path>
 </clickhouse>
 EOL
-
-    (cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_config) || { echo "Failed to create log export config"; exit 1; }
+    # NOTE (strtgbb): Log tables are disabled, we don't use them
+    # (cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_config) || { echo "Failed to create log export config"; exit 1; }
 }
 
 function filter_exists_and_template
@@ -183,7 +183,8 @@ function fuzz
 
     echo 'Server started and responded.'
 
-    (cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_start) || { echo "Failed to start log exports"; exit 1; }
+    # NOTE (strtgbb): Log tables are disabled, we don't use them
+    # (cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_start) || { echo "Failed to start log exports"; exit 1; }
 
     # Setup arguments for the fuzzer
     FUZZER_OUTPUT_SQL_FILE=''
diff --git a/ci/jobs/scripts/integration_tests_runner.py b/ci/jobs/scripts/integration_tests_runner.py
index 10771657ba5d..720897503576 100755
--- a/ci/jobs/scripts/integration_tests_runner.py
+++ b/ci/jobs/scripts/integration_tests_runner.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import csv
 import glob
 import heapq
@@ -11,10 +13,11 @@
 import signal
 import subprocess
 import time
+from functools import lru_cache
 from collections import OrderedDict, defaultdict
 from itertools import chain
 from statistics import median
-from typing import Any, Dict, Final, List, Optional, Set, Tuple
+from typing import Any, Dict, Final, List, Optional, Set, Tuple, Union
 
 import requests
 import yaml  # type: ignore[import-untyped]
@@ -23,20 +26,21 @@
 from ci.praktika.info import Info
 from ci.praktika.utils import Shell
 
-CLICKHOUSE_PLAY_HOST = os.environ.get("CLICKHOUSE_PLAY_HOST", "play.clickhouse.com")
-CLICKHOUSE_PLAY_USER = os.environ.get("CLICKHOUSE_PLAY_USER", "play")
-CLICKHOUSE_PLAY_PASSWORD = os.environ.get("CLICKHOUSE_PLAY_PASSWORD", "")
+CLICKHOUSE_PLAY_HOST = os.environ.get("CHECKS_DATABASE_HOST", "play.clickhouse.com")
+CLICKHOUSE_PLAY_USER = os.environ.get("CLICKHOUSE_TEST_STAT_LOGIN", "play")
+CLICKHOUSE_PLAY_PASSWORD = os.environ.get("CLICKHOUSE_TEST_STAT_PASSWORD", "")
 CLICKHOUSE_PLAY_DB = os.environ.get("CLICKHOUSE_PLAY_DB", "default")
-CLICKHOUSE_PLAY_URL = f"https://{CLICKHOUSE_PLAY_HOST}/"
+CLICKHOUSE_PLAY_URL = f"https://{CLICKHOUSE_PLAY_HOST}:8443/"
+
 
-MAX_RETRY = 1
+MAX_RETRY = 2
 NUM_WORKERS = 4
 SLEEP_BETWEEN_RETRIES = 5
 PARALLEL_GROUP_SIZE = 100
 CLICKHOUSE_BINARY_PATH = "usr/bin/clickhouse"
 
-FLAKY_TRIES_COUNT = 2  # run whole pytest several times
-FLAKY_REPEAT_COUNT = 3  # runs test case in single module several times
+FLAKY_TRIES_COUNT = 3  # run whole pytest several times
+FLAKY_REPEAT_COUNT = 5  # runs test case in single module several times
 MAX_TIME_SECONDS = 3600
 
 MAX_TIME_IN_SANDBOX = 20 * 60  # 20 minutes
@@ -91,6 +95,39 @@ def filter_existing_tests(tests_to_run, repo_path):
     return result
 
 
+@lru_cache(maxsize=None)
+def extract_fail_logs(log_path: str) -> dict[str, str]:
+    try:
+        with open(log_path, "r", encoding="utf-8") as log_file:
+            text = log_file.read()
+    except UnicodeDecodeError:
+        logging.warning(
+            "Failed to read log file %s as UTF-8, using errors='replace'",
+            log_path,
+        )
+        with open(log_path, "r", encoding="utf-8", errors="replace") as log_file:
+            text = log_file.read()
+
+    # Regex matches:
+    #  - a line like "_____ test_something [param] _____"
+    #  - captures the test name (with params)
+    #  - captures everything up to the next header or end of file
+    pattern = re.compile(
+        r"_{5,}\s+([^\s].*?)\s+_{5,}(.*?)(?=_{5,}\s+[^\s].*?\s+_{5,}|\Z)",
+        re.S,
+    )
+
+    results = {}
+    for match in pattern.finditer(text):
+        test_name, body = match.groups()
+
+        # Keep only sections that include a failure or captured log
+        if "Captured log" in body or "FAILED" in body:
+            results[test_name.strip()] = body.strip()
+
+    return results
+
+
 def _get_deselect_option(tests):
     return " ".join([f"--deselect {t}" for t in tests])
 
@@ -110,7 +147,7 @@ def clear_ip_tables_and_restart_daemons():
     try:
         logging.info("Killing all alive docker containers")
         subprocess.check_output(
-            "timeout --verbose --signal=KILL 10m docker ps --quiet | xargs --no-run-if-empty docker kill",
+            "timeout --verbose --signal=KILL 3h docker ps --quiet | xargs --no-run-if-empty docker kill",
             shell=True,
         )
     except subprocess.CalledProcessError as err:
@@ -119,7 +156,7 @@ def clear_ip_tables_and_restart_daemons():
     try:
         logging.info("Removing all docker containers")
         subprocess.check_output(
-            "timeout --verbose --signal=KILL 10m docker ps --all --quiet | xargs --no-run-if-empty docker rm --force",
+            "timeout --verbose --signal=KILL 3h docker ps --all --quiet | xargs --no-run-if-empty docker rm --force",
             shell=True,
         )
     except subprocess.CalledProcessError as err:
@@ -320,7 +357,7 @@ def all_tests(self) -> List[str]:
         out_file_full = os.path.join(self.result_path, "runner_get_all_tests.log")
         report_file = "runner_get_all_tests.jsonl"
         cmd = (
-            f"cd {self.repo_path}/tests/integration && PYTHONPATH='../..:.' timeout --verbose --signal=KILL 2m ./runner {runner_opts} {image_cmd} -- "
+            f"cd {self.repo_path}/tests/integration && PYTHONPATH='../..:.' timeout --verbose --signal=KILL 3h ./runner {runner_opts} {image_cmd} -- "
             f"--setup-plan --report-log={report_file}"
         )
 
@@ -376,6 +413,52 @@ def _get_parallel_tests_skip_list(repo_path):
             skip_list_tests = yaml.safe_load(skip_list_file)
         return list(sorted(skip_list_tests))
 
+    @staticmethod
+    def _get_broken_tests_rules(repo_path: str) -> dict:
+        broken_tests_file_path = f"{repo_path}/tests/broken_tests.yaml"
+        if (
+            not os.path.isfile(broken_tests_file_path)
+            or os.path.getsize(broken_tests_file_path) == 0
+        ):
+            raise ValueError(
+                "There is something wrong with getting broken tests rules: "
+                f"file '{broken_tests_file_path}' is empty or does not exist."
+            )
+
+        with open(broken_tests_file_path, "r", encoding="utf-8") as broken_tests_file:
+            broken_tests = yaml.safe_load(broken_tests_file)
+
+        compiled_rules = {"exact": {}, "pattern": {}}
+
+        for test in broken_tests:
+            regex = test.get("regex") is True
+            rule = {
+                "reason": test["reason"],
+            }
+            if test.get("message"):
+                rule["message"] = re.compile(test["message"]) if regex else test["message"]
+
+            if test.get("not_message"):
+                rule["not_message"] = (
+                    re.compile(test["not_message"]) if regex else test["not_message"]
+                )
+            if test.get("check_types"):
+                rule["check_types"] = test["check_types"]
+
+            if regex:
+                rule["regex"] = True
+                compiled_rules["pattern"][re.compile(test["name"])] = rule
+            else:
+                compiled_rules["exact"][test["name"]] = rule
+
+        logging.info(
+            "Compiled %s exact rules and %s pattern rules",
+            len(compiled_rules["exact"]),
+            len(compiled_rules["pattern"]),
+        )
+
+        return compiled_rules
+
     @staticmethod
     def group_test_by_file(tests):
         result = OrderedDict()  # type: OrderedDict
@@ -410,6 +493,118 @@ def _update_counters(
             for test in current_counters[state]:
                 main_counters[state].append(test)
 
+    def _handle_broken_tests(
+        self,
+        counters: Dict[str, List[str]],
+        known_broken_tests: Dict[str, Dict[str, str]],
+        log_paths: Union[Dict[str, List[str]], List[str]],
+    ) -> None:
+
+        context_name = self.params["context_name"]
+
+        def get_log_paths(test_name):
+            """Could be a list of logs for all tests or a dict with test name as a key"""
+            log_paths_list = (
+                log_paths[test_name] if isinstance(log_paths, dict) else log_paths
+            )
+            return sorted(
+                [x for x in log_paths_list if x.endswith(".log")], reverse=True
+            )
+
+        broken_tests_log = os.path.join(self.result_path, "broken_tests_handler.log")
+
+        def test_is_known_fail(test_name, test_logs, debug_log_file):
+            if test_logs is None:
+                debug_log_file.write(
+                    f"WARNING: Test '{test_name}' has no logs - cannot match message patterns\n"
+                )
+
+            matching_rules = []
+
+            debug_log_file.write("Potential matching rules:\n")
+            exact_rule = known_broken_tests["exact"].get(test_name)
+            if exact_rule:
+                debug_log_file.write(f"{test_name} - {exact_rule}\n")
+                matching_rules.append(exact_rule)
+
+            for name_re, data in known_broken_tests["pattern"].items():
+                if name_re.fullmatch(test_name):
+                    debug_log_file.write(f"{name_re} - {data}\n")
+                    matching_rules.append(data)
+
+            if not matching_rules:
+                return False
+
+            def matches_substring(substring, log, is_regex):
+                if log is None:
+                    # Cannot match a message pattern if we have no logs
+                    return False
+                if is_regex:
+                    return bool(substring.search(log))
+                return substring in log
+
+            for rule_data in matching_rules:
+                if rule_data.get("check_types") and not any(
+                    ct in context_name for ct in rule_data["check_types"]
+                ):
+                    debug_log_file.write(f"Check types didn't match: '{rule_data['check_types']}' not in '{context_name}'\n")
+                    continue
+
+                is_regex = rule_data.get("regex", False)
+                not_message = rule_data.get("not_message")
+                if not_message and matches_substring(not_message, test_logs, is_regex):
+                    debug_log_file.write(f"Skip rule: Not message matched: '{not_message}'\n")
+                    continue
+                message = rule_data.get("message")
+                if message and not matches_substring(message, test_logs, is_regex):
+                    debug_log_file.write(f"Skip rule: Message didn't match: '{message}'\n")
+                    continue
+
+                debug_log_file.write(f"Test {test_name} matched rule: {rule_data}\n")
+                return rule_data["reason"]
+
+            return False
+
+        with open(broken_tests_log, "a") as log_file:
+            log_file.write(
+                f"{len(known_broken_tests['exact']) + len(known_broken_tests['pattern'])} Known broken tests\n"
+            )
+            for status, tests in counters.items():
+                log_file.write(f"Total tests in {status} state: {len(tests)}\n")
+
+            for fail_status in ("ERROR", "FAILED"):
+                for failed_test in counters[fail_status].copy():
+                    log_file.write(
+                        f"Checking test {failed_test} (status: {fail_status})\n"
+                    )
+
+                    # Should only care about the most recent log file
+                    log_path = get_log_paths(failed_test)[0]
+                    test_logs = extract_fail_logs(log_path)
+                    test_log = test_logs.get(failed_test.split("::")[-1])
+                    if test_log is None:
+                        # Log extraction can fail if the fail was in the teardown
+                        log_file.write(
+                            f"WARNING: Test '{failed_test}' has no logs among {list(test_logs.keys())}, assuming log extraction failed, proceeding with full log\n"
+                        )
+                        with open(log_path, "r", encoding="utf-8") as f:
+                            test_log = f.read()
+
+                    known_fail_reason = test_is_known_fail(
+                        failed_test, test_log, log_file
+                    )
+                    if known_fail_reason is not False:
+                        log_file.write(
+                            f"Test {failed_test} is known to fail: {known_fail_reason}\n"
+                        )
+                        counters[fail_status].remove(failed_test)
+                        counters["BROKEN"].append(failed_test)
+                    else:
+                        log_file.write(f"Test {failed_test} is not known to fail\n")
+
+            for status, tests in counters.items():
+                log_file.write(f"Total tests in {status} state: {len(tests)}\n")
+
     def _get_runner_image_cmd(self):
         image_cmd = ""
         if self._can_run_with(
@@ -417,7 +612,7 @@ def _get_runner_image_cmd(self):
             "--docker-image-version",
         ):
             for img in IMAGES:
-                if img == "clickhouse/integration-tests-runner":
+                if img == "altinityinfra/integration-tests-runner":
                     runner_version = self.get_image_version(img)
                     logging.info(
                         "Can run with custom docker image version %s", runner_version
@@ -684,6 +879,7 @@ def run_flaky_check(self, should_fail=False):
         }  # type: Dict
         tests_times = defaultdict(float)  # type: Dict
         tests_log_paths = defaultdict(list)
+        known_broken_tests = self._get_broken_tests_rules(self.repo_path)
         id_counter = 0
         for test_to_run in tests_to_run:
             tries_num = 1 if should_fail else FLAKY_TRIES_COUNT
@@ -701,6 +897,10 @@ def run_flaky_check(self, should_fail=False):
                     1,
                     FLAKY_REPEAT_COUNT,
                 )
+
+                # Handle broken tests on the group counters that contain test results for a single group
+                self._handle_broken_tests(group_counters, known_broken_tests, log_paths)
+
                 id_counter = id_counter + 1
                 for counter, value in group_counters.items():
                     logging.info(
@@ -803,11 +1003,11 @@ def get_tests_execution_time(self):
                 SELECT
                     splitByString('::', test_name)[1] AS file,
                     median(test_duration_ms) AS test_duration_ms
-                FROM checks
+                FROM `{CLICKHOUSE_PLAY_DB}`.checks
                 WHERE (check_name LIKE 'Integration%')
                     AND (check_start_time >= ({start_time_filter} - toIntervalDay(30)))
                     AND (check_start_time <= ({start_time_filter} - toIntervalHour(2)))
-                    AND ((head_ref = 'master') AND startsWith(head_repo, 'ClickHouse/'))
+                    AND (head_ref LIKE 'antalya-25.8%' OR head_ref LIKE 'releases/25.8%' OR head_ref LIKE 'rebase-cicd-v25.8%')
                     AND (test_name != '')
                     AND (test_status != 'SKIPPED')
                 GROUP BY test_name
@@ -826,6 +1026,11 @@ def get_tests_execution_time(self):
         max_retries = 3
         retry_delay_seconds = 5
 
+        headers = {
+            "X-ClickHouse-User": CLICKHOUSE_PLAY_USER,
+            "X-ClickHouse-Key": CLICKHOUSE_PLAY_PASSWORD,
+        }
+
         for attempt in range(max_retries):
             try:
                 logging.info(
@@ -834,7 +1039,12 @@ def get_tests_execution_time(self):
                     max_retries,
                 )
 
-                response = requests.get(url, timeout=120)
+                response = requests.post(
+                    CLICKHOUSE_PLAY_URL,
+                    timeout=120,
+                    headers=headers,
+                    params={"query": query},
+                )
                 response.raise_for_status()
                 result_data = response.json().get("data", [])
                 tests_execution_times = {
@@ -1107,6 +1317,7 @@ def run_normal_check(self):
         tests_times = defaultdict(float)
         tests_log_paths = defaultdict(list)
         items_to_run = list(grouped_tests.items())
+        known_broken_tests = self._get_broken_tests_rules(self.repo_path)
         logging.info("Total test groups %s", len(items_to_run))
         if self.shuffle_test_groups():
             logging.info("Shuffling test groups")
@@ -1119,6 +1330,10 @@ def run_normal_check(self):
             group_counters, group_test_times, log_paths = self.try_run_test_group(
                 "2h", group, tests, MAX_RETRY, NUM_WORKERS, 0
             )
+
+            # Handle broken tests on the group counters that contain test results for a single group
+            self._handle_broken_tests(group_counters, known_broken_tests, log_paths)
+
             total_tests = 0
             for counter, value in group_counters.items():
                 logging.info(
@@ -1169,7 +1384,7 @@ def run_normal_check(self):
                 for c in counters[state]
             ]
         failed_sum = len(counters["FAILED"]) + len(counters["ERROR"])
-        status_text = f"fail: {failed_sum}, passed: {len(counters['PASSED'])}"
+        status_text = f"fail: {failed_sum}, passed: {len(counters['PASSED'])}, broken: {len(counters['BROKEN'])}"
 
         if not counters or sum(len(counter) for counter in counters.values()) == 0:
             status_text = "No tests found for some reason! It's a bug"
@@ -1225,7 +1440,7 @@ def run():
 
 
 timeout_expired = False
-runner_subprocess = None  # type:Optional[TeePopen]
+runner_subprocess = None
 
 
 def handle_sigterm(signum, _frame):
diff --git a/ci/jobs/scripts/workflow_hooks/check_backport_branch.py b/ci/jobs/scripts/workflow_hooks/check_backport_branch.py
new file mode 100644
index 000000000000..a2d5f95a9250
--- /dev/null
+++ b/ci/jobs/scripts/workflow_hooks/check_backport_branch.py
@@ -0,0 +1,36 @@
+import sys
+from ci.praktika.info import Info
+from ci.praktika.utils import Shell
+
+
+if __name__ == "__main__":
+    info = Info()
+    if info.workflow_name == "BackportPR":
+        assert info.base_branch
+        # Ensure base branch is fetched.
+        # We use treeless fetch (--filter=tree:0) and no-tags to minimize data transfer.
+        Shell.run(
+            f"git fetch --no-tags --prune --no-recurse-submodules --filter=tree:0 origin +{info.base_branch}:{info.base_branch}",
+            verbose=True,
+        )
+        num_commits = int(
+            Shell.get_output_or_raise(
+                f"git rev-list --count {info.base_branch}..{info.sha}"
+            )
+        )
+        if num_commits == 0:
+            print(f"ERROR: No commits found between {info.base_branch} and {info.sha}")
+            sys.exit(-1)
+
+        if num_commits > 50:
+            print(
+                f"ERROR: Number of commits between {info.sha} and {info.base_branch} is {num_commits}. "
+                f"Backport PR should have between 1 and 50 commits."
+            )
+            sys.exit(-1)
+
+        if not info.get_changed_files():
+            print(f"ERROR: No Files changed in the Backport PR.")
+            sys.exit(-1)
+    else:
+        assert False, f"Unsupported workflow name [{info.workflow_name}]"
diff --git a/ci/jobs/scripts/workflow_hooks/filter_job.py b/ci/jobs/scripts/workflow_hooks/filter_job.py
index 1f35939f6189..e8921e2b378c 100644
--- a/ci/jobs/scripts/workflow_hooks/filter_job.py
+++ b/ci/jobs/scripts/workflow_hooks/filter_job.py
@@ -167,4 +167,9 @@ def should_skip_job(job_name):
             return False, ""
         return True, "Skipped, not labeled with 'pr-performance'"
 
+    ci_exclude_tags = _info_cache.get_kv_data("ci_exclude_tags") or []
+    for tag in ci_exclude_tags:
+        if tag in job_name:
+            return True, f"Skipped, job name includes excluded tag '{tag}'"
+
     return False, ""
diff --git a/ci/jobs/scripts/workflow_hooks/parse_ci_tags.py b/ci/jobs/scripts/workflow_hooks/parse_ci_tags.py
new file mode 100644
index 000000000000..c28f59b552ee
--- /dev/null
+++ b/ci/jobs/scripts/workflow_hooks/parse_ci_tags.py
@@ -0,0 +1,18 @@
+import re
+
+from ci.praktika.info import Info
+
+
+def get_ci_tags(pr_body, tag_prefix):
+    pattern = rf"(- \[x\] +<!---{tag_prefix}_)([|\w]+)"
+    matches = []
+    for match in re.findall(pattern, pr_body):
+        matches.extend(match[-1].split("|"))
+    return matches
+
+
+if __name__ == "__main__":
+    info = Info()
+
+    info.store_kv_data("ci_exclude_tags", get_ci_tags(info.pr_body, "ci_exclude"))
+    info.store_kv_data("ci_regression_jobs", get_ci_tags(info.pr_body, "ci_regression"))
diff --git a/ci/jobs/scripts/workflow_hooks/version_log.py b/ci/jobs/scripts/workflow_hooks/version_log.py
index a4ed6e9b248b..8d3821e07dfc 100644
--- a/ci/jobs/scripts/workflow_hooks/version_log.py
+++ b/ci/jobs/scripts/workflow_hooks/version_log.py
@@ -8,23 +8,24 @@
 
 
 def _add_build_to_version_history():
-    info = Info()
-    Shell.check(
-        f"git rev-parse --is-shallow-repository | grep -q true && git fetch --unshallow --prune --no-recurse-submodules --filter=tree:0 origin {info.git_branch} ||:"
-    )
-    commit_parents = Shell.get_output("git log --format=%P -n 1").split(" ")
-    data = {
-        "check_start_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-        "pull_request_number": info.pr_number,
-        "pull_request_url": info.pr_url,
-        "commit_sha": info.sha,
-        "commit_url": info.commit_url,
-        "parent_commits_sha": commit_parents,
-        "version": CHVersion.get_version(),
-        "git_ref": info.git_branch,
-    }
-    print(f"Update version log: [{data}]")
-    CIDBCluster().insert_json(table="version_history", json_str=data)
+    # info = Info()
+    # Shell.check(
+    #     f"git rev-parse --is-shallow-repository | grep -q true && git fetch --unshallow --prune --no-recurse-submodules --filter=tree:0 origin {info.git_branch} ||:"
+    # )
+    # commit_parents = Shell.get_output("git log --format=%P -n 1").split(" ")
+    # data = {
+    #     "check_start_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+    #     "pull_request_number": info.pr_number,
+    #     "pull_request_url": info.pr_url,
+    #     "commit_sha": info.sha,
+    #     "commit_url": info.commit_url,
+    #     "parent_commits_sha": commit_parents,
+    #     "version": CHVersion.get_version(),
+    #     "git_ref": info.git_branch,
+    # }
+    # print(f"Update version log: [{data}]")
+    # CIDBCluster().insert_json(table="version_history", json_str=data)
+
     # stores actual version data in pipline storage, to be used by jobs that need it
     CHVersion.store_version_data_in_ci_pipeline()
 
diff --git a/ci/praktika/_environment.py b/ci/praktika/_environment.py
index c3f1a9c3cc59..06f0241e1fbe 100644
--- a/ci/praktika/_environment.py
+++ b/ci/praktika/_environment.py
@@ -41,6 +41,7 @@ class _Environment(MetaClasses.Serializable):
     REPORT_INFO: List[str] = dataclasses.field(default_factory=list)
     JOB_CONFIG: Optional[Job.Config] = None
     TRACEBACKS: List[str] = dataclasses.field(default_factory=list)
+    CLICKHOUSE_VERSION_STRING : Optional[str] = None
     name = "environment"
 
     @classmethod
@@ -144,23 +145,27 @@ def from_env(cls) -> "_Environment":
             else:
                 assert False, "TODO: not supported"
 
-            INSTANCE_TYPE = (
-                os.getenv("INSTANCE_TYPE", None)
-                or Shell.get_output("ec2metadata --instance-type")
-                or ""
-            )
-            INSTANCE_ID = (
-                os.getenv("INSTANCE_ID", None)
-                or Shell.get_output("ec2metadata --instance-id")
-                or ""
-            )
-            INSTANCE_LIFE_CYCLE = (
-                os.getenv("INSTANCE_LIFE_CYCLE", None)
-                or Shell.get_output(
-                    "curl -s --fail http://169.254.169.254/latest/meta-data/instance-life-cycle"
-                )
-                or ""
-            )
+            # NOTE (strtgbb): Override instance metadata, we don't use it
+            # INSTANCE_TYPE = (
+            #     os.getenv("INSTANCE_TYPE", None)
+            #     or Shell.get_output("ec2metadata --instance-type")
+            #     or ""
+            # )
+            # INSTANCE_ID = (
+            #     os.getenv("INSTANCE_ID", None)
+            #     or Shell.get_output("ec2metadata --instance-id")
+            #     or ""
+            # )
+            # INSTANCE_LIFE_CYCLE = (
+            #     os.getenv("INSTANCE_LIFE_CYCLE", None)
+            #     or Shell.get_output(
+            #         "curl -s --fail http://169.254.169.254/latest/meta-data/instance-life-cycle"
+            #     )
+            #     or ""
+            # )
+            INSTANCE_TYPE = "altinity-self-hosted"
+            INSTANCE_ID = "altinity-self-hosted"
+            INSTANCE_LIFE_CYCLE = "altinity-self-hosted"
 
         else:
             print("WARNING: Local execution - dummy Environment will be generated")
diff --git a/ci/praktika/execution/__main__.py b/ci/praktika/execution/__main__.py
index 4a5dd9ea5c29..94f2ac4bbfd7 100644
--- a/ci/praktika/execution/__main__.py
+++ b/ci/praktika/execution/__main__.py
@@ -1,4 +1,8 @@
 from .machine_init import run
 
 if __name__ == "__main__":
+    # Note(strtgbb): machine_init handles scaling on AWS infra,
+    # but we have our own scaling mechanism, so don't run this
+    return
+
     run()
diff --git a/ci/praktika/execution/execution_settings.py b/ci/praktika/execution/execution_settings.py
index fd51affb4586..f4068b45b7c6 100644
--- a/ci/praktika/execution/execution_settings.py
+++ b/ci/praktika/execution/execution_settings.py
@@ -11,7 +11,7 @@ class ScalingType(metaclass=MetaClasses.WithIter):
 
 class DefaultExecutionSettings:
     GH_ACTIONS_DIRECTORY: str = "/home/ubuntu/gh_actions"
-    RUNNER_SCALING_TYPE: str = ScalingType.AUTOMATIC_SCALE_UP_DOWN
+    RUNNER_SCALING_TYPE: str = ScalingType.DISABLED
     MAX_WAIT_TIME_BEFORE_SCALE_DOWN_SEC: int = 30
 
 
diff --git a/ci/praktika/gh.py b/ci/praktika/gh.py
index 662141a4b050..9989bbf26f37 100644
--- a/ci/praktika/gh.py
+++ b/ci/praktika/gh.py
@@ -367,7 +367,9 @@ def print_log_in_group(cls, group_name: str, lines: Union[str, List[str]]):
 
     @classmethod
     def print_actions_debug_info(cls):
-        cls.print_log_in_group("GITHUB_ENVS", Shell.get_output("env | grep ^GITHUB_"))
+        cls.print_log_in_group(
+            "GITHUB_ENVS", Shell.get_output("env | grep -P '^GITHUB_(?!.*TOKEN)'")
+        )
         cls.print_log_in_group(
             "GITHUB_EVENT", Shell.get_output("cat $GITHUB_EVENT_PATH")
         )
diff --git a/ci/praktika/hook_cache.py b/ci/praktika/hook_cache.py
index 32c39f5b8cc5..7c9c9e76d918 100644
--- a/ci/praktika/hook_cache.py
+++ b/ci/praktika/hook_cache.py
@@ -66,7 +66,7 @@ def fetch_record(job_name, job_digest, cache_):
         # implement algorithm to skip dependee jobs if dependency is not in the cache
         # Step 1: Fetch records concurrently
         fetched_records = []
-        if os.environ.get("DISABLE_CI_CACHE", "0") == "1":
+        if os.environ.get("DISABLE_CI_CACHE", "0") in ("1", "true"):
             print("NOTE: CI Cache disabled via GH Variable DISABLE_CI_CACHE=1")
         else:
             with ThreadPoolExecutor(max_workers=200) as executor:
diff --git a/ci/praktika/info.py b/ci/praktika/info.py
index 9683acb39c5b..a44248da8313 100644
--- a/ci/praktika/info.py
+++ b/ci/praktika/info.py
@@ -93,6 +93,10 @@ def repo_owner(self):
     def fork_name(self):
         return self.env.FORK_NAME
 
+    @property
+    def is_community_pr(self):
+        return "Community" in self.env.WORKFLOW_NAME
+
     @property
     def user_name(self):
         return self.env.USER_LOGIN
diff --git a/ci/praktika/job.py b/ci/praktika/job.py
index 1c0117fb4b40..f5d9ab1f729b 100644
--- a/ci/praktika/job.py
+++ b/ci/praktika/job.py
@@ -61,7 +61,7 @@ class Config:
 
         allow_merge_on_failure: bool = False
 
-        enable_commit_status: bool = False
+        enable_commit_status: bool = True
 
         # If a job Result contains multiple sub-results, and only a specific sub-result should be sent to CIDB, set its name here.
         result_name_for_cidb: str = ""
diff --git a/ci/praktika/native_jobs.py b/ci/praktika/native_jobs.py
index b46656b8e7cc..af1181792000 100644
--- a/ci/praktika/native_jobs.py
+++ b/ci/praktika/native_jobs.py
@@ -1,4 +1,5 @@
 import platform
+import os
 import sys
 import traceback
 from typing import Dict
@@ -17,6 +18,7 @@
 from .runtime import RunConfig
 from .settings import Settings
 from .utils import Shell, Utils
+from ci.defs.defs import ArtifactNames
 
 assert Settings.CI_CONFIG_RUNS_ON
 
@@ -200,7 +202,9 @@ def _build_dockers(workflow, job_name):
 
 def _config_workflow(workflow: Workflow.Config, job_name) -> Result:
     # debug info
-    GH.print_log_in_group("GITHUB envs", Shell.get_output("env | grep GITHUB"))
+    GH.print_log_in_group(
+        "GITHUB envs", Shell.get_output("env | grep -P '^GITHUB_(?!.*TOKEN)'")
+    )
 
     def _check_yaml_up_to_date():
         print("Check workflows are up to date")
@@ -372,7 +376,12 @@ def _check_db(workflow):
             )
         )
 
-    if workflow.enable_job_filtering_by_changes and results[-1].is_ok():
+    pr_allows_cache = "[x] <!---no_ci_cache" not in Info().pr_body
+    if (
+        workflow.enable_job_filtering_by_changes
+        and results[-1].is_ok()
+        and pr_allows_cache
+    ):
         print("Filter not affected jobs")
 
         def check_affected_jobs():
@@ -392,6 +401,27 @@ def check_affected_jobs():
             unaffected_jobs_with_artifacts = {}
             all_required_artifacts = set()
 
+            # NOTE (strtgbb): We always want these build artifacts for our report and regression tests.
+            # If we make FinishCIReport and regression tests into praktika jobs, we can remove this.
+            if "CIReport" in workflow.additional_jobs:
+                all_required_artifacts.update(
+                    [
+                        ArtifactNames.CH_AMD_RELEASE,
+                        ArtifactNames.CH_ARM_RELEASE,
+                    ]
+                )
+            if (
+                "Regression" in workflow.additional_jobs
+                and "regression"
+                not in workflow_config.custom_data.get("ci_exclude_tags", [])
+            ):
+                all_required_artifacts.update([ArtifactNames.CH_AMD_BINARY])
+                if "aarch64" not in workflow_config.custom_data.get(
+                    "ci_exclude_tags", []
+                ):
+                    all_required_artifacts.update([ArtifactNames.CH_ARM_BINARY])
+            print(f"Including artifacts for custom jobs [{all_required_artifacts}]")
+
             for job in workflow.jobs:
                 # Skip native Praktika jobs
                 if _is_praktika_job(job.name):
@@ -453,6 +483,11 @@ def check_affected_jobs():
         )
 
     if results[-1].is_ok() and workflow.enable_cache:
+        # We can't safely skip this code block entirely if enable_cache=True is set at the workflow level
+        # set DISABLE_CI_CACHE=1 to signal that the cache should be skipped
+        if not pr_allows_cache:
+            os.environ["DISABLE_CI_CACHE"] = "1"
+
         print("Cache Lookup")
         stop_watch = Utils.Stopwatch()
         info = ""
diff --git a/ci/praktika/parser.py b/ci/praktika/parser.py
index cb6210e36b91..fd9332a1af70 100644
--- a/ci/praktika/parser.py
+++ b/ci/praktika/parser.py
@@ -46,6 +46,8 @@ class JobAddonYaml:
     event: str
     branches: List[str]
     jobs: List[JobYaml]
+    additional_jobs: List[str]
+    if_condition: str
     job_to_config: Dict[str, JobYaml]
     artifact_to_config: Dict[str, ArtifactYaml]
     secret_names_gh: List[str]
@@ -74,6 +76,8 @@ def __init__(self, config: Workflow.Config):
             event=config.event,
             branches=[],
             jobs=[],
+            additional_jobs=[],
+            if_condition=config.if_condition,
             secret_names_gh=[],
             variable_names_gh=[],
             job_to_config={},
@@ -234,7 +238,8 @@ def parse(self):
                     assert (
                         False
                     ), f"Artifact [{artifact_name}] has unsupported type [{artifact.type}]"
-            if artifact.type == Artifact.Type.GH:
+            # NOTE (strtgbb): Added a check that provided_by is not empty, which is the case for artifacts that are defined in defs.py but not used in a workflow
+            if artifact.type == Artifact.Type.GH and artifact.provided_by != "":
                 self.workflow_yaml_config.job_to_config[
                     artifact.provided_by
                 ].artifacts_gh_provides.append(artifact)
@@ -243,6 +248,8 @@ def parse(self):
         for job in self.config.jobs:
             self.workflow_yaml_config.job_to_config[job.name].parameter = job.parameter
 
+        self.workflow_yaml_config.additional_jobs = self.config.additional_jobs
+
         # populate secrets
         for secret_config in self.config.secrets:
             if secret_config.is_gh_secret():
diff --git a/ci/praktika/result.py b/ci/praktika/result.py
index ececdccd8e36..69ac6e4a268f 100644
--- a/ci/praktika/result.py
+++ b/ci/praktika/result.py
@@ -52,6 +52,7 @@ class StatusExtended:
         OK = "OK"
         FAIL = "FAIL"
         SKIPPED = "SKIPPED"
+        BROKEN = "BROKEN"
 
     class Label:
         REQUIRED = "required"
@@ -176,6 +177,7 @@ def is_ok(self):
             Result.Status.SUCCESS,
             Result.StatusExtended.OK,
             Result.StatusExtended.SKIPPED,
+            Result.StatusExtended.BROKEN,
         )
 
     def is_error(self):
diff --git a/ci/praktika/runner.py b/ci/praktika/runner.py
index d08d8da1a708..6c4976771890 100644
--- a/ci/praktika/runner.py
+++ b/ci/praktika/runner.py
@@ -116,6 +116,13 @@ def _setup_env(self, _workflow, job):
 
         print("Read GH Environment")
         env = _Environment.from_env()
+        try:
+            version_string = Info().get_kv_data("version")['string']
+            os.environ["CLICKHOUSE_VERSION_STRING"] = version_string
+            env.CLICKHOUSE_VERSION_STRING = version_string
+        except Exception as e:
+            print(e)
+
         env.JOB_NAME = job.name
         os.environ["JOB_NAME"] = job.name
         os.environ["CHECK_NAME"] = job.name
@@ -555,6 +562,11 @@ def _post_run(
                 print(f"ERROR: Failed to post commit status for the job")
 
         if workflow.enable_report:
+            # Altinity workflow report
+            cmd = f"PR_NUMBER={env.PR_NUMBER} ./.github/actions/create_workflow_report/workflow_report_hook.sh"
+            workflow_report_url = Shell.get_output(cmd).splitlines()[-1]
+            print(f"::notice ::Workflow report: {workflow_report_url}")
+
             # to make it visible in GH Actions annotations
             print(f"::notice ::Job report: {report_url}")
 
diff --git a/ci/praktika/s3.py b/ci/praktika/s3.py
index 06f946263387..f5240dd1bd7c 100644
--- a/ci/praktika/s3.py
+++ b/ci/praktika/s3.py
@@ -4,12 +4,45 @@
 from pathlib import Path
 from typing import Any, Dict
 from urllib.parse import quote
+import re
 
 from ._environment import _Environment
 from .settings import Settings
 from .usage import StorageUsage
 from .utils import MetaClasses, Shell, Utils
 
+sensitive_var_pattern = re.compile(r"[A-Z_]*(SECRET|PASSWORD|KEY|TOKEN|AZURE)[A-Z_]*")
+sensitive_strings = {
+    var: value for var, value in os.environ.items() if sensitive_var_pattern.match(var)
+}
+
+
+def scan_file_for_sensitive_data(file_content, file_name):
+    """
+    Scan the content of a file for sensitive strings.
+    Raises ValueError if any sensitive values are found.
+    """
+
+    def clean_line(line):
+        for name, value in sensitive_strings.items():
+            line = line.replace(value, f"SECRET[{name}]")
+        return line
+
+    matches = []
+    for line_number, line in enumerate(file_content.splitlines(), start=1):
+        for name, value in sensitive_strings.items():
+            if value in line:
+                matches.append((file_name, line_number, clean_line(line)))
+
+    if not matches:
+        return
+
+    print(f"ERROR: Sensitive values found in {file_name}")
+    for file_name, line_number, match in matches:
+        print(f"{file_name}:{line_number}: {match}")
+
+    raise ValueError(f"Sensitive values found in {file_name}")
+
 
 @dataclasses.dataclass
 class StorageUsage(MetaClasses.SerializableSingleton):
@@ -131,6 +164,14 @@ def copy_file_to_s3(
         ).is_file(), f"Path [{local_path}] is not file. Only files are supported"
         file_name = Path(local_path).name
         s3_full_path = s3_path
+
+        try:
+            file_content = Path(local_path).read_text(encoding="utf-8")
+        except UnicodeDecodeError:
+            print(f"WARNING: Failed to scan file {local_path}, unknown encoding")
+        else:
+            scan_file_for_sensitive_data(file_content, Path(local_path).name)
+
         if not s3_full_path.endswith(file_name) and not with_rename:
             s3_full_path = f"{s3_path}/{Path(local_path).name}"
         cmd = f"aws s3 cp {local_path} s3://{s3_full_path}"
diff --git a/ci/praktika/workflow.py b/ci/praktika/workflow.py
index d2f94774a522..d58dbc8d89ed 100644
--- a/ci/praktika/workflow.py
+++ b/ci/praktika/workflow.py
@@ -25,6 +25,8 @@ class Config:
         name: str
         event: str
         jobs: List[Job.Config]
+        additional_jobs: List[str] = field(default_factory=list)
+        if_condition: str = ""
         branches: List[str] = field(default_factory=list)
         base_branches: List[str] = field(default_factory=list)
         artifacts: List[Artifact.Config] = field(default_factory=list)
diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py
new file mode 100644
index 000000000000..9518f8fe0508
--- /dev/null
+++ b/ci/praktika/yaml_additional_templates.py
@@ -0,0 +1,169 @@
+class AltinityWorkflowTemplates:
+    # Envs not defined in ci/defs/defs.py SECRETS
+    # Braces must be escaped
+    ADDITIONAL_GLOBAL_ENV = r"""  AWS_DEFAULT_REGION: ${{{{ secrets.AWS_DEFAULT_REGION }}}}
+  CHECKS_DATABASE_HOST: ${{{{ secrets.CHECKS_DATABASE_HOST }}}}
+  CLICKHOUSE_PLAY_DB: gh-data
+  AZURE_STORAGE_KEY: ${{{{ secrets.AZURE_STORAGE_KEY }}}}
+  AZURE_ACCOUNT_NAME: ${{{{ secrets.AZURE_ACCOUNT_NAME }}}}
+  AZURE_CONTAINER_NAME: ${{{{ secrets.AZURE_CONTAINER_NAME }}}}
+  AZURE_STORAGE_ACCOUNT_URL: "https://${{{{ secrets.AZURE_ACCOUNT_NAME }}}}.blob.core.windows.net/"
+  ROBOT_TOKEN: ${{{{ secrets.ROBOT_TOKEN }}}}
+"""
+    # Additional pre steps for all jobs
+    JOB_SETUP_STEPS = """
+      - name: Setup
+        uses: ./.github/actions/runner_setup
+      - name: Docker setup
+        uses: ./.github/actions/docker_setup
+        with:
+          test_name: "{JOB_NAME_GH}"
+"""
+    # Additional pre steps for config workflow job
+    ADDITIONAL_CI_CONFIG_STEPS = r"""
+      - name: Note report location to summary
+        if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+          COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/$GITHUB_RUN_ID/ci_run_report.html
+          echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
+"""
+    # Additional jobs
+    REGRESSION_HASH = f"92f4413c775fc750e826951f5d235766c562a98f"
+    ALTINITY_JOBS = {
+        "GrypeScan": r"""
+  GrypeScanServer:
+    needs: [config_workflow, docker_server_image]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        suffix: ['', '-alpine']
+    uses: ./.github/workflows/grype_scan.yml
+    secrets: inherit
+    with:
+      docker_image: altinityinfra/clickhouse-server
+      version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+      tag-suffix: ${{ matrix.suffix }}
+  GrypeScanKeeper:
+      needs: [config_workflow, docker_keeper_image]
+      if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
+      uses: ./.github/workflows/grype_scan.yml
+      secrets: inherit
+      with:
+        docker_image: altinityinfra/clickhouse-keeper
+        version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+""",
+        "Regression": r"""
+  RegressionTestsRelease:
+    needs: [config_workflow, build_amd_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
+    uses: ./.github/workflows/regression.yml
+    secrets: inherit
+    with:
+      runner_type: altinity-regression-tester
+      commit: {REGRESSION_HASH}
+      arch: x86
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout_minutes: 210
+      workflow_config: ${{ needs.config_workflow.outputs.data }}
+  RegressionTestsAarch64:
+    needs: [config_workflow, build_arm_binary]
+    if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
+    uses: ./.github/workflows/regression.yml
+    secrets: inherit
+    with:
+      runner_type: altinity-regression-tester-aarch64
+      commit: {REGRESSION_HASH}
+      arch: aarch64
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout_minutes: 210
+      workflow_config: ${{ needs.config_workflow.outputs.data }}
+""",
+        "SignRelease": r"""
+  SignRelease:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_sign.yml
+    secrets: inherit
+    with:
+      test_name: Sign release
+      runner_type: altinity-style-checker
+      data: ${{ needs.config_workflow.outputs.data }}
+  SignAarch64:
+    needs: [config_workflow, build_arm_release]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_sign.yml
+    secrets: inherit
+    with:
+      test_name: Sign aarch64
+      runner_type: altinity-style-checker-aarch64
+      data: ${{ needs.config_workflow.outputs.data }}
+""",
+        "CIReport": r"""
+  FinishCIReport:
+    if: ${{ !cancelled() }}
+    needs:
+{ALL_JOBS}
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+      - name: Finalize workflow report
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/create_workflow_report
+        with:
+          workflow_config: ${{ needs.config_workflow.outputs.data }}
+          final: true
+""",
+        "SourceUpload": r"""
+  SourceUpload:
+    needs: [config_workflow, build_amd_release]
+    if: ${{ !failure() && !cancelled() }}
+    runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
+    env:
+        COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+        PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
+        VERSION: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
+    steps:
+      - name: Check out repository code
+        uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
+        with:
+          clear-repository: true
+          ref: ${{ fromJson(needs.config_workflow.outputs.data).git_ref }}
+          submodules: true
+          fetch-depth: 0
+          filter: tree:0
+      - name: Install aws cli
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+          arch: arm64
+      - name: Create source tar
+        run: |
+          cd .. && tar czf $RUNNER_TEMP/build_source.src.tar.gz ClickHouse/
+      - name: Upload source tar
+        run: |
+          if [ "$PR_NUMBER" -eq 0 ]; then
+              S3_PATH="REFs/$GITHUB_REF_NAME/$COMMIT_SHA/build_amd_release"
+          else
+              S3_PATH="PRs/$PR_NUMBER/$COMMIT_SHA/build_amd_release"
+          fi
+
+          aws s3 cp $RUNNER_TEMP/build_source.src.tar.gz s3://altinity-build-artifacts/$S3_PATH/clickhouse-$VERSION.src.tar.gz
+""",
+    }
+    ADDITIONAL_JOBS_BANNER = r"""
+##########################################################################################
+##################################### ALTINITY JOBS ######################################
+##########################################################################################
+"""
diff --git a/ci/praktika/yaml_generator.py b/ci/praktika/yaml_generator.py
index 3e4b0797d6e4..4d6add1c2e83 100644
--- a/ci/praktika/yaml_generator.py
+++ b/ci/praktika/yaml_generator.py
@@ -1,5 +1,6 @@
 import dataclasses
 from typing import List
+import os
 
 from . import Artifact, Job, Workflow
 from .mangle import _get_workflows
@@ -8,6 +9,7 @@
 from .settings import Settings
 from .utils import Shell, Utils
 
+from .yaml_additional_templates import AltinityWorkflowTemplates
 
 class YamlGenerator:
     class Templates:
@@ -34,6 +36,13 @@ class Templates:
 name: {NAME}
 
 on:
+  workflow_dispatch:
+    inputs:
+      no_cache:
+        description: Run without cache
+        required: false
+        type: boolean
+        default: false
   {EVENT}:
     branches: [{BRANCHES}]
 
@@ -47,16 +56,21 @@ class Templates:
 jobs:
 {JOBS}\
 """
-        TEMPLATE_GH_TOKEN_PERMISSIONS = """\
-# Allow updating GH commit statuses and PR comments to post an actual job reports link
-permissions: write-all\
-"""
+        # NOTE (strtgbb): permissions: write is dangerous to set for untrusted workflows, and for trusted workflows it should already be the default
+        TEMPLATE_GH_TOKEN_PERMISSIONS = ""
         TEMPLATE_ENV_CHECKOUT_REF_PR = """\
+  GH_TOKEN: ${{{{ github.token }}}}
   DISABLE_CI_MERGE_COMMIT: ${{{{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}}}
-  DISABLE_CI_CACHE: ${{{{ vars.DISABLE_CI_CACHE || '0' }}}}
+  DISABLE_CI_CACHE: ${{{{ github.event.inputs.no_cache || '0' }}}}
   CHECKOUT_REF: ${{{{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}}}\
+"""
+        TEMPLATE_ENV_CHECKOUT_REF_PUSH = """\
+  GH_TOKEN: ${{{{ github.token }}}}
+  DISABLE_CI_CACHE: ${{{{ github.event.inputs.no_cache || '0' }}}}
+  CHECKOUT_REF: ""\
 """
         TEMPLATE_ENV_CHECKOUT_REF_DEFAULT = """\
+  GH_TOKEN: ${{{{ github.token }}}}
   CHECKOUT_REF: ""\
 """
         TEMPLATE_ENV_SECRET = """\
@@ -100,6 +114,7 @@ class Templates:
 env:
   PYTHONUNBUFFERED: 1
 {ENV_CHECKOUT_REFERENCE}
+{ENV_SECRETS}
 
 jobs:
 {JOBS}\
@@ -214,7 +229,7 @@ class Templates:
 
         TEMPLATE_GH_UPLOAD = """
       - name: Upload artifact {NAME}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: {NAME}
           path: {PATH}
@@ -222,7 +237,7 @@ class Templates:
 
         TEMPLATE_GH_DOWNLOAD = """
       - name: Download artifact {NAME}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: {NAME}
           path: {PATH}
@@ -275,6 +290,11 @@ def generate(self):
             needs = ", ".join(map(Utils.normalize_string, job.needs))
             job_name = job.name
             job_addons = []
+
+            job_addons.append(AltinityWorkflowTemplates.JOB_SETUP_STEPS.format(JOB_NAME_GH = job_name))
+            if job_name == Settings.CI_CONFIG_JOB_NAME:
+                job_addons.append(AltinityWorkflowTemplates.ADDITIONAL_CI_CONFIG_STEPS)
+
             for addon in job.addons:
                 if addon.install_python:
                     job_addons.append(
@@ -295,7 +315,8 @@ def generate(self):
             for artifact in job.artifacts_gh_provides:
                 uploads_github.append(
                     YamlGenerator.Templates.TEMPLATE_GH_UPLOAD.format(
-                        NAME=artifact.name, PATH=artifact.path
+                        NAME=artifact.name,
+                        PATH=os.path.relpath(artifact.path, os.getcwd()),
                     )
                 )
             downloads_github = []
@@ -311,26 +332,35 @@ def generate(self):
             )
 
             if_expression = ""
+            # NOTE (strtgbb): We still want the cache logic, we use it for skipping based on PR config
             if (
-                self.workflow_config.config.enable_cache
-                and job_name_normalized != config_job_name_normalized
+                # self.workflow_config.config.enable_cache
+                # and 
+                job_name_normalized != config_job_name_normalized
             ):
                 if_expression = YamlGenerator.Templates.TEMPLATE_IF_EXPRESSION.format(
                     WORKFLOW_CONFIG_JOB_NAME=config_job_name_normalized,
                     JOB_NAME_BASE64=Utils.to_base64(job_name),
                 )
+            elif self.workflow_config.if_condition:
+                if_expression = (
+                    f"\n    if: ${{{{ {self.workflow_config.if_condition} }}}}"
+                )
+
             if job.run_unless_cancelled:
                 if_expression = (
                     YamlGenerator.Templates.TEMPLATE_IF_EXPRESSION_NOT_CANCELLED
                 )
 
             secrets_envs = []
-            for secret in self.workflow_config.secret_names_gh:
-                secrets_envs.append(
-                    YamlGenerator.Templates.TEMPLATE_SETUP_ENV_SECRETS.format(
-                        SECRET_NAME=secret
-                    )
-                )
+            # note(strtgbb): This adds github secrets to praktika_setup_env.sh
+            # This makes the workflow very verbose and we don't need it
+            # for secret in self.workflow_config.secret_names_gh:
+            #     secrets_envs.append(
+            #         YamlGenerator.Templates.TEMPLATE_SETUP_ENV_SECRETS.format(
+            #             SECRET_NAME=secret
+            #         )
+            #     )
             for var in self.workflow_config.variable_names_gh:
                 secrets_envs.append(
                     YamlGenerator.Templates.TEMPLATE_SETUP_ENV_VARS.format(VAR_NAME=var)
@@ -423,6 +453,10 @@ def generate(self):
                 ENV_CHECKOUT_REFERENCE = (
                     YamlGenerator.Templates.TEMPLATE_ENV_CHECKOUT_REF_PR
                 )
+            elif self.workflow_config.event in (Workflow.Event.PUSH,):
+                ENV_CHECKOUT_REFERENCE = (
+                    YamlGenerator.Templates.TEMPLATE_ENV_CHECKOUT_REF_PUSH
+                )
             else:
                 ENV_CHECKOUT_REFERENCE = (
                     YamlGenerator.Templates.TEMPLATE_ENV_CHECKOUT_REF_DEFAULT
@@ -463,6 +497,12 @@ def generate(self):
                 )
         format_kwargs["ENV_SECRETS"] = GH_VAR_ENVS + SECRET_ENVS
 
+        if self.parser.config.secrets:
+            # Only add global env if there are secrets in workflow config
+            format_kwargs[
+                "ENV_SECRETS"
+            ] += AltinityWorkflowTemplates.ADDITIONAL_GLOBAL_ENV
+
         template_1 = base_template.strip().format(
             NAME=self.workflow_config.name,
             JOBS="{}" * len(job_items),
@@ -471,6 +511,33 @@ def generate(self):
         )
         res = template_1.format(*job_items)
 
+        ALL_JOBS = "\n".join(
+            "      - " + Utils.normalize_string(job.name)
+            for job in self.workflow_config.jobs
+        )
+        if self.workflow_config.additional_jobs:
+            res += AltinityWorkflowTemplates.ADDITIONAL_JOBS_BANNER
+        if "GrypeScan" in self.workflow_config.additional_jobs:
+            res += AltinityWorkflowTemplates.ALTINITY_JOBS["GrypeScan"]
+            ALL_JOBS += "\n      - GrypeScanServer\n      - GrypeScanKeeper"
+        if "Regression" in self.workflow_config.additional_jobs:
+            res += AltinityWorkflowTemplates.ALTINITY_JOBS["Regression"].replace(
+                "{REGRESSION_HASH}", AltinityWorkflowTemplates.REGRESSION_HASH
+            )
+            ALL_JOBS += (
+                "\n      - RegressionTestsRelease\n      - RegressionTestsAarch64"
+            )
+        if "SignRelease" in self.workflow_config.additional_jobs:
+            res += AltinityWorkflowTemplates.ALTINITY_JOBS["SignRelease"]
+            ALL_JOBS += "\n      - SignRelease\n      - SignAarch64"
+        if "CIReport" in self.workflow_config.additional_jobs:
+            res += AltinityWorkflowTemplates.ALTINITY_JOBS["CIReport"].replace(
+                "{ALL_JOBS}", ALL_JOBS
+            )
+        if "SourceUpload" in self.workflow_config.additional_jobs:
+            res += AltinityWorkflowTemplates.ALTINITY_JOBS["SourceUpload"]
+            ALL_JOBS += "\n      - SourceUpload"
+
         return res
 
 
diff --git a/ci/settings/altinity_overrides.py b/ci/settings/altinity_overrides.py
new file mode 100644
index 000000000000..5c2c550d51d5
--- /dev/null
+++ b/ci/settings/altinity_overrides.py
@@ -0,0 +1,58 @@
+S3_BUCKET_NAME = "altinity-build-artifacts"
+S3_REPORT_BUCKET_NAME = "altinity-build-artifacts"
+S3_BUCKET_HTTP_ENDPOINT = "altinity-build-artifacts.s3.amazonaws.com"
+S3_REPORT_BUCKET_HTTP_ENDPOINT = "altinity-build-artifacts.s3.amazonaws.com"
+
+
+class RunnerLabels:
+    STYLE_CHECK_AMD = ["self-hosted", "altinity-on-demand", "altinity-style-checker"]
+    STYLE_CHECK_ARM = [
+        "self-hosted",
+        "altinity-on-demand",
+        "altinity-style-checker-aarch64",
+    ]
+
+
+MAIN_BRANCH = "antalya"
+S3_ARTIFACT_PATH = S3_BUCKET_NAME
+CI_CONFIG_RUNS_ON = RunnerLabels.STYLE_CHECK_ARM
+
+ENABLE_MULTIPLATFORM_DOCKER_IN_ONE_JOB = False
+DOCKER_BUILD_AND_MERGE_RUNS_ON = RunnerLabels.STYLE_CHECK_AMD
+DOCKER_BUILD_ARM_RUNS_ON = RunnerLabels.STYLE_CHECK_ARM
+
+CACHE_S3_PATH = f"{S3_BUCKET_NAME}/ci_ch_cache"
+HTML_S3_PATH = S3_REPORT_BUCKET_NAME
+S3_BUCKET_TO_HTTP_ENDPOINT = {
+    S3_BUCKET_NAME: S3_BUCKET_HTTP_ENDPOINT,
+    S3_REPORT_BUCKET_NAME: S3_REPORT_BUCKET_HTTP_ENDPOINT,
+}
+ENABLE_ARTIFACTS_REPORT = True
+
+COMPRESS_THRESHOLD_MB = 32
+TEXT_CONTENT_EXTENSIONS = [".txt", ".log", ".err", ".out", ".tsv", ".csv", ".json"]
+
+DOCKERHUB_USERNAME = "altinityinfra"
+DOCKERHUB_SECRET = "DOCKER_PASSWORD"
+
+CI_DB_DB_NAME = "gh-data"
+CI_DB_TABLE_NAME = "checks"
+SECRET_CI_DB_URL = "CLICKHOUSE_TEST_STAT_URL"
+SECRET_CI_DB_USER = "CLICKHOUSE_TEST_STAT_LOGIN"
+SECRET_CI_DB_PASSWORD = "CLICKHOUSE_TEST_STAT_PASSWORD"
+
+USE_CUSTOM_GH_AUTH = False
+# SECRET_GH_APP_ID: str = "woolenwolf_gh_app.clickhouse-app-id"
+# SECRET_GH_APP_PEM_KEY: str = "woolenwolf_gh_app.clickhouse-app-key"
+
+INSTALL_PYTHON_REQS_FOR_NATIVE_JOBS = ""
+
+DISABLED_WORKFLOWS = [
+    "new_pull_request.py",
+    "nightly_statistics.py",
+    "nightly_jepsen.py",
+    "VectorSearchStress.py",
+]
+
+DEFAULT_LOCAL_TEST_WORKFLOW = "pull_request.py"
+READY_FOR_MERGE_CUSTOM_STATUS_NAME = "Mergeable Check"
diff --git a/ci/settings/settings.py b/ci/settings/settings.py
index 59a7b7e5fd24..65ca57d9301f 100644
--- a/ci/settings/settings.py
+++ b/ci/settings/settings.py
@@ -5,8 +5,12 @@
 
 
 class RunnerLabels:
-    STYLE_CHECK_AMD = ["self-hosted", "style-checker"]
-    STYLE_CHECK_ARM = ["self-hosted", "style-checker-aarch64"]
+    STYLE_CHECK_AMD = ["self-hosted", "altinity-on-demand", "altinity-style-checker"]
+    STYLE_CHECK_ARM = [
+        "self-hosted",
+        "altinity-on-demand",
+        "altinity-style-checker-aarch64",
+    ]
 
 
 MAIN_BRANCH = "master"
diff --git a/ci/workflows/VectorSearchStress.py b/ci/workflows/VectorSearchStress.py
index b386da6eabbc..7306bf776a6c 100644
--- a/ci/workflows/VectorSearchStress.py
+++ b/ci/workflows/VectorSearchStress.py
@@ -5,7 +5,7 @@
 vector_search_stress_job = Job.Config(
     name="Vector Search Stress",
     runs_on=RunnerLabels.ARM_SMALL,
-    # run_in_docker="clickhouse/stateless-test+--shm-size=16g+--network=host",  # remove if run in docker is not required
+    # run_in_docker="altinityinfra/stateless-test+--shm-size=16g+--network=host",  # remove if run in docker is not required
     command="python3 ./ci/jobs/vector_search_stress_job.py",
 )
 
diff --git a/ci/workflows/backport_branches.py b/ci/workflows/backport_branches.py
index 75b3ced967eb..86172c171eb4 100644
--- a/ci/workflows/backport_branches.py
+++ b/ci/workflows/backport_branches.py
@@ -39,6 +39,7 @@
     artifacts=[
         *ArtifactConfigs.unittests_binaries,
         *ArtifactConfigs.clickhouse_binaries,
+        *ArtifactConfigs.clickhouse_stripped_binaries,
         *ArtifactConfigs.clickhouse_debians,
         *ArtifactConfigs.clickhouse_rpms,
         *ArtifactConfigs.clickhouse_tgzs,
@@ -54,6 +55,7 @@
     pre_hooks=[
         "python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
         "python3 ./ci/jobs/scripts/workflow_hooks/version_log.py",
+        "python3 ./ci/jobs/scripts/workflow_hooks/check_backport_branch.py",
     ],
     workflow_filter_hooks=[should_skip_job],
     post_hooks=[],
diff --git a/ci/workflows/master.py b/ci/workflows/master.py
index cea5f054ed31..70fc36acfe6d 100644
--- a/ci/workflows/master.py
+++ b/ci/workflows/master.py
@@ -8,39 +8,43 @@
 workflow = Workflow.Config(
     name="MasterCI",
     event=Workflow.Event.PUSH,
-    branches=[BASE_BRANCH],
+    branches=[BASE_BRANCH, "releases/*", "antalya-*"],
     jobs=[
-        *JobConfigs.tidy_build_arm_jobs,
+        # *JobConfigs.tidy_build_arm_jobs,
         *JobConfigs.build_jobs,
-        *[
-            job.set_dependency(
-                REGULAR_BUILD_NAMES + [JobConfigs.tidy_build_arm_jobs[0].name]
-            )
-            for job in JobConfigs.special_build_jobs
-        ],
+        # *[ # NOTE (strtgbb): we don't run special build jobs
+        #     job.set_dependency(
+        #         REGULAR_BUILD_NAMES  # + [JobConfigs.tidy_build_arm_jobs[0].name]  # NOTE (strtgbb): we don't run tidy build jobs
+        #     )
+        #     for job in JobConfigs.special_build_jobs
+        # ],
         *JobConfigs.unittest_jobs,
         JobConfigs.docker_sever,
         JobConfigs.docker_keeper,
         *JobConfigs.install_check_master_jobs,
         *JobConfigs.compatibility_test_jobs,
         *JobConfigs.functional_tests_jobs,
-        *JobConfigs.functional_tests_jobs_azure_master_only,
+        # *JobConfigs.functional_tests_jobs_azure_master_only, # NOTE (strtgbb): disabled due to ASAN build failure
         *JobConfigs.integration_test_jobs_required,
         *JobConfigs.integration_test_jobs_non_required,
         *JobConfigs.functional_tests_jobs_coverage,
         *JobConfigs.stress_test_jobs,
-        *JobConfigs.stress_test_azure_master_jobs,
+        # *JobConfigs.stress_test_azure_master_jobs, # NOTE (strtgbb): disabled due to ASAN build failure
         *JobConfigs.ast_fuzzer_jobs,
         *JobConfigs.buzz_fuzzer_jobs,
-        *JobConfigs.performance_comparison_with_master_head_jobs,
-        *JobConfigs.performance_comparison_with_release_base_jobs,
+        # *JobConfigs.performance_comparison_with_master_head_jobs, # NOTE (strtgbb): fails due to GH secrets not being handled properly
+        # *JobConfigs.performance_comparison_with_release_base_jobs,
         *JobConfigs.clickbench_master_jobs,
-        *JobConfigs.sqlancer_master_jobs,
+        # TODO: sqlancer needs adjustment after https://github.com/ClickHouse/ClickHouse/pull/81835
+        #   job error: java.lang.AssertionError: CREATE TABLE IF NOT EXISTS database0NoREC.t1 (c0 String MATERIALIZED (-1457864079) CODEC (NONE)) ENGINE = MergeTree()  ORDER BY tuple()  SETTINGS allow_suspicious_indices=1;
+        # *JobConfigs.sqlancer_master_jobs,
         JobConfigs.sqltest_master_job,
     ],
+    additional_jobs=["GrypeScan", "Regression", "SignRelease", "CIReport", "SourceUpload"],
     artifacts=[
         *ArtifactConfigs.unittests_binaries,
         *ArtifactConfigs.clickhouse_binaries,
+        *ArtifactConfigs.clickhouse_stripped_binaries,
         *ArtifactConfigs.clickhouse_debians,
         *ArtifactConfigs.clickhouse_rpms,
         *ArtifactConfigs.clickhouse_tgzs,
@@ -51,7 +55,7 @@
     enable_dockers_manifest_merge=True,
     set_latest_for_docker_merged_manifest=True,
     secrets=SECRETS,
-    enable_job_filtering_by_changes=True,
+    enable_job_filtering_by_changes=False,
     enable_cache=True,
     enable_report=True,
     enable_cidb=True,
@@ -59,7 +63,8 @@
     pre_hooks=[
         "python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
         "python3 ./ci/jobs/scripts/workflow_hooks/version_log.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/merge_sync_pr.py",
+        "python3 ./ci/jobs/scripts/workflow_hooks/parse_ci_tags.py",
+        # "python3 ./ci/jobs/scripts/workflow_hooks/merge_sync_pr.py", # NOTE (strtgbb): we don't do this
     ],
     workflow_filter_hooks=[should_skip_job],
     post_hooks=[],
diff --git a/ci/workflows/merge_queue.py b/ci/workflows/merge_queue.py
index 1ec8a208d423..eb5d7ab5846b 100644
--- a/ci/workflows/merge_queue.py
+++ b/ci/workflows/merge_queue.py
@@ -7,7 +7,7 @@
     name="MergeQueueCI",
     event=Workflow.Event.MERGE_QUEUE,
     jobs=[
-        JobConfigs.style_check,
+        # JobConfigs.style_check, # NOTE (strtgbb): We don't use style check
         JobConfigs.fast_test,
         *[job for job in JobConfigs.build_jobs if job.name == "Build (amd_binary)"],
     ],
@@ -27,7 +27,7 @@
     enable_commit_status_on_failure=True,
     pre_hooks=[
         "python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/set_dummy_sync_commit_status.py",
+        # "python3 ./ci/jobs/scripts/workflow_hooks/set_dummy_sync_commit_status.py", # NOTE (strtgbb): We don't use this
     ],
 )
 
diff --git a/ci/workflows/pull_request.py b/ci/workflows/pull_request.py
index 0b5952f3d039..6ac534326d80 100644
--- a/ci/workflows/pull_request.py
+++ b/ci/workflows/pull_request.py
@@ -23,26 +23,28 @@
 workflow = Workflow.Config(
     name="PR",
     event=Workflow.Event.PULL_REQUEST,
-    base_branches=[BASE_BRANCH],
+    base_branches=[BASE_BRANCH, "releases/*", "antalya-*"],
+    if_condition="github.repository == github.event.pull_request.head.repo.full_name",
     jobs=[
-        JobConfigs.style_check,
-        JobConfigs.docs_job,
+        # JobConfigs.style_check, # NOTE (strtgbb): we don't run style check
+        # JobConfigs.docs_job, # NOTE (strtgbb): we don't build docs
         JobConfigs.fast_test,
-        *JobConfigs.tidy_build_arm_jobs,
+        # *JobConfigs.tidy_build_jobs, # NOTE (strtgbb): we don't run tidy build jobs
+        # *JobConfigs.tidy_build_arm_jobs,
         *[
             job.set_dependency(
                 [
-                    JobNames.STYLE_CHECK,
+                    # JobNames.STYLE_CHECK, # NOTE (strtgbb): we don't run style check
                     JobNames.FAST_TEST,
-                    *[j.name for j in JobConfigs.tidy_build_arm_jobs],
+                    # JobConfigs.tidy_build_arm_jobs[0].name, # NOTE (strtgbb): this takes too long, revisit later
                 ]
             )
             for job in JobConfigs.build_jobs
         ],
-        *[
-            job.set_dependency(REGULAR_BUILD_NAMES)
-            for job in JobConfigs.special_build_jobs
-        ],
+        # *[
+        #     job.set_dependency(REGULAR_BUILD_NAMES)
+        #     for job in JobConfigs.special_build_jobs
+        # ],
         *JobConfigs.unittest_jobs,
         *[
             j.set_dependency(
@@ -52,14 +54,14 @@
             )
             for j in JobConfigs.functional_tests_jobs
         ],
-        JobConfigs.bugfix_validation_it_job.set_dependency(
-            [
-                JobNames.STYLE_CHECK,
-                JobNames.FAST_TEST,
-                JobConfigs.tidy_build_arm_jobs[0].name,
-            ]
-        ),
-        JobConfigs.bugfix_validation_ft_pr_job,
+        # JobConfigs.bugfix_validation_it_job.set_dependency(
+        #     [
+        #         # JobNames.STYLE_CHECK, # NOTE (strtgbb): we don't run style check
+        #         # JobNames.FAST_TEST, # NOTE (strtgbb): this takes too long, revisit later
+        #         # JobConfigs.tidy_build_arm_jobs[0].name, # NOTE (strtgbb): we don't run tidy build jobs
+        #     ]
+        # ),
+        # JobConfigs.bugfix_validation_ft_pr_job,
         *JobConfigs.stateless_tests_flaky_pr_jobs,
         *[
             job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
@@ -70,12 +72,8 @@
             for job in JobConfigs.integration_test_jobs_non_required
         ],
         JobConfigs.integration_test_asan_flaky_pr_job,
-        JobConfigs.docker_sever.set_dependency(
-            FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES
-        ),
-        JobConfigs.docker_keeper.set_dependency(
-            FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES
-        ),
+        JobConfigs.docker_sever,
+        JobConfigs.docker_keeper,
         *[
             job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
             for job in JobConfigs.install_check_jobs
@@ -88,10 +86,10 @@
             job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
             for job in JobConfigs.stress_test_jobs
         ],
-        *[
-            job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
-            for job in JobConfigs.upgrade_test_jobs
-        ],
+        # *[
+        #     job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+        #     for job in JobConfigs.upgrade_test_jobs
+        # ], # TODO: customize for our repo
         *[
             job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
             for job in JobConfigs.ast_fuzzer_jobs
@@ -100,14 +98,16 @@
             job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
             for job in JobConfigs.buzz_fuzzer_jobs
         ],
-        *[
-            job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
-            for job in JobConfigs.performance_comparison_with_master_head_jobs
-        ],
+        # *[
+        #    job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+        #    for job in JobConfigs.performance_comparison_with_master_head_jobs
+        # ], # NOTE (strtgbb): failed previously due to GH secrets not being handled properly, try again later
     ],
+    additional_jobs=["GrypeScan", "Regression", "CIReport", "SourceUpload"],
     artifacts=[
         *ArtifactConfigs.unittests_binaries,
         *ArtifactConfigs.clickhouse_binaries,
+        *ArtifactConfigs.clickhouse_stripped_binaries,
         *ArtifactConfigs.clickhouse_debians,
         *ArtifactConfigs.clickhouse_rpms,
         *ArtifactConfigs.clickhouse_tgzs,
@@ -121,22 +121,22 @@
     enable_cache=True,
     enable_report=True,
     enable_cidb=True,
-    enable_merge_ready_status=True,
-    enable_gh_summary_comment=True,
-    enable_commit_status_on_failure=False,
+    enable_merge_ready_status=False,  # NOTE (strtgbb): we don't use this, TODO, see if we can use it
+    enable_commit_status_on_failure=True,
     pre_hooks=[
-        can_be_trusted,
+        # can_be_trusted, # NOTE (strtgbb): relies on labels we don't use
         "python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/pr_description.py",
+        # "python3 ./ci/jobs/scripts/workflow_hooks/pr_description.py", # NOTE (strtgbb): relies on labels we don't use
         "python3 ./ci/jobs/scripts/workflow_hooks/version_log.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/quick_sync.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/team_notifications.py",
+        # "python3 ./ci/jobs/scripts/workflow_hooks/quick_sync.py", # NOTE (strtgbb): we don't do this
+        # "python3 ./ci/jobs/scripts/workflow_hooks/team_notifications.py",
+        "python3 ./ci/jobs/scripts/workflow_hooks/parse_ci_tags.py",
     ],
     workflow_filter_hooks=[should_skip_job],
     post_hooks=[
-        "python3 ./ci/jobs/scripts/workflow_hooks/feature_docs.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/new_tests_check.py",
-        "python3 ./ci/jobs/scripts/workflow_hooks/can_be_merged.py",
+        # "python3 ./ci/jobs/scripts/workflow_hooks/feature_docs.py", # NOTE (strtgbb): we don't build docs
+        # "python3 ./ci/jobs/scripts/workflow_hooks/new_tests_check.py", # NOTE (strtgbb): we don't use this
+        # "python3 ./ci/jobs/scripts/workflow_hooks/can_be_merged.py", # NOTE (strtgbb): relies on labels we don't use
     ],
 )
 
diff --git a/ci/workflows/pull_request_community.py b/ci/workflows/pull_request_community.py
new file mode 100644
index 000000000000..b00efa4b8809
--- /dev/null
+++ b/ci/workflows/pull_request_community.py
@@ -0,0 +1,111 @@
+import copy
+from praktika import Workflow, Artifact
+
+from ci.defs.defs import BASE_BRANCH, DOCKERS, SECRETS, ArtifactConfigs, JobNames
+from ci.defs.job_configs import JobConfigs
+from ci.jobs.scripts.workflow_hooks.filter_job import should_skip_job
+
+FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES = [
+    job.name
+    for job in JobConfigs.functional_tests_jobs
+    if any(
+        substr in job.name
+        for substr in (
+            "_debug, parallel",
+            "_binary, parallel",
+            "_asan, distributed plan, parallel",
+        )
+    )
+]
+
+REGULAR_BUILD_NAMES = [job.name for job in JobConfigs.build_jobs]
+
+workflow = Workflow.Config(
+    name="Community PR",
+    event=Workflow.Event.PULL_REQUEST,
+    base_branches=[BASE_BRANCH, "releases/*", "antalya-*"],
+    if_condition="github.repository != github.event.pull_request.head.repo.full_name",
+    jobs=[
+        JobConfigs.fast_test,
+        *[job.set_dependency([JobNames.FAST_TEST]) for job in JobConfigs.build_jobs],
+        *JobConfigs.unittest_jobs,
+        *[
+            j.set_dependency(
+                FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES
+                if j.name not in FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES
+                else []
+            )
+            for j in JobConfigs.functional_tests_jobs
+        ],
+        *JobConfigs.stateless_tests_flaky_pr_jobs,
+        *[
+            job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+            for job in JobConfigs.integration_test_jobs_required[:]
+        ],
+        *[
+            job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+            for job in JobConfigs.integration_test_jobs_non_required
+        ],
+        JobConfigs.integration_test_asan_flaky_pr_job,
+        *[
+            job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+            for job in JobConfigs.install_check_jobs
+        ],
+        # *[
+        #     job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+        #     for job in JobConfigs.stress_test_jobs
+        # ], # NOTE (strtgbb): Does not support github artifacts
+        # *[
+        #     job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+        #     for job in JobConfigs.upgrade_test_jobs
+        # ], # TODO: customize for our repo
+        # *[ # Remove fuzzers for now
+        #     job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+        #     for job in JobConfigs.ast_fuzzer_jobs
+        # ],
+        # *[
+        #     job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
+        #     for job in JobConfigs.buzz_fuzzer_jobs
+        # ],
+    ],
+    artifacts=[
+        *ArtifactConfigs.unittests_binaries,
+        *ArtifactConfigs.clickhouse_binaries,
+        *ArtifactConfigs.clickhouse_stripped_binaries,
+        *ArtifactConfigs.clickhouse_debians,
+        *ArtifactConfigs.clickhouse_rpms,
+        *ArtifactConfigs.clickhouse_tgzs,
+        ArtifactConfigs.fuzzers,
+        ArtifactConfigs.fuzzers_corpus,
+    ],
+    dockers=DOCKERS,
+    disable_dockers_build=True,
+    enable_dockers_manifest_merge=False,
+    secrets=[],
+    enable_job_filtering_by_changes=False,  # TODO: Change this back?
+    enable_cache=False,
+    enable_report=False,
+    enable_cidb=False,
+    enable_merge_ready_status=False,
+    enable_commit_status_on_failure=False,
+    pre_hooks=[
+        "python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
+        "python3 ./ci/jobs/scripts/workflow_hooks/version_log.py",
+        "python3 ./ci/jobs/scripts/workflow_hooks/parse_ci_tags.py",
+    ],
+    workflow_filter_hooks=[should_skip_job],
+    post_hooks=[],
+)
+
+# NOTE (strtgbb): use deepcopy to avoid modifying workflows generated after this one
+for i, job in enumerate(workflow.jobs):
+    workflow.jobs[i] = copy.deepcopy(job)
+    workflow.jobs[i].enable_commit_status = False
+
+for i, artifact in enumerate(workflow.artifacts):
+    workflow.artifacts[i] = copy.deepcopy(artifact)
+    workflow.artifacts[i].type = Artifact.Type.GH
+
+WORKFLOWS = [
+    workflow,
+]
diff --git a/ci/workflows/release_branches.py b/ci/workflows/release_branches.py
index 199909e32598..fe53cbd718c3 100644
--- a/ci/workflows/release_branches.py
+++ b/ci/workflows/release_branches.py
@@ -24,6 +24,7 @@
         JobConfigs.docker_sever,
         JobConfigs.docker_keeper,
         *JobConfigs.install_check_master_jobs,
+        *[job for job in JobConfigs.functional_tests_jobs if "asan" in job.name],
         *[
             job
             for job in JobConfigs.integration_test_asan_master_jobs
@@ -43,6 +44,7 @@
     ],
     artifacts=[
         *ArtifactConfigs.clickhouse_binaries,
+        *ArtifactConfigs.clickhouse_stripped_binaries,
         *ArtifactConfigs.clickhouse_debians,
         *ArtifactConfigs.clickhouse_rpms,
         *ArtifactConfigs.clickhouse_tgzs,
diff --git a/ci/workflows/release_builds.py b/ci/workflows/release_builds.py
new file mode 100644
index 000000000000..9ecbc39a5b9a
--- /dev/null
+++ b/ci/workflows/release_builds.py
@@ -0,0 +1,67 @@
+from praktika import Workflow
+
+from ci.defs.defs import DOCKERS, SECRETS, ArtifactConfigs
+from ci.defs.job_configs import JobConfigs
+from ci.jobs.scripts.workflow_hooks.filter_job import should_skip_job
+
+builds_for_release_branch = [
+    job.unset_provides("unittest")
+    for job in JobConfigs.build_jobs
+    if "coverage" not in job.name
+]
+
+# Make sure that builds that get tested are built first
+# Note that the release build job should not block or be blocked, it is long and it's dependencies are fast.
+BLOCKING_BUILD_JOBS = [
+    job.name
+    for job in JobConfigs.build_jobs
+    if any(substr in job.name for substr in ["binary"])
+]
+
+workflow = Workflow.Config(
+    name="Release Builds",
+    event=Workflow.Event.DISPATCH,
+    jobs=[
+        *[
+            job.set_dependency(
+                BLOCKING_BUILD_JOBS
+                if job.name not in BLOCKING_BUILD_JOBS and "release" not in job.name
+                else []
+            )
+            for job in builds_for_release_branch
+        ],
+        JobConfigs.docker_sever,
+        JobConfigs.docker_keeper,
+        *JobConfigs.install_check_master_jobs,
+        *[
+            job
+            for job in JobConfigs.functional_tests_jobs
+            if any(t in job.name for t in ("release", "binary"))
+        ],
+    ],
+    additional_jobs=["GrypeScan", "SignRelease", "CIReport", "SourceUpload"],
+    artifacts=[
+        *ArtifactConfigs.clickhouse_binaries,
+        *ArtifactConfigs.clickhouse_stripped_binaries,
+        *ArtifactConfigs.clickhouse_debians,
+        *ArtifactConfigs.clickhouse_rpms,
+        *ArtifactConfigs.clickhouse_tgzs,
+    ],
+    dockers=DOCKERS,
+    secrets=SECRETS,
+    enable_job_filtering_by_changes=False,
+    enable_cache=False,
+    enable_report=True,
+    enable_cidb=True,
+    enable_commit_status_on_failure=True,
+    pre_hooks=[
+        "python3 ./ci/jobs/scripts/workflow_hooks/store_data.py",
+        "python3 ./ci/jobs/scripts/workflow_hooks/version_log.py",
+    ],
+    workflow_filter_hooks=[should_skip_job],
+    post_hooks=[],
+)
+
+WORKFLOWS = [
+    workflow,
+]
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index 8f2d34ebd851..e667e07775ac 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -2,11 +2,14 @@
 
 # NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54501)
+SET(VERSION_REVISION 54516)
 SET(VERSION_MAJOR 25)
 SET(VERSION_MINOR 8)
-SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH d4d4c9f77fa0796ad566398ef022b9a50f9779d5)
-SET(VERSION_DESCRIBE v25.8.1.1-testing)
-SET(VERSION_STRING 25.8.1.1)
+SET(VERSION_PATCH 16)
+SET(VERSION_GITHASH 7a0b36cf8934881236312e9fea094baaf5c709a4)
+SET(VERSION_DESCRIBE v25.8.16.20001.altinityantalya)
+SET(VERSION_STRING 25.8.16.20001.altinityantalya)
 # end of autochange
+
+SET(VERSION_TWEAK 20001)
+SET(VERSION_FLAVOUR altinityantalya)
diff --git a/cmake/version.cmake b/cmake/version.cmake
index 9ca21556f4d4..b008c989c0b0 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -3,9 +3,10 @@ include(${PROJECT_SOURCE_DIR}/cmake/autogenerated_versions.txt)
 set(VERSION_EXTRA "" CACHE STRING "")
 set(VERSION_TWEAK "" CACHE STRING "")
 
-if (VERSION_TWEAK)
-    string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_TWEAK})
-endif ()
+# NOTE(vnemkov): we rely on VERSION_TWEAK portion to be already present in VERSION_STRING
+# if (VERSION_TWEAK)
+#     string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_TWEAK})
+# endif ()
 
 if (VERSION_EXTRA)
     string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_EXTRA})
@@ -19,5 +20,5 @@ set (VERSION_STRING_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}")
 math (EXPR VERSION_INTEGER "${VERSION_PATCH} + ${VERSION_MINOR}*1000 + ${VERSION_MAJOR}*1000000")
 
 if(CLICKHOUSE_OFFICIAL_BUILD)
-    set(VERSION_OFFICIAL " (official build)")
+    set(VERSION_OFFICIAL " (altinity build)")
 endif()
diff --git a/contrib/azure b/contrib/azure
index 9e62bd3c7645..0f7a2013f7d7 160000
--- a/contrib/azure
+++ b/contrib/azure
@@ -1 +1 @@
-Subproject commit 9e62bd3c7645fbf276d37bcf99d9b90230d8efc9
+Subproject commit 0f7a2013f7d79058047fc4bd35e94d20578c0d2b
diff --git a/contrib/c-ares b/contrib/c-ares
index d3a507e920e7..3ac47ee46edd 160000
--- a/contrib/c-ares
+++ b/contrib/c-ares
@@ -1 +1 @@
-Subproject commit d3a507e920e7af18a5efb7f9f1d8044ed4750013
+Subproject commit 3ac47ee46edd8ea40370222f91613fc16c434853
diff --git a/contrib/corrosion-cmake/CMakeLists.txt b/contrib/corrosion-cmake/CMakeLists.txt
index 7c82987dfdf6..fd4509f7308c 100644
--- a/contrib/corrosion-cmake/CMakeLists.txt
+++ b/contrib/corrosion-cmake/CMakeLists.txt
@@ -134,6 +134,16 @@ if (SANITIZE STREQUAL "memory")
 elseif (SANITIZE STREQUAL "thread")
     set(RUST_CARGO_BUILD_STD "-Zbuild-std=std,panic_abort,core,alloc")
     list(APPEND RUSTFLAGS "-Zsanitizer=thread")
+elseif (SANITIZE STREQUAL "address")
+    set(RUST_CARGO_BUILD_STD "-Zbuild-std=std,panic_abort,core,alloc")
+    list(APPEND RUSTFLAGS "-Zsanitizer=address")
+endif()
+
+# Set metadata flag to force different hashes for different sanitizers
+if (SANITIZE STREQUAL "")
+    list(APPEND RUSTFLAGS "-C" "metadata=no-sanitizer")
+else()
+    list(APPEND RUSTFLAGS "-C" "metadata=with-sanitizer-${SANITIZE}")
 endif()
 
 list(APPEND RUSTFLAGS
diff --git a/contrib/curl b/contrib/curl
index cfbfb65047e8..2eebc58c4b8d 160000
--- a/contrib/curl
+++ b/contrib/curl
@@ -1 +1 @@
-Subproject commit cfbfb65047e85e6b08af65fe9cdbcf68e9ad496a
+Subproject commit 2eebc58c4b8d68c98c8344381a9f6df4cca838fd
diff --git a/contrib/curl-cmake/CMakeLists.txt b/contrib/curl-cmake/CMakeLists.txt
index c0332cdb8e57..47caa9292e9a 100644
--- a/contrib/curl-cmake/CMakeLists.txt
+++ b/contrib/curl-cmake/CMakeLists.txt
@@ -19,6 +19,7 @@ set (SRCS
     "${LIBRARY_DIR}/lib/cf-h2-proxy.c"
     "${LIBRARY_DIR}/lib/cf-haproxy.c"
     "${LIBRARY_DIR}/lib/cf-https-connect.c"
+    "${LIBRARY_DIR}/lib/cf-ip-happy.c"
     "${LIBRARY_DIR}/lib/cf-socket.c"
     "${LIBRARY_DIR}/lib/cfilters.c"
     "${LIBRARY_DIR}/lib/conncache.c"
@@ -27,9 +28,9 @@ set (SRCS
     "${LIBRARY_DIR}/lib/cookie.c"
     "${LIBRARY_DIR}/lib/cshutdn.c"
     "${LIBRARY_DIR}/lib/curl_addrinfo.c"
-    "${LIBRARY_DIR}/lib/curl_des.c"
     "${LIBRARY_DIR}/lib/curl_endian.c"
     "${LIBRARY_DIR}/lib/curl_fnmatch.c"
+    "${LIBRARY_DIR}/lib/curl_fopen.c"
     "${LIBRARY_DIR}/lib/curl_get_line.c"
     "${LIBRARY_DIR}/lib/curl_gethostname.c"
     "${LIBRARY_DIR}/lib/curl_gssapi.c"
@@ -39,6 +40,7 @@ set (SRCS
     "${LIBRARY_DIR}/lib/curl_rtmp.c"
     "${LIBRARY_DIR}/lib/curl_sasl.c"
     "${LIBRARY_DIR}/lib/curl_sha512_256.c"
+    "${LIBRARY_DIR}/lib/curl_share.c"
     "${LIBRARY_DIR}/lib/curl_sspi.c"
     "${LIBRARY_DIR}/lib/curl_threads.c"
     "${LIBRARY_DIR}/lib/curl_trc.c"
@@ -54,7 +56,6 @@ set (SRCS
     "${LIBRARY_DIR}/lib/fake_addrinfo.c"
     "${LIBRARY_DIR}/lib/file.c"
     "${LIBRARY_DIR}/lib/fileinfo.c"
-    "${LIBRARY_DIR}/lib/fopen.c"
     "${LIBRARY_DIR}/lib/formdata.c"
     "${LIBRARY_DIR}/lib/ftp.c"
     "${LIBRARY_DIR}/lib/ftplistparser.c"
@@ -81,18 +82,17 @@ set (SRCS
     "${LIBRARY_DIR}/lib/idn.c"
     "${LIBRARY_DIR}/lib/if2ip.c"
     "${LIBRARY_DIR}/lib/imap.c"
-    "${LIBRARY_DIR}/lib/krb5.c"
     "${LIBRARY_DIR}/lib/ldap.c"
     "${LIBRARY_DIR}/lib/llist.c"
     "${LIBRARY_DIR}/lib/macos.c"
     "${LIBRARY_DIR}/lib/md4.c"
     "${LIBRARY_DIR}/lib/md5.c"
-    "${LIBRARY_DIR}/lib/memdebug.c"
     "${LIBRARY_DIR}/lib/mime.c"
     "${LIBRARY_DIR}/lib/mprintf.c"
     "${LIBRARY_DIR}/lib/mqtt.c"
     "${LIBRARY_DIR}/lib/multi.c"
     "${LIBRARY_DIR}/lib/multi_ev.c"
+    "${LIBRARY_DIR}/lib/multi_ntfy.c"
     "${LIBRARY_DIR}/lib/netrc.c"
     "${LIBRARY_DIR}/lib/noproxy.c"
     "${LIBRARY_DIR}/lib/openldap.c"
@@ -102,14 +102,14 @@ set (SRCS
     "${LIBRARY_DIR}/lib/progress.c"
     "${LIBRARY_DIR}/lib/psl.c"
     "${LIBRARY_DIR}/lib/rand.c"
-    "${LIBRARY_DIR}/lib/rename.c"
+    "${LIBRARY_DIR}/lib/ratelimit.c"
     "${LIBRARY_DIR}/lib/request.c"
     "${LIBRARY_DIR}/lib/rtsp.c"
     "${LIBRARY_DIR}/lib/select.c"
     "${LIBRARY_DIR}/lib/sendf.c"
     "${LIBRARY_DIR}/lib/setopt.c"
     "${LIBRARY_DIR}/lib/sha256.c"
-    "${LIBRARY_DIR}/lib/share.c"
+    "${LIBRARY_DIR}/lib/curl_share.c"
     "${LIBRARY_DIR}/lib/slist.c"
     "${LIBRARY_DIR}/lib/smb.c"
     "${LIBRARY_DIR}/lib/smtp.c"
@@ -117,7 +117,6 @@ set (SRCS
     "${LIBRARY_DIR}/lib/socks.c"
     "${LIBRARY_DIR}/lib/socks_gssapi.c"
     "${LIBRARY_DIR}/lib/socks_sspi.c"
-    "${LIBRARY_DIR}/lib/speedcheck.c"
     "${LIBRARY_DIR}/lib/splay.c"
     "${LIBRARY_DIR}/lib/strcase.c"
     "${LIBRARY_DIR}/lib/strdup.c"
@@ -149,16 +148,15 @@ set (SRCS
     "${LIBRARY_DIR}/lib/vauth/spnego_sspi.c"
     "${LIBRARY_DIR}/lib/vauth/vauth.c"
     "${LIBRARY_DIR}/lib/vquic/vquic.c"
-    "${LIBRARY_DIR}/lib/vssh/curl_path.c"
     "${LIBRARY_DIR}/lib/vssh/libssh.c"
     "${LIBRARY_DIR}/lib/vssh/libssh2.c"
+    "${LIBRARY_DIR}/lib/vssh/vssh.c"
 
     "${LIBRARY_DIR}/lib/vtls/cipher_suite.c"
     "${LIBRARY_DIR}/lib/vtls/gtls.c"
     "${LIBRARY_DIR}/lib/vtls/hostcheck.c"
     "${LIBRARY_DIR}/lib/vtls/keylog.c"
     "${LIBRARY_DIR}/lib/vtls/mbedtls.c"
-    "${LIBRARY_DIR}/lib/vtls/mbedtls_threadlock.c"
     "${LIBRARY_DIR}/lib/vtls/openssl.c"
     "${LIBRARY_DIR}/lib/vtls/rustls.c"
     "${LIBRARY_DIR}/lib/vtls/schannel.c"
@@ -170,16 +168,20 @@ set (SRCS
     "${LIBRARY_DIR}/lib/vtls/x509asn1.c"
     "${LIBRARY_DIR}/lib/curlx/base64.c"
     "${LIBRARY_DIR}/lib/curlx/dynbuf.c"
+    "${LIBRARY_DIR}/lib/curlx/fopen.c"
     "${LIBRARY_DIR}/lib/curlx/inet_ntop.c"
+    "${LIBRARY_DIR}/lib/curlx/strcopy.c"
     "${LIBRARY_DIR}/lib/curlx/inet_pton.c"
     "${LIBRARY_DIR}/lib/curlx/multibyte.c"
     "${LIBRARY_DIR}/lib/curlx/nonblock.c"
+    "${LIBRARY_DIR}/lib/curlx/strcopy.c"
+    "${LIBRARY_DIR}/lib/curlx/strerr.c"
     "${LIBRARY_DIR}/lib/curlx/strparse.c"
     "${LIBRARY_DIR}/lib/curlx/timediff.c"
     "${LIBRARY_DIR}/lib/curlx/timeval.c"
     "${LIBRARY_DIR}/lib/curlx/version_win32.c"
-    "${LIBRARY_DIR}/lib/curlx/warnless.c"
     "${LIBRARY_DIR}/lib/curlx/wait.c"
+    "${LIBRARY_DIR}/lib/curlx/warnless.c"
     "${LIBRARY_DIR}/lib/curlx/winapi.c"
 )
 
diff --git a/contrib/curl-cmake/curl_config.h b/contrib/curl-cmake/curl_config.h
index 1b177c5e49b4..0e42508dff0f 100644
--- a/contrib/curl-cmake/curl_config.h
+++ b/contrib/curl-cmake/curl_config.h
@@ -48,6 +48,7 @@
 #define HAVE_SELECT_H
 #define HAVE_SETJMP_H
 #define HAVE_SETJMP_H
+#define HAVE_STDINT_H
 #define HAVE_UNISTD_H
 #define HAVE_POLL_H
 #define HAVE_PTHREAD_H
diff --git a/contrib/icu b/contrib/icu
index 4216173eeeb3..b29faa6d4e46 160000
--- a/contrib/icu
+++ b/contrib/icu
@@ -1 +1 @@
-Subproject commit 4216173eeeb39c1d4caaa54a68860e800412d273
+Subproject commit b29faa6d4e46f10d230b93a3c33885e7ec71bd41
diff --git a/contrib/icu-cmake/CMakeLists.txt b/contrib/icu-cmake/CMakeLists.txt
index b2c5923bfe81..46deb3d1bd67 100644
--- a/contrib/icu-cmake/CMakeLists.txt
+++ b/contrib/icu-cmake/CMakeLists.txt
@@ -40,6 +40,7 @@ set(ICUUC_SOURCES
 "${ICU_SOURCE_DIR}/common/errorcode.cpp"
 "${ICU_SOURCE_DIR}/common/filteredbrk.cpp"
 "${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/fixedstring.cpp"
 "${ICU_SOURCE_DIR}/common/icudataver.cpp"
 "${ICU_SOURCE_DIR}/common/icuplug.cpp"
 "${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp"
@@ -478,11 +479,11 @@ enable_language(ASM)
 
 if (OS_DARWIN)
     # Fine for both x86 and ARM
-    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/darwin_x86_64/icudt75l_dat.S")
+    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/darwin/icudt78l_dat.S")
 elseif (ARCH_S390X)
-    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt75b_dat.S")
+    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt78b_dat.S")
 else ()
-    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt75l_dat.S")
+    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt78l_dat.S")
 endif ()
 # ^^ you might be confused how for different little endian platforms (x86, ARM) the same assembly files can be used.
 # These files are indeed assembly but they only contain data ('.long' directive), which makes them portable accross CPUs.
diff --git a/contrib/icudata b/contrib/icudata
index cfc05b4c3140..e3ae5bcb2b24 160000
--- a/contrib/icudata
+++ b/contrib/icudata
@@ -1 +1 @@
-Subproject commit cfc05b4c3140ff2be84291b80de8c62b1e42d0da
+Subproject commit e3ae5bcb2b24f17cd9336c4f1b25f36ed636d839
diff --git a/contrib/jwt-cpp-cmake/CMakeLists.txt b/contrib/jwt-cpp-cmake/CMakeLists.txt
index 4cb8716bc68f..606c13d29de2 100644
--- a/contrib/jwt-cpp-cmake/CMakeLists.txt
+++ b/contrib/jwt-cpp-cmake/CMakeLists.txt
@@ -1,7 +1,4 @@
-set(ENABLE_JWT_CPP_DEFAULT OFF)
-if(ENABLE_LIBRARIES AND CLICKHOUSE_CLOUD)
-    set(ENABLE_JWT_CPP_DEFAULT ON)
-endif()
+set(ENABLE_JWT_CPP_DEFAULT ON)
 
 option(ENABLE_JWT_CPP "Enable jwt-cpp library" ${ENABLE_JWT_CPP_DEFAULT})
 
@@ -20,4 +17,4 @@ set (JWT_CPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/jwt-cpp/include")
 
 add_library (_jwt-cpp INTERFACE)
 target_include_directories(_jwt-cpp SYSTEM BEFORE INTERFACE ${JWT_CPP_INCLUDE_DIR})
-add_library(ch_contrib::jwt-cpp ALIAS _jwt-cpp)
+add_library(ch_contrib::jwt-cpp ALIAS _jwt-cpp)
\ No newline at end of file
diff --git a/contrib/libarchive b/contrib/libarchive
index 9525f90ca4bd..7f53fce04e4e 160000
--- a/contrib/libarchive
+++ b/contrib/libarchive
@@ -1 +1 @@
-Subproject commit 9525f90ca4bd14c7b335e2f8c84a4607b0af6bdf
+Subproject commit 7f53fce04e4e672230f4eb80b219af17975e4f83
diff --git a/contrib/libarchive-cmake/config.h b/contrib/libarchive-cmake/config.h
index b82e1afa61cc..309251100cd9 100644
--- a/contrib/libarchive-cmake/config.h
+++ b/contrib/libarchive-cmake/config.h
@@ -334,16 +334,16 @@ typedef uint64_t uintmax_t;
 /* #undef ARCHIVE_XATTR_LINUX */
 
 /* Version number of bsdcpio */
-#define BSDCPIO_VERSION_STRING "3.7.4"
+#define BSDCPIO_VERSION_STRING "3.9.0"
 
 /* Version number of bsdtar */
-#define BSDTAR_VERSION_STRING "3.7.4"
+#define BSDTAR_VERSION_STRING "3.9.0"
 
 /* Version number of bsdcat */
-#define BSDCAT_VERSION_STRING "3.7.4"
+#define BSDCAT_VERSION_STRING "3.9.0"
 
 /* Version number of bsdunzip */
-#define BSDUNZIP_VERSION_STRING "3.7.4"
+#define BSDUNZIP_VERSION_STRING "3.9.0"
 
 /* Define to 1 if you have the `acl_create_entry' function. */
 /* #undef HAVE_ACL_CREATE_ENTRY */
@@ -405,6 +405,12 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
 
+/* Define to 1 if you have the `closefrom' function. */
+/* #undef HAVE_CLOSEFROM */
+
+/* Define to 1 if you have the `close_range' function. */
+/* #undef HAVE_CLOSE_RANGE */
+
 /* Define to 1 if you have the <copyfile.h> header file. */
 /* #undef HAVE_COPYFILE_H */
 
diff --git a/contrib/libssh b/contrib/libssh
index ed4011b91873..47305a2f7257 160000
--- a/contrib/libssh
+++ b/contrib/libssh
@@ -1 +1 @@
-Subproject commit ed4011b91873836713576475a98cd132cd834539
+Subproject commit 47305a2f7257b56ca407260a72af85db058d551f
diff --git a/contrib/libssh-cmake/CMakeLists.txt b/contrib/libssh-cmake/CMakeLists.txt
index 4cc3e2a18312..0e1fae5880af 100644
--- a/contrib/libssh-cmake/CMakeLists.txt
+++ b/contrib/libssh-cmake/CMakeLists.txt
@@ -35,6 +35,7 @@ set(libssh_SRCS
     ${LIB_SOURCE_DIR}/src/external/blowfish.c
     ${LIB_SOURCE_DIR}/src/external/chacha.c
     ${LIB_SOURCE_DIR}/src/external/poly1305.c
+    ${LIB_SOURCE_DIR}/src/external/sntrup761.c
     ${LIB_SOURCE_DIR}/src/getpass.c
     ${LIB_SOURCE_DIR}/src/init.c
     ${LIB_SOURCE_DIR}/src/kdf.c
@@ -61,6 +62,7 @@ set(libssh_SRCS
     ${LIB_SOURCE_DIR}/src/string.c
     ${LIB_SOURCE_DIR}/src/threads.c
     ${LIB_SOURCE_DIR}/src/token.c
+    ${LIB_SOURCE_DIR}/src/ttyopts.c
     ${LIB_SOURCE_DIR}/src/wrapper.c
     # some files of libssh/src/ are missing - why?
 
@@ -69,15 +71,21 @@ set(libssh_SRCS
     # files missing - why?
 
     # LIBCRYPT specific
+    ${LIB_SOURCE_DIR}/src/crypto_common.c
+    ${LIB_SOURCE_DIR}/src/curve25519_crypto.c
     ${LIB_SOURCE_DIR}/src/dh_crypto.c
     ${LIB_SOURCE_DIR}/src/ecdh_crypto.c
+    ${LIB_SOURCE_DIR}/src/getrandom_crypto.c
+    ${LIB_SOURCE_DIR}/src/gzip.c
     ${LIB_SOURCE_DIR}/src/libcrypto.c
+    ${LIB_SOURCE_DIR}/src/md_crypto.c
     ${LIB_SOURCE_DIR}/src/pki_crypto.c
+    ${LIB_SOURCE_DIR}/src/pki_context.c
+    ${LIB_SOURCE_DIR}/src/sntrup761.c
     ${LIB_SOURCE_DIR}/src/threads/libcrypto.c
 
     ${LIB_SOURCE_DIR}/src/bind.c
     ${LIB_SOURCE_DIR}/src/bind_config.c
-    ${LIB_SOURCE_DIR}/src/options.c
     ${LIB_SOURCE_DIR}/src/server.c
 )
 
diff --git a/contrib/libssh-cmake/linux/aarch64-musl/config.h b/contrib/libssh-cmake/linux/aarch64-musl/config.h
index 15236527fdf8..9cc21c1df4ad 100644
--- a/contrib/libssh-cmake/linux/aarch64-musl/config.h
+++ b/contrib/libssh-cmake/linux/aarch64-musl/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/aarch64/config.h b/contrib/libssh-cmake/linux/aarch64/config.h
index e65ccb8ba3e6..7e21b1b4f683 100644
--- a/contrib/libssh-cmake/linux/aarch64/config.h
+++ b/contrib/libssh-cmake/linux/aarch64/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/loongarch64/config.h b/contrib/libssh-cmake/linux/loongarch64/config.h
index aa684ca29a35..3e19e6ab945d 100644
--- a/contrib/libssh-cmake/linux/loongarch64/config.h
+++ b/contrib/libssh-cmake/linux/loongarch64/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/ppc64le/config.h b/contrib/libssh-cmake/linux/ppc64le/config.h
index c56b1ad03344..701ee00416bb 100644
--- a/contrib/libssh-cmake/linux/ppc64le/config.h
+++ b/contrib/libssh-cmake/linux/ppc64le/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/riscv64/config.h b/contrib/libssh-cmake/linux/riscv64/config.h
index 33c91bf542b9..ca0868072bdc 100644
--- a/contrib/libssh-cmake/linux/riscv64/config.h
+++ b/contrib/libssh-cmake/linux/riscv64/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/s390x/config.h b/contrib/libssh-cmake/linux/s390x/config.h
index 289a8cabc8e4..6c284c9d6d4f 100644
--- a/contrib/libssh-cmake/linux/s390x/config.h
+++ b/contrib/libssh-cmake/linux/s390x/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/x86-64-musl/config.h b/contrib/libssh-cmake/linux/x86-64-musl/config.h
index fd7c2e2b0c12..9b325957c358 100644
--- a/contrib/libssh-cmake/linux/x86-64-musl/config.h
+++ b/contrib/libssh-cmake/linux/x86-64-musl/config.h
@@ -82,13 +82,13 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
 /* Define to 1 if you have DSA */
diff --git a/contrib/libssh-cmake/linux/x86-64/config.h b/contrib/libssh-cmake/linux/x86-64/config.h
index 4090c5a45ad1..f6316af195cd 100644
--- a/contrib/libssh-cmake/linux/x86-64/config.h
+++ b/contrib/libssh-cmake/linux/x86-64/config.h
@@ -82,64 +82,37 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
-/* Define to 1 if you have eliptic curve cryptography in openssl */
+/* Define to 1 if you have elliptic curve cryptography in openssl */
 #define HAVE_OPENSSL_ECC 1
 
-/* Define to 1 if you have eliptic curve cryptography in gcrypt */
+/* Define to 1 if you have elliptic curve cryptography in gcrypt */
 /* #undef HAVE_GCRYPT_ECC */
 
-/* Define to 1 if you have eliptic curve cryptography */
+/* Define to 1 if you have elliptic curve cryptography */
 #define HAVE_ECC 1
 
-/* Define to 1 if you have DSA */
-/* #undef HAVE_DSA */
-
-/* Define to 1 if you have gl_flags as a glob_t sturct member */
+/* Define to 1 if you have gl_flags as a glob_t struct member */
 #define HAVE_GLOB_GL_FLAGS_MEMBER 1
 
-/* Define to 1 if you have OpenSSL with Ed25519 support */
-#define HAVE_OPENSSL_ED25519 1
+/* Define to 1 if you have gcrypt with ChaCha20/Poly1305 support */
+/* #undef HAVE_GCRYPT_CHACHA_POLY */
 
-/* Define to 1 if you have OpenSSL with X25519 support */
-#define HAVE_OPENSSL_X25519 1
+/* Define to 1 if you have gcrypt with curve25519 support */
+/* #undef HAVE_GCRYPT_CURVE25519 */
 
 /*************************** FUNCTIONS ***************************/
 
-/* Define to 1 if you have the `EVP_aes128_ctr' function. */
-#define HAVE_OPENSSL_EVP_AES_CTR 1
-
-/* Define to 1 if you have the `EVP_aes128_cbc' function. */
-#define HAVE_OPENSSL_EVP_AES_CBC 1
-
-/* Define to 1 if you have the `EVP_aes128_gcm' function. */
-/* #undef HAVE_OPENSSL_EVP_AES_GCM */
-
-/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */
-#define HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK 1
-
-/* Define to 1 if you have the `CRYPTO_ctr128_encrypt' function. */
-#define HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT 1
+/* Define to 1 if you have the `EVP_chacha20' function. */
+#define HAVE_OPENSSL_EVP_CHACHA20 1
 
-/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */
-#define HAVE_OPENSSL_EVP_CIPHER_CTX_NEW 1
-
-/* Define to 1 if you have the `EVP_KDF_CTX_new_id' function. */
-/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
+/* Define to 1 if you have the `EVP_KDF_CTX_new_id' or `EVP_KDF_CTX_new` function. */
+#define HAVE_OPENSSL_EVP_KDF_CTX 1
 
 /* Define to 1 if you have the `FIPS_mode' function. */
 #if USE_BORINGSSL
 #define HAVE_OPENSSL_FIPS_MODE 1
 #endif
 
-/* Define to 1 if you have the `EVP_DigestSign' function. */
-#define HAVE_OPENSSL_EVP_DIGESTSIGN 1
-
-/* Define to 1 if you have the `EVP_DigestVerify' function. */
-#define HAVE_OPENSSL_EVP_DIGESTVERIFY 1
-
-/* Define to 1 if you have the `OPENSSL_ia32cap_loc' function. */
-/* #undef HAVE_OPENSSL_IA32CAP_LOC */
-
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
@@ -212,6 +185,12 @@
 /* Define to 1 if you have the `cmocka_set_test_filter' function. */
 /* #undef HAVE_CMOCKA_SET_TEST_FILTER */
 
+/* Define to 1 if we have support for blowfish */
+/* #undef HAVE_BLOWFISH */
+
+/* Define to 1 if we have support for ML-KEM */
+/* #undef HAVE_MLKEM */
+
 /*************************** LIBRARIES ***************************/
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
@@ -229,6 +208,10 @@
 /* Define to 1 if you have the `cmocka' library (-lcmocka). */
 /* #undef HAVE_CMOCKA */
 
+/* Define to 1 if you have the `libfido2' library (-lfido2).
+ * This is required for interacting with FIDO2/U2F devices over USB-HID. */
+/* #undef HAVE_LIBFIDO2 */
+
 /**************************** OPTIONS ****************************/
 
 #define HAVE_GCC_THREAD_LOCAL_STORAGE 1
@@ -236,6 +219,7 @@
 
 #define HAVE_FALLTHROUGH_ATTRIBUTE 1
 #define HAVE_UNUSED_ATTRIBUTE 1
+/* #undef HAVE_WEAK_ATTRIBUTE */
 
 #define HAVE_CONSTRUCTOR_ATTRIBUTE 1
 #define HAVE_DESTRUCTOR_ATTRIBUTE 1
@@ -262,6 +246,14 @@
 /* Define to 1 if you want to enable DH group exchange algorithms */
 /* #undef WITH_GEX */
 
+/* Define to 1 if you want to enable insecure none cipher and MAC */
+/* #undef WITH_INSECURE_NONE */
+
+/* Define to 1 if you want to allow libssh to execute arbitrary commands from
+ * configuration files or options (match exec, proxy commands and OpenSSH-based
+ * proxy-jumps). */
+/* #undef WITH_EXEC */
+
 /* Define to 1 if you want to enable blowfish cipher support */
 /* #undef WITH_BLOWFISH_CIPHER */
 
@@ -280,6 +272,15 @@
 /* Define to 1 if you want to enable NaCl support */
 /* #undef WITH_NACL */
 
+/* Define to 1 if you want to enable PKCS #11 URI support */
+/* #undef WITH_PKCS11_URI */
+
+/* Define to 1 if we want to build a support for PKCS #11 provider. */
+/* #undef WITH_PKCS11_PROVIDER */
+
+/* Define to 1 if you want to enable FIDO2/U2F support */
+/* #undef WITH_FIDO2 */
+
 /*************************** ENDIAN *****************************/
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
diff --git a/contrib/openldap b/contrib/openldap
index 5671b80e369d..22fe35c6b409 160000
--- a/contrib/openldap
+++ b/contrib/openldap
@@ -1 +1 @@
-Subproject commit 5671b80e369df2caf5f34e02924316205a43c895
+Subproject commit 22fe35c6b4098e3ad166469f9574c79832c42952
diff --git a/contrib/postgres b/contrib/postgres
index 9da0420d861d..5ad0c31d0c3a 160000
--- a/contrib/postgres
+++ b/contrib/postgres
@@ -1 +1 @@
-Subproject commit 9da0420d861df7542b92058342afd4723e95ef4c
+Subproject commit 5ad0c31d0c3a76ed64655f4d397934b5ecc9696f
diff --git a/contrib/postgres-cmake/CMakeLists.txt b/contrib/postgres-cmake/CMakeLists.txt
index 944251c9d647..93c5159300f3 100644
--- a/contrib/postgres-cmake/CMakeLists.txt
+++ b/contrib/postgres-cmake/CMakeLists.txt
@@ -7,6 +7,8 @@ set(LIBPQ_CMAKE_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/postgres-cmake")
 set(SRCS
     "${LIBPQ_SOURCE_DIR}/fe-auth.c"
     "${LIBPQ_SOURCE_DIR}/fe-auth-scram.c"
+    "${LIBPQ_SOURCE_DIR}/fe-auth-oauth.c"
+    "${LIBPQ_SOURCE_DIR}/fe-cancel.c"
     "${LIBPQ_SOURCE_DIR}/fe-connect.c"
     "${LIBPQ_SOURCE_DIR}/fe-exec.c"
     "${LIBPQ_SOURCE_DIR}/fe-lobj.c"
@@ -45,8 +47,6 @@ set(SRCS
     "${POSTGRES_SOURCE_DIR}/src/common/logging.c"
 
     "${POSTGRES_SOURCE_DIR}/src/port/snprintf.c"
-    "${POSTGRES_SOURCE_DIR}/src/port/strlcat.c"
-    "${POSTGRES_SOURCE_DIR}/src/port/strlcpy.c"
     "${POSTGRES_SOURCE_DIR}/src/port/strerror.c"
     "${POSTGRES_SOURCE_DIR}/src/port/inet_net_ntop.c"
     "${POSTGRES_SOURCE_DIR}/src/port/getpeereid.c"
@@ -55,17 +55,20 @@ set(SRCS
     "${POSTGRES_SOURCE_DIR}/src/port/pg_strong_random.c"
     "${POSTGRES_SOURCE_DIR}/src/port/pgstrcasecmp.c"
     "${POSTGRES_SOURCE_DIR}/src/port/pg_bitutils.c"
-    "${POSTGRES_SOURCE_DIR}/src/port/thread.c"
     "${POSTGRES_SOURCE_DIR}/src/port/path.c"
 )
 
+if(NOT OS_DARWIN)
+    set(SRCS ${SRCS}
+        "${POSTGRES_SOURCE_DIR}/src/port/strlcat.c"
+        "${POSTGRES_SOURCE_DIR}/src/port/strlcpy.c"
+    )
+endif()
+
 add_library(_libpq ${SRCS})
 
-add_definitions(-DHAVE_BIO_METH_NEW)
-add_definitions(-DHAVE_HMAC_CTX_NEW)
-add_definitions(-DHAVE_HMAC_CTX_FREE)
-add_definitions(-DHAVE_OPENSSL_INIT_SSL)
-add_definitions(-DHAVE_ASN1_STRING_GET0_DATA)
+add_definitions(-DFRONTEND)
+add_definitions(-D_GNU_SOURCE)
 add_definitions(-DOPENSSL_NO_ENGINE)
 
 target_include_directories (_libpq SYSTEM PUBLIC ${LIBPQ_SOURCE_DIR})
diff --git a/contrib/postgres-cmake/nodes/nodetags.h b/contrib/postgres-cmake/nodes/nodetags.h
deleted file mode 100644
index f75ac7a05ee4..000000000000
--- a/contrib/postgres-cmake/nodes/nodetags.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * nodetags.h
- *    Generated node infrastructure code
- *
- * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * NOTES
- *  ******************************
- *  *** DO NOT EDIT THIS FILE! ***
- *  ******************************
- *
- *  It has been GENERATED by src/backend/nodes/gen_node_support.pl
- *
- *-------------------------------------------------------------------------
- */
-	T_List = 1,
-	T_Alias = 2,
-	T_RangeVar = 3,
-	T_TableFunc = 4,
-	T_IntoClause = 5,
-	T_Var = 6,
-	T_Const = 7,
-	T_Param = 8,
-	T_Aggref = 9,
-	T_GroupingFunc = 10,
-	T_WindowFunc = 11,
-	T_SubscriptingRef = 12,
-	T_FuncExpr = 13,
-	T_NamedArgExpr = 14,
-	T_OpExpr = 15,
-	T_DistinctExpr = 16,
-	T_NullIfExpr = 17,
-	T_ScalarArrayOpExpr = 18,
-	T_BoolExpr = 19,
-	T_SubLink = 20,
-	T_SubPlan = 21,
-	T_AlternativeSubPlan = 22,
-	T_FieldSelect = 23,
-	T_FieldStore = 24,
-	T_RelabelType = 25,
-	T_CoerceViaIO = 26,
-	T_ArrayCoerceExpr = 27,
-	T_ConvertRowtypeExpr = 28,
-	T_CollateExpr = 29,
-	T_CaseExpr = 30,
-	T_CaseWhen = 31,
-	T_CaseTestExpr = 32,
-	T_ArrayExpr = 33,
-	T_RowExpr = 34,
-	T_RowCompareExpr = 35,
-	T_CoalesceExpr = 36,
-	T_MinMaxExpr = 37,
-	T_SQLValueFunction = 38,
-	T_XmlExpr = 39,
-	T_JsonFormat = 40,
-	T_JsonReturning = 41,
-	T_JsonValueExpr = 42,
-	T_JsonConstructorExpr = 43,
-	T_JsonIsPredicate = 44,
-	T_NullTest = 45,
-	T_BooleanTest = 46,
-	T_CoerceToDomain = 47,
-	T_CoerceToDomainValue = 48,
-	T_SetToDefault = 49,
-	T_CurrentOfExpr = 50,
-	T_NextValueExpr = 51,
-	T_InferenceElem = 52,
-	T_TargetEntry = 53,
-	T_RangeTblRef = 54,
-	T_JoinExpr = 55,
-	T_FromExpr = 56,
-	T_OnConflictExpr = 57,
-	T_Query = 58,
-	T_TypeName = 59,
-	T_ColumnRef = 60,
-	T_ParamRef = 61,
-	T_A_Expr = 62,
-	T_A_Const = 63,
-	T_TypeCast = 64,
-	T_CollateClause = 65,
-	T_RoleSpec = 66,
-	T_FuncCall = 67,
-	T_A_Star = 68,
-	T_A_Indices = 69,
-	T_A_Indirection = 70,
-	T_A_ArrayExpr = 71,
-	T_ResTarget = 72,
-	T_MultiAssignRef = 73,
-	T_SortBy = 74,
-	T_WindowDef = 75,
-	T_RangeSubselect = 76,
-	T_RangeFunction = 77,
-	T_RangeTableFunc = 78,
-	T_RangeTableFuncCol = 79,
-	T_RangeTableSample = 80,
-	T_ColumnDef = 81,
-	T_TableLikeClause = 82,
-	T_IndexElem = 83,
-	T_DefElem = 84,
-	T_LockingClause = 85,
-	T_XmlSerialize = 86,
-	T_PartitionElem = 87,
-	T_PartitionSpec = 88,
-	T_PartitionBoundSpec = 89,
-	T_PartitionRangeDatum = 90,
-	T_PartitionCmd = 91,
-	T_RangeTblEntry = 92,
-	T_RTEPermissionInfo = 93,
-	T_RangeTblFunction = 94,
-	T_TableSampleClause = 95,
-	T_WithCheckOption = 96,
-	T_SortGroupClause = 97,
-	T_GroupingSet = 98,
-	T_WindowClause = 99,
-	T_RowMarkClause = 100,
-	T_WithClause = 101,
-	T_InferClause = 102,
-	T_OnConflictClause = 103,
-	T_CTESearchClause = 104,
-	T_CTECycleClause = 105,
-	T_CommonTableExpr = 106,
-	T_MergeWhenClause = 107,
-	T_MergeAction = 108,
-	T_TriggerTransition = 109,
-	T_JsonOutput = 110,
-	T_JsonKeyValue = 111,
-	T_JsonObjectConstructor = 112,
-	T_JsonArrayConstructor = 113,
-	T_JsonArrayQueryConstructor = 114,
-	T_JsonAggConstructor = 115,
-	T_JsonObjectAgg = 116,
-	T_JsonArrayAgg = 117,
-	T_RawStmt = 118,
-	T_InsertStmt = 119,
-	T_DeleteStmt = 120,
-	T_UpdateStmt = 121,
-	T_MergeStmt = 122,
-	T_SelectStmt = 123,
-	T_SetOperationStmt = 124,
-	T_ReturnStmt = 125,
-	T_PLAssignStmt = 126,
-	T_CreateSchemaStmt = 127,
-	T_AlterTableStmt = 128,
-	T_ReplicaIdentityStmt = 129,
-	T_AlterTableCmd = 130,
-	T_AlterCollationStmt = 131,
-	T_AlterDomainStmt = 132,
-	T_GrantStmt = 133,
-	T_ObjectWithArgs = 134,
-	T_AccessPriv = 135,
-	T_GrantRoleStmt = 136,
-	T_AlterDefaultPrivilegesStmt = 137,
-	T_CopyStmt = 138,
-	T_VariableSetStmt = 139,
-	T_VariableShowStmt = 140,
-	T_CreateStmt = 141,
-	T_Constraint = 142,
-	T_CreateTableSpaceStmt = 143,
-	T_DropTableSpaceStmt = 144,
-	T_AlterTableSpaceOptionsStmt = 145,
-	T_AlterTableMoveAllStmt = 146,
-	T_CreateExtensionStmt = 147,
-	T_AlterExtensionStmt = 148,
-	T_AlterExtensionContentsStmt = 149,
-	T_CreateFdwStmt = 150,
-	T_AlterFdwStmt = 151,
-	T_CreateForeignServerStmt = 152,
-	T_AlterForeignServerStmt = 153,
-	T_CreateForeignTableStmt = 154,
-	T_CreateUserMappingStmt = 155,
-	T_AlterUserMappingStmt = 156,
-	T_DropUserMappingStmt = 157,
-	T_ImportForeignSchemaStmt = 158,
-	T_CreatePolicyStmt = 159,
-	T_AlterPolicyStmt = 160,
-	T_CreateAmStmt = 161,
-	T_CreateTrigStmt = 162,
-	T_CreateEventTrigStmt = 163,
-	T_AlterEventTrigStmt = 164,
-	T_CreatePLangStmt = 165,
-	T_CreateRoleStmt = 166,
-	T_AlterRoleStmt = 167,
-	T_AlterRoleSetStmt = 168,
-	T_DropRoleStmt = 169,
-	T_CreateSeqStmt = 170,
-	T_AlterSeqStmt = 171,
-	T_DefineStmt = 172,
-	T_CreateDomainStmt = 173,
-	T_CreateOpClassStmt = 174,
-	T_CreateOpClassItem = 175,
-	T_CreateOpFamilyStmt = 176,
-	T_AlterOpFamilyStmt = 177,
-	T_DropStmt = 178,
-	T_TruncateStmt = 179,
-	T_CommentStmt = 180,
-	T_SecLabelStmt = 181,
-	T_DeclareCursorStmt = 182,
-	T_ClosePortalStmt = 183,
-	T_FetchStmt = 184,
-	T_IndexStmt = 185,
-	T_CreateStatsStmt = 186,
-	T_StatsElem = 187,
-	T_AlterStatsStmt = 188,
-	T_CreateFunctionStmt = 189,
-	T_FunctionParameter = 190,
-	T_AlterFunctionStmt = 191,
-	T_DoStmt = 192,
-	T_InlineCodeBlock = 193,
-	T_CallStmt = 194,
-	T_CallContext = 195,
-	T_RenameStmt = 196,
-	T_AlterObjectDependsStmt = 197,
-	T_AlterObjectSchemaStmt = 198,
-	T_AlterOwnerStmt = 199,
-	T_AlterOperatorStmt = 200,
-	T_AlterTypeStmt = 201,
-	T_RuleStmt = 202,
-	T_NotifyStmt = 203,
-	T_ListenStmt = 204,
-	T_UnlistenStmt = 205,
-	T_TransactionStmt = 206,
-	T_CompositeTypeStmt = 207,
-	T_CreateEnumStmt = 208,
-	T_CreateRangeStmt = 209,
-	T_AlterEnumStmt = 210,
-	T_ViewStmt = 211,
-	T_LoadStmt = 212,
-	T_CreatedbStmt = 213,
-	T_AlterDatabaseStmt = 214,
-	T_AlterDatabaseRefreshCollStmt = 215,
-	T_AlterDatabaseSetStmt = 216,
-	T_DropdbStmt = 217,
-	T_AlterSystemStmt = 218,
-	T_ClusterStmt = 219,
-	T_VacuumStmt = 220,
-	T_VacuumRelation = 221,
-	T_ExplainStmt = 222,
-	T_CreateTableAsStmt = 223,
-	T_RefreshMatViewStmt = 224,
-	T_CheckPointStmt = 225,
-	T_DiscardStmt = 226,
-	T_LockStmt = 227,
-	T_ConstraintsSetStmt = 228,
-	T_ReindexStmt = 229,
-	T_CreateConversionStmt = 230,
-	T_CreateCastStmt = 231,
-	T_CreateTransformStmt = 232,
-	T_PrepareStmt = 233,
-	T_ExecuteStmt = 234,
-	T_DeallocateStmt = 235,
-	T_DropOwnedStmt = 236,
-	T_ReassignOwnedStmt = 237,
-	T_AlterTSDictionaryStmt = 238,
-	T_AlterTSConfigurationStmt = 239,
-	T_PublicationTable = 240,
-	T_PublicationObjSpec = 241,
-	T_CreatePublicationStmt = 242,
-	T_AlterPublicationStmt = 243,
-	T_CreateSubscriptionStmt = 244,
-	T_AlterSubscriptionStmt = 245,
-	T_DropSubscriptionStmt = 246,
-	T_PlannerGlobal = 247,
-	T_PlannerInfo = 248,
-	T_RelOptInfo = 249,
-	T_IndexOptInfo = 250,
-	T_ForeignKeyOptInfo = 251,
-	T_StatisticExtInfo = 252,
-	T_JoinDomain = 253,
-	T_EquivalenceClass = 254,
-	T_EquivalenceMember = 255,
-	T_PathKey = 256,
-	T_PathTarget = 257,
-	T_ParamPathInfo = 258,
-	T_Path = 259,
-	T_IndexPath = 260,
-	T_IndexClause = 261,
-	T_BitmapHeapPath = 262,
-	T_BitmapAndPath = 263,
-	T_BitmapOrPath = 264,
-	T_TidPath = 265,
-	T_TidRangePath = 266,
-	T_SubqueryScanPath = 267,
-	T_ForeignPath = 268,
-	T_CustomPath = 269,
-	T_AppendPath = 270,
-	T_MergeAppendPath = 271,
-	T_GroupResultPath = 272,
-	T_MaterialPath = 273,
-	T_MemoizePath = 274,
-	T_UniquePath = 275,
-	T_GatherPath = 276,
-	T_GatherMergePath = 277,
-	T_NestPath = 278,
-	T_MergePath = 279,
-	T_HashPath = 280,
-	T_ProjectionPath = 281,
-	T_ProjectSetPath = 282,
-	T_SortPath = 283,
-	T_IncrementalSortPath = 284,
-	T_GroupPath = 285,
-	T_UpperUniquePath = 286,
-	T_AggPath = 287,
-	T_GroupingSetData = 288,
-	T_RollupData = 289,
-	T_GroupingSetsPath = 290,
-	T_MinMaxAggPath = 291,
-	T_WindowAggPath = 292,
-	T_SetOpPath = 293,
-	T_RecursiveUnionPath = 294,
-	T_LockRowsPath = 295,
-	T_ModifyTablePath = 296,
-	T_LimitPath = 297,
-	T_RestrictInfo = 298,
-	T_PlaceHolderVar = 299,
-	T_SpecialJoinInfo = 300,
-	T_OuterJoinClauseInfo = 301,
-	T_AppendRelInfo = 302,
-	T_RowIdentityVarInfo = 303,
-	T_PlaceHolderInfo = 304,
-	T_MinMaxAggInfo = 305,
-	T_PlannerParamItem = 306,
-	T_AggInfo = 307,
-	T_AggTransInfo = 308,
-	T_PlannedStmt = 309,
-	T_Result = 310,
-	T_ProjectSet = 311,
-	T_ModifyTable = 312,
-	T_Append = 313,
-	T_MergeAppend = 314,
-	T_RecursiveUnion = 315,
-	T_BitmapAnd = 316,
-	T_BitmapOr = 317,
-	T_SeqScan = 318,
-	T_SampleScan = 319,
-	T_IndexScan = 320,
-	T_IndexOnlyScan = 321,
-	T_BitmapIndexScan = 322,
-	T_BitmapHeapScan = 323,
-	T_TidScan = 324,
-	T_TidRangeScan = 325,
-	T_SubqueryScan = 326,
-	T_FunctionScan = 327,
-	T_ValuesScan = 328,
-	T_TableFuncScan = 329,
-	T_CteScan = 330,
-	T_NamedTuplestoreScan = 331,
-	T_WorkTableScan = 332,
-	T_ForeignScan = 333,
-	T_CustomScan = 334,
-	T_NestLoop = 335,
-	T_NestLoopParam = 336,
-	T_MergeJoin = 337,
-	T_HashJoin = 338,
-	T_Material = 339,
-	T_Memoize = 340,
-	T_Sort = 341,
-	T_IncrementalSort = 342,
-	T_Group = 343,
-	T_Agg = 344,
-	T_WindowAgg = 345,
-	T_Unique = 346,
-	T_Gather = 347,
-	T_GatherMerge = 348,
-	T_Hash = 349,
-	T_SetOp = 350,
-	T_LockRows = 351,
-	T_Limit = 352,
-	T_PlanRowMark = 353,
-	T_PartitionPruneInfo = 354,
-	T_PartitionedRelPruneInfo = 355,
-	T_PartitionPruneStepOp = 356,
-	T_PartitionPruneStepCombine = 357,
-	T_PlanInvalItem = 358,
-	T_ExprState = 359,
-	T_IndexInfo = 360,
-	T_ExprContext = 361,
-	T_ReturnSetInfo = 362,
-	T_ProjectionInfo = 363,
-	T_JunkFilter = 364,
-	T_OnConflictSetState = 365,
-	T_MergeActionState = 366,
-	T_ResultRelInfo = 367,
-	T_EState = 368,
-	T_WindowFuncExprState = 369,
-	T_SetExprState = 370,
-	T_SubPlanState = 371,
-	T_DomainConstraintState = 372,
-	T_ResultState = 373,
-	T_ProjectSetState = 374,
-	T_ModifyTableState = 375,
-	T_AppendState = 376,
-	T_MergeAppendState = 377,
-	T_RecursiveUnionState = 378,
-	T_BitmapAndState = 379,
-	T_BitmapOrState = 380,
-	T_ScanState = 381,
-	T_SeqScanState = 382,
-	T_SampleScanState = 383,
-	T_IndexScanState = 384,
-	T_IndexOnlyScanState = 385,
-	T_BitmapIndexScanState = 386,
-	T_BitmapHeapScanState = 387,
-	T_TidScanState = 388,
-	T_TidRangeScanState = 389,
-	T_SubqueryScanState = 390,
-	T_FunctionScanState = 391,
-	T_ValuesScanState = 392,
-	T_TableFuncScanState = 393,
-	T_CteScanState = 394,
-	T_NamedTuplestoreScanState = 395,
-	T_WorkTableScanState = 396,
-	T_ForeignScanState = 397,
-	T_CustomScanState = 398,
-	T_JoinState = 399,
-	T_NestLoopState = 400,
-	T_MergeJoinState = 401,
-	T_HashJoinState = 402,
-	T_MaterialState = 403,
-	T_MemoizeState = 404,
-	T_SortState = 405,
-	T_IncrementalSortState = 406,
-	T_GroupState = 407,
-	T_AggState = 408,
-	T_WindowAggState = 409,
-	T_UniqueState = 410,
-	T_GatherState = 411,
-	T_GatherMergeState = 412,
-	T_HashState = 413,
-	T_SetOpState = 414,
-	T_LockRowsState = 415,
-	T_LimitState = 416,
-	T_IndexAmRoutine = 417,
-	T_TableAmRoutine = 418,
-	T_TsmRoutine = 419,
-	T_EventTriggerData = 420,
-	T_TriggerData = 421,
-	T_TupleTableSlot = 422,
-	T_FdwRoutine = 423,
-	T_Bitmapset = 424,
-	T_ExtensibleNode = 425,
-	T_ErrorSaveContext = 426,
-	T_IdentifySystemCmd = 427,
-	T_BaseBackupCmd = 428,
-	T_CreateReplicationSlotCmd = 429,
-	T_DropReplicationSlotCmd = 430,
-	T_StartReplicationCmd = 431,
-	T_ReadReplicationSlotCmd = 432,
-	T_TimeLineHistoryCmd = 433,
-	T_SupportRequestSimplify = 434,
-	T_SupportRequestSelectivity = 435,
-	T_SupportRequestCost = 436,
-	T_SupportRequestRows = 437,
-	T_SupportRequestIndexCondition = 438,
-	T_SupportRequestWFuncMonotonic = 439,
-	T_SupportRequestOptimizeWindowClause = 440,
-	T_Integer = 441,
-	T_Float = 442,
-	T_Boolean = 443,
-	T_String = 444,
-	T_BitString = 445,
-	T_ForeignKeyCacheInfo = 446,
-	T_IntList = 447,
-	T_OidList = 448,
-	T_XidList = 449,
-	T_AllocSetContext = 450,
-	T_GenerationContext = 451,
-	T_SlabContext = 452,
-	T_TIDBitmap = 453,
-	T_WindowObjectData = 454,
diff --git a/contrib/postgres-cmake/pg_config.h b/contrib/postgres-cmake/pg_config.h
index efe6a58ec732..169b0af039ea 100644
--- a/contrib/postgres-cmake/pg_config.h
+++ b/contrib/postgres-cmake/pg_config.h
@@ -1,20 +1,23 @@
 /* src/include/pg_config.h.  Generated from pg_config.h.in by configure.  */
-/* src/include/pg_config.h.in.  Generated from configure.in by autoheader.  */
+/* src/include/pg_config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* The normal alignment of `double', in bytes. */
-#define ALIGNOF_DOUBLE 4
+#define ALIGNOF_DOUBLE 8
 
 /* The normal alignment of `int', in bytes. */
 #define ALIGNOF_INT 4
 
+/* The normal alignment of `int64_t', in bytes. */
+#define ALIGNOF_INT64_T 8
+
 /* The normal alignment of `long', in bytes. */
-#define ALIGNOF_LONG 4
+#define ALIGNOF_LONG 8
 
-/* The normal alignment of `long long int', in bytes. */
-#define ALIGNOF_LONG_LONG_INT 4
+/* The normal alignment of `PG_INT128_TYPE', in bytes. */
+#define ALIGNOF_PG_INT128_TYPE 16
 
 /* The normal alignment of `short', in bytes. */
 #define ALIGNOF_SHORT 2
@@ -28,6 +31,9 @@
    Changing BLCKSZ requires an initdb. */
 #define BLCKSZ 8192
 
+/* Saved arguments from configure */
+#define CONFIGURE_ARGS ""
+
 /* Define to the default TCP port number on which the server listens and to
    which clients will try to connect. This can be overridden at run-time, but
    it's convenient if your clients have the right default compiled in.
@@ -41,54 +47,34 @@
 #define DLSUFFIX ".so"
 
 /* Define to build with GSSAPI support. (--with-gssapi) */
-//#define ENABLE_GSS 0
+/* #undef ENABLE_GSS */
 
 /* Define to 1 if you want National Language Support. (--enable-nls) */
 /* #undef ENABLE_NLS */
 
-/* Define to 1 to build client libraries as thread-safe code.
-   (--enable-thread-safety) */
-#define ENABLE_THREAD_SAFETY 1
-
-/* Define to nothing if C supports flexible array members, and to 1 if it does
-   not. That way, with a declaration like `struct s { int n; double
-   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
-   compilers. When computing the size of such an object, don't use 'sizeof
-   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
-   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
-   MSVC and with C++ compilers. */
-#define FLEXIBLE_ARRAY_MEMBER /**/
-
-/* float4 values are passed by value if 'true', by reference if 'false' */
-#define FLOAT4PASSBYVAL true
-
-/* float8, int8, and related values are passed by value if 'true', by
-   reference if 'false' */
-#define FLOAT8PASSBYVAL false
-
 /* Define to 1 if you have the `append_history' function. */
-/* #undef HAVE_APPEND_HISTORY */
-
-/* Define to 1 if you want to use atomics if available. */
-#define HAVE_ATOMICS 1
+#define HAVE_APPEND_HISTORY 1
 
 /* Define to 1 if you have the <atomic.h> header file. */
 /* #undef HAVE_ATOMIC_H */
 
-/* Define to 1 if you have the `cbrt' function. */
-#define HAVE_CBRT 1
+/* Define to 1 if you have the `backtrace_symbols' function. */
+#define HAVE_BACKTRACE_SYMBOLS 1
 
-/* Define to 1 if you have the `class' function. */
-/* #undef HAVE_CLASS */
+/* Define to 1 if your compiler handles computed gotos. */
+#define HAVE_COMPUTED_GOTO 1
 
-/* Define to 1 if you have the <crtdefs.h> header file. */
-/* #undef HAVE_CRTDEFS_H */
+/* Define to 1 if you have the `copyfile' function. */
+/* #undef HAVE_COPYFILE */
+
+/* Define to 1 if you have the <copyfile.h> header file. */
+/* #undef HAVE_COPYFILE_H */
 
-/* Define to 1 if you have the `crypt' function. */
-#define HAVE_CRYPT 1
+/* Define to 1 if you have the `copy_file_range' function. */
+#define HAVE_COPY_FILE_RANGE 1
 
-/* Define to 1 if you have the <crypt.h> header file. */
-#define HAVE_CRYPT_H 1
+/* Define to 1 if you have the <crtdefs.h> header file. */
+/* #undef HAVE_CRTDEFS_H */
 
 /* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
    don't. */
@@ -98,13 +84,35 @@
    don't. */
 #define HAVE_DECL_F_FULLFSYNC 0
 
+/* Define to 1 if you have the declaration of
+   `LLVMCreateGDBRegistrationListener', and to 0 if you don't. */
+/* #undef HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER */
+
+/* Define to 1 if you have the declaration of
+   `LLVMCreatePerfJITEventListener', and to 0 if you don't. */
+/* #undef HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER */
+
+/* Define to 1 if you have the declaration of `memset_s', and to 0 if you
+   don't. */
+#define HAVE_DECL_MEMSET_S 0
+
 /* Define to 1 if you have the declaration of `posix_fadvise', and to 0 if you
    don't. */
 #define HAVE_DECL_POSIX_FADVISE 1
 
-/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+/* Define to 1 if you have the declaration of `preadv', and to 0 if you don't.
+   */
+#define HAVE_DECL_PREADV 1
+
+/* Define to 1 if you have the declaration of `pwritev', and to 0 if you
+   don't. */
+#define HAVE_DECL_PWRITEV 1
+
+/* Define to 1 if you have the declaration of `strchrnul', and to 0 if you
    don't. */
-#define HAVE_DECL_SNPRINTF 1
+#if (!OS_DARWIN)
+#define HAVE_DECL_STRCHRNUL 0
+#endif
 
 /* Define to 1 if you have the declaration of `strlcat', and to 0 if you
    don't. */
@@ -118,34 +126,32 @@
 #define HAVE_DECL_STRLCPY 1
 #endif
 
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
    don't. */
-#define HAVE_DECL_SYS_SIGLIST 1
+#define HAVE_DECL_STRNLEN 1
 
-/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL_VSNPRINTF 1
+/* Define to 1 if you have the declaration of `strsep', and to 0 if you don't.
+   */
+#define HAVE_DECL_STRSEP 1
 
-/* Define to 1 if you have the <dld.h> header file. */
-/* #undef HAVE_DLD_H */
+/* Define to 1 if you have the declaration of `timingsafe_bcmp', and to 0 if
+   you don't. */
+#define HAVE_DECL_TIMINGSAFE_BCMP 0
 
 /* Define to 1 if you have the <editline/history.h> header file. */
 /* #undef HAVE_EDITLINE_HISTORY_H */
 
 /* Define to 1 if you have the <editline/readline.h> header file. */
-#define HAVE_EDITLINE_READLINE_H 1
+/* #undef HAVE_EDITLINE_READLINE_H */
 
-/* Define to 1 if you have the `fpclass' function. */
-/* #undef HAVE_FPCLASS */
+/* Define to 1 if you have the `elf_aux_info' function. */
+/* #undef HAVE_ELF_AUX_INFO */
 
-/* Define to 1 if you have the `fp_class' function. */
-/* #undef HAVE_FP_CLASS */
+/* Define to 1 if you have the <execinfo.h> header file. */
+#define HAVE_EXECINFO_H 1
 
-/* Define to 1 if you have the `fp_class_d' function. */
-/* #undef HAVE_FP_CLASS_D */
-
-/* Define to 1 if you have the <fp_class.h> header file. */
-/* #undef HAVE_FP_CLASS_H */
+/* Define to 1 if you have the `explicit_bzero' function. */
+/* #define HAVE_EXPLICIT_BZERO */
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
@@ -153,21 +159,25 @@
 /* Define to 1 if you have __atomic_compare_exchange_n(int *, int *, int). */
 /* #undef HAVE_GCC__ATOMIC_INT32_CAS */
 
-/* Define to 1 if you have __atomic_compare_exchange_n(int64 *, int *, int64).
-   */
+/* Define to 1 if you have __atomic_compare_exchange_n(int64 *, int64 *,
+   int64). */
 /* #undef HAVE_GCC__ATOMIC_INT64_CAS */
 
 /* Define to 1 if you have __sync_lock_test_and_set(char *) and friends. */
 #define HAVE_GCC__SYNC_CHAR_TAS 1
 
-/* Define to 1 if you have __sync_compare_and_swap(int *, int, int). */
+/* Define to 1 if you have __sync_val_compare_and_swap(int *, int, int). */
 /* #undef HAVE_GCC__SYNC_INT32_CAS */
 
 /* Define to 1 if you have __sync_lock_test_and_set(int *) and friends. */
 #define HAVE_GCC__SYNC_INT32_TAS 1
 
-/* Define to 1 if you have __sync_compare_and_swap(int64 *, int64, int64). */
-/* #undef HAVE_GCC__SYNC_INT64_CAS */
+/* Define to 1 if you have __sync_val_compare_and_swap(int64_t *, int64_t,
+   int64_t). */
+#define HAVE_GCC__SYNC_INT64_CAS 1
+
+/* Define to 1 if you have the `getauxval' function. */
+#define HAVE_GETAUXVAL 1
 
 /* Define to 1 if you have the `getifaddrs' function. */
 #define HAVE_GETIFADDRS 1
@@ -194,7 +204,7 @@
 /* #undef HAVE_GSSAPI_GSSAPI_EXT_H */
 
 /* Define to 1 if you have the <gssapi/gssapi.h> header file. */
-//#define HAVE_GSSAPI_GSSAPI_H 0
+/* #undef HAVE_GSSAPI_GSSAPI_H */
 
 /* Define to 1 if you have the <gssapi.h> header file. */
 /* #undef HAVE_GSSAPI_H */
@@ -205,9 +215,6 @@
 /* Define to 1 if you have the `history_truncate_file' function. */
 #define HAVE_HISTORY_TRUNCATE_FILE 1
 
-/* Define to 1 if you have the <ieeefp.h> header file. */
-/* #undef HAVE_IEEEFP_H */
-
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #define HAVE_IFADDRS_H 1
 
@@ -217,15 +224,6 @@
 /* Define to 1 if you have the `inet_pton' function. */
 #define HAVE_INET_PTON 1
 
-/* Define to 1 if the system has the type `int64'. */
-/* #undef HAVE_INT64 */
-
-/* Define to 1 if the system has the type `int8'. */
-/* #undef HAVE_INT8 */
-
-/* Define to 1 if the system has the type `intptr_t'. */
-#define HAVE_INTPTR_T 1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -238,23 +236,38 @@
 /* Define to 1 if you have the global variable 'int timezone'. */
 #define HAVE_INT_TIMEZONE 1
 
-/* Define to 1 if you have isinf(). */
-#define HAVE_ISINF 1
+/* Define to 1 if you have the `io_uring_queue_init_mem' function. */
+/* #undef HAVE_IO_URING_QUEUE_INIT_MEM */
 
-/* Define to 1 if you have the <langinfo.h> header file. */
-#define HAVE_LANGINFO_H 1
+/* Define to 1 if __builtin_constant_p(x) implies "i"(x) acceptance. */
+/* #undef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P */
+
+/* Define to 1 if you have the `kqueue' function. */
+/* #undef HAVE_KQUEUE */
+
+/* Define to 1 if you have the `ldap_initialize' function. */
+/* #undef HAVE_LDAP_INITIALIZE */
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #define HAVE_LIBCRYPTO 1
 
+/* Define to 1 if you have the `curl' library (-lcurl). */
+/* #undef HAVE_LIBCURL */
+
 /* Define to 1 if you have the `ldap' library (-lldap). */
-//#define HAVE_LIBLDAP 0
+/* #undef HAVE_LIBLDAP */
+
+/* Define to 1 if you have the `lz4' library (-llz4). */
+/* #undef HAVE_LIBLZ4 */
 
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 
+/* Define to 1 if you have the `numa' library (-lnuma). */
+/* #undef HAVE_LIBNUMA */
+
 /* Define to 1 if you have the `pam' library (-lpam). */
-#define HAVE_LIBPAM 1
+/* #undef HAVE_LIBPAM */
 
 /* Define if you have a function readline library */
 #define HAVE_LIBREADLINE 1
@@ -263,7 +276,7 @@
 /* #undef HAVE_LIBSELINUX */
 
 /* Define to 1 if you have the `ssl' library (-lssl). */
-#define HAVE_LIBSSL 0
+/* #undef HAVE_LIBSSL */
 
 /* Define to 1 if you have the `wldap32' library (-lwldap32). */
 /* #undef HAVE_LIBWLDAP32 */
@@ -280,21 +293,8 @@
 /* Define to 1 if you have the `zstd' library (-lzstd). */
 /* #undef HAVE_LIBZSTD */
 
-/* Define to 1 if constants of type 'long long int' should have the suffix LL.
-   */
-#define HAVE_LL_CONSTANTS 1
-
-/* Define to 1 if the system has the type `locale_t'. */
-#define HAVE_LOCALE_T 1
-
-/* Define to 1 if `long int' works and is 64 bits. */
-/* #undef HAVE_LONG_INT_64 */
-
-/* Define to 1 if the system has the type `long long int'. */
-#define HAVE_LONG_LONG_INT 1
-
-/* Define to 1 if `long long int' works and is 64 bits. */
-#define HAVE_LONG_LONG_INT_64 1
+/* Define to 1 if you have the `localeconv_l' function. */
+/* #undef HAVE_LOCALECONV_L */
 
 /* Define to 1 if you have the <mbarrier.h> header file. */
 /* #undef HAVE_MBARRIER_H */
@@ -302,18 +302,12 @@
 /* Define to 1 if you have the `mbstowcs_l' function. */
 /* #undef HAVE_MBSTOWCS_L */
 
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `mkdtemp' function. */
 #define HAVE_MKDTEMP 1
 
-/* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
-
 /* Define to 1 if you have the <ossp/uuid.h> header file. */
 /* #undef HAVE_OSSP_UUID_H */
 
@@ -323,26 +317,23 @@
 /* Define to 1 if you have the `posix_fadvise' function. */
 #define HAVE_POSIX_FADVISE 1
 
-/* Define to 1 if you have the declaration of `preadv', and to 0 if you don't. */
-/* #undef HAVE_DECL_PREADV */
+/* Define to 1 if you have the `posix_fallocate' function. */
+#define HAVE_POSIX_FALLOCATE 1
 
-/* Define to 1 if you have the declaration of `pwritev', and to 0 if you don't. */
-/* #define HAVE_DECL_PWRITEV */
+/* Define to 1 if you have the `ppoll' function. */
+#define HAVE_PPOLL 1
 
-/* Define to 1 if you have the `X509_get_signature_info' function. */
-/* #undef HAVE_X509_GET_SIGNATURE_INFO */
+/* Define if you have POSIX threads libraries and header files. */
+#define HAVE_PTHREAD 1
 
-/* Define to 1 if you have the POSIX signal interface. */
-#define HAVE_POSIX_SIGNALS 1
-
-/* Define to 1 if the assembler supports PPC's LWARX mutex hint bit. */
-/* #undef HAVE_PPC_LWARX_MUTEX_HINT */
+/* Define to 1 if you have the `pthread_barrier_wait' function. */
+#define HAVE_PTHREAD_BARRIER_WAIT 1
 
 /* Define to 1 if you have the `pthread_is_threaded_np' function. */
 /* #undef HAVE_PTHREAD_IS_THREADED_NP */
 
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
+/* Have PTHREAD_PRIO_INHERIT. */
+#define HAVE_PTHREAD_PRIO_INHERIT 1
 
 /* Define to 1 if you have the <readline.h> header file. */
 /* #undef HAVE_READLINE_H */
@@ -351,17 +342,26 @@
 #define HAVE_READLINE_HISTORY_H 1
 
 /* Define to 1 if you have the <readline/readline.h> header file. */
-/* #undef HAVE_READLINE_READLINE_H */
-
-/* Define to 1 if you have the `rint' function. */
-#define HAVE_RINT 1
+#define HAVE_READLINE_READLINE_H 1
 
 /* Define to 1 if you have the `rl_completion_matches' function. */
 #define HAVE_RL_COMPLETION_MATCHES 1
 
+/* Define to 1 if you have the global variable 'rl_completion_suppress_quote'.
+   */
+#define HAVE_RL_COMPLETION_SUPPRESS_QUOTE 1
+
 /* Define to 1 if you have the `rl_filename_completion_function' function. */
 #define HAVE_RL_FILENAME_COMPLETION_FUNCTION 1
 
+/* Define to 1 if you have the global variable 'rl_filename_quote_characters'.
+   */
+#define HAVE_RL_FILENAME_QUOTE_CHARACTERS 1
+
+/* Define to 1 if you have the global variable 'rl_filename_quoting_function'.
+   */
+#define HAVE_RL_FILENAME_QUOTING_FUNCTION 1
+
 /* Define to 1 if you have the `rl_reset_screen_size' function. */
 /* #undef HAVE_RL_RESET_SCREEN_SIZE */
 
@@ -374,32 +374,23 @@
 /* Define to 1 if you have the `setproctitle' function. */
 /* #undef HAVE_SETPROCTITLE */
 
+/* Define to 1 if you have the `setproctitle_fast' function. */
+/* #undef HAVE_SETPROCTITLE_FAST */
+
 /* Define to 1 if the system has the type `socklen_t'. */
 #define HAVE_SOCKLEN_T 1
 
-/* Define to 1 if you have the `sigprocmask' function. */
-#define HAVE_SIGPROCMASK 1
-
-/* Define to 1 if you have sigsetjmp(). */
-#define HAVE_SIGSETJMP 1
-
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
+/* Define to 1 if you have the `SSL_CTX_set_cert_cb' function. */
+/* #undef HAVE_SSL_CTX_SET_CERT_CB */
 
-/* Define to 1 if you have spinlocks. */
-#define HAVE_SPINLOCKS 1
+/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */
+/* #undef HAVE_SSL_CTX_SET_CIPHERSUITES */
 
-/* Define to 1 if you have the `SSL_CTX_set_cert_cb' function. */
-#define HAVE_SSL_CTX_SET_CERT_CB 1
+/* Define to 1 if you have the `SSL_CTX_set_keylog_callback' function. */
+/* #undef HAVE_SSL_CTX_SET_KEYLOG_CALLBACK */
 
 /* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */
-/* #define HAVE_SSL_CTX_SET_NUM_TICKETS */
-
-/* Define to 1 if you have the `SSL_get_current_compression' function. */
-#define HAVE_SSL_GET_CURRENT_COMPRESSION 0
+/* #undef HAVE_SSL_CTX_SET_NUM_TICKETS */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -407,14 +398,11 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
 /* Define to 1 if you have the `strerror_r' function. */
 #define HAVE_STRERROR_R 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-//#define HAVE_STRINGS_H 1
+#define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
@@ -425,9 +413,14 @@
 /* Define to 1 if you have the `strlcpy' function. */
 /* #undef HAVE_STRLCPY */
 
-#if (!OS_DARWIN)
-#define HAVE_STRCHRNUL 1
-#endif
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if you have the `strsep' function. */
+#define HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
 
 /* Define to 1 if the system has the type `struct option'. */
 #define HAVE_STRUCT_OPTION 1
@@ -438,33 +431,36 @@
 /* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #define HAVE_STRUCT_TM_TM_ZONE 1
 
+/* Define to 1 if you have the `syncfs' function. */
+#define HAVE_SYNCFS 1
+
 /* Define to 1 if you have the `sync_file_range' function. */
 /* #undef HAVE_SYNC_FILE_RANGE */
 
 /* Define to 1 if you have the syslog interface. */
 #define HAVE_SYSLOG 1
 
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+#define HAVE_SYS_EPOLL_H 1
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+/* #undef HAVE_SYS_EVENT_H */
 
 /* Define to 1 if you have the <sys/personality.h> header file. */
 /* #undef HAVE_SYS_PERSONALITY_H */
 
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#define HAVE_SYS_POLL_H 1
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+#define HAVE_SYS_PRCTL_H 1
+
+/* Define to 1 if you have the <sys/procctl.h> header file. */
+/* #undef HAVE_SYS_PROCCTL_H */
 
 /* Define to 1 if you have the <sys/signalfd.h> header file. */
 /* #undef HAVE_SYS_SIGNALFD_H */
 
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
@@ -473,54 +469,29 @@
 #define HAVE_SYS_UCRED_H 1
 #endif
 
-/* Define to 1 if you have the <sys/un.h> header file. */
-#define _GNU_SOURCE 1 /* Needed for glibc struct ucred */
-
 /* Define to 1 if you have the <termios.h> header file. */
 #define HAVE_TERMIOS_H 1
 
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#define HAVE_TM_ZONE 1
+/* Define to 1 if curl_global_init() is guaranteed to be thread-safe. */
+/* #undef HAVE_THREADSAFE_CURL_GLOBAL_INIT */
 
-/* Define to 1 if you have the `towlower' function. */
-#define HAVE_TOWLOWER 1
+/* Define to 1 if you have the `timingsafe_bcmp' function. */
+/* #undef HAVE_TIMINGSAFE_BCMP */
 
-/* Define to 1 if you have the external array `tzname'. */
-#define HAVE_TZNAME 1
+/* Define to 1 if your compiler understands `typeof' or something similar. */
+#define HAVE_TYPEOF 1
 
 /* Define to 1 if you have the <ucred.h> header file. */
 /* #undef HAVE_UCRED_H */
 
-/* Define to 1 if the system has the type `uint64'. */
-/* #undef HAVE_UINT64 */
-
-/* Define to 1 if the system has the type `uint8'. */
-/* #undef HAVE_UINT8 */
-
-/* Define to 1 if the system has the type `uintptr_t'. */
-#define HAVE_UINTPTR_T 1
-
 /* Define to 1 if the system has the type `union semun'. */
 /* #undef HAVE_UNION_SEMUN */
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to 1 if you have unix sockets. */
-#define HAVE_UNIX_SOCKETS 1
-
-/* Define to 1 if the system has the type `unsigned long long int'. */
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-
-/* Define to 1 if you have the `utime' function. */
-#define HAVE_UTIME 1
-
-/* Define to 1 if you have the `utimes' function. */
-#define HAVE_UTIMES 1
-
-/* Define to 1 if you have the <utime.h> header file. */
-#define HAVE_UTIME_H 1
+/* Define to 1 if you have the `uselocale' function. */
+#define HAVE_USELOCALE 1
 
 /* Define to 1 if you have BSD UUID support. */
 /* #undef HAVE_UUID_BSD */
@@ -540,108 +511,135 @@
 /* Define to 1 if your compiler knows the visibility("hidden") attribute. */
 /* #undef HAVE_VISIBILITY_ATTRIBUTE */
 
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
+/* Define to 1 if you have the `wcstombs_l' function. */
+/* #undef HAVE_WCSTOMBS_L */
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#define HAVE_WCHAR_H 1
+/* Define to 1 if you have the `X509_get_signature_info' function. */
+/* #undef HAVE_X509_GET_SIGNATURE_INFO */
 
-/* Define to 1 if you have the `wcstombs' function. */
-#define HAVE_WCSTOMBS 1
+/* Define to 1 if the assembler supports X86_64's POPCNTQ instruction. */
+#define HAVE_X86_64_POPCNTQ 1
 
-/* Define to 1 if you have the `wcstombs_l' function. */
-/* #undef HAVE_WCSTOMBS_L */
+/* Define to 1 if you have the <xlocale.h> header file. */
+#if OS_DARWIN
+#define HAVE_XLOCALE_H
+#endif
+
+/* Define to 1 if you have XSAVE intrinsics. */
+#define HAVE_XSAVE_INTRINSICS 1
+
+/* Define to 1 if your compiler understands __builtin_bswap16. */
+#define HAVE__BUILTIN_BSWAP16 1
 
 /* Define to 1 if your compiler understands __builtin_bswap32. */
-/* #undef HAVE__BUILTIN_BSWAP32 */
+#define HAVE__BUILTIN_BSWAP32 1
+
+/* Define to 1 if your compiler understands __builtin_bswap64. */
+#define HAVE__BUILTIN_BSWAP64 1
+
+/* Define to 1 if your compiler understands __builtin_clz. */
+#define HAVE__BUILTIN_CLZ 1
 
 /* Define to 1 if your compiler understands __builtin_constant_p. */
 #define HAVE__BUILTIN_CONSTANT_P 1
 
+/* Define to 1 if your compiler understands __builtin_ctz. */
+#define HAVE__BUILTIN_CTZ 1
+
 /* Define to 1 if your compiler understands __builtin_frame_address. */
-/* #undef HAVE__BUILTIN_FRAME_ADDRESS */
+#define HAVE__BUILTIN_FRAME_ADDRESS 1
+
+/* Define to 1 if your compiler understands __builtin_$op_overflow. */
+#define HAVE__BUILTIN_OP_OVERFLOW 1
+
+/* Define to 1 if your compiler understands __builtin_popcount. */
+#define HAVE__BUILTIN_POPCOUNT 1
 
 /* Define to 1 if your compiler understands __builtin_types_compatible_p. */
 #define HAVE__BUILTIN_TYPES_COMPATIBLE_P 1
 
 /* Define to 1 if your compiler understands __builtin_unreachable. */
-/* #undef HAVE__BUILTIN_UNREACHABLE */
+/* #define HAVE__BUILTIN_UNREACHABLE */
 
 /* Define to 1 if you have __cpuid. */
 /* #undef HAVE__CPUID */
 
+/* Define to 1 if you have __cpuidex. */
+/* #undef HAVE__CPUIDEX */
+
 /* Define to 1 if you have __get_cpuid. */
 /* #undef HAVE__GET_CPUID */
 
-/* Define to 1 if your compiler understands _Static_assert. */
-/* #undef HAVE__STATIC_ASSERT */
-
-/* Define to 1 if your compiler understands __VA_ARGS__ in macros. */
-#define HAVE__VA_ARGS 1
-
-/* Define to the appropriate snprintf length modifier for 64-bit ints. */
-#define INT64_MODIFIER "ll"
+/* Define to 1 if you have __get_cpuid_count. */
+/* #undef HAVE__GET_CPUID_COUNT */
 
-/* Define to 1 if `locale_t' requires <xlocale.h>. */
-/* #undef LOCALE_T_IN_XLOCALE */
+/* Define to 1 if your compiler understands _Static_assert. */
+#define HAVE__STATIC_ASSERT 1
 
 /* Define as the maximum alignment requirement of any C data type. */
-#define MAXIMUM_ALIGNOF 4
+#define MAXIMUM_ALIGNOF 8
 
 /* Define bytes to use libc memset(). */
 #define MEMSET_LOOP_LIMIT 1024
 
+/* Define to the OpenSSL API version in use. This avoids deprecation warnings
+   from newer OpenSSL versions. */
+/* #undef OPENSSL_API_COMPAT */
+
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "pgsql-bugs@postgresql.org"
+#define PACKAGE_BUGREPORT "pgsql-bugs@lists.postgresql.org"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.5.4"
+#define PACKAGE_STRING "PostgreSQL 18.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "postgresql"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL ""
+#define PACKAGE_URL "https://www.postgresql.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "9.5.4"
+#define PACKAGE_VERSION "18.0"
 
 /* Define to the name of a signed 128-bit integer type. */
-/* #undef PG_INT128_TYPE */
-
-/* Define to the name of a signed 64-bit integer type. */
-#define PG_INT64_TYPE long long int
+#define PG_INT128_TYPE __int128
 
 /* Define to the name of the default PostgreSQL service principal in Kerberos
    (GSSAPI). (--with-krb-srvnam=NAME) */
 #define PG_KRB_SRVNAM "postgres"
 
 /* PostgreSQL major version as a string */
-#define PG_MAJORVERSION "9.5"
+#define PG_MAJORVERSION "18"
+
+/* PostgreSQL major version number */
+#define PG_MAJORVERSION_NUM 18
 
-/* Define to gnu_printf if compiler supports it, else printf. */
-#define PG_PRINTF_ATTRIBUTE printf
+/* PostgreSQL minor version number */
+#define PG_MINORVERSION_NUM 0
 
-/* Define to 1 if "static inline" works without unwanted warnings from
-   compilations where static inline functions are defined but not called. */
-#define PG_USE_INLINE 1
+/* Define to best printf format archetype, usually gnu_printf if available. */
+#define PG_PRINTF_ATTRIBUTE gnu_printf
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "9.5.4"
+#define PG_VERSION "18.0"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90504
+#define PG_VERSION_NUM 180000
 
 /* A string containing the version number, platform, and C compiler */
-#define PG_VERSION_STR "PostgreSQL 9.5.4 on i686-pc-linux-gnu, compiled by gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55), 32-bit"
+#define PG_VERSION_STR "PostgreSQL 18.0 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 15.2.1 20250813, 64-bit"
 
 /* Define to 1 to allow profiling output to be saved separately for each
    process. */
 /* #undef PROFILE_PID_DIR */
 
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
 /* RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus,
    the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger
    than that are divided into multiple files. RELSEG_SIZE * BLCKSZ must be
@@ -656,46 +654,64 @@
 #define RELSEG_SIZE 131072
 
 /* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG 8
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
 
 /* The size of `off_t', as computed by sizeof. */
 #define SIZEOF_OFF_T 8
 
 /* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
+#define SIZEOF_SIZE_T 8
 
 /* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
+#define SIZEOF_VOID_P 8
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Define to 1 if strerror_r() returns a int. */
+/* Define to 1 if strerror_r() returns int. */
 /* #undef STRERROR_R_INT */
 
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
+/* Define to 1 to use ARMv8 CRC Extension. */
+/* #undef USE_ARMV8_CRC32C */
+
+/* Define to 1 to use ARMv8 CRC Extension with a runtime check. */
+/* #undef USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK */
 
 /* Define to 1 to build with assertion checks. (--enable-cassert) */
 /* #undef USE_ASSERT_CHECKING */
 
+/* Define to 1 to use AVX-512 CRC algorithms with a runtime check. */
+#define USE_AVX512_CRC32C_WITH_RUNTIME_CHECK 1
+
+/* Define to 1 to use AVX-512 popcount instructions with a runtime check. */
+#define USE_AVX512_POPCNT_WITH_RUNTIME_CHECK 1
+
 /* Define to 1 to build with Bonjour support. (--with-bonjour) */
 /* #undef USE_BONJOUR */
 
-/* Define to 1 if you want float4 values to be passed by value.
-   (--enable-float4-byval) */
-#define USE_FLOAT4_BYVAL 1
+/* Define to 1 to build with BSD Authentication support. (--with-bsd-auth) */
+/* #undef USE_BSD_AUTH */
 
-/* Define to 1 if you want float8, int8, etc values to be passed by value.
-   (--enable-float8-byval) */
-/* #undef USE_FLOAT8_BYVAL */
+/* Define to build with ICU support. (--with-icu) */
+#define USE_ICU 1
 
-/* Define to 1 if you want 64-bit integer timestamp and interval support.
-   (--enable-integer-datetimes) */
-#define USE_INTEGER_DATETIMES 1
+/* Define to 1 to build with injection points. (--enable-injection-points) */
+/* #undef USE_INJECTION_POINTS */
 
 /* Define to 1 to build with LDAP support. (--with-ldap) */
-//#define USE_LDAP 0
+/* #undef USE_LDAP */
+
+/* Define to 1 to build with libcurl support. (--with-libcurl) */
+/* #undef USE_LIBCURL */
+
+/* Define to build with NUMA support. (--with-libnuma) */
+/* #undef USE_LIBNUMA */
+
+/* Define to build with io_uring support. (--with-liburing) */
+/* #undef USE_LIBURING */
 
 /* Define to 1 to build with XML support. (--with-libxml) */
 #define USE_LIBXML 1
@@ -704,30 +720,38 @@
    (--with-libxslt) */
 #define USE_LIBXSLT 1
 
+/* Define to 1 to build with LLVM based JIT support. (--with-llvm) */
+/* #undef USE_LLVM */
+
+/* Define to 1 to use LoongArch CRCC instructions. */
+/* #undef USE_LOONGARCH_CRC32C */
+
+/* Define to 1 to build with LZ4 support. (--with-lz4) */
+/* #undef USE_LZ4 */
+
 /* Define to select named POSIX semaphores. */
 /* #undef USE_NAMED_POSIX_SEMAPHORES */
 
-/* Define to build with OpenSSL support. (--with-openssl) */
+/* Define to 1 to build with OpenSSL support. (--with-ssl=openssl) */
 #define USE_OPENSSL 0
 
-#define USE_OPENSSL_RANDOM 0
-
-#define FRONTEND 1
-
 /* Define to 1 to build with PAM support. (--with-pam) */
-#define USE_PAM 1
+/* #undef USE_PAM */
 
-/* Use replacement snprintf() functions. */
-/* #undef USE_REPL_SNPRINTF */
-
-/* Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check. */
-#define USE_SLICING_BY_8_CRC32C 1
+/* Define to 1 to use software CRC-32C implementation (slicing-by-8). */
+/* #undef USE_SLICING_BY_8_CRC32C */
 
 /* Define to 1 use Intel SSE 4.2 CRC instructions. */
 /* #undef USE_SSE42_CRC32C */
 
-/* Define to 1 to use Intel SSSE 4.2 CRC instructions with a runtime check. */
-/* #undef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK */
+/* Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check. */
+#define USE_SSE42_CRC32C_WITH_RUNTIME_CHECK 1
+
+/* Define to 1 to use SVE popcount instructions with a runtime check. */
+/* #undef USE_SVE_POPCNT_WITH_RUNTIME_CHECK */
+
+/* Define to build with systemd support. (--with-systemd) */
+/* #undef USE_SYSTEMD */
 
 /* Define to select SysV-style semaphores. */
 #define USE_SYSV_SEMAPHORES 1
@@ -747,9 +771,6 @@
 /* Define to 1 to build with ZSTD support. (--with-zstd) */
 /* #undef USE_ZSTD */
 
-/* Define to 1 if `wcstombs_l' requires <xlocale.h>. */
-/* #undef WCSTOMBS_L_IN_XLOCALE */
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
@@ -769,11 +790,6 @@
    */
 #define XLOG_BLCKSZ 8192
 
-/* XLOG_SEG_SIZE is the size of a single WAL file. This must be a power of 2
-   and larger than XLOG_BLCKSZ (preferably, a great deal larger than
-   XLOG_BLCKSZ). Changing XLOG_SEG_SIZE requires an initdb. */
-#define XLOG_SEG_SIZE (16 * 1024 * 1024)
-
 
 
 /* Number of bits in a file offset, on hosts where this is settable. */
@@ -791,13 +807,23 @@
 /* #undef inline */
 #endif
 
-/* Define to the type of a signed integer type wide enough to hold a pointer,
-   if such a type exists, and if the system does not define it. */
-/* #undef intptr_t */
-
-/* Define to empty if the C compiler does not understand signed types. */
-/* #undef signed */
+/* Define to keyword to use for C99 restrict support, or to nothing if not
+   supported */
+#define pg_restrict __restrict
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#define restrict __restrict
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+# define __restrict__
+#endif
 
-/* Define to the type of an unsigned integer type wide enough to hold a
-   pointer, if such a type exists, and if the system does not define it. */
-/* #undef uintptr_t */
+/* Define to how the compiler spells `typeof'. */
+/* #undef typeof */
diff --git a/contrib/postgres-cmake/pg_config_ext.h b/contrib/postgres-cmake/pg_config_ext.h
deleted file mode 100644
index c54013557667..000000000000
--- a/contrib/postgres-cmake/pg_config_ext.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- *  * src/include/pg_config_ext.h.in.  This is generated manually, not by
- *   * autoheader, since we want to limit which symbols get defined here.
- *    */
-
-/* Define to the name of a signed 64-bit integer type. */
-#define PG_INT64_TYPE long long int
diff --git a/contrib/postgres-cmake/pg_config_os.h b/contrib/postgres-cmake/pg_config_os.h
index ecfed0d7b199..8101af2b93f5 100644
--- a/contrib/postgres-cmake/pg_config_os.h
+++ b/contrib/postgres-cmake/pg_config_os.h
@@ -1,14 +1,5 @@
-#if defined(OS_DARWIN)
-
-/* src/include/port/darwin.h */
-#define __darwin__	1
-
-#if HAVE_DECL_F_FULLFSYNC		/* not present before macOS 10.3 */
-#define HAVE_FSYNC_WRITETHROUGH
-#endif
-
-#else
 /* src/include/port/linux.h */
+
 /*
  * As of July 2007, all known versions of the Linux kernel will sometimes
  * return EIDRM for a shmctl() operation when EINVAL is correct (it happens
@@ -28,7 +19,4 @@
  * perform better and (b) causes outright failures on ext4 data=journal
  * filesystems, because those don't support O_DIRECT.
  */
-#define PLATFORM_DEFAULT_SYNC_METHOD	SYNC_METHOD_FDATASYNC
-
-#endif
-
+#define PLATFORM_DEFAULT_WAL_SYNC_METHOD	WAL_SYNC_METHOD_FDATASYNC
diff --git a/contrib/postgres-cmake/pg_config_paths.h b/contrib/postgres-cmake/pg_config_paths.h
index b366e3994b37..8d16c70b41ca 100644
--- a/contrib/postgres-cmake/pg_config_paths.h
+++ b/contrib/postgres-cmake/pg_config_paths.h
@@ -1,12 +1,12 @@
-#define PGBINDIR "/bin"
-#define PGSHAREDIR "/share"
-#define SYSCONFDIR "/etc"
-#define INCLUDEDIR "/include"
-#define PKGINCLUDEDIR "/include"
-#define INCLUDEDIRSERVER "/include/server"
-#define LIBDIR "/lib"
-#define PKGLIBDIR "/lib"
-#define LOCALEDIR "/share/locale"
-#define DOCDIR "/doc"
-#define HTMLDIR "/doc"
-#define MANDIR "/man"
+#define PGBINDIR "/usr/local/pgsql/bin"
+#define PGSHAREDIR "/usr/local/pgsql/share"
+#define SYSCONFDIR "/usr/local/pgsql/etc"
+#define INCLUDEDIR "/usr/local/pgsql/include"
+#define PKGINCLUDEDIR "/usr/local/pgsql/include"
+#define INCLUDEDIRSERVER "/usr/local/pgsql/include/server"
+#define LIBDIR "/usr/local/pgsql/lib"
+#define PKGLIBDIR "/usr/local/pgsql/lib"
+#define LOCALEDIR "/usr/local/pgsql/share/locale"
+#define DOCDIR "/usr/local/pgsql/share/doc/"
+#define HTMLDIR "/usr/local/pgsql/share/doc/"
+#define MANDIR "/usr/local/pgsql/share/man"
diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index 3887eae8f0a3..aae7fe7b524f 100644
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@@ -16,7 +16,7 @@ RUN arch=${TARGETARCH:-amd64} \
     esac
 
 
-FROM alpine
+FROM alpine:3.21
 
 ENV LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
@@ -35,11 +35,8 @@ RUN arch=${TARGETARCH:-amd64} \
         arm64) ln -sf /lib/ld-2.35.so /lib/ld-linux-aarch64.so.1 ;; \
     esac
 
-# lts / testing / prestable / etc
-ARG REPO_CHANNEL="stable"
-ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="25.7.4.11"
-ARG PACKAGES="clickhouse-keeper"
+# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile
+
 ARG DIRECT_DOWNLOAD_URLS=""
 
 # user/group precreated explicitly with fixed uid/gid on purpose.
@@ -63,12 +60,7 @@ RUN arch=${TARGETARCH:-amd64} \
             && wget -c -q "$url" \
         ; done \
     else \
-        for package in ${PACKAGES}; do \
-            cd /tmp \
-            && echo "Get ${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \
-            && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \
-            && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz.sha512" \
-        ; done \
+        exit 1; \
     fi \
     && cat *.tgz.sha512 | sha512sum -c \
     && for file in *.tgz; do \
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index f5aa9cff4792..39fde82efda5 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -32,11 +32,10 @@ RUN arch=${TARGETARCH:-amd64} \
         arm64) ln -sf /lib/ld-2.35.so /lib/ld-linux-aarch64.so.1 ;; \
     esac
 
-# lts / testing / prestable / etc
-ARG REPO_CHANNEL="stable"
-ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="25.7.4.11"
-ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
+
+
+# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile
+
 ARG DIRECT_DOWNLOAD_URLS=""
 
 # user/group precreated explicitly with fixed uid/gid on purpose.
@@ -59,11 +58,7 @@ RUN arch=${TARGETARCH:-amd64} \
             && wget -c -q "$url" \
         ; done \
     else \
-        for package in ${PACKAGES}; do \
-            echo "Get ${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \
-            && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz" \
-            && wget -c -q "${REPOSITORY}/${package}-${VERSION}-${arch}.tgz.sha512" \
-        ; done \
+        exit 1; \
     fi \
     && cat *.tgz.sha512 | sed 's:/output/:/tmp/:' | sha512sum -c \
     && for file in *.tgz; do \
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index dc9c786c115e..6c76b8dee446 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -15,6 +15,7 @@ ARG apt_archive="http://archive.ubuntu.com"
 # We do that in advance at the begining of Dockerfile before any packages will be
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
+# Update gpgv to resolve CVE-2025-68973
 RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list \
     && groupadd -r clickhouse --gid=101 \
     && useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
@@ -25,26 +26,16 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
         locales \
         tzdata \
         wget \
+        gpgv \
     && busybox --install -s \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
-ARG REPO_CHANNEL="stable"
-ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="25.7.4.11"
-ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
-
 #docker-official-library:off
 # The part between `docker-official-library` tags is related to our builds
 
-# set non-empty deb_location_url url to create a docker image
-# from debs created by CI build, for example:
-# docker build . --network host --build-arg version="21.4.1.6282" --build-arg deb_location_url="https://..." -t ...
-ARG deb_location_url=""
-ARG DIRECT_DOWNLOAD_URLS=""
+# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile
 
-# set non-empty single_binary_location_url to create docker image
-# from a single binary url (useful for non-standard builds - with sanitizers, for arm64).
-ARG single_binary_location_url=""
+ARG DIRECT_DOWNLOAD_URLS=""
 
 ARG TARGETARCH
 
@@ -60,64 +51,7 @@ RUN if [ -n "${DIRECT_DOWNLOAD_URLS}" ]; then \
         && rm -rf /tmp/* ; \
     fi
 
-# install from a web location with deb packages
-RUN arch="${TARGETARCH:-amd64}" \
-    && if [ -n "${deb_location_url}" ]; then \
-        echo "installing from custom url with deb packages: ${deb_location_url}" \
-        && rm -rf /tmp/clickhouse_debs \
-        && mkdir -p /tmp/clickhouse_debs \
-        && for package in ${PACKAGES}; do \
-            { wget --progress=bar:force:noscroll "${deb_location_url}/${package}_${VERSION}_${arch}.deb" -P /tmp/clickhouse_debs || \
-                wget --progress=bar:force:noscroll "${deb_location_url}/${package}_${VERSION}_all.deb" -P /tmp/clickhouse_debs ; } \
-            || exit 1 \
-        ; done \
-        && dpkg -i /tmp/clickhouse_debs/*.deb \
-        && rm -rf /tmp/* ; \
-    fi
-
-# install from a single binary
-RUN if [ -n "${single_binary_location_url}" ]; then \
-        echo "installing from single binary url: ${single_binary_location_url}" \
-        && rm -rf /tmp/clickhouse_binary \
-        && mkdir -p /tmp/clickhouse_binary \
-        && wget --progress=bar:force:noscroll "${single_binary_location_url}" -O /tmp/clickhouse_binary/clickhouse \
-        && chmod +x /tmp/clickhouse_binary/clickhouse \
-        && /tmp/clickhouse_binary/clickhouse install --user "clickhouse" --group "clickhouse" \
-        && rm -rf /tmp/* ; \
-    fi
-
-# The rest is the same in the official docker and in our build system
-#docker-official-library:on
-
-# A fallback to installation from ClickHouse repository
-# It works unless the clickhouse binary already exists
-RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \
-    ; apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        dirmngr \
-        gnupg2 \
-    && mkdir -p /etc/apt/sources.list.d \
-    && GNUPGHOME=$(mktemp -d) \
-    && GNUPGHOME="$GNUPGHOME" gpg --batch --no-default-keyring \
-        --keyring /usr/share/keyrings/clickhouse-keyring.gpg \
-        --keyserver hkp://keyserver.ubuntu.com:80 \
-        --recv-keys 3a9ea1193a97b548be1457d48919f6bd2b48d754 \
-    && rm -rf "$GNUPGHOME" \
-    && chmod +r /usr/share/keyrings/clickhouse-keyring.gpg \
-    && echo "${REPOSITORY}" > /etc/apt/sources.list.d/clickhouse.list \
-    && echo "installing from repository: ${REPOSITORY}" \
-    && apt-get update \
-    && for package in ${PACKAGES}; do \
-        packages="${packages} ${package}=${VERSION}" \
-    ; done \
-    && apt-get install --yes --no-install-recommends ${packages} || exit 1 \
-    && rm -rf \
-        /var/lib/apt/lists/* \
-        /var/cache/debconf \
-        /tmp/* \
-    && apt-get autoremove --purge -yq dirmngr gnupg2 \
-    && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
-# The last chmod is here to make the next one is No-op in docker official library Dockerfile
+# NOTE (strtgbb): Removed install methods other than direct URL install to tidy the Dockerfile
 
 # post install
 # we need to allow "others" access to clickhouse folder, because docker container
diff --git a/docker/server/README.md b/docker/server/README.md
index 61e86b8a9b53..68e81956a700 100644
--- a/docker/server/README.md
+++ b/docker/server/README.md
@@ -193,4 +193,4 @@ EOSQL
 
 ## License
 
-View [license information](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) for the software contained in this image.
+View [license information](https://github.com/Altinity/ClickHouse/blob/antalya/LICENSE) for the software contained in this image.
diff --git a/docker/server/README.src/github-repo b/docker/server/README.src/github-repo
index 70a009ec9588..721b5d7bc3f8 100644
--- a/docker/server/README.src/github-repo
+++ b/docker/server/README.src/github-repo
@@ -1 +1 @@
-https://github.com/ClickHouse/ClickHouse
+https://github.com/Altinity/ClickHouse/
diff --git a/docker/server/README.src/license.md b/docker/server/README.src/license.md
index 6be024edcdec..fac387a11c5b 100644
--- a/docker/server/README.src/license.md
+++ b/docker/server/README.src/license.md
@@ -1 +1 @@
-View [license information](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) for the software contained in this image.
+View [license information](https://github.com/Altinity/ClickHouse/blob/antalya/LICENSE) for the software contained in this image.
diff --git a/docker/server/README.src/logo.svg b/docker/server/README.src/logo.svg
index a50dd81a1645..886f4f0e4ddd 100644
--- a/docker/server/README.src/logo.svg
+++ b/docker/server/README.src/logo.svg
@@ -1,43 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 616 616">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg viewBox="0 0 150 150" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+<style xmlns="http://www.w3.org/2000/svg" type="text/css">
 
-      .cls-2 {
-        fill: none;
-      }
+polygon {
+    fill:#199DCF;
+    fill-opacity:1;
+}
 
-      .cls-2, .cls-3, .cls-4 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #1e1e1e;
-      }
-
-      .cls-4 {
-        fill: #faff69;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" x="83.23" y="71.73" width="472.55" height="472.55"/>
-    </clipPath>
-  </defs>
-  <g id="Layer_2" data-name="Layer 2">
-    <rect class="cls-4" width="616" height="616"/>
-  </g>
-  <g id="Layer_1" data-name="Layer 1">
-    <g class="cls-1">
-      <g>
-        <path class="cls-3" d="m120.14,113.3c0-2.57,2.09-4.66,4.66-4.66h34.98c2.57,0,4.66,2.09,4.66,4.66v389.38c0,2.57-2.09,4.66-4.66,4.66h-34.98c-2.57,0-4.66-2.09-4.66-4.66V113.3Z"/>
-        <path class="cls-3" d="m208.75,113.3c0-2.57,2.09-4.66,4.66-4.66h34.98c2.57,0,4.66,2.09,4.66,4.66v389.38c0,2.57-2.09,4.66-4.66,4.66h-34.98c-2.57,0-4.66-2.09-4.66-4.66V113.3Z"/>
-        <path class="cls-3" d="m297.35,113.3c0-2.57,2.09-4.66,4.66-4.66h34.98c2.57,0,4.66,2.09,4.66,4.66v389.38c0,2.57-2.09,4.66-4.66,4.66h-34.98c-2.57,0-4.66-2.09-4.66-4.66V113.3Z"/>
-        <path class="cls-3" d="m385.94,113.3c0-2.57,2.09-4.66,4.66-4.66h34.98c2.57,0,4.66,2.09,4.66,4.66v389.38c0,2.57-2.09,4.66-4.66,4.66h-34.98c-2.57,0-4.66-2.09-4.66-4.66V113.3Z"/>
-        <path class="cls-3" d="m474.56,268.36c0-2.57,2.09-4.66,4.66-4.66h34.98c2.57,0,4.65,2.09,4.65,4.66v79.28c0,2.57-2.09,4.66-4.65,4.66h-34.98c-2.57,0-4.66-2.09-4.66-4.66v-79.28Z"/>
-      </g>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
+</style>
+  <polygon points="18.72 72.33 101.38 24.24 75.41 9.24 75.41 9.29 18.61 42.09 18.72 42.16 18.72 72.33 18.72 72.33"/>
+  <polygon points="23.82 75.09 47.01 88.57 47.01 61.59 23.82 75.09 23.82 75.09"/>
+  <polygon points="72.77 109.26 18.72 78.06 18.72 140.46 72.77 109.26 72.77 109.26"/>
+  <polygon points="101.3 56.84 129.55 40.4 106.41 27.04 78.07 43.53 101.3 56.84 101.3 56.84"/>
+  <polygon points="103.67 63.96 103.67 123.77 132.09 140.18 132.09 80.49 103.67 63.96 103.67 63.96"/>
+  <polygon points="106.23 59.7 132.09 74.67 132.09 44.66 106.23 59.7 106.23 59.7"/>
+</svg>
diff --git a/docker/server/README.src/maintainer.md b/docker/server/README.src/maintainer.md
index 26c7db1a2934..90f15bb5337c 100644
--- a/docker/server/README.src/maintainer.md
+++ b/docker/server/README.src/maintainer.md
@@ -1 +1 @@
-[ClickHouse Inc.](%%GITHUB-REPO%%)
+[Altinity Inc.](%%GITHUB-REPO%%)
diff --git a/docker/test/upgrade/Dockerfile b/docker/test/upgrade/Dockerfile
new file mode 100644
index 000000000000..fa8eaa45d7a4
--- /dev/null
+++ b/docker/test/upgrade/Dockerfile
@@ -0,0 +1,29 @@
+# rebuild in #33610
+# docker build -t altinityinfra/upgrade-check .
+ARG FROM_TAG=latest
+FROM altinityinfra/stateless-test:$FROM_TAG
+
+RUN apt-get update -y \
+    && env DEBIAN_FRONTEND=noninteractive \
+        apt-get install --yes --no-install-recommends \
+            bash \
+            tzdata \
+            parallel \
+            expect \
+            python3 \
+            python3-lxml \
+            python3-termcolor \
+            python3-requests \
+            curl \
+            sudo \
+            openssl \
+            netcat-openbsd \
+            brotli \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
+
+COPY run.sh /
+
+ENV EXPORT_S3_STORAGE_POLICIES=1
+
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docs/en/antalya/swarm.md b/docs/en/antalya/swarm.md
new file mode 100644
index 000000000000..a26f9de26e0a
--- /dev/null
+++ b/docs/en/antalya/swarm.md
@@ -0,0 +1,73 @@
+# Antalya branch
+
+## Swarm
+
+### Difference with upstream version
+
+#### `storage_type` argument in object storage functions
+
+In upstream ClickHouse, there are several table functions to read Iceberg tables from different storage backends such as `icebergLocal`, `icebergS3`, `icebergAzure`, `icebergHDFS`, cluster variants, the `iceberg` function as a synonym for `icebergS3`, and table engines like `IcebergLocal`, `IcebergS3`, `IcebergAzure`, `IcebergHDFS`.
+
+In the Antalya branch, the `iceberg` table function and the `Iceberg` table engine unify all variants into one by using a new named argument, `storage_type`, which can be one of `local`, `s3`, `azure`, or `hdfs`.
+
+Old syntax examples:
+
+```sql
+SELECT * FROM icebergS3('http://minio1:9000/root/table_data', 'minio', 'minio123', 'Parquet');
+SELECT * FROM icebergAzureCluster('mycluster', 'http://azurite1:30000/devstoreaccount1', 'cont', '/table_data', 'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'Parquet');
+CREATE TABLE mytable ENGINE=IcebergHDFS('/table_data', 'Parquet');
+```
+
+New syntax examples:
+
+```sql
+SELECT * FROM iceberg(storage_type='s3', 'http://minio1:9000/root/table_data', 'minio', 'minio123', 'Parquet');
+SELECT * FROM icebergCluster('mycluster', storage_type='azure', 'http://azurite1:30000/devstoreaccount1', 'cont', '/table_data', 'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'Parquet');
+CREATE TABLE mytable ENGINE=Iceberg('/table_data', 'Parquet', storage_type='hdfs');
+```
+
+Also, if a named collection is used to store access parameters, the field `storage_type` can be included in the same named collection:
+
+```xml
+<named_collections>
+    <s3>
+        <url>http://minio1:9001/root/</url>
+        <access_key_id>minio</access_key_id>
+        <secret_access_key>minio123</secret_access_key>
+        <storage_type>s3</storage_type>
+    </s3>
+</named_collections>
+```
+
+```sql
+SELECT * FROM iceberg(s3, filename='table_data');
+```
+
+By default `storage_type` is `'s3'` to maintain backward compatibility.
+
+
+#### `object_storage_cluster` setting
+
+The new setting `object_storage_cluster` controls whether a single-node or cluster variant of table functions reading from object storage (e.g., `s3`, `azure`, `iceberg`, and their cluster variants like `s3Cluster`, `azureCluster`, `icebergCluster`) is used.
+
+Old syntax examples:
+
+```sql
+SELECT * from s3Cluster('myCluster', 'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))');
+SELECT * FROM icebergAzureCluster('mycluster', 'http://azurite1:30000/devstoreaccount1', 'cont', '/table_data', 'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'Parquet');
+```
+
+New syntax examples:
+
+```sql
+SELECT * from s3('http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+        SETTINGS object_storage_cluster='myCluster';
+SELECT * FROM icebergAzure('http://azurite1:30000/devstoreaccount1', 'cont', '/table_data', 'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'Parquet')
+        SETTINGS object_storage_cluster='myCluster';
+```
+
+This setting also applies to table engines and can be used with tables managed by Iceberg Catalog.
+
+Note: The upstream ClickHouse has introduced analogous settings, such as `parallel_replicas_for_cluster_engines` and `cluster_for_parallel_replicas`. Since version 25.10, these settings work with table engines. It is possible that in the future, the `object_storage_cluster` setting will be deprecated.
diff --git a/docs/en/engines/table-engines/integrations/iceberg.md b/docs/en/engines/table-engines/integrations/iceberg.md
index e667dca4ebd4..60c959ce7761 100644
--- a/docs/en/engines/table-engines/integrations/iceberg.md
+++ b/docs/en/engines/table-engines/integrations/iceberg.md
@@ -296,6 +296,62 @@ CREATE TABLE example_table ENGINE = Iceberg(
 
 `Iceberg` table engine and table function support metadata cache storing the information of manifest files, manifest list and metadata json. The cache is stored in memory. This feature is controlled by setting `use_iceberg_metadata_files_cache`, which is enabled by default.
 
+## Altinity Antalya branch
+
+### Specify storage type in arguments
+
+Only in the Altinity Antalya branch does `Iceberg` table engine support all storage types. The storage type can be specified using the named argument `storage_type`. Supported values are `s3`, `azure`, `hdfs`, and `local`.
+
+```sql
+CREATE TABLE iceberg_table_s3
+    ENGINE = Iceberg(storage_type='s3', url,  [, NOSIGN | access_key_id, secret_access_key, [session_token]], format, [,compression])
+
+CREATE TABLE iceberg_table_azure
+    ENGINE = Iceberg(storage_type='azure', connection_string|storage_account_url, container_name, blobpath, [account_name, account_key, format, compression])
+
+CREATE TABLE iceberg_table_hdfs
+    ENGINE = Iceberg(storage_type='hdfs', path_to_table, [,format] [,compression_method])
+
+CREATE TABLE iceberg_table_local
+    ENGINE = Iceberg(storage_type='local', path_to_table, [,format] [,compression_method])
+```
+
+### Specify storage type in named collection
+
+Only in Altinity Antalya branch `storage_type` can be included as part of a named collection. This allows for centralized configuration of storage settings.
+
+```xml
+<clickhouse>
+    <named_collections>
+        <iceberg_conf>
+            <url>http://test.s3.amazonaws.com/clickhouse-bucket/</url>
+            <access_key_id>test<access_key_id>
+            <secret_access_key>test</secret_access_key>
+            <format>auto</format>
+            <structure>auto</structure>
+            <storage_type>s3</storage_type>
+        </iceberg_conf>
+    </named_collections>
+</clickhouse>
+```
+
+```sql
+CREATE TABLE iceberg_table ENGINE=Iceberg(iceberg_conf, filename = 'test_table')
+```
+
+The default value for `storage_type` is `s3`.
+
+### The `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch is an alternative syntax for the `Iceberg` table engine available. This syntax allows execution on a cluster when the `object_storage_cluster` setting is non-empty and contains the cluster name.
+
+```sql
+CREATE TABLE iceberg_table_s3
+    ENGINE = Iceberg(storage_type='s3', url,  [, NOSIGN | access_key_id, secret_access_key, [session_token]], format, [,compression]);
+
+SELECT * FROM iceberg_table_s3 SETTINGS object_storage_cluster='cluster_simple';
+```
+
 ## See also {#see-also}
 
 - [iceberg table function](/sql-reference/table-functions/iceberg.md)
diff --git a/docs/en/engines/table-engines/integrations/s3queue.md b/docs/en/engines/table-engines/integrations/s3queue.md
index 0ae9913469d2..45191f5ec0fd 100644
--- a/docs/en/engines/table-engines/integrations/s3queue.md
+++ b/docs/en/engines/table-engines/integrations/s3queue.md
@@ -216,6 +216,16 @@ Default value: `30000`.
 
 For 'Ordered' mode. Available since `24.6`. If there are several replicas of S3Queue table, each working with the same metadata directory in keeper, the value of `s3queue_buckets` needs to be equal to at least the number of replicas. If `s3queue_processing_threads` setting is used as well, it makes sense to increase the value of `s3queue_buckets` setting even further, as it defines the actual parallelism of `S3Queue` processing.
 
+### `use_persistent_processing_nodes` {#use_persistent_processing_nodes}
+
+By default S3Queue table has always used ephemeral processing nodes, which could lead to duplicates in data in case zookeeper session expires before S3Queue commits processed files in zookeeper, but after it has started processing. This setting forces the server to eliminate possibility of duplicates in case of expired keeper session. 
+
+### `persistent_processing_nodes_ttl_seconds` {#persistent_processing_nodes_ttl_seconds}
+
+In case of non-graceful server termination, it is possible that if `use_persistent_processing_nodes` is enabled, we can have not removed processing nodes. This setting defines a period of time when these processing nodes can safely be cleaned up.
+
+Default value: `3600` (1 hour).
+
 ## S3-related settings {#s3-settings}
 
 Engine supports all s3 related settings. For more information about S3 settings see [here](../../../engines/table-engines/integrations/s3.md).
@@ -305,7 +315,7 @@ Constructions with `{}` are similar to the [remote](../../../sql-reference/table
 
 - an exception happens during parsing in the middle of file processing and retries are enabled via `s3queue_loading_retries`;
 
-- `S3Queue` is configured on multiple servers pointing to the same path in zookeeper and keeper session expires before one server managed to commit processed file, which could lead to another server taking processing of the file, which could be partially or fully processed by the first server;
+- `S3Queue` is configured on multiple servers pointing to the same path in zookeeper and keeper session expires before one server managed to commit processed file, which could lead to another server taking processing of the file, which could be partially or fully processed by the first server; However, this is not true since version 25.8 if `use_persistent_processing_nodes = 1`.
 
 - abnormal server termination.
 
diff --git a/docs/en/engines/table-engines/mergetree-family/part_export.md b/docs/en/engines/table-engines/mergetree-family/part_export.md
new file mode 100644
index 000000000000..287e0a17f3af
--- /dev/null
+++ b/docs/en/engines/table-engines/mergetree-family/part_export.md
@@ -0,0 +1,307 @@
+# ALTER TABLE EXPORT PART
+
+## Overview
+
+The `ALTER TABLE EXPORT PART` command exports individual MergeTree data parts to object storage (S3, Azure Blob Storage, etc.), typically in Parquet format. A commit file is shipped to the same destination directory containing all data files exported within that transaction.
+
+**Key Characteristics:**
+- **Experimental feature** - must be enabled via `allow_experimental_export_merge_tree_part` setting
+- **Asynchronous** - executes in the background, returns immediately
+- **Ephemeral** - no automatic retry mechanism; manual retry required on failure
+- **Idempotent** - safe to re-export the same part (skips by default if file exists)
+- **Preserves sort order** from the source table
+
+## Syntax
+
+```sql
+ALTER TABLE [database.]table_name 
+EXPORT PART 'part_name' 
+TO TABLE [destination_database.]destination_table 
+SETTINGS allow_experimental_export_merge_tree_part = 1 
+         [, setting_name = value, ...]
+```
+
+## Syntax with table function
+
+```sql
+ALTER TABLE [database.]table_name
+EXPORT PART 'part_name'
+TO TABLE FUNCTION s3(s3_conn, filename='table_function', partition_strategy...)
+SETTINGS allow_experimental_export_merge_tree_part = 1
+         [, setting_name = value, ...]
+```
+
+### Parameters
+
+- **`table_name`**: The source MergeTree table containing the part to export
+- **`part_name`**: The exact name of the data part to export (e.g., `'2020_1_1_0'`, `'all_1_1_0'`)
+- **`destination_table`**: The target table for the export (typically an S3, Azure, or other object storage table)
+
+## Requirements
+
+Source and destination tables must be 100% compatible:
+
+1. **Identical schemas** - same columns, types, and order
+2. **Matching partition keys** - partition expressions must be identical
+
+In case a table function is used as the destination, the schema can be omitted and it will be inferred from the source table.
+
+## Settings
+
+### `allow_experimental_export_merge_tree_part` (Required)
+
+- **Type**: `Bool`
+- **Default**: `false`
+- **Description**: Must be set to `true` to enable the experimental feature.
+
+### `export_merge_tree_part_overwrite_file_if_exists` (Optional)
+
+- **Type**: `Bool`
+- **Default**: `false`
+- **Description**: If set to `true`, it will overwrite the file. Otherwise, fails with exception.
+
+### `export_merge_tree_part_max_bytes_per_file` (Optional)
+
+- **Type**: `UInt64`
+- **Default**: `0`
+- **Description**: Maximum number of bytes to write to a single file when exporting a merge tree part. 0 means no limit. This is not a hard limit, and it highly depends on the output format granularity and input source chunk size. Using this might break idempotency, use it with care.
+
+### `export_merge_tree_part_max_rows_per_file` (Optional)
+
+- **Type**: `UInt64`
+- **Default**: `0`
+- **Description**: Maximum number of rows to write to a single file when exporting a merge tree part. 0 means no limit. This is not a hard limit, and it highly depends on the output format granularity and input source chunk size. Using this might break idempotency, use it with care.
+
+### export_merge_tree_part_throw_on_pending_mutations
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Description**: If set to true, throws if pending mutations exists for a given part. Note that by default mutations are applied to all parts, which means that if a mutation in practice would only affetct part/partition x, all the other parts/partition will throw upon export. The exception is when the `IN PARTITION` clause was used in the mutation command. Note the `IN PARTITION` clause is not properly implemented for plain MergeTree tables.
+
+### export_merge_tree_part_throw_on_pending_patch_parts
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Description**: If set to true, throws if pending patch parts exists for a given part. Note that by default mutations are applied to all parts, which means that if a mutation in practice would only affetct part/partition x, all the other parts/partition will throw upon export. The exception is when the `IN PARTITION` clause was used in the mutation command. Note the `IN PARTITION` clause is not properly implemented for plain MergeTree tables.
+
+## Examples
+
+### Basic Export to S3
+
+```sql
+-- Create source and destination tables
+CREATE TABLE mt_table (id UInt64, year UInt16) 
+ENGINE = MergeTree() PARTITION BY year ORDER BY tuple();
+
+CREATE TABLE s3_table (id UInt64, year UInt16) 
+ENGINE = S3(s3_conn, filename='data', format=Parquet, partition_strategy='hive') 
+PARTITION BY year;
+
+-- Insert and export
+INSERT INTO mt_table VALUES (1, 2020), (2, 2020), (3, 2021);
+
+ALTER TABLE mt_table EXPORT PART '2020_1_1_0' TO TABLE s3_table 
+SETTINGS allow_experimental_export_merge_tree_part = 1;
+
+ALTER TABLE mt_table EXPORT PART '2021_2_2_0' TO TABLE s3_table 
+SETTINGS allow_experimental_export_merge_tree_part = 1;
+```
+
+### Table function export
+
+```sql
+-- Create source and destination tables
+CREATE TABLE mt_table (id UInt64, year UInt16)
+ENGINE = MergeTree() PARTITION BY year ORDER BY tuple();
+
+-- Insert and export
+INSERT INTO mt_table VALUES (1, 2020), (2, 2020), (3, 2021);
+
+ALTER TABLE mt_table EXPORT PART '2020_1_1_0' TO TABLE FUNCTION s3(s3_conn, filename='table_function', format=Parquet, partition_strategy='hive') PARTITION BY year
+SETTINGS allow_experimental_export_merge_tree_part = 1;
+```
+
+## Monitoring
+
+### Active Exports
+
+Active exports can be found in the `system.exports` table. As of now, it only shows currently executing exports. It will not show pending or finished exports.
+
+```sql
+arthur :) select * from system.exports;
+
+SELECT *
+FROM system.exports
+
+Query id: 2026718c-d249-4208-891b-a271f1f93407
+
+Row 1:
+──────
+source_database:               default
+source_table:                  source_mt_table
+destination_database:          default
+destination_table:             destination_table
+create_time:                   2025-11-19 09:09:11
+part_name:                     20251016-365_1_1_0
+destination_file_paths:        ['table_root/eventDate=2025-10-16/retention=365/20251016-365_1_1_0_17B2F6CD5D3C18E787C07AE3DAF16EB1.1.parquet']
+elapsed:                       2.04845441
+rows_read:                     1138688 -- 1.14 million
+total_rows_to_read:            550961374 -- 550.96 million
+total_size_bytes_compressed:   37619147120 -- 37.62 billion
+total_size_bytes_uncompressed: 138166213721 -- 138.17 billion
+bytes_read_uncompressed:       316892925 -- 316.89 million
+memory_usage:                  596006095 -- 596.01 million
+peak_memory_usage:             601239033 -- 601.24 million
+```
+
+### Export History
+
+You can query succeeded or failed exports in `system.part_log`. For now, it only keeps track of completion events (either success or fails).
+
+```sql
+arthur :) select * from system.part_log where event_type='ExportPart' and table = 'replicated_source' order by event_time desc limit 1;
+
+SELECT *
+FROM system.part_log
+WHERE (event_type = 'ExportPart') AND (`table` = 'replicated_source')
+ORDER BY event_time DESC
+LIMIT 1
+
+Query id: ae1c1cd3-c20e-4f20-8b82-ed1f6af0237f
+
+Row 1:
+──────
+hostname:                arthur
+query_id:                
+event_type:              ExportPart
+merge_reason:            NotAMerge
+merge_algorithm:         Undecided
+event_date:              2025-11-19
+event_time:              2025-11-19 09:08:31
+event_time_microseconds: 2025-11-19 09:08:31.974701
+duration_ms:             4
+database:                default
+table:                   replicated_source
+table_uuid:              78471c67-24f4-4398-9df5-ad0a6c3daf41
+part_name:               2021_0_0_0
+partition_id:            2021
+partition:               2021
+part_type:               Compact
+disk_name:               default
+path_on_disk:            
+remote_file_paths        ['year=2021/2021_0_0_0_78C704B133D41CB0EF64DD2A9ED3B6BA.1.parquet']
+rows:                    1
+size_in_bytes:           272
+merged_from:             ['2021_0_0_0']
+bytes_uncompressed:      86
+read_rows:               1
+read_bytes:              6
+peak_memory_usage:       22
+error:                   0
+exception:               
+ProfileEvents:           {}
+```
+
+### Profile Events
+
+- `PartsExports` - Successful exports
+- `PartsExportFailures` - Failed exports
+- `PartsExportDuplicated` - Number of part exports that failed because target already exists.
+- `PartsExportTotalMilliseconds` - Total time
+
+### Split large files
+
+```sql
+alter table big_table export part '2025_0_32_3' to table replicated_big_destination SETTINGS export_merge_tree_part_max_bytes_per_file=10000000, output_format_parquet_row_group_size_bytes=5000000;
+
+arthur :) select * from system.exports;
+
+SELECT *
+FROM system.exports
+
+Query id: d78d9ce5-cfbc-4957-b7dd-bc8129811634
+
+Row 1:
+──────
+source_database:               default
+source_table:                  big_table
+destination_database:          default
+destination_table:             replicated_big_destination
+create_time:                   2025-12-15 13:12:48
+part_name:                     2025_0_32_3
+destination_file_paths:        ['replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.1.parquet','replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.2.parquet','replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.3.parquet','replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.4.parquet']
+elapsed:                       14.360427274
+rows_read:                     10256384 -- 10.26 million
+total_rows_to_read:            10485760 -- 10.49 million
+total_size_bytes_compressed:   83779395 -- 83.78 million
+total_size_bytes_uncompressed: 10611691600 -- 10.61 billion
+bytes_read_uncompressed:       10440998912 -- 10.44 billion
+memory_usage:                  89795477 -- 89.80 million
+peak_memory_usage:             107362133 -- 107.36 million
+
+1 row in set. Elapsed: 0.014 sec. 
+
+arthur :) select * from system.part_log where event_type = 'ExportPart' order by event_time desc limit 1 format Vertical;
+
+SELECT *
+FROM system.part_log
+WHERE event_type = 'ExportPart'
+ORDER BY event_time DESC
+LIMIT 1
+FORMAT Vertical
+
+Query id: 95128b01-b751-4726-8e3e-320728ac6af7
+
+Row 1:
+──────
+hostname:                arthur
+query_id:                
+event_type:              ExportPart
+merge_reason:            NotAMerge
+merge_algorithm:         Undecided
+event_date:              2025-12-15
+event_time:              2025-12-15 13:13:03
+event_time_microseconds: 2025-12-15 13:13:03.197492
+duration_ms:             14673
+database:                default
+table:                   big_table
+table_uuid:              a3eeeea0-295c-41a3-84ef-6b5463dbbe8c
+part_name:               2025_0_32_3
+partition_id:            2025
+partition:               2025
+part_type:               Wide
+disk_name:               default
+path_on_disk:            ./store/a3e/a3eeeea0-295c-41a3-84ef-6b5463dbbe8c/2025_0_32_3/
+remote_file_paths:       ['replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.1.parquet','replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.2.parquet','replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.3.parquet','replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.4.parquet']
+rows:                    10485760 -- 10.49 million
+size_in_bytes:           83779395 -- 83.78 million
+merged_from:             ['2025_0_32_3']
+bytes_uncompressed:      10611691600 -- 10.61 billion
+read_rows:               10485760 -- 10.49 million
+read_bytes:              10674503680 -- 10.67 billion
+peak_memory_usage:       107362133 -- 107.36 million
+error:                   0
+exception:               
+ProfileEvents:           {}
+
+1 row in set. Elapsed: 0.044 sec.
+
+arthur :) select _path, formatReadableSize(_size) as _size from s3(s3_conn, filename='**', format=One);
+
+SELECT
+    _path,
+    formatReadableSize(_size) AS _size
+FROM s3(s3_conn, filename = '**', format = One)
+
+Query id: c48ae709-f590-4d1b-8158-191f8d628966
+
+   ┌─_path────────────────────────────────────────────────────────────────────────────────┬─_size─────┐
+1. │ test/replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.1.parquet │ 17.36 MiB │
+2. │ test/replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.2.parquet │ 17.32 MiB │
+3. │ test/replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.4.parquet │ 5.04 MiB  │
+4. │ test/replicated_big/year=2025/2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7.3.parquet │ 17.40 MiB │
+5. │ test/replicated_big/year=2025/commit_2025_0_32_3_E439C23833C39C6E5104F6F4D1048BE7    │ 320.00 B  │
+   └──────────────────────────────────────────────────────────────────────────────────────┴───────────┘
+
+5 rows in set. Elapsed: 0.072 sec. 
+```
diff --git a/docs/en/engines/table-engines/mergetree-family/partition_export.md b/docs/en/engines/table-engines/mergetree-family/partition_export.md
new file mode 100644
index 000000000000..d91f226dbbf6
--- /dev/null
+++ b/docs/en/engines/table-engines/mergetree-family/partition_export.md
@@ -0,0 +1,182 @@
+# ALTER TABLE EXPORT PARTITION
+
+## Overview
+
+The `ALTER TABLE EXPORT PARTITION` command exports entire partitions from Replicated*MergeTree tables to object storage (S3, Azure Blob Storage, etc.), typically in Parquet format. This feature coordinates export part operations across all replicas using ZooKeeper.
+
+Each MergeTree part will become a separate file with the following name convention: `<table_directory>/<partitioning>/<data_part_name>_<merge_tree_part_checksum>.<format>`. To ensure atomicity, a commit file containing the relative paths of all exported parts is also shipped. A data file should only be considered part of the dataset if a commit file references it. The commit file will be named using the following convention: `<table_directory>/commit_<partition_id>_<transaction_id>`.
+
+The set of parts that are exported is based on the list of parts the replica that received the export command sees. The other replicas will assist in the export process if they have those parts locally. Otherwise they will ignore it.
+
+The partition export tasks can be observed through `system.replicated_partition_exports`. Querying this table results in a query to ZooKeeper, so it must be used with care. Individual part export progress can be observed as usual through `system.exports`.
+
+The same partition can not be exported to the same destination more than once. There are two ways to override this behavior: either by setting the `export_merge_tree_partition_force_export` setting or waiting for the task to expire.
+
+The export task can be killed by issuing the kill command: `KILL EXPORT PARTITION <where predicate for system.replicated_partition_exports>`.
+
+The task is persistent - it should be resumed after crashes, failures and etc.
+
+## Syntax
+
+```sql
+ALTER TABLE [database.]table_name 
+EXPORT PARTITION ID 'partition_id' 
+TO TABLE [destination_database.]destination_table 
+[SETTINGS setting_name = value, ...]
+```
+
+### Parameters
+
+- **`table_name`**: The source Replicated*MergeTree table containing the partition to export
+- **`partition_id`**: The partition identifier to export (e.g., `'2020'`, `'2021'`)
+- **`destination_table`**: The target table for the export (typically an S3, Azure, or other object storage table)
+
+## Settings
+
+### Server Settings
+
+#### `enable_experimental_export_merge_tree_partition_feature` (Required)
+
+- **Type**: `Bool`
+- **Default**: `false`
+- **Description**: Enable export replicated merge tree partition feature. It is experimental and not yet ready for production use.
+
+### Query Settings
+
+#### `export_merge_tree_partition_force_export` (Optional)
+
+- **Type**: `Bool`
+- **Default**: `false`
+- **Description**: Ignore existing partition export and overwrite the ZooKeeper entry. Allows re-exporting a partition to the same destination before the manifest expires.
+
+#### `export_merge_tree_partition_max_retries` (Optional)
+
+- **Type**: `UInt64`
+- **Default**: `3`
+- **Description**: Maximum number of retries for exporting a merge tree part in an export partition task. If it exceeds, the entire task fails.
+
+#### `export_merge_tree_partition_manifest_ttl` (Optional)
+
+- **Type**: `UInt64`
+- **Default**: `180` (seconds)
+- **Description**: Determines how long the manifest will live in ZooKeeper. It prevents the same partition from being exported twice to the same destination. This setting does not affect or delete in-progress tasks; it only cleans up completed ones.
+
+#### `export_merge_tree_part_file_already_exists_policy` (Optional)
+
+- **Type**: `MergeTreePartExportFileAlreadyExistsPolicy`
+- **Default**: `skip`
+- **Description**: Policy for handling files that already exist during export. Possible values:
+  - `skip` - Skip the file if it already exists
+  - `error` - Throw an error if the file already exists
+  - `overwrite` - Overwrite the file
+
+### export_merge_tree_part_throw_on_pending_mutations
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Description**: If set to true, throws if pending mutations exists for a given part. Note that by default mutations are applied to all parts, which means that if a mutation in practice would only affetct part/partition x, all the other parts/partition will throw upon export. The exception is when the `IN PARTITION` clause was used in the mutation command. Note the `IN PARTITION` clause is not properly implemented for plain MergeTree tables.
+
+### export_merge_tree_part_throw_on_pending_patch_parts
+
+- **Type**: `bool`
+- **Default**: `true`
+- **Description**: If set to true, throws if pending patch parts exists for a given part. Note that by default mutations are applied to all parts, which means that if a mutation in practice would only affetct part/partition x, all the other parts/partition will throw upon export. The exception is when the `IN PARTITION` clause was used in the mutation command. Note the `IN PARTITION` clause is not properly implemented for plain MergeTree tables.
+
+## Examples
+
+### Basic Export to S3
+
+```sql
+CREATE TABLE rmt_table (id UInt64, year UInt16) 
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/rmt_table', 'replica1') 
+PARTITION BY year ORDER BY tuple();
+
+CREATE TABLE s3_table (id UInt64, year UInt16) 
+ENGINE = S3(s3_conn, filename='data', format=Parquet, partition_strategy='hive') 
+PARTITION BY year;
+
+INSERT INTO rmt_table VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021);
+
+ALTER TABLE rmt_table EXPORT PARTITION ID '2020' TO TABLE s3_table;
+
+## Killing Exports
+
+You can cancel in-progress partition exports using the `KILL EXPORT PARTITION` command:
+
+```sql
+KILL EXPORT PARTITION 
+WHERE partition_id = '2020' 
+  AND source_table = 'rmt_table' 
+  AND destination_table = 's3_table'
+```
+
+The `WHERE` clause filters exports from the `system.replicated_partition_exports` table. You can use any columns from that table in the filter.
+
+## Monitoring
+
+### Active and Completed Exports
+
+Monitor partition exports using the `system.replicated_partition_exports` table:
+
+```sql
+arthur :) select * from system.replicated_partition_exports Format Vertical;
+
+SELECT *
+FROM system.replicated_partition_exports
+FORMAT Vertical
+
+Query id: 9efc271a-a501-44d1-834f-bc4d20156164
+
+Row 1:
+──────
+source_database:      default
+source_table:         replicated_source
+destination_database: default
+destination_table:    replicated_destination
+create_time:          2025-11-21 18:21:51
+partition_id:         2022
+transaction_id:       7397746091717128192
+source_replica:       r1
+parts:                ['2022_0_0_0','2022_1_1_0','2022_2_2_0']
+parts_count:          3
+parts_to_do:          0
+status:               COMPLETED
+exception_replica:    
+last_exception:       
+exception_part:       
+exception_count:      0
+
+Row 2:
+──────
+source_database:      default
+source_table:         replicated_source
+destination_database: default
+destination_table:    replicated_destination
+create_time:          2025-11-21 18:20:35
+partition_id:         2021
+transaction_id:       7397745772618674176
+source_replica:       r1
+parts:                ['2021_0_0_0']
+parts_count:          1
+parts_to_do:          0
+status:               COMPLETED
+exception_replica:    
+last_exception:       
+exception_part:       
+exception_count:      0
+
+2 rows in set. Elapsed: 0.019 sec. 
+
+arthur :) 
+```
+
+Status values include:
+- `PENDING` - Export is queued / in progress
+- `COMPLETED` - Export finished successfully
+- `FAILED` - Export failed
+- `KILLED` - Export was cancelled
+
+## Related Features
+
+- [ALTER TABLE EXPORT PART](/docs/en/engines/table-engines/mergetree-family/part_export.md) - Export individual parts (non-replicated)
+
diff --git a/docs/en/engines/table-engines/special/hybrid.md b/docs/en/engines/table-engines/special/hybrid.md
new file mode 100644
index 000000000000..12df6cd859b8
--- /dev/null
+++ b/docs/en/engines/table-engines/special/hybrid.md
@@ -0,0 +1,120 @@
+---
+description: 'Hybrid unions multiple data sources behind per-segment predicates so queries behave like a single table while data is migrated or tiered.'
+slug: /engines/table-engines/special/hybrid
+title: 'Hybrid Table Engine'
+sidebar_label: 'Hybrid'
+sidebar_position: 11
+---
+
+# Hybrid table engine
+
+`Hybrid` builds on top of the [Distributed](./distributed.md) table engine. It lets you expose several data sources as one logical table and assign every source its own predicate.
+The engine rewrites incoming queries so that each segment receives the original query plus its predicate. This keeps all of the Distributed optimisations (remote aggregation, `skip_unused_shards`,
+global JOIN pushdown, and so on) while you duplicate or migrate data across clusters, storage types, or formats.
+
+It keeps the same execution pipeline as `engine=Distributed` but can read from multiple underlying sources simultaneously—similar to `engine=Merge`—while still pushing logic down to each source.
+
+Typical use cases include:
+
+- Zero-downtime migrations where "old" and "new" replicas temporarily overlap.
+- Tiered storage, for example fresh data on a local cluster and historical data in S3.
+- Gradual roll-outs where only a subset of rows should be served from a new backend.
+
+By giving mutually exclusive predicates to the segments (for example, `date < watermark` and `date >= watermark`), you ensure that each row is read from exactly one source.
+
+## Enable the engine
+
+The Hybrid engine is experimental. Enable it per session (or in the user profile) before creating tables:
+
+```sql
+SET allow_experimental_hybrid_table = 1;
+```
+
+### Automatic Type Alignment
+
+Hybrid segments can evolve independently, so the same logical column may use different physical types. With the experimental `hybrid_table_auto_cast_columns = 1` **(enabled by default and requires `allow_experimental_analyzer = 1`)**, the engine inserts the necessary `CAST` operations into each rewritten query so every shard receives the schema defined by the Hybrid table. You can opt out by setting the flag to `0` if it causes issues.
+
+Segment schemas are cached when you create or attach a Hybrid table. If you alter a segment later (for example change a column type), refresh the Hybrid table (detach/attach or recreate it) so the cached headers stay in sync with the new schema; otherwise the auto-cast feature may miss the change and queries can still fail with header/type errors.
+
+## Engine definition
+
+```sql
+CREATE TABLE [IF NOT EXISTS] [db.]table_name
+(
+    column1 type1,
+    column2 type2,
+    ...
+)
+ENGINE = Hybrid(table_function_1, predicate_1 [, table_function_2, predicate_2 ...])
+```
+
+You must pass at least two arguments – the first table function and its predicate. Additional sources are appended as `table_function, predicate` pairs. The first table function is also used for `INSERT` statements.
+
+### Arguments and behaviour
+
+- `table_function_n` must be a valid table function (for example `remote`, `remoteSecure`, `cluster`, `clusterAllReplicas`, `s3Cluster`) or a fully qualified table name (`database.table`). The first argument must be a table function—such as `remote` or `cluster`—because it instantiates the underlying `Distributed` storage.
+- `predicate_n` must be an expression that can be evaluated on the table columns. The engine adds it to the segment's query with an additional `AND`, so expressions like `event_date >= '2025-09-01'` or `id BETWEEN 10 AND 15` are typical.
+- The query planner picks the same processing stage for every segment as it does for the base `Distributed` plan, so remote aggregation, ORDER BY pushdown, `skip_unused_shards`, and the legacy/analyzer execution modes behave the same way.
+- `INSERT` statements are forwarded to the first table function only. If you need multi-destination writes, use explicit `INSERT` statements into the respective sources.
+- Align schemas across the segments. ClickHouse builds a common header and rejects creation if any segment misses a column defined in the Hybrid schema. If the physical types differ you may need to add casts on one side or in the query, just as you would when reading from heterogeneous replicas.
+
+## Example: local cluster plus S3 historical tier
+
+The following commands illustrate a two-segment layout. Hot data stays on a local ClickHouse cluster, while historical rows come from public S3 Parquet files.
+
+```sql
+-- Local MergeTree table that keeps current data
+CREATE OR REPLACE TABLE btc_blocks_local
+(
+    `hash` FixedString(64),
+    `version` Int64,
+    `mediantime` DateTime64(9),
+    `nonce` Int64,
+    `bits` FixedString(8),
+    `difficulty` Float64,
+    `chainwork` FixedString(64),
+    `size` Int64,
+    `weight` Int64,
+    `coinbase_param` String,
+    `number` Int64,
+    `transaction_count` Int64,
+    `merkle_root` FixedString(64),
+    `stripped_size` Int64,
+    `timestamp` DateTime64(9),
+    `date` Date
+)
+ENGINE = MergeTree
+ORDER BY (timestamp)
+PARTITION BY toYYYYMM(date);
+
+-- Hybrid table that unions the local shard with historical data in S3
+CREATE OR REPLACE TABLE btc_blocks ENGINE = Hybrid(
+    remote('localhost:9000', currentDatabase(), 'btc_blocks_local'), date >= '2025-09-01',
+    s3('s3://aws-public-blockchain/v1.0/btc/blocks/**.parquet', NOSIGN), date < '2025-09-01'
+) AS btc_blocks_local;
+
+-- Writes target the first (remote) segment
+INSERT INTO btc_blocks
+SELECT *
+FROM s3('s3://aws-public-blockchain/v1.0/btc/blocks/**.parquet', NOSIGN)
+WHERE date BETWEEN '2025-09-01' AND '2025-09-30';
+
+-- Reads seamlessly combine both predicates
+SELECT * FROM btc_blocks WHERE date = '2025-08-01'; -- data from s3
+SELECT * FROM btc_blocks WHERE date = '2025-09-05'; -- data from MergeTree (TODO: still analyzes s3)
+SELECT * FROM btc_blocks WHERE date IN ('2025-08-31','2025-09-01') -- data from both sources, single copy always
+
+
+-- Run analytic queries as usual
+SELECT
+    date,
+    count(),
+    uniqExact(CAST(hash, 'Nullable(String)')) AS hashes,
+    sum(CAST(number, 'Nullable(Int64)')) AS blocks_seen
+FROM btc_blocks
+WHERE date BETWEEN '2025-08-01' AND '2025-09-30'
+GROUP BY date
+ORDER BY date;
+```
+
+Because the predicates are applied inside every segment, queries such as `ORDER BY`, `GROUP BY`, `LIMIT`, `JOIN`, and `EXPLAIN` behave as if you were reading from a single `Distributed` table. When sources expose different physical types (for example `FixedString(64)` versus `String` in Parquet), add explicit casts during ingestion or in the query, as shown above.
diff --git a/docs/en/interfaces/formats/JSON/JSONAsObject.md b/docs/en/interfaces/formats/JSON/JSONAsObject.md
index 752e73330752..424d0ca3bcdf 100644
--- a/docs/en/interfaces/formats/JSON/JSONAsObject.md
+++ b/docs/en/interfaces/formats/JSON/JSONAsObject.md
@@ -19,7 +19,6 @@ This format can only be parsed for a table with a single field of type [JSON](/s
 ### Basic example {#basic-example}
 
 ```sql title="Query"
-SET enable_json_type = 1;
 CREATE TABLE json_as_object (json JSON) ENGINE = Memory;
 INSERT INTO json_as_object (json) FORMAT JSONAsObject {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
 SELECT * FROM json_as_object FORMAT JSONEachRow;
@@ -34,7 +33,6 @@ SELECT * FROM json_as_object FORMAT JSONEachRow;
 ### An array of JSON objects {#an-array-of-json-objects}
 
 ```sql title="Query"
-SET enable_json_type = 1;
 CREATE TABLE json_square_brackets (field JSON) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONAsObject [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
 SELECT * FROM json_square_brackets FORMAT JSONEachRow;
@@ -48,7 +46,6 @@ SELECT * FROM json_square_brackets FORMAT JSONEachRow;
 ### Columns with default values {#columns-with-default-values}
 
 ```sql title="Query"
-SET enable_json_type = 1;
 CREATE TABLE json_as_object (json JSON, time DateTime MATERIALIZED now()) ENGINE = Memory;
 INSERT INTO json_as_object (json) FORMAT JSONAsObject {"foo":{"bar":{"x":"y"},"baz":1}};
 INSERT INTO json_as_object (json) FORMAT JSONAsObject {};
diff --git a/docs/en/operations/external-authenticators/index.md b/docs/en/operations/external-authenticators/index.md
index 5a28003ad6c5..1391b7d14ce9 100644
--- a/docs/en/operations/external-authenticators/index.md
+++ b/docs/en/operations/external-authenticators/index.md
@@ -18,4 +18,5 @@ The following external authenticators and directories are supported:
 - [LDAP](/operations/external-authenticators/ldap#ldap-external-authenticator) [Authenticator](./ldap.md#ldap-external-authenticator) and [Directory](./ldap.md#ldap-external-user-directory)
 - Kerberos [Authenticator](/operations/external-authenticators/kerberos#kerberos-as-an-external-authenticator-for-existing-users)
 - [SSL X.509 authentication](/operations/external-authenticators/ssl-x509)
-- HTTP [Authenticator](./http.md)
\ No newline at end of file
+- HTTP [Authenticator](./http.md)
+- Token-based [Authenticator](./tokens.md)
diff --git a/docs/en/operations/external-authenticators/tokens.md b/docs/en/operations/external-authenticators/tokens.md
new file mode 100644
index 000000000000..ed9ebee2bd09
--- /dev/null
+++ b/docs/en/operations/external-authenticators/tokens.md
@@ -0,0 +1,278 @@
+---
+slug: /en/operations/external-authenticators/oauth
+title: "Token-based authentication"
+---
+import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_no_roadmap.md';
+
+<SelfManaged />
+
+ClickHouse users can be authenticated using tokens. This works in two ways:
+
+- An existing user (defined in `users.xml` or in local access control paths) can be authenticated with a token if this user can be `IDENTIFIED WITH jwt`. 
+- Use the information from the token or from an external Identity Provider (IdP) as a source of user definitions and allow locally undefined users to be authenticated with a valid token.
+
+Although not all tokens are JWTs, under the hood both ways are treated as the same authentication method to maintain better compatibility.
+
+# Token Processors
+
+## Configuration
+
+Token-based authentication is enabled by default. To disable it, set `enable_token_auth` to `0` in `config.xml`:
+
+```xml
+<enable_token_auth>0</enable_token_auth>
+```
+
+When disabled, token processors are not parsed, TokenAccessStorage is not available, and authentication via tokens (`--jwt` option or `Authorization: Bearer` header) is rejected.
+
+To use token-based authentication, add `token_processors` section to `config.xml` and define at least one token processor in it.
+Its contents are different for different token processor types.
+
+**Common parameters**
+- `type` -- type of token processor. Supported values: "jwt_static_key", "jwt_static_jwks", "jwt_dynamic_jwks", "azure", "openid". Mandatory. Case-insensitive.
+- `token_cache_lifetime` -- maximum lifetime of cached token (in seconds). Optional, default: 3600.
+- `username_claim` -- name of claim (field) that will be treated as ClickHouse username. Optional, default: "sub".
+- `groups_claim` -- name of claim (field) that contains list of groups user belongs to. This claim will be looked up in the token itself (in case token is a valid JWT, e.g. in Keycloak) or in response from `/userinfo`. Optional, default: "groups".
+
+For each type, there are additional specific parameters (some of them are mandatory).
+If some parameters that are not required for current processor type are specified, they are ignored. 
+
+## JWT (JSON Web Token)
+
+JWT itself is a source of information about user.
+It is decoded locally and its integrity is verified using either a local static key or JWKS (JSON Web Key Set), local or remote.
+
+### JWT with static key:
+```xml
+<clickhouse>
+    <token_processors>
+        <my_static_key_validator>
+          <type>jwt_static_key</type>
+          <algo>HS256</algo>
+          <static_key>my_static_secret</static_key>
+        </my_static_key_validator>
+    </token_processors>
+</clickhouse>
+```
+**Parameters:**
+- `algo` - Algorithm for signature validation. Mandatory. Supported values:
+
+  | HMAC  | RSA   | ECDSA  | PSS   | EdDSA   |
+    |-------| ----- | ------ | ----- | ------- |
+  | HS256 | RS256 | ES256  | PS256 | Ed25519 |
+  | HS384 | RS384 | ES384  | PS384 | Ed448   |
+  | HS512 | RS512 | ES512  | PS512 |         |
+  |       |       | ES256K |       |         |
+  Also supports None (not recommended and must *NEVER* be used in production).
+- `claims` - A string containing a JSON object that should be contained in the token payload. If this parameter is defined, token without corresponding payload will be considered invalid. Optional.
+- `static_key` - key for symmetric algorithms. Mandatory for `HS*` family algorithms.
+- `static_key_in_base64` - indicates if the `static_key` key is base64-encoded. Optional, default: `False`.
+- `public_key` - public key for asymmetric algorithms. Mandatory except for `HS*` family algorithms and `None`.
+- `private_key` - private key for asymmetric algorithms. Optional.
+- `public_key_password` - public key password. Optional.
+- `private_key_password` - private key password. Optional.
+- `expected_issuer` - Expected value of the `iss` (issuer) claim in the JWT. If specified, tokens with a different issuer will be rejected. Optional.
+- `expected_audience` - Expected value of the `aud` (audience) claim in the JWT. If specified, tokens with a different audience will be rejected. Optional.
+- `allow_no_expiration` - If `true`, tokens without the `exp` (expiration) claim are accepted. Otherwise they are rejected. Optional, default: `false`.
+
+### JWT with static JWKS
+```xml
+<clickhouse>
+    <token_processors>
+        <my_static_jwks_validator>
+          <type>jwt_static_jwks</type>
+          <static_jwks>{"keys": [{"kty": "RSA", "alg": "RS256", "kid": "mykid", "n": "_public_key_mod_", "e": "AQAB"}]}</static_jwks>
+        </my_static_jwks_validator>
+    </token_processors>
+</clickhouse>
+```
+
+**Parameters:**
+
+- `static_jwks` - content of JWKS in JSON
+- `static_jwks_file` - path to a file with JWKS
+- `claims` - A string containing a JSON object that should be contained in the token payload. If this parameter is defined, token without corresponding payload will be considered invalid. Optional.
+- `verifier_leeway` - Clock skew tolerance (seconds). Useful for handling small differences in system clocks between ClickHouse and the token issuer. Optional.
+- `expected_issuer` - Expected value of the `iss` (issuer) claim in the JWT. If specified, tokens with a different issuer will be rejected. Optional.
+- `expected_audience` - Expected value of the `aud` (audience) claim in the JWT. If specified, tokens with a different audience will be rejected. Optional.
+- `allow_no_expiration` - If `true`, tokens without the `exp` (expiration) claim are accepted. Otherwise they are rejected. Optional, default: `false`.
+
+:::note
+Only one of `static_jwks` or `static_jwks_file` keys must be present in one verifier
+:::
+
+:::note
+Only RS* family algorithms are supported!
+:::
+
+### JWT with remote JWKS
+```xml
+<clickhouse>
+    <token_processors>
+        <basic_auth_server>
+          <type>jwt_dynamic_jwks</type>
+          <jwks_uri>http://localhost:8000/.well-known/jwks.json</jwks_uri>
+          <jwks_cache_lifetime>3600</jwks_cache_lifetime>
+        </basic_auth_server>
+    </token_processors>
+</clickhouse>
+```
+
+**Parameters:**
+
+- `uri` - JWKS endpoint. Mandatory.
+- `jwks_cache_lifetime` - Period for resend request for refreshing JWKS. Optional, default: 3600.
+- `claims` - A string containing a JSON object that should be contained in the token payload. If this parameter is defined, token without corresponding payload will be considered invalid. Optional.
+- `verifier_leeway` - Clock skew tolerance (seconds). Useful for handling small differences in system clocks between ClickHouse and the token issuer. Optional.
+- `expected_issuer` - Expected value of the `iss` (issuer) claim in the JWT. If specified, tokens with a different issuer will be rejected. Optional.
+- `expected_audience` - Expected value of the `aud` (audience) claim in the JWT. If specified, tokens with a different audience will be rejected. Optional.
+- `allow_no_expiration` - If `true`, tokens without the `exp` (expiration) claim are accepted. Otherwise they are rejected. Optional, default: `false`.
+
+
+## Processors with external providers
+
+Some tokens cannot be decoded and validated locally. External service is needed in this case. "Azure" and "OpenID" (a generic type) are supported now.
+
+### Azure
+```xml
+<clickhouse>
+    <token_processors>
+        <azure_processor>
+          <type>azure</type>
+        </azure_processor>
+    </token_processors>
+</clickhouse>
+```
+
+No additional parameters are required.
+
+### OpenID
+```xml
+<clickhouse>
+    <token_processors>
+        <oid_processor_1>
+          <type>openid</type>
+          <configuration_endpoint>url/.well-known/openid-configuration</configuration_endpoint>
+          <verifier_leeway>60</verifier_leeway>
+          <jwks_cache_lifetime>3600</jwks_cache_lifetime>
+        </oid_processor_1>
+        <oid_processor_2>
+          <type>openid</type>
+          <userinfo_endpoint>url/userinfo</userinfo_endpoint>
+          <token_introspection_endpoint>url/tokeninfo</token_introspection_endpoint>
+          <jwks_uri>url/.well-known/jwks.json</jwks_uri>
+          <verifier_leeway>60</verifier_leeway>
+          <jwks_cache_lifetime>3600</jwks_cache_lifetime>
+        </oid_processor_2>
+    </token_processors>
+</clickhouse>
+```
+
+:::note
+Either `configuration_endpoint` or both `userinfo_endpoint` and `token_introspection_endpoint` (and, optionally, `jwks_uri`) shall be set. If none of them are set or all three are set, this is an invalid configuration that will not be parsed.
+:::
+
+**Parameters:**
+
+- `configuration_endpoint` - URI of OpenID configuration (often ends with `.well-known/openid-configuration`);
+- `userinfo_endpoint` - URI of endpoint that returns user information in exchange for a valid token;
+- `token_introspection_endpoint` - URI of token introspection endpoint (returns information about a valid token);
+- `jwks_uri` - URI of OpenID configuration (often ends with `.well-known/jwks.json`)
+- `jwks_cache_lifetime` - Period for resend request for refreshing JWKS. Optional, default: 3600.
+- `verifier_leeway` - Clock skew tolerance (seconds). Useful for handling small differences in system clocks between ClickHouse and the token issuer. Optional, default: 60
+- `expected_issuer` - Expected value of the `iss` (issuer) claim in the JWT. If specified, tokens with a different issuer will be rejected. Optional.
+- `expected_audience` - Expected value of the `aud` (audience) claim in the JWT. If specified, tokens with a different audience will be rejected. Optional.
+- `allow_no_expiration` - If `true`, tokens without the `exp` (expiration) claim are accepted. Otherwise they are rejected. Optional, default: `false`.
+
+Sometimes a token is a valid JWT. In that case token will be decoded and validated locally if configuration endpoint returns JWKS URI (or `jwks_uri` is specified alongside `userinfo_endpoint` and `token_introspection_endpoint`).
+
+### Tokens cache
+To reduce number of requests to IdP, tokens are cached internally for a maximum period of `token_cache_lifetime` seconds.
+If token expires sooner than `token_cache_lifetime`, then cache entry for this token will only be valid while token is valid.
+If token lifetime is longer than `token_cache_lifetime`, cache entry for this token will be valid for `token_cache_lifetime`. 
+
+## Enabling token authentication for a user in `users.xml` {#enabling-jwt-auth-in-users-xml}
+
+In order to enable token-based authentication for the user, specify `jwt` section instead of `password` or other similar sections in the user definition.
+
+Parameters:
+- `claims` - An optional string containing a json object that should be contained in the token payload.
+
+Example (goes into `users.xml`):
+```xml
+<clickhouse>
+    <my_user>
+        <jwt>
+            <claims>{"resource_access":{"account": {"roles": ["view-profile"]}}}</claims>
+        </jwt>
+    </my_user>
+</clickhouse>
+```
+
+Here, the JWT payload must contain `["view-profile"]` on path `resource_access.account.roles`, otherwise authentication will not succeed even with a valid JWT.
+
+:::note
+If `claims` is defined, this user will not be able to authenticate using opaque tokens, so, only JWT-based authentication will be available.
+:::
+
+```
+{
+...
+  "resource_access": {
+    "account": {
+      "roles": ["view-profile"]
+    }
+  },
+...
+}
+```
+
+:::note
+A user cannot have JWT authentication together with any other authentication method. The presence of any other sections like `password` alongside `jwt` will force ClickHouse to shut down.
+:::
+
+## Enabling token authentication using SQL {#enabling-jwt-auth-using-sql}
+
+Users with "JWT" authentication type cannot be created using SQL now.
+
+## Identity Provider as an External User Directory {#idp-external-user-directory}
+
+If there is no suitable user pre-defined in ClickHouse, authentication is still possible: Identity Provider can be used as source of user information.
+To allow this, add `token` section to the `users_directories` section of the `config.xml` file.
+
+At each login attempt, ClickHouse tries to find the user definition locally and authenticate it as usual.
+If a token is provided but the user is not defined, ClickHouse will treat the user as externally defined and will try to validate the token and get user information from the specified processor.
+If validated successfully, the user will be considered existing and authenticated. The user will be assigned roles from the list specified in the `roles` section. 
+All this implies that the SQL-driven [Access Control and Account Management](/docs/en/guides/sre/user-management/index.md#access-control) is enabled and roles are created using the [CREATE ROLE](/docs/en/sql-reference/statements/create/role.md#create-role-statement) statement.
+
+**Example**
+
+```xml
+<clickhouse>
+    <user_directories>
+        <token>
+            <processor>token_processor_name</processor>
+            <common_roles>
+                <token_test_role_1 />
+            </common_roles>
+            <default_profile>my_profile</default_profile>
+            <roles_filter>
+                \bclickhouse-[a-zA-Z0-9]+\b
+            </roles_filter>
+            <roles_transform>s/-/_/g</roles_transform>
+        </token>
+    </user_directories>
+</clickhouse>
+```
+
+:::note
+For now, no more than one `token` section can be defined inside `user_directories`. This _may_ change in future.
+:::
+
+**Parameters**
+
+- `processor` — Name of one of processors defined in `token_processors` config section described above. This parameter is mandatory and cannot be empty.
+- `common_roles` — Section with a list of locally defined roles that will be assigned to each user retrieved from the IdP. Optional.
+- `default_profile` — Name of a locally defined settings profile that will be assigned to each user retrieved from the IdP. If the profile does not exist, a warning will be logged and the user will be created without a profile. Optional.
+- `roles_filter` — Regex string for groups filtering. Only groups matching this regex will be mapped to roles. Optional.
+- `roles_transform` — Sed-style transform pattern to apply to group names before mapping to roles. Format: `s/pattern/replacement/flags`. The `g` flag applies the replacement globally (all occurrences). Example: `s/-/_/g` converts `clickhouse-grp-dba` to `clickhouse_grp_dba`. Optional.
diff --git a/docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md b/docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md
index e4a97bf10fcd..c4f796a4642e 100644
--- a/docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md
+++ b/docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md
@@ -969,6 +969,8 @@ To enable JSON logging support, use the following snippet:
 <logger>
     <formatting>
         <type>json</type>
+        <!-- Can be configured on a per-channel basis (log, errorlog, console, syslog), or globally for all channels (then just omit it). -->
+        <!-- <channel></channel> -->
         <names>
             <date_time>date_time</date_time>
             <thread_name>thread_name</thread_name>
diff --git a/docs/en/operations/system-tables/exports.md b/docs/en/operations/system-tables/exports.md
new file mode 100644
index 000000000000..e26514364008
--- /dev/null
+++ b/docs/en/operations/system-tables/exports.md
@@ -0,0 +1,56 @@
+---
+description: 'System table containing information about in progress merge tree part exports'
+keywords: ['system table', 'exports', 'merge tree', 'part']
+slug: /operations/system-tables/exports
+title: 'system.exports'
+---
+
+Contains information about in progress merge tree part exports
+
+Columns:
+
+- `source_database` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the source database.
+- `source_table` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the source table.
+- `destination_database` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the destination database.
+- `destination_table` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the destination table.
+- `create_time` ([DateTime](/docs/en/sql-reference/data-types/datetime.md)) — Date and time when the export command was received in the server.
+- `part_name` ([String](/docs/en/sql-reference/data-types/string.md)) — Name of the part.
+- `destination_file_path` ([String](/docs/en/sql-reference/data-types/string.md)) — File path relative to where the part is being exported to.
+- `elapsed` ([Float64](/docs/en/sql-reference/data-types/float.md)) — The time elapsed (in seconds) since the export started.
+- `rows_read` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — The number of rows read from the exported part.
+- `total_rows_to_read` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — The total number of rows to read from the exported part.
+- `total_size_bytes_compressed` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — The total size of the compressed data in the exported part.
+- `total_size_bytes_uncompressed` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — The total size of the uncompressed data in the exported part.
+- `bytes_read_uncompressed` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — The number of uncompressed bytes read from the exported part.
+- `memory_usage` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — Current memory usage in bytes for the export operation.
+- `peak_memory_usage` ([UInt64](/docs/en/sql-reference/data-types/int-uint.md)) — Peak memory usage in bytes during the export operation.
+
+**Example**
+
+```sql
+arthur :) select * from system.exports;
+
+SELECT *
+FROM system.exports
+
+Query id: 2026718c-d249-4208-891b-a271f1f93407
+
+Row 1:
+──────
+source_database:               default
+source_table:                  source_mt_table
+destination_database:          default
+destination_table:             destination_table
+create_time:                   2025-11-19 09:09:11
+part_name:                     20251016-365_1_1_0
+destination_file_path:         table_root/eventDate=2025-10-16/retention=365/20251016-365_1_1_0_17B2F6CD5D3C18E787C07AE3DAF16EB1.parquet
+elapsed:                       2.04845441
+rows_read:                     1138688 -- 1.14 million
+total_rows_to_read:            550961374 -- 550.96 million
+total_size_bytes_compressed:   37619147120 -- 37.62 billion
+total_size_bytes_uncompressed: 138166213721 -- 138.17 billion
+bytes_read_uncompressed:       316892925 -- 316.89 million
+memory_usage:                  596006095 -- 596.01 million
+peak_memory_usage:             601239033 -- 601.24 million
+```
+
diff --git a/docs/en/operations/system-tables/iceberg_metadata_log.md b/docs/en/operations/system-tables/iceberg_metadata_log.md
new file mode 100644
index 000000000000..7ae3b57ff19b
--- /dev/null
+++ b/docs/en/operations/system-tables/iceberg_metadata_log.md
@@ -0,0 +1,86 @@
+---
+description: 'System table containing information about metadata files read from Iceberg tables. Each entry
+  represents either a root metadata file, metadata extracted from an Avro file, or an entry of some Avro file.'
+keywords: ['system table', 'iceberg_metadata_log']
+slug: /operations/system-tables/iceberg_metadata_log
+title: 'system.iceberg_metadata_log'
+---
+
+import SystemTableCloud from '@site/docs/_snippets/_system_table_cloud.md';
+
+# system.iceberg_metadata_log
+
+The `system.iceberg_metadata_log` table records metadata access and parsing events for Iceberg tables read by ClickHouse. It provides detailed information about each metadata file or entry processed, which is useful for debugging, auditing, and understanding Iceberg table structure evolution.
+
+## Purpose {#purpose}
+
+This table logs every metadata file and entry read from Iceberg tables, including root metadata files, manifest lists, and manifest entries. It helps users trace how ClickHouse interprets Iceberg table metadata and diagnose issues related to schema evolution, file resolution, or query planning.
+
+:::note
+This table is primarily intended for debugging purposes.
+:::note
+
+## Columns {#columns}
+| Name           | Type      | Description                                                                                   |
+|----------------|-----------|----------------------------------------------------------------------------------------------|
+| `event_date`   | [Date](../../sql-reference/data-types/date.md)      | Date of the log entry.                                                                       |
+| `event_time`   | [DateTime](../../sql-reference/data-types/datetime.md)  | Timestamp of the event.                                                                      |
+| `query_id`     | [String](../../sql-reference/data-types/string.md)    | Query ID that triggered the metadata read.                                                   |
+| `content_type` | [Enum8](../../sql-reference/data-types/enum.md)     | Type of metadata content (see below).                                                        |
+| `table_path`   | [String](../../sql-reference/data-types/string.md)    | Path to the Iceberg table.                                                                   |
+| `file_path`    | [String](../../sql-reference/data-types/string.md)    | Path to the root metadata JSON file, Avro manifest list, or manifest file.                   |
+| `content`      | [String](../../sql-reference/data-types/string.md)    | Content in JSON format (raw metadata from .json, Avro metadata, or Avro entry).              |
+| `row_in_file`  | [Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md)) | Row number in the file, if applicable. Present for `ManifestListEntry` and `ManifestFileEntry` content types. |
+
+## `content_type` values {#content-type-values}
+
+- `None`: No content.
+- `Metadata`: Root metadata file.
+- `ManifestListMetadata`: Manifest list metadata.
+- `ManifestListEntry`: Entry in a manifest list.
+- `ManifestFileMetadata`: Manifest file metadata.
+- `ManifestFileEntry`: Entry in a manifest file.
+
+<SystemTableCloud/>
+
+## Controlling log verbosity {#controlling-log-verbosity}
+
+You can control which metadata events are logged using the [`iceberg_metadata_log_level`](../../operations/settings/settings.md#iceberg_metadata_log_level) setting.
+
+To log all metadata used in the current query:
+
+```sql
+SELECT * FROM my_iceberg_table SETTINGS iceberg_metadata_log_level = 'manifest_file_entry';
+
+SYSTEM FLUSH LOGS iceberg_metadata_log;
+
+SELECT content_type, file_path, row_in_file
+FROM system.iceberg_metadata_log
+WHERE query_id = '{previous_query_id}';
+```
+
+To log only the root metadata JSON file used in the current query:
+
+```sql
+SELECT * FROM my_iceberg_table SETTINGS iceberg_metadata_log_level = 'metadata';
+
+SYSTEM FLUSH LOGS iceberg_metadata_log;
+
+SELECT content_type, file_path, row_in_file
+FROM system.iceberg_metadata_log
+WHERE query_id = '{previous_query_id}';
+```
+
+See more information in the description of the [`iceberg_metadata_log_level`](../../operations/settings/settings.md#iceberg_metadata_log_level) setting.
+
+### Good To Know {#good-to-know}
+
+- Use `iceberg_metadata_log_level` at the query level only when you need to investigate your Iceberg table in detail. Otherwise, you may populate the log table with excessive metadata and experience performance degradation.
+- The table may contain duplicate entries, as it is intended primarily for debugging and does not guarantee uniqueness per entity.
+- If you use a `content_type` more verbose than `ManifestListMetadata`, the Iceberg metadata cache is disabled for manifest lists.
+- Similarly, if you use a `content_type` more verbose than `ManifestFileMetadata`, the Iceberg metadata cache is disabled for manifest files.
+
+## See also {#see-also}
+- [Iceberg Table Engine](../../engines/table-engines/integrations/iceberg.md)
+- [Iceberg Table Function](../../sql-reference/table-functions/iceberg.md)
+- [system.iceberg_history](./iceberg_history.md)
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index 97ad424c4078..d8580ccc23b5 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -37,6 +37,8 @@ Columns:
   - `MemorySample` represents collecting random allocations and deallocations.
   - `MemoryPeak` represents collecting updates of peak memory usage.
   - `ProfileEvent` represents collecting of increments of profile events.
+  - `JemallocSample` represents collecting of jemalloc samples.
+  - `MemoryAllocatedWithoutCheck` represents collection of significant allocations (>16MiB) that is done with ignoring any memory limits (for ClickHouse developers only).
 - `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
 - `query_id` ([String](../../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](/operations/system-tables/query_log) system table.
 - `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Stack trace at the moment of sampling. Each element is a virtual memory address inside ClickHouse server process.
diff --git a/docs/en/sql-reference/data-types/dynamic.md b/docs/en/sql-reference/data-types/dynamic.md
index 7609207d6bab..6dccd0af2101 100644
--- a/docs/en/sql-reference/data-types/dynamic.md
+++ b/docs/en/sql-reference/data-types/dynamic.md
@@ -53,7 +53,7 @@ SELECT 'Hello, World!'::Dynamic AS d, dynamicType(d);
 Using CAST from `Variant` column:
 
 ```sql
-SET enable_variant_type = 1, use_variant_as_common_type = 1;
+SET use_variant_as_common_type = 1;
 SELECT multiIf((number % 3) = 0, number, (number % 3) = 1, range(number + 1), NULL)::Dynamic AS d, dynamicType(d) FROM numbers(3)
 ```
 
diff --git a/docs/en/sql-reference/data-types/newjson.md b/docs/en/sql-reference/data-types/newjson.md
index 308252d59529..8f63db24ac91 100644
--- a/docs/en/sql-reference/data-types/newjson.md
+++ b/docs/en/sql-reference/data-types/newjson.md
@@ -26,12 +26,6 @@ import Link from '@docusaurus/Link'
 
 The `JSON` type stores JavaScript Object Notation (JSON) documents in a single column.
 
-If you want to use the `JSON` type, and for the examples on this page, please use:
-
-```sql
-SET enable_json_type = 1
-```
-
 :::note
 In ClickHouse Open-Source JSON data type is marked as production ready in version 25.3. It's not recommended to use this type in production in previous versions.
 :::
@@ -124,7 +118,7 @@ SELECT (tuple(42 AS b) AS a, [1, 2, 3] AS c, 'Hello, World!' AS d)::JSON AS json
 #### CAST from `Map` to `JSON` {#cast-from-map-to-json}
 
 ```sql title="Query"
-SET enable_variant_type=1, use_variant_as_common_type=1;
+SET use_variant_as_common_type=1;
 SELECT map('a', map('b', 42), 'c', [1,2,3], 'd', 'Hello, World!')::JSON AS json;
 ```
 
diff --git a/docs/en/sql-reference/distribution-on-cluster.md b/docs/en/sql-reference/distribution-on-cluster.md
new file mode 100644
index 000000000000..3a9835e23856
--- /dev/null
+++ b/docs/en/sql-reference/distribution-on-cluster.md
@@ -0,0 +1,23 @@
+# Task distribution in *Cluster family functions
+
+## Task distribution algorithm
+
+Table functions such as `s3Cluster`, `azureBlobStorageCluster`, `hdsfCluster`, `icebergCluster`, and table engines like `S3`, `Azure`, `HDFS`, `Iceberg` with the setting `object_storage_cluster` distribute tasks across all cluster nodes or a subset limited by the `object_storage_max_nodes` setting. This setting limits the number of nodes involved in processing a distributed query, randomly selecting nodes for each query.
+
+A single task corresponds to processing one source file.
+
+For each file, one cluster node is selected as the primary node using a consistent Rendezvous Hashing algorithm. This algorithm guarantees that:
+  * The same node is consistently selected as primary for each file, as long as the cluster remains unchanged.
+  * When the cluster changes (nodes added or removed), only files assigned to those affected nodes change their primary node assignment.
+
+This improves cache efficiency by minimizing data movement among nodes.
+
+## `lock_object_storage_task_distribution_ms` setting
+
+Each node begins processing files for which it is the primary node. After completing its assigned files, a node may take tasks from other nodes, either immediately or after waiting for `lock_object_storage_task_distribution_ms` milliseconds if the primary node does not request new files during that interval. The default value of `lock_object_storage_task_distribution_ms` is 500 milliseconds. This setting balances between caching efficiency and workload redistribution when nodes are imbalanced.
+
+## `SYSTEM STOP SWARM MODE` command
+
+If a node needs to shut down gracefully, the command `SYSTEM STOP SWARM MODE` prevents the node from receiving new tasks for *Cluster-family queries. The node finishes processing already assigned files before it can safely shut down without errors.
+
+Receiving new tasks can be resumed with the command `SYSTEM START SWARM MODE`.
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 9b0ea66d21b6..11a8a655cfaa 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -680,6 +680,23 @@ GRANT READ ON S3('s3://foo/.*') TO john
 GRANT READ ON S3('s3://bar/.*') TO john
 ```
 
+:::warning
+Source filter takes **regexp** as a parameter, so a grant
+`GRANT READ ON URL('http://www.google.com') TO john;`
+
+will allow queries
+```sql
+SELECT * FROM url('https://www.google.com');
+SELECT * FROM url('https://www-google.com');
+```
+
+because `.` is treated as an `Any Single Character` in the regexps. 
+This may lead to potential vulnerability. The correct grant should be
+```sql
+GRANT READ ON URL('https://www\.google\.com') TO john;
+```
+:::
+
 **Re-granting with GRANT OPTION:**
 
 If the original grant has `WITH GRANT OPTION`, it can be re-granted using `GRANT CURRENT GRANTS`:
diff --git a/docs/en/sql-reference/statements/system.md b/docs/en/sql-reference/statements/system.md
index 3168254596c5..4524a84a98d2 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -206,6 +206,12 @@ SYSTEM RELOAD USERS [ON CLUSTER cluster_name]
 
 Normally shuts down ClickHouse (like `service clickhouse-server stop` / `kill {$pid_clickhouse-server}`)
 
+## PRESHUTDOWN {#preshutdown}
+
+<CloudNotSupportedBadge/>
+
+Prepare node for graceful shutdown. Unregister in autodiscovered clusters, stop accepting distributed requests to object storages (s3Cluster, icebergCluster, etc.).
+
 ## KILL {#kill}
 
 Aborts ClickHouse process (like `kill -9 {$ pid_clickhouse-server}`)
diff --git a/docs/en/sql-reference/table-functions/azureBlobStorageCluster.md b/docs/en/sql-reference/table-functions/azureBlobStorageCluster.md
index 95011c7d6186..c5ad04b739e4 100644
--- a/docs/en/sql-reference/table-functions/azureBlobStorageCluster.md
+++ b/docs/en/sql-reference/table-functions/azureBlobStorageCluster.md
@@ -53,6 +53,20 @@ SELECT count(*) FROM azureBlobStorageCluster(
 
 See [azureBlobStorage](/sql-reference/table-functions/azureBlobStorage#using-shared-access-signatures-sas-sas-tokens) for examples.
 
+## Altinity Antalya branch
+
+### `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch, the alternative syntax for the `azureBlobStorageCluster` table function is avilable. This allows the `azureBlobStorage` function to be used with the non-empty `object_storage_cluster` setting, specifying a cluster name. This enables distributed queries over Azure Blob Storage across a ClickHouse cluster.
+
+```sql
+SELECT count(*) FROM azureBlobStorage(
+        'http://azurite1:10000/devstoreaccount1', 'testcontainer', 'test_cluster_count.csv', 'devstoreaccount1',
+        'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'CSV',
+        'auto', 'key UInt64')
+SETTINGS object_storage_cluster='cluster_simple'
+```
+
 ## Related {#related}
 
 - [AzureBlobStorage engine](../../engines/table-engines/integrations/azureBlobStorage.md)
diff --git a/docs/en/sql-reference/table-functions/deltalakeCluster.md b/docs/en/sql-reference/table-functions/deltalakeCluster.md
index 5a36565c67f0..073bd5a41440 100644
--- a/docs/en/sql-reference/table-functions/deltalakeCluster.md
+++ b/docs/en/sql-reference/table-functions/deltalakeCluster.md
@@ -36,6 +36,17 @@ A table with the specified structure for reading data from cluster in the specif
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 - `_etag` — The etag of the file. Type: `LowCardinality(String)`. If the etag is unknown, the value is `NULL`.
 
+## Altinity Antalya branch
+
+### `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch alternative syntax for `deltaLakeCluster` table function is available. This allows the `deltaLake` function to be used with the non-empty `object_storage_cluster` setting, specifying a cluster name. This enables distributed queries over Delta Lake Storage across a ClickHouse cluster.
+
+```sql
+SELECT count(*) FROM deltaLake(url [,aws_access_key_id, aws_secret_access_key] [,format] [,structure] [,compression])
+SETTINGS object_storage_cluster='cluster_simple'
+```
+
 ## Related {#related}
 
 - [deltaLake engine](engines/table-engines/integrations/deltalake.md)
diff --git a/docs/en/sql-reference/table-functions/hdfsCluster.md b/docs/en/sql-reference/table-functions/hdfsCluster.md
index a2556e86ae97..72a87276a5bd 100644
--- a/docs/en/sql-reference/table-functions/hdfsCluster.md
+++ b/docs/en/sql-reference/table-functions/hdfsCluster.md
@@ -59,6 +59,18 @@ FROM hdfsCluster('cluster_simple', 'hdfs://hdfs1:9000/{some,another}_dir/*', 'TS
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
+## Altinity Antalya branch
+
+### `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch alternative syntax for `hdfsCluster` table function is available. This allows the `hdfs` function to be used with the non-empty `object_storage_cluster` setting, specifying a cluster name. This enables distributed queries over HDFS Storage across a ClickHouse cluster.
+
+```sql
+SELECT count(*)
+FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV', 'name String, value UInt32')
+SETTINGS object_storage_cluster='cluster_simple'
+```
+
 ## Related {#related}
 
 - [HDFS engine](../../engines/table-engines/integrations/hdfs.md)
diff --git a/docs/en/sql-reference/table-functions/hudiCluster.md b/docs/en/sql-reference/table-functions/hudiCluster.md
index 974ac8bb7f7b..e409c0a9f906 100644
--- a/docs/en/sql-reference/table-functions/hudiCluster.md
+++ b/docs/en/sql-reference/table-functions/hudiCluster.md
@@ -42,6 +42,18 @@ A table with the specified structure for reading data from cluster in the specif
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 - `_etag` — The etag of the file. Type: `LowCardinality(String)`. If the etag is unknown, the value is `NULL`.
 
+## Altinity Antalya branch
+
+### `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch alternative syntax for `hudiCluster` table function is available. This allows the `hudi` function to be used with the non-empty `object_storage_cluster` setting, specifying a cluster name. This enables distributed queries over Hudi Storage across a ClickHouse cluster.
+
+```sql
+SELECT *
+FROM hudi(url [,aws_access_key_id, aws_secret_access_key] [,format] [,structure] [,compression])
+SETTINGS object_storage_cluster='cluster_simple'
+```
+
 ## Related {#related}
 
 - [Hudi engine](engines/table-engines/integrations/hudi.md)
diff --git a/docs/en/sql-reference/table-functions/iceberg.md b/docs/en/sql-reference/table-functions/iceberg.md
index 92282e871f44..c3bf7fc41921 100644
--- a/docs/en/sql-reference/table-functions/iceberg.md
+++ b/docs/en/sql-reference/table-functions/iceberg.md
@@ -302,6 +302,47 @@ Table function `iceberg` is an alias to `icebergS3` now.
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 - `_etag` — The etag of the file. Type: `LowCardinality(String)`. If the etag is unknown, the value is `NULL`.
 
+## Altinity Antalya branch
+
+### Specify storage type in arguments
+
+Only in the Altinity Antalya branch does the `iceberg` table function support all storage types. The storage type can be specified using the named argument `storage_type`. Supported values are `s3`, `azure`, `hdfs`, and `local`.
+
+```sql
+iceberg(storage_type='s3', url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,compression_method])
+
+iceberg(storage_type='azure', connection_string|storage_account_url, container_name, blobpath, [,account_name], [,account_key] [,format] [,compression_method])
+
+iceberg(storage_type='hdfs', path_to_table, [,format] [,compression_method])
+
+iceberg(storage_type='local', path_to_table, [,format] [,compression_method])
+```
+
+### Specify storage type in named collection
+
+Only in the Altinity Antalya branch can storage_type be included as part of a named collection. This allows for centralized configuration of storage settings.
+
+```xml
+<clickhouse>
+    <named_collections>
+        <iceberg_conf>
+            <url>http://test.s3.amazonaws.com/clickhouse-bucket/</url>
+            <access_key_id>test<access_key_id>
+            <secret_access_key>test</secret_access_key>
+            <format>auto</format>
+            <structure>auto</structure>
+            <storage_type>s3</storage_type>
+        </iceberg_conf>
+    </named_collections>
+</clickhouse>
+```
+
+```sql
+iceberg(named_collection[, option=value [,..]])
+```
+
+The default value for `storage_type` is `s3`.
+
 ## See Also {#see-also}
 
 * [Iceberg engine](/engines/table-engines/integrations/iceberg.md)
diff --git a/docs/en/sql-reference/table-functions/icebergCluster.md b/docs/en/sql-reference/table-functions/icebergCluster.md
index f66151d002cb..178e8b8b4351 100644
--- a/docs/en/sql-reference/table-functions/icebergCluster.md
+++ b/docs/en/sql-reference/table-functions/icebergCluster.md
@@ -49,6 +49,81 @@ SELECT * FROM icebergS3Cluster('cluster_simple', 'http://test.s3.amazonaws.com/c
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 - `_etag` — The etag of the file. Type: `LowCardinality(String)`. If the etag is unknown, the value is `NULL`.
 
+## Altinity Antalya branch
+
+### `icebergLocalCluster` table function
+
+Only in the Altinity Antalya branch, `icebergLocalCluster` designed to make distributed cluster queries when Iceberg data is stored on shared network storage mounted with a local path. The path must be identical on all replicas.
+
+```sql
+icebergLocalCluster(cluster_name, path_to_table, [,format] [,compression_method])
+```
+
+### Specify storage type in function arguments
+
+Only in the Altinity Antalya branch, the `icebergCluster` table function supports all storage backends. The storage backend can be specified using the named argument `storage_type`. Valid values include `s3`, `azure`, `hdfs`, and `local`.
+
+```sql
+icebergCluster(storage_type='s3', cluster_name, url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,compression_method])
+
+icebergCluster(storage_type='azure', cluster_name, connection_string|storage_account_url, container_name, blobpath, [,account_name], [,account_key] [,format] [,compression_method])
+
+icebergCluster(storage_type='hdfs', cluster_name, path_to_table, [,format] [,compression_method])
+
+icebergCluster(storage_type='local', cluster_name, path_to_table, [,format] [,compression_method])
+```
+
+### Specify storage type in a named collection
+
+Only in the Altinity Antalya branch, `storage_type` can be part of a named collection.
+
+```xml
+<clickhouse>
+    <named_collections>
+        <iceberg_conf>
+            <url>http://test.s3.amazonaws.com/clickhouse-bucket/</url>
+            <access_key_id>test</access_key_id>
+            <secret_access_key>test</secret_access_key>
+            <format>auto</format>
+            <structure>auto</structure>
+            <storage_type>s3</storage_type>
+        </iceberg_conf>
+    </named_collections>
+</clickhouse>
+```
+
+```sql
+icebergCluster(iceberg_conf[, option=value [,..]])
+```
+
+The default value for `storage_type` is `s3`.
+
+### `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch, an alternative syntax for `icebergCluster` table function is available. This allows the `iceberg` function to be used with the non-empty `object_storage_cluster` setting, specifying a cluster name. This enables distributed queries over Iceberg table across a ClickHouse cluster.
+
+```sql
+icebergS3(url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+icebergAzure(connection_string|storage_account_url, container_name, blobpath, [,account_name], [,account_key] [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+icebergHDFS(path_to_table, [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+icebergLocal(path_to_table, [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+icebergS3(option=value [,..]) SETTINGS object_storage_cluster='cluster_name'
+
+iceberg(storage_type='s3', url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+iceberg(storage_type='azure', connection_string|storage_account_url, container_name, blobpath, [,account_name], [,account_key] [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+iceberg(storage_type='hdfs', path_to_table, [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+iceberg(storage_type='local', path_to_table, [,format] [,compression_method]) SETTINGS object_storage_cluster='cluster_name'
+
+iceberg(iceberg_conf[, option=value [,..]]) SETTINGS object_storage_cluster='cluster_name'
+```
+
 **See Also**
 
 - [Iceberg engine](/engines/table-engines/integrations/iceberg.md)
diff --git a/docs/en/sql-reference/table-functions/s3Cluster.md b/docs/en/sql-reference/table-functions/s3Cluster.md
index 2023a3777380..e1b2c80f3efb 100644
--- a/docs/en/sql-reference/table-functions/s3Cluster.md
+++ b/docs/en/sql-reference/table-functions/s3Cluster.md
@@ -90,6 +90,23 @@ Users can use the same approaches as document for the s3 function [here](/sql-re
 
 For details on optimizing the performance of the s3 function see [our detailed guide](/integrations/s3/performance).
 
+## Altinity Antalya branch
+
+### `object_storage_cluster` setting.
+
+Only in the Altinity Antalya branch alternative syntax for `s3Cluster` table function is available. This allows the `s3` function to be used with the non-empty `object_storage_cluster` setting, specifying a cluster name. This enables distributed queries over S3 Storage across a ClickHouse cluster.
+
+```sql
+SELECT * FROM s3(
+    'http://minio1:9001/root/data/{clickhouse,database}/*',
+    'minio',
+    'ClickHouse_Minio_P@ssw0rd',
+    'CSV',
+    'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))'
+) ORDER BY (name, value, polygon)
+SETTINGS object_storage_cluster='cluster_simple'
+```
+
 ## Related {#related}
 
 - [S3 engine](../../engines/table-engines/integrations/s3.md)
diff --git a/docs/logo_horizontal_blue_black.png b/docs/logo_horizontal_blue_black.png
new file mode 100644
index 000000000000..b67e8ed45385
Binary files /dev/null and b/docs/logo_horizontal_blue_black.png differ
diff --git a/docs/logo_horizontal_blue_white.png b/docs/logo_horizontal_blue_white.png
new file mode 100644
index 000000000000..44ed6cca6d75
Binary files /dev/null and b/docs/logo_horizontal_blue_white.png differ
diff --git a/packages/clickhouse-client.yaml b/packages/clickhouse-client.yaml
index 48e63ee370e0..68ba77ee8442 100644
--- a/packages/clickhouse-client.yaml
+++ b/packages/clickhouse-client.yaml
@@ -11,12 +11,12 @@ description: |
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
-vendor: "ClickHouse Inc."
-homepage: "https://clickhouse.com"
+vendor: "Altinity Inc."
+homepage: "https://altinity.com"
 license: "Apache"
 section: "database"
 priority: "optional"
-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+maintainer: "Altinity Server Dev Team <support@altinity.com>"
 deb:
   fields:
     Source: clickhouse
diff --git a/packages/clickhouse-common-static-dbg.yaml b/packages/clickhouse-common-static-dbg.yaml
index 74b7fa8381bc..c656fb372a0b 100644
--- a/packages/clickhouse-common-static-dbg.yaml
+++ b/packages/clickhouse-common-static-dbg.yaml
@@ -11,12 +11,12 @@ description: |
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
-vendor: "ClickHouse Inc."
-homepage: "https://clickhouse.com"
+vendor: "Altinity Inc."
+homepage: "https://altinity.com"
 license: "Apache"
 section: "database"
 priority: "optional"
-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+maintainer: "Altinity Server Dev Team <support@altinity.com>"
 deb:
   fields:
     Source: clickhouse
diff --git a/packages/clickhouse-common-static.yaml b/packages/clickhouse-common-static.yaml
index db330f808e15..cf7941eb46b8 100644
--- a/packages/clickhouse-common-static.yaml
+++ b/packages/clickhouse-common-static.yaml
@@ -11,12 +11,12 @@ description: |
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
-vendor: "ClickHouse Inc."
-homepage: "https://clickhouse.com"
+vendor: "Altinity Inc."
+homepage: "https://altinity.com"
 license: "Apache"
 section: "database"
 priority: "optional"
-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+maintainer: "Altinity Server Dev Team <support@altinity.com>"
 deb:
   fields:
     Source: clickhouse
diff --git a/packages/clickhouse-keeper-dbg.yaml b/packages/clickhouse-keeper-dbg.yaml
index 28d53b39518d..d992eaf2375f 100644
--- a/packages/clickhouse-keeper-dbg.yaml
+++ b/packages/clickhouse-keeper-dbg.yaml
@@ -11,12 +11,12 @@ description: |
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
-vendor: "ClickHouse Inc."
-homepage: "https://clickhouse.com"
+vendor: "Altinity Inc."
+homepage: "https://altinity.com"
 license: "Apache"
 section: "database"
 priority: "optional"
-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+maintainer: "Altinity Server Dev Team <support@altinity.com>"
 deb:
   fields:
     Source: clickhouse
diff --git a/packages/clickhouse-keeper.postinstall b/packages/clickhouse-keeper.postinstall
index 2b4f303b6849..aab4596be52f 100644
--- a/packages/clickhouse-keeper.postinstall
+++ b/packages/clickhouse-keeper.postinstall
@@ -28,6 +28,25 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
             "${KEEPER_USER}"
     fi
 
+    if [ -x "/bin/systemctl" ] && [ -f /lib/systemd/system/clickhouse-keeper.service ] && [ -d /run/systemd/system ]; then
+        # if old rc.d service present - remove it
+        if [ -x "/etc/init.d/clickhouse-keeper" ] && [ -x "/usr/sbin/update-rc.d" ]; then
+            /usr/sbin/update-rc.d clickhouse-keeper remove
+        fi
+
+        /bin/systemctl daemon-reload
+        /bin/systemctl enable clickhouse-keeper
+    else
+        # If you downgrading to version older than 1.1.54336 run: systemctl disable clickhouse-keeper
+        if [ -x "/etc/init.d/clickhouse-keeper" ]; then
+            if [ -x "/usr/sbin/update-rc.d" ]; then
+                /usr/sbin/update-rc.d clickhouse-keeper defaults 19 19 >/dev/null || exit $?
+            else
+                echo # Other OS
+            fi
+        fi
+    fi
+
     chown -R "${KEEPER_USER}:${KEEPER_GROUP}" "${KEEPER_CONFDIR}"
     chmod 0755 "${KEEPER_CONFDIR}"
 
diff --git a/packages/clickhouse-keeper.yaml b/packages/clickhouse-keeper.yaml
index 9dad5382c082..e6a0d18d9242 100644
--- a/packages/clickhouse-keeper.yaml
+++ b/packages/clickhouse-keeper.yaml
@@ -11,12 +11,12 @@ description: |
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
-vendor: "ClickHouse Inc."
-homepage: "https://clickhouse.com"
+vendor: "Altinity Inc."
+homepage: "https://altinity.com"
 license: "Apache"
 section: "database"
 priority: "optional"
-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+maintainer: "Altinity Server Dev Team <support@altinity.com>"
 deb:
   fields:
     Source: clickhouse
diff --git a/packages/clickhouse-server.yaml b/packages/clickhouse-server.yaml
index dc183ead1020..d1d36e4a4ba5 100644
--- a/packages/clickhouse-server.yaml
+++ b/packages/clickhouse-server.yaml
@@ -11,12 +11,12 @@ description: |
 arch: "${DEB_ARCH}" # amd64, arm64
 platform: "linux"
 version: "${CLICKHOUSE_VERSION_STRING}"
-vendor: "ClickHouse Inc."
-homepage: "https://clickhouse.com"
+vendor: "Altinity Inc."
+homepage: "https://altinity.com"
 license: "Apache"
 section: "database"
 priority: "optional"
-maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+maintainer: "Altinity Server Dev Team <support@altinity.com>"
 deb:
   fields:
     Source: clickhouse
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 883fb6902861..02d10e28461c 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -93,6 +93,15 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+namespace ServerSetting
+{
+    extern const ServerSettingsUInt64 memory_worker_period_ms;
+    extern const ServerSettingsDouble memory_worker_purge_dirty_pages_threshold_ratio;
+    extern const ServerSettingsDouble memory_worker_purge_total_memory_threshold_ratio;
+    extern const ServerSettingsBool memory_worker_correct_memory_tracker;
+    extern const ServerSettingsBool memory_worker_use_cgroup;
+}
+
 Poco::Net::SocketAddress Keeper::socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, [[maybe_unused]] bool secure) const
 {
     auto address = makeSocketAddress(host, port, &logger());
@@ -303,6 +312,8 @@ String getKeeperPath(Poco::Util::LayeredConfiguration & config)
 int Keeper::main(const std::vector<std::string> & /*args*/)
 try
 {
+    ServerSettings server_settings;
+    server_settings.loadSettingsFromConfig(config());
 #if USE_JEMALLOC
     setJemallocBackgroundThreads(true);
 #endif
@@ -327,7 +338,7 @@ try
     if (!config().has("keeper_server"))
         throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Keeper configuration (<keeper_server> section) not found in config");
 
-    auto updateMemorySoftLimitInConfig = [&](Poco::Util::AbstractConfiguration & config)
+    auto update_memory_soft_limit_in_config = [&](Poco::Util::AbstractConfiguration & config)
     {
         UInt64 memory_soft_limit = 0;
         if (config.has("keeper_server.max_memory_usage_soft_limit"))
@@ -352,7 +363,7 @@ try
         LOG_INFO(log, "keeper_server.max_memory_usage_soft_limit is set to {}", formatReadableSizeWithBinarySuffix(memory_soft_limit));
     };
 
-    updateMemorySoftLimitInConfig(config());
+    update_memory_soft_limit_in_config(config());
 
     std::string path = getKeeperPath(config());
     std::filesystem::create_directories(path);
@@ -380,8 +391,15 @@ try
         LOG_INFO(log, "Background threads finished in {} ms", watch.elapsedMilliseconds());
     });
 
-    MemoryWorker memory_worker(
-        config().getUInt64("memory_worker_period_ms", 0), config().getBool("memory_worker_correct_memory_tracker", false), /*use_cgroup*/ true, /*page_cache*/ nullptr);
+    MemoryWorkerConfig memory_worker_config{
+        .rss_update_period_ms = server_settings[ServerSetting::memory_worker_period_ms],
+        .purge_dirty_pages_threshold_ratio = server_settings[ServerSetting::memory_worker_purge_dirty_pages_threshold_ratio],
+        .purge_total_memory_threshold_ratio = server_settings[ServerSetting::memory_worker_purge_total_memory_threshold_ratio],
+        .correct_tracker = server_settings[ServerSetting::memory_worker_correct_memory_tracker],
+        .use_cgroup = server_settings[ServerSetting::memory_worker_use_cgroup],
+    };
+
+    MemoryWorker memory_worker(memory_worker_config, /*page_cache_=*/nullptr);
     memory_worker.start();
 
     static ServerErrorHandler error_handler;
@@ -579,7 +597,7 @@ try
         {
             updateLevels(*config, logger());
 
-            updateMemorySoftLimitInConfig(*config);
+            update_memory_soft_limit_in_config(*config);
 
             if (config->has("keeper_server"))
                 global_context->updateKeeperConfiguration(*config);
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index f24c5a716974..93350ee596b2 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -83,6 +83,7 @@
 #include <Storages/System/attachSystemTables.h>
 #include <Storages/System/attachInformationSchemaTables.h>
 #include <Storages/Cache/registerRemoteFileMetadatas.h>
+#include <Storages/Cache/ObjectStorageListObjectsCache.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <Functions/UserDefined/IUserDefinedSQLObjectsStorage.h>
 #include <Functions/registerFunctions.h>
@@ -157,6 +158,10 @@
 #   include <azure/core/diagnostics/logger.hpp>
 #endif
 
+#if USE_PARQUET
+#   include <Processors/Formats/Impl/ParquetFileMetaDataCache.h>
+#endif
+
 
 #include <incbin.h>
 /// A minimal file used when the server is run without installation
@@ -279,6 +284,8 @@ namespace ServerSetting
     extern const ServerSettingsUInt64 max_view_num_to_warn;
     extern const ServerSettingsUInt64 max_waiting_queries;
     extern const ServerSettingsUInt64 memory_worker_period_ms;
+    extern const ServerSettingsDouble memory_worker_purge_dirty_pages_threshold_ratio;
+    extern const ServerSettingsDouble memory_worker_purge_total_memory_threshold_ratio;
     extern const ServerSettingsBool memory_worker_correct_memory_tracker;
     extern const ServerSettingsBool memory_worker_use_cgroup;
     extern const ServerSettingsUInt64 merges_mutations_memory_usage_soft_limit;
@@ -338,6 +345,10 @@ namespace ServerSetting
     extern const ServerSettingsBool abort_on_logical_error;
     extern const ServerSettingsUInt64 jemalloc_flush_profile_interval_bytes;
     extern const ServerSettingsBool jemalloc_flush_profile_on_memory_exceeded;
+    extern const ServerSettingsUInt64 object_storage_list_objects_cache_ttl;
+    extern const ServerSettingsUInt64 object_storage_list_objects_cache_size;
+    extern const ServerSettingsUInt64 object_storage_list_objects_cache_max_entries;
+    extern const ServerSettingsUInt64 input_format_parquet_metadata_cache_max_size;
 }
 
 namespace ErrorCodes
@@ -348,6 +359,9 @@ namespace ErrorCodes
 namespace FileCacheSetting
 {
     extern const FileCacheSettingsBool load_metadata_asynchronously;
+    extern const ServerSettingsUInt64 object_storage_list_objects_cache_size;
+    extern const ServerSettingsUInt64 object_storage_list_objects_cache_max_entries;
+    extern const ServerSettingsUInt64 object_storage_list_objects_cache_ttl;
 }
 
 }
@@ -1223,7 +1237,7 @@ try
     std::vector<ProtocolServerAdapter> servers_to_start_before_tables;
 
     /// Wait for all threads to avoid possible use-after-free (for example logging objects can be already destroyed).
-    SCOPE_EXIT({
+    SCOPE_EXIT_SAFE({
         Stopwatch watch;
         LOG_INFO(log, "Waiting for background threads");
         GlobalThreadPool::instance().shutdown();
@@ -1243,11 +1257,15 @@ try
         total_memory_tracker.setPageCache(global_context->getPageCache().get());
     }
 
-    MemoryWorker memory_worker(
-        server_settings[ServerSetting::memory_worker_period_ms],
-        server_settings[ServerSetting::memory_worker_correct_memory_tracker],
-        global_context->getServerSettings()[ServerSetting::memory_worker_use_cgroup],
-        global_context->getPageCache());
+    MemoryWorkerConfig memory_worker_config{
+        .rss_update_period_ms = server_settings[ServerSetting::memory_worker_period_ms],
+        .purge_dirty_pages_threshold_ratio = server_settings[ServerSetting::memory_worker_purge_dirty_pages_threshold_ratio],
+        .purge_total_memory_threshold_ratio = server_settings[ServerSetting::memory_worker_purge_total_memory_threshold_ratio],
+        .correct_tracker = server_settings[ServerSetting::memory_worker_correct_memory_tracker],
+        .use_cgroup = server_settings[ServerSetting::memory_worker_use_cgroup],
+    };
+
+    MemoryWorker memory_worker(memory_worker_config, global_context->getPageCache());
 
     /// This object will periodically calculate some metrics.
     ServerAsynchronousMetrics async_metrics(
@@ -1274,7 +1292,7 @@ try
 
     /// NOTE: global context should be destroyed *before* GlobalThreadPool::shutdown()
     /// Otherwise GlobalThreadPool::shutdown() will hang, since Context holds some threads.
-    SCOPE_EXIT({
+    SCOPE_EXIT_SAFE({
         async_metrics.stop();
 
         /** Ask to cancel background jobs all table engines,
@@ -2329,6 +2347,8 @@ try
 
     }
 
+    global_context->startSwarmMode();
+
     {
         std::lock_guard lock(servers_lock);
         /// We should start interserver communications before (and more important shutdown after) tables.
@@ -2520,8 +2540,16 @@ try
     if (dns_cache_updater)
         dns_cache_updater->start();
 
+    ObjectStorageListObjectsCache::instance().setMaxSizeInBytes(server_settings[ServerSetting::object_storage_list_objects_cache_size]);
+    ObjectStorageListObjectsCache::instance().setMaxCount(server_settings[ServerSetting::object_storage_list_objects_cache_max_entries]);
+    ObjectStorageListObjectsCache::instance().setTTL(server_settings[ServerSetting::object_storage_list_objects_cache_ttl]);
+
     auto replicas_reconnector = ReplicasReconnector::init(global_context);
 
+#if USE_PARQUET
+    ParquetFileMetaDataCache::instance()->setMaxSizeInBytes(server_settings[ServerSetting::input_format_parquet_metadata_cache_max_size]);
+#endif
+
     /// Set current database name before loading tables and databases because
     /// system logs may copy global context.
     std::string default_database = server_settings[ServerSetting::default_database];
@@ -2777,6 +2805,8 @@ try
 
             is_cancelled = true;
 
+            global_context->stopSwarmMode();
+
             LOG_DEBUG(log, "Waiting for current connections to close.");
 
             size_t current_connections = 0;
@@ -2820,11 +2850,11 @@ try
             else
                 LOG_INFO(log, "Closed connections.");
 
-            global_context->getRefreshSet().joinBackgroundTasks(wait_start + std::chrono::milliseconds(wait_limit_seconds * 1000));
+            bool joined_refresh_tasks = global_context->getRefreshSet().joinBackgroundTasks(wait_start + std::chrono::milliseconds(wait_limit_seconds * 1000));
 
             dns_cache_updater.reset();
 
-            if (current_connections)
+            if (current_connections || !joined_refresh_tasks)
             {
                 /// There is no better way to force connections to close in Poco.
                 /// Otherwise connection handlers will continue to live
diff --git a/programs/server/binary.html b/programs/server/binary.html
index 5f2ccafbfdd2..896a88ec3640 100644
--- a/programs/server/binary.html
+++ b/programs/server/binary.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDkgOCI+PHN0eWxlPi5ve2ZpbGw6I2ZjMH0ucntmaWxsOnJlZH08L3N0eWxlPjxwYXRoIGQ9Ik0wLDcgaDEgdjEgaC0xIHoiIGNsYXNzPSJyIi8+PHBhdGggZD0iTTAsMCBoMSB2NyBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNMiwwIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik00LDAgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTYsMCBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNOCwzLjI1IGgxIHYxLjUgaC0xIHoiIGNsYXNzPSJvIi8+PC9zdmc+">
+    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTUwIDE1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMTkgNzIgODItNDhMNzUgOSAxOSA0MnptNSAzIDIzIDE0VjYyem00OSAzNEwxOSA3OHY2MnptMjgtNTIgMjktMTctMjQtMTMtMjggMTd6bTMgN3Y2MGwyOCAxNlY4MHptMi00IDI2IDE1VjQ1eiIgZmlsbD0iIzE5OURDRiIvPjwvc3ZnPg==">
     <title>ClickHouse Binary Viewer</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.min.css" />
     <style type="text/css">
@@ -181,8 +181,7 @@
 
         layer.addTo(map);
 
-        map.attributionControl.setPrefix('<a href="https://github.com/ClickHouse/ClickHouse/">About</a>');
-
+        map.attributionControl.setPrefix('<a href="https://github.com/Altinity/ClickHouse/">About</a>');
         function latLngToPixel(latlng) {
             return { x: ((latlng.lng / 1024) * 32768)|0, y: ((-latlng.lat / 1024) * 32768)|0 };
         }
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 062a0784c9c6..7df59e3a7281 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -72,10 +72,12 @@
           </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:
+
+        You can specify log format(for now, JSON only).
+        It can be done either on a per-channel (log, errorlog, console, syslog) level (set `channel`, i.e. `<channel>console</channel>') or for all channels (omit `channel`).
+        The log will be printed in specified format like JSON, example:
 
         {"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"}
         {"date_time_utc":"2024-11-06T09:06:09Z","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"}
@@ -91,8 +93,10 @@
         However, if you comment out all the tags under <names>, the program will print default values for as
         below.
         -->
-        <!-- <formatting>
+        <!--
+        <formatting>
             <type>json</type>
+            <channel></channel>
             <names>
                 <date_time>date_time</date_time>
                 <date_time_utc>date_time_utc</date_time_utc>
@@ -105,7 +109,8 @@
                 <source_file>source_file</source_file>
                 <source_line>source_line</source_line>
             </names>
-        </formatting> -->
+        </formatting>
+        -->
     </logger>
 
     <url_scheme_mappers>
@@ -1281,6 +1286,16 @@
         <flush_on_crash>false</flush_on_crash>
     </asynchronous_metric_log>
 
+    <iceberg_metadata_log>
+        <database>system</database>
+        <table>iceberg_metadata_log</table>
+        <flush_interval_milliseconds>2000</flush_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </iceberg_metadata_log>
+
     <!--
         OpenTelemetry log contains OpenTelemetry trace spans.
 
@@ -1718,9 +1733,9 @@
         <!-- the ClickHouse core developers team. -->
         <!-- Doing so at least in pre-production environments is highly appreciated -->
         <!-- The reports are anonymized -->
-        <enabled>true</enabled>
-        <send_logical_errors>true</send_logical_errors>
-        <endpoint>https://crash.clickhouse.com/</endpoint>
+        <enabled>false</enabled>
+        <send_logical_errors>false</send_logical_errors>
+        <endpoint></endpoint>
     </send_crash_reports>
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
index 4c800389ba3c..d3d7b2a90614 100644
--- a/programs/server/config.yaml.example
+++ b/programs/server/config.yaml.example
@@ -924,8 +924,8 @@ query_masking_rules:
 #           response_content: config://http_server_default_response
 
 send_crash_reports:
-    enabled: true
-    endpoint: 'https://crash.clickhouse.com/'
+    enabled: false
+    endpoint: ''
 
 # Uncomment to disable ClickHouse internal DNS caching.
 # disable_internal_dns_cache: 1
diff --git a/programs/server/dashboard.html b/programs/server/dashboard.html
index 727d65316a7a..f43bf4698e06 100644
--- a/programs/server/dashboard.html
+++ b/programs/server/dashboard.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ClickHouse Dashboard</title>
-    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDExIDEwIj48c3R5bGU+LmJne2ZpbGw6IzAwMH0ub3tmaWxsOiNmZjB9PC9zdHlsZT48cmVjdCBjbGFzcz0iYmciIHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiLz48cGF0aCBkPSJNMSwxIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik0zLDEgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTUsMSBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNNywxIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik05LDQuMjUgaDEgdjEuNSBoLTEgeiIgY2xhc3M9Im8iLz48L3N2Zz4">
+    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTUwIDE1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMTkgNzIgODItNDhMNzUgOSAxOSA0MnptNSAzIDIzIDE0VjYyem00OSAzNEwxOSA3OHY2MnptMjgtNTIgMjktMTctMjQtMTMtMjggMTd6bTMgN3Y2MGwyOCAxNlY4MHptMi00IDI2IDE1VjQ1eiIgZmlsbD0iIzE5OURDRiIvPjwvc3ZnPg==">
     <script src="https://cdn.jsdelivr.net/npm/uplot@1.6.21/dist/uPlot.iife.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/lz-string@1.5.0/libs/lz-string.min.js"></script>
     <style>
diff --git a/programs/server/embedded.xml b/programs/server/embedded.xml
index 14f031bac834..e4f44971f0b5 100644
--- a/programs/server/embedded.xml
+++ b/programs/server/embedded.xml
@@ -15,9 +15,9 @@
     <mlock_executable>true</mlock_executable>
 
     <send_crash_reports>
-        <enabled>true</enabled>
-        <send_logical_errors>true</send_logical_errors>
-        <endpoint>https://crash.clickhouse.com/</endpoint>
+        <enabled>false</enabled>
+        <send_logical_errors>false</send_logical_errors>
+        <endpoint></endpoint>
     </send_crash_reports>
 
     <http_options_response>
diff --git a/programs/server/index.html b/programs/server/index.html
index 2d14d1c0acd8..2dc87670907d 100644
--- a/programs/server/index.html
+++ b/programs/server/index.html
@@ -2,21 +2,72 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDExIDEwIj48c3R5bGU+LmJne2ZpbGw6I2ZmMH0ub3tmaWxsOiMwMDB9PC9zdHlsZT48cmVjdCBjbGFzcz0iYmciIHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiLz48cGF0aCBkPSJNMSwxIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik0zLDEgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTUsMSBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNNywxIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik05LDQuMjUgaDEgdjEuNSBoLTEgeiIgY2xhc3M9Im8iLz48L3N2Zz4K">
+    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTUwIDE1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMTkgNzIgODItNDhMNzUgOSAxOSA0MnptNSAzIDIzIDE0VjYyem00OSAzNEwxOSA3OHY2MnptMjgtNTIgMjktMTctMjQtMTMtMjggMTd6bTMgN3Y2MGwyOCAxNlY4MHptMi00IDI2IDE1VjQ1eiIgZmlsbD0iIzE5OURDRiIvPjwvc3ZnPg==">
     <title>ClickHouse</title>
     <style>
         :root {
-            --background-color: white;
-            --text-color: black;
-            --link-color: black;
-            --link-hover-color: black;
+            --background-color-rotate: 215;
+            --background-color: oklch(96% 0.0296 var(--background-color-rotate));
+            --element-background-color: #FFF;
+            --element-color-ok: #080;
+            --element-background-color-fail: #FEE;
+            --bar-color: #FF8; /* Light bar in background of table cells. */
+            --border-color: #CCC;
+            --shadow-color: rgba(0, 0, 0, 0.1);
+            --button-color: var(--altinity-accent);
+            --text-color: #000;
+            --text-color-active: #000;
+            --button-active-color: var(--altinity-accent);
+            --button-active-text-color: #000;
+            --misc-text-color: #888;
+            --error-color: #FEE; /* Light-pink on light-cyan is so neat, I even want to trigger errors to see this cool combination of colors. */
+            --table-header-color: #EEE;
+            --table-hover-filter: brightness(0.9);
+            --link-color: var(--altinity-gray);
+            --link-hover-color: var(--altinity-accent);
+            --link-hover-bg-color: var(--altinity-light-gray);
+            --logo-color: #000D45;
+            --border-color-selected: #F80;
+            --menu-toggle-color: #000;
+
+            --progress-color: #0C4;
+            --progress: 0%;
+
+            --altinity-background: #000D45;
+            --altinity-accent: #189DCF;
+            --altinity-highlight: #FFC600;
+            --altinity-gray: #6c757d;
+            --altinity-light-gray: #f8f9fa;
+            --altinity-white: #ffffff;
         }
 
         [data-theme="dark"] {
-            --background-color: black;
-            --text-color: white;
-            --link-color: white;
-            --link-hover-color: black;
+            --background-color-rotate: 250;
+            --background-color: oklch(15% 0.0296 var(--background-color-rotate));
+            --element-background-color: ##000d45;
+            --element-color-ok: #8F8;
+            --element-background-color-fail: #300;
+            --bar-color: #320;
+            --border-color: #444;
+            --shadow-color: rgba(0, 0, 0, 0.1);
+            --text-color: #CCC;
+            --text-color-active: #FFF;
+            --button-color: var(--altinity-accent);
+            --button-text-color: #000;
+            --button-active-color: var(--altinity-accent);
+            --button-active-text-color: #000;
+            --misc-text-color: #888;
+            --error-color: #400;
+            --table-header-color: #102020;
+            --table-hover-filter: contrast(0.9) brightness(2);
+            --link-color: var(--altinity-gray);
+            --link-hover-color: var(--altinity-accent);
+            --link-hover-bg-color: var(--altinity-light-gray);
+            --logo-color: var(--altinity-light-gray);
+            --border-color-selected: var(--altinity-accent);
+            --menu-toggle-color: var(--altinity-accent);
+
+
         }
 
         *
@@ -59,7 +110,23 @@
         #logo-container
         {
             margin-bottom: 3em;
-            fill: var(--text-color);
+            fill: var(--logo-color);
+        }
+        #logo-container svg text
+        {
+            /** (R) symbol **/
+            font-size: x-small;
+        }
+        #logo-container span
+        {
+            text-align: center;
+            display: inline-block;
+            width: 100%;
+        }
+        #logo-container a:hover
+        {
+            color: var(--link-hover-color);
+            fill: var(--link-hover-color);
         }
 
         #links
@@ -71,13 +138,13 @@
         #links a
         {
             display: inline-block;
-            text-decoration-color: yellow;
+            /* text-decoration-color: yellow; */
             margin: 0 0.5em;
             padding: 0 0.5em;
             &:hover
             {
                 color: var(--link-hover-color);
-                background-color: yellow;
+                background-color: var(--link-hover-bg-color);
                 text-decoration: none;
                 text-shadow: none;
             }
@@ -126,8 +193,12 @@
 <body>
 <main>
     <p id="logo-container">
-        <a href="https://clickhouse.com/">
-            <svg id="logo" width="100%" viewBox="0 0 180 28" version="1.1" xmlns="http://www.w3.org/2000/svg"><title>Powered by ClickHouse</title><g transform="translate(21, 0)"><path d="M9.76,20.95 C8.43,20.97 7.11,20.73 5.87,20.26 C4.72,19.80 3.67,19.11 2.81,18.22 C1.90,17.32 1.20,16.25 0.74,15.07 C-0.24,12.29 -0.24,9.27 0.74,6.49 C1.67,4.07 3.61,2.16 6.08,1.26 C7.35,0.79 8.71,0.55 10.07,0.57 C11.16,0.54 12.24,0.67 13.30,0.93 C14.15,1.16 14.98,1.47 15.78,1.87 L15.03,4.17 C14.33,3.70 13.57,3.32 12.78,3.03 C11.83,2.71 10.83,2.56 9.82,2.58 C7.96,2.56 6.18,3.35 4.96,4.74 C4.30,5.50 3.79,6.38 3.47,7.33 C3.08,8.46 2.89,9.65 2.91,10.85 C2.90,12.02 3.07,13.18 3.43,14.29 C3.73,15.23 4.21,16.09 4.86,16.84 C5.46,17.52 6.21,18.06 7.05,18.41 C7.95,18.78 8.92,18.96 9.90,18.96 C10.80,18.96 11.68,18.82 12.53,18.55 C13.34,18.27 14.12,17.91 14.85,17.47 L15.57,19.20 C14.87,19.72 14.09,20.13 13.25,20.40 C12.13,20.78 10.95,20.97 9.76,20.95 L9.76,20.95 Z"></path><polygon points="21.20 0 21.20 20.67 18.73 20.67 18.73 0 21.20 0"></polygon><path d="M26.51,4.15 C26.09,4.18 25.68,4.03 25.38,3.74 C25.08,3.46 24.92,3.05 24.94,2.64 C24.92,2.23 25.07,1.83 25.35,1.52 C25.99,0.92 26.99,0.92 27.63,1.52 C27.92,1.82 28.07,2.23 28.06,2.64 C28.07,3.05 27.92,3.44 27.63,3.72 C27.33,4.01 26.93,4.16 26.51,4.15 L26.51,4.15 Z M27.75,6.31 L27.75,20.56 L25.31,20.56 L25.31,6.31 L27.77,6.31 L27.75,6.31 Z"></path><path d="M38.20,20.95 C37.23,20.96 36.27,20.78 35.36,20.44 C34.50,20.12 33.72,19.62 33.07,18.98 C32.40,18.30 31.88,17.51 31.54,16.63 C30.78,14.61 30.78,12.39 31.54,10.36 C31.89,9.48 32.43,8.68 33.11,8.02 C33.80,7.36 34.62,6.85 35.53,6.53 C36.46,6.19 37.45,6.02 38.44,6.02 C39.23,6.02 40.02,6.11 40.78,6.29 C41.40,6.43 41.99,6.67 42.52,7.00 L41.73,9.14 C41.23,8.76 40.68,8.44 40.10,8.18 C39.49,7.95 38.85,7.84 38.20,7.86 C37.57,7.85 36.95,7.97 36.38,8.20 C35.80,8.44 35.28,8.80 34.87,9.26 C34.42,9.77 34.07,10.36 33.85,10.99 C33.58,11.78 33.45,12.61 33.46,13.44 C33.36,14.92 33.85,16.38 34.83,17.51 C35.81,18.45 37.15,18.94 38.53,18.87 C39.72,18.85 40.89,18.48 41.88,17.81 L42.44,19.61 C41.88,20.02 41.26,20.33 40.60,20.52 C39.82,20.79 39.01,20.93 38.20,20.95 L38.20,20.95 Z"></path><path d="M47.94,0 L47.94,20.67 L45.44,20.67 L45.44,0 L47.94,0 Z M54.35,20.67 L48.27,13.01 L54.27,6.33 L56.83,6.33 L50.90,12.72 L57.24,20.67 L54.35,20.67 L54.35,20.67 Z"></path><polygon points="73.11 11.87 62.77 11.87 62.77 20.65 60.10 20.65 60.10 0.85 62.77 0.85 62.77 9.89 73.11 9.89 73.11 0.85 75.78 0.85 75.78 20.67 73.11 20.67"></polygon><path d="M86.30,20.95 C85.38,20.95 84.47,20.78 83.61,20.44 C82.78,20.12 82.01,19.63 81.38,19.00 C80.72,18.32 80.21,17.53 79.87,16.65 C79.12,14.60 79.12,12.35 79.87,10.30 C80.21,9.43 80.72,8.64 81.38,7.98 C82.02,7.35 82.78,6.86 83.61,6.53 C84.47,6.20 85.38,6.02 86.30,6.02 C87.23,6.02 88.15,6.20 89.01,6.53 C89.86,6.86 90.62,7.35 91.27,7.98 C91.94,8.64 92.47,9.43 92.82,10.30 C93.59,12.35 93.59,14.60 92.82,16.65 C92.50,17.52 92.00,18.32 91.37,19.00 C90.73,19.63 89.96,20.12 89.12,20.44 C88.22,20.79 87.27,20.96 86.30,20.95 Z M86.30,19.10 C86.88,19.10 87.46,18.99 88.00,18.79 C88.56,18.59 89.07,18.25 89.47,17.81 C89.93,17.31 90.28,16.71 90.50,16.06 C90.78,15.23 90.91,14.35 90.89,13.48 C90.92,12.60 90.78,11.72 90.50,10.89 C90.28,10.25 89.93,9.66 89.47,9.16 C89.07,8.72 88.56,8.39 88.00,8.18 C87.46,7.98 86.88,7.88 86.30,7.88 C85.74,7.88 85.18,7.98 84.65,8.18 C84.10,8.39 83.61,8.73 83.22,9.16 C82.77,9.66 82.42,10.25 82.21,10.89 C81.94,11.73 81.81,12.60 81.84,13.48 C81.81,14.35 81.94,15.23 82.21,16.06 C82.42,16.71 82.76,17.31 83.22,17.81 C83.61,18.25 84.10,18.58 84.65,18.79 C85.18,18.99 85.74,19.10 86.30,19.10 L86.30,19.10 Z"></path><path d="M104.21,20.12 C103.26,20.71 102.14,21.00 101.01,20.95 C99.79,21.00 98.61,20.56 97.74,19.73 C96.83,18.70 96.38,17.34 96.50,15.98 L96.50,6.31 L98.98,6.31 L98.98,15.98 C98.97,16.47 99.04,16.95 99.19,17.41 C99.30,17.76 99.50,18.07 99.77,18.32 C100.01,18.55 100.31,18.72 100.64,18.81 C100.99,18.91 101.35,18.96 101.71,18.96 C102.65,19.00 103.58,18.73 104.34,18.18 C105.05,17.63 105.63,16.94 106.03,16.14 L106.03,6.31 L108.49,6.31 L108.49,20.56 L106.32,20.56 L106.10,18.00 L106.10,18.00 C105.68,18.86 105.03,19.60 104.21,20.12 L104.21,20.12 Z"></path><path d="M116.42,20.95 C115.80,20.99 115.17,20.99 114.55,20.95 C114.09,20.89 113.62,20.80 113.17,20.69 C112.81,20.60 112.46,20.48 112.11,20.34 C111.83,20.22 111.55,20.07 111.29,19.91 L112.09,17.88 C112.27,18.02 112.47,18.15 112.67,18.26 C112.97,18.43 113.28,18.57 113.60,18.69 C114.01,18.85 114.43,18.97 114.86,19.06 C115.38,19.16 115.90,19.20 116.42,19.20 C117.26,19.26 118.09,19.04 118.79,18.59 C119.33,18.19 119.63,17.56 119.60,16.90 C119.62,16.34 119.38,15.80 118.94,15.45 C118.24,14.98 117.47,14.63 116.64,14.43 L114.86,13.84 C114.33,13.66 113.82,13.39 113.36,13.07 C112.91,12.76 112.55,12.35 112.28,11.89 C111.99,11.34 111.84,10.72 111.87,10.10 C111.79,8.92 112.33,7.79 113.29,7.10 C114.46,6.39 115.83,6.05 117.20,6.13 C118.07,6.11 118.94,6.19 119.79,6.37 C120.38,6.49 120.97,6.68 121.52,6.92 L120.95,8.96 C120.47,8.73 119.99,8.52 119.50,8.34 C118.79,8.11 118.05,8.00 117.31,8.02 C116.53,7.98 115.76,8.13 115.05,8.45 C114.47,8.75 114.14,9.37 114.20,10.01 C114.20,10.33 114.29,10.63 114.47,10.89 C114.66,11.15 114.90,11.36 115.18,11.52 C115.50,11.72 115.85,11.87 116.21,11.99 L117.45,12.36 L119.13,12.91 C119.66,13.10 120.16,13.36 120.61,13.70 C121.60,14.41 122.15,15.56 122.08,16.76 C122.12,17.46 121.95,18.17 121.61,18.79 C121.30,19.33 120.86,19.79 120.35,20.14 C119.80,20.50 119.19,20.76 118.55,20.91 C117.84,21.01 117.13,21.02 116.42,20.95 Z"></path><path d="M136.37,19.42 C135.76,19.91 135.06,20.28 134.31,20.50 C133.39,20.80 132.43,20.95 131.47,20.93 C129.48,21.04 127.53,20.30 126.14,18.89 C124.81,17.36 124.15,15.38 124.28,13.38 C124.26,12.31 124.43,11.26 124.79,10.26 C125.11,9.39 125.59,8.60 126.22,7.92 C126.79,7.29 127.50,6.79 128.29,6.45 C129.13,6.11 130.03,5.94 130.93,5.94 C131.84,5.93 132.74,6.10 133.58,6.45 C134.35,6.77 135.02,7.28 135.53,7.94 C136.06,8.66 136.42,9.50 136.56,10.38 C136.75,11.50 136.75,12.64 136.56,13.76 L126.72,13.76 C126.83,17.17 128.46,18.87 131.62,18.87 C132.38,18.89 133.13,18.77 133.85,18.53 C134.49,18.30 135.10,18.00 135.67,17.63 L136.37,19.42 Z M131.02,7.73 C130.01,7.72 129.05,8.12 128.35,8.83 C127.52,9.75 127.03,10.91 126.94,12.13 L134.33,12.13 C134.53,10.97 134.25,9.78 133.56,8.81 C132.93,8.09 131.99,7.69 131.02,7.73 Z"></path></g></svg>
+        <a href="https://altinity.com/">
+            <svg id="logo" width="100%" viewBox="0 0 180 21" version="1.1" xmlns="http://www.w3.org/2000/svg"><title>Powered by ClickHouse®</title><g transform="translate(21, 0)"><path d="M9.76,20.95 C8.43,20.97 7.11,20.73 5.87,20.26 C4.72,19.80 3.67,19.11 2.81,18.22 C1.90,17.32 1.20,16.25 0.74,15.07 C-0.24,12.29 -0.24,9.27 0.74,6.49 C1.67,4.07 3.61,2.16 6.08,1.26 C7.35,0.79 8.71,0.55 10.07,0.57 C11.16,0.54 12.24,0.67 13.30,0.93 C14.15,1.16 14.98,1.47 15.78,1.87 L15.03,4.17 C14.33,3.70 13.57,3.32 12.78,3.03 C11.83,2.71 10.83,2.56 9.82,2.58 C7.96,2.56 6.18,3.35 4.96,4.74 C4.30,5.50 3.79,6.38 3.47,7.33 C3.08,8.46 2.89,9.65 2.91,10.85 C2.90,12.02 3.07,13.18 3.43,14.29 C3.73,15.23 4.21,16.09 4.86,16.84 C5.46,17.52 6.21,18.06 7.05,18.41 C7.95,18.78 8.92,18.96 9.90,18.96 C10.80,18.96 11.68,18.82 12.53,18.55 C13.34,18.27 14.12,17.91 14.85,17.47 L15.57,19.20 C14.87,19.72 14.09,20.13 13.25,20.40 C12.13,20.78 10.95,20.97 9.76,20.95 L9.76,20.95 Z"></path><polygon points="21.20 0 21.20 20.67 18.73 20.67 18.73 0 21.20 0"></polygon><path d="M26.51,4.15 C26.09,4.18 25.68,4.03 25.38,3.74 C25.08,3.46 24.92,3.05 24.94,2.64 C24.92,2.23 25.07,1.83 25.35,1.52 C25.99,0.92 26.99,0.92 27.63,1.52 C27.92,1.82 28.07,2.23 28.06,2.64 C28.07,3.05 27.92,3.44 27.63,3.72 C27.33,4.01 26.93,4.16 26.51,4.15 L26.51,4.15 Z M27.75,6.31 L27.75,20.56 L25.31,20.56 L25.31,6.31 L27.77,6.31 L27.75,6.31 Z"></path><path d="M38.20,20.95 C37.23,20.96 36.27,20.78 35.36,20.44 C34.50,20.12 33.72,19.62 33.07,18.98 C32.40,18.30 31.88,17.51 31.54,16.63 C30.78,14.61 30.78,12.39 31.54,10.36 C31.89,9.48 32.43,8.68 33.11,8.02 C33.80,7.36 34.62,6.85 35.53,6.53 C36.46,6.19 37.45,6.02 38.44,6.02 C39.23,6.02 40.02,6.11 40.78,6.29 C41.40,6.43 41.99,6.67 42.52,7.00 L41.73,9.14 C41.23,8.76 40.68,8.44 40.10,8.18 C39.49,7.95 38.85,7.84 38.20,7.86 C37.57,7.85 36.95,7.97 36.38,8.20 C35.80,8.44 35.28,8.80 34.87,9.26 C34.42,9.77 34.07,10.36 33.85,10.99 C33.58,11.78 33.45,12.61 33.46,13.44 C33.36,14.92 33.85,16.38 34.83,17.51 C35.81,18.45 37.15,18.94 38.53,18.87 C39.72,18.85 40.89,18.48 41.88,17.81 L42.44,19.61 C41.88,20.02 41.26,20.33 40.60,20.52 C39.82,20.79 39.01,20.93 38.20,20.95 L38.20,20.95 Z"></path><path d="M47.94,0 L47.94,20.67 L45.44,20.67 L45.44,0 L47.94,0 Z M54.35,20.67 L48.27,13.01 L54.27,6.33 L56.83,6.33 L50.90,12.72 L57.24,20.67 L54.35,20.67 L54.35,20.67 Z"></path><polygon points="73.11 11.87 62.77 11.87 62.77 20.65 60.10 20.65 60.10 0.85 62.77 0.85 62.77 9.89 73.11 9.89 73.11 0.85 75.78 0.85 75.78 20.67 73.11 20.67"></polygon><path d="M86.30,20.95 C85.38,20.95 84.47,20.78 83.61,20.44 C82.78,20.12 82.01,19.63 81.38,19.00 C80.72,18.32 80.21,17.53 79.87,16.65 C79.12,14.60 79.12,12.35 79.87,10.30 C80.21,9.43 80.72,8.64 81.38,7.98 C82.02,7.35 82.78,6.86 83.61,6.53 C84.47,6.20 85.38,6.02 86.30,6.02 C87.23,6.02 88.15,6.20 89.01,6.53 C89.86,6.86 90.62,7.35 91.27,7.98 C91.94,8.64 92.47,9.43 92.82,10.30 C93.59,12.35 93.59,14.60 92.82,16.65 C92.50,17.52 92.00,18.32 91.37,19.00 C90.73,19.63 89.96,20.12 89.12,20.44 C88.22,20.79 87.27,20.96 86.30,20.95 Z M86.30,19.10 C86.88,19.10 87.46,18.99 88.00,18.79 C88.56,18.59 89.07,18.25 89.47,17.81 C89.93,17.31 90.28,16.71 90.50,16.06 C90.78,15.23 90.91,14.35 90.89,13.48 C90.92,12.60 90.78,11.72 90.50,10.89 C90.28,10.25 89.93,9.66 89.47,9.16 C89.07,8.72 88.56,8.39 88.00,8.18 C87.46,7.98 86.88,7.88 86.30,7.88 C85.74,7.88 85.18,7.98 84.65,8.18 C84.10,8.39 83.61,8.73 83.22,9.16 C82.77,9.66 82.42,10.25 82.21,10.89 C81.94,11.73 81.81,12.60 81.84,13.48 C81.81,14.35 81.94,15.23 82.21,16.06 C82.42,16.71 82.76,17.31 83.22,17.81 C83.61,18.25 84.10,18.58 84.65,18.79 C85.18,18.99 85.74,19.10 86.30,19.10 L86.30,19.10 Z"></path><path d="M104.21,20.12 C103.26,20.71 102.14,21.00 101.01,20.95 C99.79,21.00 98.61,20.56 97.74,19.73 C96.83,18.70 96.38,17.34 96.50,15.98 L96.50,6.31 L98.98,6.31 L98.98,15.98 C98.97,16.47 99.04,16.95 99.19,17.41 C99.30,17.76 99.50,18.07 99.77,18.32 C100.01,18.55 100.31,18.72 100.64,18.81 C100.99,18.91 101.35,18.96 101.71,18.96 C102.65,19.00 103.58,18.73 104.34,18.18 C105.05,17.63 105.63,16.94 106.03,16.14 L106.03,6.31 L108.49,6.31 L108.49,20.56 L106.32,20.56 L106.10,18.00 L106.10,18.00 C105.68,18.86 105.03,19.60 104.21,20.12 L104.21,20.12 Z"></path><path d="M116.42,20.95 C115.80,20.99 115.17,20.99 114.55,20.95 C114.09,20.89 113.62,20.80 113.17,20.69 C112.81,20.60 112.46,20.48 112.11,20.34 C111.83,20.22 111.55,20.07 111.29,19.91 L112.09,17.88 C112.27,18.02 112.47,18.15 112.67,18.26 C112.97,18.43 113.28,18.57 113.60,18.69 C114.01,18.85 114.43,18.97 114.86,19.06 C115.38,19.16 115.90,19.20 116.42,19.20 C117.26,19.26 118.09,19.04 118.79,18.59 C119.33,18.19 119.63,17.56 119.60,16.90 C119.62,16.34 119.38,15.80 118.94,15.45 C118.24,14.98 117.47,14.63 116.64,14.43 L114.86,13.84 C114.33,13.66 113.82,13.39 113.36,13.07 C112.91,12.76 112.55,12.35 112.28,11.89 C111.99,11.34 111.84,10.72 111.87,10.10 C111.79,8.92 112.33,7.79 113.29,7.10 C114.46,6.39 115.83,6.05 117.20,6.13 C118.07,6.11 118.94,6.19 119.79,6.37 C120.38,6.49 120.97,6.68 121.52,6.92 L120.95,8.96 C120.47,8.73 119.99,8.52 119.50,8.34 C118.79,8.11 118.05,8.00 117.31,8.02 C116.53,7.98 115.76,8.13 115.05,8.45 C114.47,8.75 114.14,9.37 114.20,10.01 C114.20,10.33 114.29,10.63 114.47,10.89 C114.66,11.15 114.90,11.36 115.18,11.52 C115.50,11.72 115.85,11.87 116.21,11.99 L117.45,12.36 L119.13,12.91 C119.66,13.10 120.16,13.36 120.61,13.70 C121.60,14.41 122.15,15.56 122.08,16.76 C122.12,17.46 121.95,18.17 121.61,18.79 C121.30,19.33 120.86,19.79 120.35,20.14 C119.80,20.50 119.19,20.76 118.55,20.91 C117.84,21.01 117.13,21.02 116.42,20.95 Z"></path><path d="M136.37,19.42 C135.76,19.91 135.06,20.28 134.31,20.50 C133.39,20.80 132.43,20.95 131.47,20.93 C129.48,21.04 127.53,20.30 126.14,18.89 C124.81,17.36 124.15,15.38 124.28,13.38 C124.26,12.31 124.43,11.26 124.79,10.26 C125.11,9.39 125.59,8.60 126.22,7.92 C126.79,7.29 127.50,6.79 128.29,6.45 C129.13,6.11 130.03,5.94 130.93,5.94 C131.84,5.93 132.74,6.10 133.58,6.45 C134.35,6.77 135.02,7.28 135.53,7.94 C136.06,8.66 136.42,9.50 136.56,10.38 C136.75,11.50 136.75,12.64 136.56,13.76 L126.72,13.76 C126.83,17.17 128.46,18.87 131.62,18.87 C132.38,18.89 133.13,18.77 133.85,18.53 C134.49,18.30 135.10,18.00 135.67,17.63 L136.37,19.42 Z M131.02,7.73 C130.01,7.72 129.05,8.12 128.35,8.83 C127.52,9.75 127.03,10.91 126.94,12.13 L134.33,12.13 C134.53,10.97 134.25,9.78 133.56,8.81 C132.93,8.09 131.99,7.69 131.02,7.73 Z"></path>
+                <text dy="10" background-color="transparent" dx="135">®</text>
+                </g>
+            </svg>
+            <span>Altinity Antalya build</span>
         </a>
     </p>
 
@@ -135,10 +206,10 @@
         <a href="/play">Web SQL UI</a>
         <a href="/dashboard">Dashboard</a>
         <br/>
-        <a href="https://github.com/ClickHouse/ClickHouse/">Source code</a>
-        <a href="https://clickhouse.com/docs/">Documentation</a>
-        <a href="https://clickhouse.com/">Website</a>
-        <a href="https://clickhouse.cloud/">Cloud</a>
+        <a href="https://github.com/Altinity/ClickHouse/">Source code</a>
+        <a href="https://docs.altinity.com/">Documentation</a>
+        <a href="https://Altinity.com/">Website</a>
+        <a href="https://Altinity.cloud/">Cloud</a>
         <br/>
         <a href="/binary">Binary visualizer</a>
         <a href="/merges">Merges visualizer</a>
@@ -146,7 +217,7 @@
 
     <!-- https://github.com/logos -->
     <p id="github-icon">
-        <a href="https://github.com/ClickHouse/ClickHouse/">
+        <a href="https://github.com/Altinity/ClickHouse/">
             <svg id="github-icon-light" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#24292f"/></svg>
             <svg id="github-icon-dark" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#fff"/></svg>
         </a>
diff --git a/programs/server/merges.html b/programs/server/merges.html
index 119fb058b0ba..6b1686973d25 100644
--- a/programs/server/merges.html
+++ b/programs/server/merges.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ClickHouse Merges Visualizer</title>
-    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDkgOCI+PHN0eWxlPi5ve2ZpbGw6I2ZjMH0ucntmaWxsOnJlZH08L3N0eWxlPjxwYXRoIGQ9Ik0wLDcgaDEgdjEgaC0xIHoiIGNsYXNzPSJyIi8+PHBhdGggZD0iTTAsMCBoMSB2NyBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNMiwwIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik00LDAgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTYsMCBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNOCwzLjI1IGgxIHYxLjUgaC0xIHoiIGNsYXNzPSJvIi8+PC9zdmc+">
+    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTUwIDE1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMTkgNzIgODItNDhMNzUgOSAxOSA0MnptNSAzIDIzIDE0VjYyem00OSAzNEwxOSA3OHY2MnptMjgtNTIgMjktMTctMjQtMTMtMjggMTd6bTMgN3Y2MGwyOCAxNlY4MHptMi00IDI2IDE1VjQ1eiIgZmlsbD0iIzE5OURDRiIvPjwvc3ZnPg==">
     <style>
         * {
             box-sizing: border-box;
diff --git a/programs/server/play.html b/programs/server/play.html
index 292904e4086f..014e9d624150 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -2,7 +2,8 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDExIDEwIj48c3R5bGU+LmJne2ZpbGw6I2ZmMH0ub3tmaWxsOiMwMDB9PC9zdHlsZT48cmVjdCBjbGFzcz0iYmciIHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiLz48cGF0aCBkPSJNMSwxIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik0zLDEgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTUsMSBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNNywxIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik05LDQuMjUgaDEgdjEuNSBoLTEgeiIgY2xhc3M9Im8iLz48L3N2Zz4K">
+
+    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTUwIDE1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMTkgNzIgODItNDhMNzUgOSAxOSA0MnptNSAzIDIzIDE0VjYyem00OSAzNEwxOSA3OHY2MnptMjgtNTIgMjktMTctMjQtMTMtMjggMTd6bTMgN3Y2MGwyOCAxNlY4MHptMi00IDI2IDE1VjQ1eiIgZmlsbD0iIzE5OURDRiIvPjwvc3ZnPg==">
     <title>ClickHouse Query</title>
 
     <!-- Code Style:
@@ -51,10 +52,10 @@
             --bar-color: #FF8; /* Light bar in background of table cells. */
             --border-color: #CCC;
             --shadow-color: rgba(0, 0, 0, 0.1);
-            --button-color: #FF0;
+            --button-color: var(--altinity-accent);
             --text-color: #000;
             --text-color-active: #000;
-            --button-active-color: #FE0;
+            --button-active-color: var(--altinity-accent);
             --button-active-text-color: #000;
             --misc-text-color: #888;
             --error-color: #FEE; /* Light-pink on light-cyan is so neat, I even want to trigger errors to see this cool combination of colors. */
@@ -68,6 +69,13 @@
             --progress-color: #0C4;
             --progress: 0%;
 
+            --altinity-background: #000D45;
+            --altinity-accent: #189DCF;
+            --altinity-highlight: #FFC600;
+            --altinity-gray: #6c757d;
+            --altinity-light-gray: #f8f9fa;
+            --altinity-white: #ffffff;
+
             ::selection {
                 color: #FFF;
                 background-color: #456;
@@ -85,9 +93,9 @@
             --shadow-color: rgba(0, 0, 0, 0.1);
             --text-color: #CCC;
             --text-color-active: #FFF;
-            --button-color: rgb(250 255 105);
+            --button-color: var(--altinity-accent);
             --button-text-color: #000;
-            --button-active-color: #FE0;
+            --button-active-color: var(--altinity-accent);
             --button-active-text-color: #000;
             --misc-text-color: #888;
             --error-color: #400;
@@ -95,10 +103,10 @@
             --table-hover-filter: contrast(0.9) brightness(2);
             --link-color: #4BDAF7;
             --logo-color: #444;
-            --border-color-selected: #FF0;
-            --menu-toggle-color: #FF0;
+            --border-color-selected: var(--altinity-accent);
+            --menu-toggle-color: var(--altinity-accent);
 
-            --progress-color: #FF0;
+            --progress-color: var(--altinity-accent);
 
             ::selection {
                 color: #000;
@@ -210,6 +218,7 @@
         {
             color: var(--button-text-color);
             background-color: var(--button-color);
+            filter: brightness(120%);
         }
 
         .database button:focus
@@ -383,6 +392,7 @@
         {
             color: var(--button-active-text-color);
             background-color: var(--button-active-color);
+            filter: brightness(120%);
         }
 
         #hint
@@ -652,6 +662,10 @@
         {
             fill: var(--logo-color);
         }
+        #logo text
+        {
+            fill: var(--logo-color);
+        }
 
         #cloud-logo
         {
@@ -741,12 +755,14 @@
 <body>
     <div id="menu">
         <div id="databases-icon" class="menu-icon">
-            <svg id="databases-toggle" viewBox="0 0 9 9"><path d="M0,0 h1 v8 h-1 z"/><path d="M2,0 h1 v8 h-1 z"/><path d="M4,0 h1 v8 h-1 z"/><path d="M6,0 h1 v8 h-1 z"/><path d="M8,3.25 h1 v1.5 h-1 z"/></svg>
+            <svg id="databases-toggle" viewBox="0 0 150 150">
+                <path d="m19 72 82-48L75 9 19 42zm5 3 23 14V62zm49 34L19 78v62zm28-52 29-17-24-13-28 17zm3 7v60l28 16V80zm2-4 26 15V45z" fill="#199DCF"/>
+            </svg>
         </div>
         <div id="databases"></div>
         <!-- https://github.com/logos -->
         <div id="github-icon" class="menu-icon">
-            <a href="https://github.com/ClickHouse/ClickHouse/">
+            <a href="https://github.com/Altinity/ClickHouse/">
                 <svg id="github-icon-light" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#24292f"/></svg>
                 <svg id="github-icon-dark" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#fff"/></svg>
             </a>
@@ -777,10 +793,14 @@
         <p id="error" class="monospace shadow">
         </p>
         <p id="logo-container">
-            <a href="https://clickhouse.com/">
-            <svg id="logo" width="50%" viewBox="0 0 180 28" version="1.1" xmlns="http://www.w3.org/2000/svg"><title>Powered by ClickHouse</title><g transform="translate(21, 0)"><path d="M9.76,20.95 C8.43,20.97 7.11,20.73 5.87,20.26 C4.72,19.80 3.67,19.11 2.81,18.22 C1.90,17.32 1.20,16.25 0.74,15.07 C-0.24,12.29 -0.24,9.27 0.74,6.49 C1.67,4.07 3.61,2.16 6.08,1.26 C7.35,0.79 8.71,0.55 10.07,0.57 C11.16,0.54 12.24,0.67 13.30,0.93 C14.15,1.16 14.98,1.47 15.78,1.87 L15.03,4.17 C14.33,3.70 13.57,3.32 12.78,3.03 C11.83,2.71 10.83,2.56 9.82,2.58 C7.96,2.56 6.18,3.35 4.96,4.74 C4.30,5.50 3.79,6.38 3.47,7.33 C3.08,8.46 2.89,9.65 2.91,10.85 C2.90,12.02 3.07,13.18 3.43,14.29 C3.73,15.23 4.21,16.09 4.86,16.84 C5.46,17.52 6.21,18.06 7.05,18.41 C7.95,18.78 8.92,18.96 9.90,18.96 C10.80,18.96 11.68,18.82 12.53,18.55 C13.34,18.27 14.12,17.91 14.85,17.47 L15.57,19.20 C14.87,19.72 14.09,20.13 13.25,20.40 C12.13,20.78 10.95,20.97 9.76,20.95 L9.76,20.95 Z"></path><polygon points="21.20 0 21.20 20.67 18.73 20.67 18.73 0 21.20 0"></polygon><path d="M26.51,4.15 C26.09,4.18 25.68,4.03 25.38,3.74 C25.08,3.46 24.92,3.05 24.94,2.64 C24.92,2.23 25.07,1.83 25.35,1.52 C25.99,0.92 26.99,0.92 27.63,1.52 C27.92,1.82 28.07,2.23 28.06,2.64 C28.07,3.05 27.92,3.44 27.63,3.72 C27.33,4.01 26.93,4.16 26.51,4.15 L26.51,4.15 Z M27.75,6.31 L27.75,20.56 L25.31,20.56 L25.31,6.31 L27.77,6.31 L27.75,6.31 Z"></path><path d="M38.20,20.95 C37.23,20.96 36.27,20.78 35.36,20.44 C34.50,20.12 33.72,19.62 33.07,18.98 C32.40,18.30 31.88,17.51 31.54,16.63 C30.78,14.61 30.78,12.39 31.54,10.36 C31.89,9.48 32.43,8.68 33.11,8.02 C33.80,7.36 34.62,6.85 35.53,6.53 C36.46,6.19 37.45,6.02 38.44,6.02 C39.23,6.02 40.02,6.11 40.78,6.29 C41.40,6.43 41.99,6.67 42.52,7.00 L41.73,9.14 C41.23,8.76 40.68,8.44 40.10,8.18 C39.49,7.95 38.85,7.84 38.20,7.86 C37.57,7.85 36.95,7.97 36.38,8.20 C35.80,8.44 35.28,8.80 34.87,9.26 C34.42,9.77 34.07,10.36 33.85,10.99 C33.58,11.78 33.45,12.61 33.46,13.44 C33.36,14.92 33.85,16.38 34.83,17.51 C35.81,18.45 37.15,18.94 38.53,18.87 C39.72,18.85 40.89,18.48 41.88,17.81 L42.44,19.61 C41.88,20.02 41.26,20.33 40.60,20.52 C39.82,20.79 39.01,20.93 38.20,20.95 L38.20,20.95 Z"></path><path d="M47.94,0 L47.94,20.67 L45.44,20.67 L45.44,0 L47.94,0 Z M54.35,20.67 L48.27,13.01 L54.27,6.33 L56.83,6.33 L50.90,12.72 L57.24,20.67 L54.35,20.67 L54.35,20.67 Z"></path><polygon points="73.11 11.87 62.77 11.87 62.77 20.65 60.10 20.65 60.10 0.85 62.77 0.85 62.77 9.89 73.11 9.89 73.11 0.85 75.78 0.85 75.78 20.67 73.11 20.67"></polygon><path d="M86.30,20.95 C85.38,20.95 84.47,20.78 83.61,20.44 C82.78,20.12 82.01,19.63 81.38,19.00 C80.72,18.32 80.21,17.53 79.87,16.65 C79.12,14.60 79.12,12.35 79.87,10.30 C80.21,9.43 80.72,8.64 81.38,7.98 C82.02,7.35 82.78,6.86 83.61,6.53 C84.47,6.20 85.38,6.02 86.30,6.02 C87.23,6.02 88.15,6.20 89.01,6.53 C89.86,6.86 90.62,7.35 91.27,7.98 C91.94,8.64 92.47,9.43 92.82,10.30 C93.59,12.35 93.59,14.60 92.82,16.65 C92.50,17.52 92.00,18.32 91.37,19.00 C90.73,19.63 89.96,20.12 89.12,20.44 C88.22,20.79 87.27,20.96 86.30,20.95 Z M86.30,19.10 C86.88,19.10 87.46,18.99 88.00,18.79 C88.56,18.59 89.07,18.25 89.47,17.81 C89.93,17.31 90.28,16.71 90.50,16.06 C90.78,15.23 90.91,14.35 90.89,13.48 C90.92,12.60 90.78,11.72 90.50,10.89 C90.28,10.25 89.93,9.66 89.47,9.16 C89.07,8.72 88.56,8.39 88.00,8.18 C87.46,7.98 86.88,7.88 86.30,7.88 C85.74,7.88 85.18,7.98 84.65,8.18 C84.10,8.39 83.61,8.73 83.22,9.16 C82.77,9.66 82.42,10.25 82.21,10.89 C81.94,11.73 81.81,12.60 81.84,13.48 C81.81,14.35 81.94,15.23 82.21,16.06 C82.42,16.71 82.76,17.31 83.22,17.81 C83.61,18.25 84.10,18.58 84.65,18.79 C85.18,18.99 85.74,19.10 86.30,19.10 L86.30,19.10 Z"></path><path d="M104.21,20.12 C103.26,20.71 102.14,21.00 101.01,20.95 C99.79,21.00 98.61,20.56 97.74,19.73 C96.83,18.70 96.38,17.34 96.50,15.98 L96.50,6.31 L98.98,6.31 L98.98,15.98 C98.97,16.47 99.04,16.95 99.19,17.41 C99.30,17.76 99.50,18.07 99.77,18.32 C100.01,18.55 100.31,18.72 100.64,18.81 C100.99,18.91 101.35,18.96 101.71,18.96 C102.65,19.00 103.58,18.73 104.34,18.18 C105.05,17.63 105.63,16.94 106.03,16.14 L106.03,6.31 L108.49,6.31 L108.49,20.56 L106.32,20.56 L106.10,18.00 L106.10,18.00 C105.68,18.86 105.03,19.60 104.21,20.12 L104.21,20.12 Z"></path><path d="M116.42,20.95 C115.80,20.99 115.17,20.99 114.55,20.95 C114.09,20.89 113.62,20.80 113.17,20.69 C112.81,20.60 112.46,20.48 112.11,20.34 C111.83,20.22 111.55,20.07 111.29,19.91 L112.09,17.88 C112.27,18.02 112.47,18.15 112.67,18.26 C112.97,18.43 113.28,18.57 113.60,18.69 C114.01,18.85 114.43,18.97 114.86,19.06 C115.38,19.16 115.90,19.20 116.42,19.20 C117.26,19.26 118.09,19.04 118.79,18.59 C119.33,18.19 119.63,17.56 119.60,16.90 C119.62,16.34 119.38,15.80 118.94,15.45 C118.24,14.98 117.47,14.63 116.64,14.43 L114.86,13.84 C114.33,13.66 113.82,13.39 113.36,13.07 C112.91,12.76 112.55,12.35 112.28,11.89 C111.99,11.34 111.84,10.72 111.87,10.10 C111.79,8.92 112.33,7.79 113.29,7.10 C114.46,6.39 115.83,6.05 117.20,6.13 C118.07,6.11 118.94,6.19 119.79,6.37 C120.38,6.49 120.97,6.68 121.52,6.92 L120.95,8.96 C120.47,8.73 119.99,8.52 119.50,8.34 C118.79,8.11 118.05,8.00 117.31,8.02 C116.53,7.98 115.76,8.13 115.05,8.45 C114.47,8.75 114.14,9.37 114.20,10.01 C114.20,10.33 114.29,10.63 114.47,10.89 C114.66,11.15 114.90,11.36 115.18,11.52 C115.50,11.72 115.85,11.87 116.21,11.99 L117.45,12.36 L119.13,12.91 C119.66,13.10 120.16,13.36 120.61,13.70 C121.60,14.41 122.15,15.56 122.08,16.76 C122.12,17.46 121.95,18.17 121.61,18.79 C121.30,19.33 120.86,19.79 120.35,20.14 C119.80,20.50 119.19,20.76 118.55,20.91 C117.84,21.01 117.13,21.02 116.42,20.95 Z"></path><path d="M136.37,19.42 C135.76,19.91 135.06,20.28 134.31,20.50 C133.39,20.80 132.43,20.95 131.47,20.93 C129.48,21.04 127.53,20.30 126.14,18.89 C124.81,17.36 124.15,15.38 124.28,13.38 C124.26,12.31 124.43,11.26 124.79,10.26 C125.11,9.39 125.59,8.60 126.22,7.92 C126.79,7.29 127.50,6.79 128.29,6.45 C129.13,6.11 130.03,5.94 130.93,5.94 C131.84,5.93 132.74,6.10 133.58,6.45 C134.35,6.77 135.02,7.28 135.53,7.94 C136.06,8.66 136.42,9.50 136.56,10.38 C136.75,11.50 136.75,12.64 136.56,13.76 L126.72,13.76 C126.83,17.17 128.46,18.87 131.62,18.87 C132.38,18.89 133.13,18.77 133.85,18.53 C134.49,18.30 135.10,18.00 135.67,17.63 L136.37,19.42 Z M131.02,7.73 C130.01,7.72 129.05,8.12 128.35,8.83 C127.52,9.75 127.03,10.91 126.94,12.13 L134.33,12.13 C134.53,10.97 134.25,9.78 133.56,8.81 C132.93,8.09 131.99,7.69 131.02,7.73 Z"></path></g></svg>
+            <a href="https://altinity.com/">
+            <!-- NOTE (vnemkov): That's just a text ClickHouse as svg (maybe for custom font?)-->
+            <svg id="logo" width="50%" viewBox="0 0 180 28" version="1.1" xmlns="http://www.w3.org/2000/svg"><title>Powered by ClickHouse</title><g transform="translate(21, 0)"><path d="M9.76,20.95 C8.43,20.97 7.11,20.73 5.87,20.26 C4.72,19.80 3.67,19.11 2.81,18.22 C1.90,17.32 1.20,16.25 0.74,15.07 C-0.24,12.29 -0.24,9.27 0.74,6.49 C1.67,4.07 3.61,2.16 6.08,1.26 C7.35,0.79 8.71,0.55 10.07,0.57 C11.16,0.54 12.24,0.67 13.30,0.93 C14.15,1.16 14.98,1.47 15.78,1.87 L15.03,4.17 C14.33,3.70 13.57,3.32 12.78,3.03 C11.83,2.71 10.83,2.56 9.82,2.58 C7.96,2.56 6.18,3.35 4.96,4.74 C4.30,5.50 3.79,6.38 3.47,7.33 C3.08,8.46 2.89,9.65 2.91,10.85 C2.90,12.02 3.07,13.18 3.43,14.29 C3.73,15.23 4.21,16.09 4.86,16.84 C5.46,17.52 6.21,18.06 7.05,18.41 C7.95,18.78 8.92,18.96 9.90,18.96 C10.80,18.96 11.68,18.82 12.53,18.55 C13.34,18.27 14.12,17.91 14.85,17.47 L15.57,19.20 C14.87,19.72 14.09,20.13 13.25,20.40 C12.13,20.78 10.95,20.97 9.76,20.95 L9.76,20.95 Z"></path><polygon points="21.20 0 21.20 20.67 18.73 20.67 18.73 0 21.20 0"></polygon><path d="M26.51,4.15 C26.09,4.18 25.68,4.03 25.38,3.74 C25.08,3.46 24.92,3.05 24.94,2.64 C24.92,2.23 25.07,1.83 25.35,1.52 C25.99,0.92 26.99,0.92 27.63,1.52 C27.92,1.82 28.07,2.23 28.06,2.64 C28.07,3.05 27.92,3.44 27.63,3.72 C27.33,4.01 26.93,4.16 26.51,4.15 L26.51,4.15 Z M27.75,6.31 L27.75,20.56 L25.31,20.56 L25.31,6.31 L27.77,6.31 L27.75,6.31 Z"></path><path d="M38.20,20.95 C37.23,20.96 36.27,20.78 35.36,20.44 C34.50,20.12 33.72,19.62 33.07,18.98 C32.40,18.30 31.88,17.51 31.54,16.63 C30.78,14.61 30.78,12.39 31.54,10.36 C31.89,9.48 32.43,8.68 33.11,8.02 C33.80,7.36 34.62,6.85 35.53,6.53 C36.46,6.19 37.45,6.02 38.44,6.02 C39.23,6.02 40.02,6.11 40.78,6.29 C41.40,6.43 41.99,6.67 42.52,7.00 L41.73,9.14 C41.23,8.76 40.68,8.44 40.10,8.18 C39.49,7.95 38.85,7.84 38.20,7.86 C37.57,7.85 36.95,7.97 36.38,8.20 C35.80,8.44 35.28,8.80 34.87,9.26 C34.42,9.77 34.07,10.36 33.85,10.99 C33.58,11.78 33.45,12.61 33.46,13.44 C33.36,14.92 33.85,16.38 34.83,17.51 C35.81,18.45 37.15,18.94 38.53,18.87 C39.72,18.85 40.89,18.48 41.88,17.81 L42.44,19.61 C41.88,20.02 41.26,20.33 40.60,20.52 C39.82,20.79 39.01,20.93 38.20,20.95 L38.20,20.95 Z"></path><path d="M47.94,0 L47.94,20.67 L45.44,20.67 L45.44,0 L47.94,0 Z M54.35,20.67 L48.27,13.01 L54.27,6.33 L56.83,6.33 L50.90,12.72 L57.24,20.67 L54.35,20.67 L54.35,20.67 Z"></path><polygon points="73.11 11.87 62.77 11.87 62.77 20.65 60.10 20.65 60.10 0.85 62.77 0.85 62.77 9.89 73.11 9.89 73.11 0.85 75.78 0.85 75.78 20.67 73.11 20.67"></polygon><path d="M86.30,20.95 C85.38,20.95 84.47,20.78 83.61,20.44 C82.78,20.12 82.01,19.63 81.38,19.00 C80.72,18.32 80.21,17.53 79.87,16.65 C79.12,14.60 79.12,12.35 79.87,10.30 C80.21,9.43 80.72,8.64 81.38,7.98 C82.02,7.35 82.78,6.86 83.61,6.53 C84.47,6.20 85.38,6.02 86.30,6.02 C87.23,6.02 88.15,6.20 89.01,6.53 C89.86,6.86 90.62,7.35 91.27,7.98 C91.94,8.64 92.47,9.43 92.82,10.30 C93.59,12.35 93.59,14.60 92.82,16.65 C92.50,17.52 92.00,18.32 91.37,19.00 C90.73,19.63 89.96,20.12 89.12,20.44 C88.22,20.79 87.27,20.96 86.30,20.95 Z M86.30,19.10 C86.88,19.10 87.46,18.99 88.00,18.79 C88.56,18.59 89.07,18.25 89.47,17.81 C89.93,17.31 90.28,16.71 90.50,16.06 C90.78,15.23 90.91,14.35 90.89,13.48 C90.92,12.60 90.78,11.72 90.50,10.89 C90.28,10.25 89.93,9.66 89.47,9.16 C89.07,8.72 88.56,8.39 88.00,8.18 C87.46,7.98 86.88,7.88 86.30,7.88 C85.74,7.88 85.18,7.98 84.65,8.18 C84.10,8.39 83.61,8.73 83.22,9.16 C82.77,9.66 82.42,10.25 82.21,10.89 C81.94,11.73 81.81,12.60 81.84,13.48 C81.81,14.35 81.94,15.23 82.21,16.06 C82.42,16.71 82.76,17.31 83.22,17.81 C83.61,18.25 84.10,18.58 84.65,18.79 C85.18,18.99 85.74,19.10 86.30,19.10 L86.30,19.10 Z"></path><path d="M104.21,20.12 C103.26,20.71 102.14,21.00 101.01,20.95 C99.79,21.00 98.61,20.56 97.74,19.73 C96.83,18.70 96.38,17.34 96.50,15.98 L96.50,6.31 L98.98,6.31 L98.98,15.98 C98.97,16.47 99.04,16.95 99.19,17.41 C99.30,17.76 99.50,18.07 99.77,18.32 C100.01,18.55 100.31,18.72 100.64,18.81 C100.99,18.91 101.35,18.96 101.71,18.96 C102.65,19.00 103.58,18.73 104.34,18.18 C105.05,17.63 105.63,16.94 106.03,16.14 L106.03,6.31 L108.49,6.31 L108.49,20.56 L106.32,20.56 L106.10,18.00 L106.10,18.00 C105.68,18.86 105.03,19.60 104.21,20.12 L104.21,20.12 Z"></path><path d="M116.42,20.95 C115.80,20.99 115.17,20.99 114.55,20.95 C114.09,20.89 113.62,20.80 113.17,20.69 C112.81,20.60 112.46,20.48 112.11,20.34 C111.83,20.22 111.55,20.07 111.29,19.91 L112.09,17.88 C112.27,18.02 112.47,18.15 112.67,18.26 C112.97,18.43 113.28,18.57 113.60,18.69 C114.01,18.85 114.43,18.97 114.86,19.06 C115.38,19.16 115.90,19.20 116.42,19.20 C117.26,19.26 118.09,19.04 118.79,18.59 C119.33,18.19 119.63,17.56 119.60,16.90 C119.62,16.34 119.38,15.80 118.94,15.45 C118.24,14.98 117.47,14.63 116.64,14.43 L114.86,13.84 C114.33,13.66 113.82,13.39 113.36,13.07 C112.91,12.76 112.55,12.35 112.28,11.89 C111.99,11.34 111.84,10.72 111.87,10.10 C111.79,8.92 112.33,7.79 113.29,7.10 C114.46,6.39 115.83,6.05 117.20,6.13 C118.07,6.11 118.94,6.19 119.79,6.37 C120.38,6.49 120.97,6.68 121.52,6.92 L120.95,8.96 C120.47,8.73 119.99,8.52 119.50,8.34 C118.79,8.11 118.05,8.00 117.31,8.02 C116.53,7.98 115.76,8.13 115.05,8.45 C114.47,8.75 114.14,9.37 114.20,10.01 C114.20,10.33 114.29,10.63 114.47,10.89 C114.66,11.15 114.90,11.36 115.18,11.52 C115.50,11.72 115.85,11.87 116.21,11.99 L117.45,12.36 L119.13,12.91 C119.66,13.10 120.16,13.36 120.61,13.70 C121.60,14.41 122.15,15.56 122.08,16.76 C122.12,17.46 121.95,18.17 121.61,18.79 C121.30,19.33 120.86,19.79 120.35,20.14 C119.80,20.50 119.19,20.76 118.55,20.91 C117.84,21.01 117.13,21.02 116.42,20.95 Z"></path><path d="M136.37,19.42 C135.76,19.91 135.06,20.28 134.31,20.50 C133.39,20.80 132.43,20.95 131.47,20.93 C129.48,21.04 127.53,20.30 126.14,18.89 C124.81,17.36 124.15,15.38 124.28,13.38 C124.26,12.31 124.43,11.26 124.79,10.26 C125.11,9.39 125.59,8.60 126.22,7.92 C126.79,7.29 127.50,6.79 128.29,6.45 C129.13,6.11 130.03,5.94 130.93,5.94 C131.84,5.93 132.74,6.10 133.58,6.45 C134.35,6.77 135.02,7.28 135.53,7.94 C136.06,8.66 136.42,9.50 136.56,10.38 C136.75,11.50 136.75,12.64 136.56,13.76 L126.72,13.76 C126.83,17.17 128.46,18.87 131.62,18.87 C132.38,18.89 133.13,18.77 133.85,18.53 C134.49,18.30 135.10,18.00 135.67,17.63 L136.37,19.42 Z M131.02,7.73 C130.01,7.72 129.05,8.12 128.35,8.83 C127.52,9.75 127.03,10.91 126.94,12.13 L134.33,12.13 C134.53,10.97 134.25,9.78 133.56,8.81 C132.93,8.09 131.99,7.69 131.02,7.73 Z"></path>
+                <text dy="10" background-color="transparent" dx="135" fill="white">®</text>
+            </g>
+            </svg>
             </a>
-            <a id="cloud-logo" href="https://clickhouse.cloud/">☁</a>
+            <a id="cloud-logo" href="https://altinity.cloud/">☁</a>
         </p>
     </div>
 </body>
diff --git a/src/Access/AccessControl.cpp b/src/Access/AccessControl.cpp
index 70818a25af16..ac1b0f5499e5 100644
--- a/src/Access/AccessControl.cpp
+++ b/src/Access/AccessControl.cpp
@@ -5,6 +5,7 @@
 #include <Access/UsersConfigAccessStorage.h>
 #include <Access/DiskAccessStorage.h>
 #include <Access/LDAPAccessStorage.h>
+#include <Access/TokenAccessStorage.h>
 #include <Access/ContextAccess.h>
 #include <Access/EnabledSettings.h>
 #include <Access/EnabledRolesInfo.h>
@@ -41,6 +42,7 @@ namespace ErrorCodes
     extern const int REQUIRED_PASSWORD;
     extern const int CANNOT_COMPILE_REGEXP;
     extern const int BAD_ARGUMENTS;
+    extern const int INVALID_CONFIG_PARAMETER;
 }
 
 namespace
@@ -295,6 +297,8 @@ void AccessControl::setupFromMainConfig(const Poco::Util::AbstractConfiguration
     setDefaultPasswordTypeFromConfig(config_.getString("default_password_type", "sha256_password"));
     setPasswordComplexityRulesFromConfig(config_);
 
+    setTokenAuthEnabled(config_.getBool("enable_token_auth", true));
+
     setBcryptWorkfactor(config_.getInt("bcrypt_workfactor", 12));
 
     /// Optional improvements in access control system.
@@ -422,6 +426,12 @@ void AccessControl::addLDAPStorage(const String & storage_name_, const Poco::Uti
     LOG_DEBUG(getLogger(), "Added {} access storage '{}', LDAP server name: {}", String(new_storage->getStorageType()), new_storage->getStorageName(), new_storage->getLDAPServerName());
 }
 
+void AccessControl::addTokenStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_)
+{
+    auto new_storage = std::make_shared<TokenAccessStorage>(storage_name_, *this, config_, prefix_);
+    addStorage(new_storage);
+    LOG_DEBUG(getLogger(), "Added {} access storage '{}'", String(new_storage->getStorageType()), new_storage->getStorageName());
+}
 
 void AccessControl::addStoragesFromUserDirectoriesConfig(
     const Poco::Util::AbstractConfiguration & config,
@@ -434,6 +444,8 @@ void AccessControl::addStoragesFromUserDirectoriesConfig(
     Strings keys_in_user_directories;
     config.keys(key, keys_in_user_directories);
 
+    bool has_token_storage = false;
+
     for (const String & key_in_user_directories : keys_in_user_directories)
     {
         String prefix = key + "." + key_in_user_directories;
@@ -447,6 +459,8 @@ void AccessControl::addStoragesFromUserDirectoriesConfig(
             type = DiskAccessStorage::STORAGE_TYPE;
         else if (type == "ldap")
             type = LDAPAccessStorage::STORAGE_TYPE;
+        else if (type == "token")
+            type = TokenAccessStorage::STORAGE_TYPE;
 
         String name = config.getString(prefix + ".name", type);
 
@@ -480,6 +494,20 @@ void AccessControl::addStoragesFromUserDirectoriesConfig(
             bool allow_backup = config.getBool(prefix + ".allow_backup", true);
             addReplicatedStorage(name, zookeeper_path, get_zookeeper_function, allow_backup);
         }
+        else if (type == TokenAccessStorage::STORAGE_TYPE)
+        {
+            if (!isTokenAuthEnabled())
+            {
+                LOG_INFO(getLogger(), "Token authentication is disabled, skipping token user directory '{}'", name);
+                continue;
+            }
+
+            if (has_token_storage)
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Only one `token` section can be defined.");
+
+            addTokenStorage(name, config, prefix);
+            has_token_storage = true;
+        }
         else
             throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Unknown storage type '{}' at {} in config", type, prefix);
     }
@@ -657,7 +685,7 @@ void AccessControl::restoreFromBackup(RestorerFromBackup & restorer, const Strin
 
 void AccessControl::setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfiguration & config)
 {
-    external_authenticators->setConfiguration(config, getLogger());
+    external_authenticators->setConfiguration(config, getLogger(), isTokenAuthEnabled());
 }
 
 
@@ -936,4 +964,14 @@ bool AccessControl::getAllowBetaTierSettings() const
 {
     return allow_beta_tier_settings;
 }
+
+void AccessControl::setTokenAuthEnabled(bool enable)
+{
+    enable_token_auth = enable;
+}
+
+bool AccessControl::isTokenAuthEnabled() const
+{
+    return enable_token_auth;
+}
 }
diff --git a/src/Access/AccessControl.h b/src/Access/AccessControl.h
index c1e32fc7c467..a246795d005f 100644
--- a/src/Access/AccessControl.h
+++ b/src/Access/AccessControl.h
@@ -93,6 +93,8 @@ class AccessControl : public MultipleAccessStorage
     /// Adds LDAPAccessStorage which allows querying remote LDAP server for user info.
     void addLDAPStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_);
 
+    void addTokenStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_);
+
     void addReplicatedStorage(const String & storage_name,
                               const String & zookeeper_path,
                               const zkutil::GetZooKeeper & get_zookeeper_function,
@@ -259,6 +261,10 @@ class AccessControl : public MultipleAccessStorage
     bool getAllowExperimentalTierSettings() const;
     bool getAllowBetaTierSettings() const;
 
+    /// Controls whether token-based auth is enabled.
+    void setTokenAuthEnabled(bool enable);
+    bool isTokenAuthEnabled() const;
+
 private:
     class ContextAccessCache;
     class CustomSettingsPrefixes;
@@ -292,6 +298,7 @@ class AccessControl : public MultipleAccessStorage
     std::atomic_bool allow_beta_tier_settings = true;
     std::atomic_bool enable_user_name_access_type = true;
     std::atomic_bool enable_read_write_grants = false;
+    std::atomic_bool enable_token_auth = true;
 };
 
 }
diff --git a/src/Access/AccessRights.cpp b/src/Access/AccessRights.cpp
index f2b60053e402..979434eaa0d0 100644
--- a/src/Access/AccessRights.cpp
+++ b/src/Access/AccessRights.cpp
@@ -239,8 +239,8 @@ namespace
         {
             case GLOBAL_LEVEL: return AccessFlags::allFlagsGrantableOnGlobalLevel();
             case DATABASE_LEVEL: return AccessFlags::allFlagsGrantableOnDatabaseLevel() | AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel();
-            case TABLE_LEVEL: return AccessFlags::allFlagsGrantableOnTableLevel() | AccessFlags::allSourceFlags();
-            case COLUMN_LEVEL: return AccessFlags::allFlagsGrantableOnColumnLevel();
+            case TABLE_LEVEL: return AccessFlags::allFlagsGrantableOnTableLevel() | AccessFlags::allSourceFlags() | AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel();
+            case COLUMN_LEVEL: return AccessFlags::allFlagsGrantableOnColumnLevel() | AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel();
         }
         chassert(false);
     }
@@ -366,12 +366,14 @@ struct AccessRights::Node
     AccessFlags flags;                   /// flags = (inherited_flags - partial_revokes) | explicit_grants
     AccessFlags min_flags_with_children; /// min_flags_with_children = access & child[0].min_flags_with_children & ... & child[N-1].min_flags_with_children
     AccessFlags max_flags_with_children; /// max_flags_with_children = access | child[0].max_flags_with_children | ... | child[N-1].max_flags_with_children
-    std::unique_ptr<Container> children;
+    std::shared_ptr<Container> children;
 
     bool wildcard_grant = false;
 
     Node() = default;
     Node(const Node & src) { *this = src; }
+    Node(Node && src) noexcept = default;
+    Node & operator=(Node && src) noexcept = default;
 
     Iterator begin() const { return ++Iterator{*this}; }
     Iterator end() const { return Iterator{*this}; }
@@ -388,12 +390,25 @@ struct AccessRights::Node
         min_flags_with_children = src.min_flags_with_children;
         max_flags_with_children = src.max_flags_with_children;
         if (src.children)
-            children = std::make_unique<Container>(*src.children);
+            children = std::make_shared<Container>(*src.children);
         else
             children = nullptr;
         return *this;
     }
 
+    Node makeLightCopy() const
+    {
+        Node res;
+        res.node_name = node_name;
+        res.level = level;
+        res.flags = flags;
+        res.wildcard_grant = wildcard_grant;
+        res.min_flags_with_children = min_flags_with_children;
+        res.max_flags_with_children = max_flags_with_children;
+        res.children = children;
+        return res;
+    }
+
     bool isLeaf() const { return node_name.empty(); }
 
     template <bool wildcard = false>
@@ -480,6 +495,8 @@ struct AccessRights::Node
     template <bool wildcard = false, typename... Args>
     bool isGranted(const AccessFlags & flags_, std::string_view name, const Args &... subnames) const
     {
+        const auto next_level = static_cast<Level>(level + 1);
+
         AccessFlags flags_to_check = flags_ - min_flags_with_children;
         if (!flags_to_check)
             return true;
@@ -498,15 +515,12 @@ struct AccessRights::Node
             ///                 "foo" (SELECT)
             ///                /             \
             ///     "" (leaf, USAGE)        "bar" (SELECT)
-            const auto & [node, _] = tryGetLeafOrPrefix(name, /* return_parent_node= */ true);
-            return node.flags.contains(flags_to_check);
+            const auto node = tryGetLeaf(name, next_level, /* return_parent_node= */ true);
+            return node.isGranted(flags_to_check);
         }
 
-        const auto & [node, final] = tryGetLeafOrPrefix(name);
-        if (final)
-            return node.isGranted<wildcard>(flags_to_check, subnames...);
-
-        return node.flags.contains(flags_to_check);
+        const auto node = tryGetLeaf(name, next_level);
+        return node.isGranted<wildcard>(flags_to_check, subnames...);
     }
 
     template <bool wildcard = false, typename StringT>
@@ -520,17 +534,9 @@ struct AccessRights::Node
 
         for (const auto & name : names)
         {
-            const Node * child = tryGetLeaf(name);
-            if (child)
-            {
-                if (!child->isGranted<wildcard>(flags_to_check, name))
-                    return false;
-            }
-            else
-            {
-                if (!flags.contains(flags_to_check))
-                    return false;
-            }
+            Node child = tryGetLeaf(name);
+            if (!child.isGranted<wildcard>(flags_to_check, name))
+                return false;
         }
         return true;
     }
@@ -670,7 +676,7 @@ struct AccessRights::Node
             return *this;
 
         if (!children)
-            children = std::make_unique<Container>();
+            children = std::make_shared<Container>();
 
         auto find_possible_prefix = [path](const Node & n)
         {
@@ -709,7 +715,9 @@ struct AccessRights::Node
 
             auto & new_parent = getChildNode(prefix, level_);
             child.node_name = child.node_name.substr(i);
-            new_parent.children = std::make_unique<Container>();
+            new_parent.children = std::make_shared<Container>();
+            new_parent.min_flags_with_children = it->min_flags_with_children & flags;
+            new_parent.max_flags_with_children = it->max_flags_with_children | flags;
             new_parent.children->splice(new_parent.children->begin(), *children, it);
 
             return new_parent.getLeaf(new_path, level_, return_parent_node);
@@ -719,44 +727,68 @@ struct AccessRights::Node
         auto & child = getChildNode(path, level_);
 
         /// Child is a leaf.
-        if (path.empty())
+        if (path.empty() || return_parent_node)
             return child;
 
         /// Creates a leaf in child.
         return child.getLeaf("", level_, return_parent_node);
     }
 
-    /// Returns a pair [node, is_leaf].
-    std::pair<const Node &, bool> tryGetLeafOrPrefix(std::string_view path, bool return_parent_node = false) const
+    /// Same logic as `getLeaf`, but const.
+    /// Using non-move copy on the returned node will make a full copy of all underlying children.
+    Node tryGetLeaf(std::string_view path, Level level_ = Level::GLOBAL_LEVEL, bool return_parent_node = false) const
     {
-        if (!children)
-            return {*this, false};
+        /// The implementation of this function is almost the same as `getLeaf`.
+        /// Instead of creating new nodes in-place, this function creates ephemeral nodes without modifying the tree structure.
+        /// If a node already exists, this function returns a lightweight copy of it (without the deep copy of the children)
+        ///
+        /// The nodes, returned by this function, don't have ownership of their children (!)
+        /// Attempting to read or modify `.children` may break the grants tree logic     (!)
+        /// The returned ephemeral nodes shouldn't be used longer than a function scope  (!)
+        if (path.empty() && return_parent_node)
+            return this->makeLightCopy();
 
-        for (auto & child : *children)
+        auto find_possible_prefix = [path](const Node & n)
         {
-            if (path.empty() && child.isLeaf())
-                return {child, true};
+            if (path.empty())
+                return n.isLeaf();
 
-            if (!child.isLeaf() && path.starts_with(child.node_name))
+            return n.node_name[0] == path[0];
+        };
+
+        if (children)
+        {
+            if (auto it = std::find_if(children->begin(), children->end(), find_possible_prefix); it != children->end())
             {
-                if (return_parent_node && path == child.node_name)
-                    return {child, true};
+                if (path.empty())
+                    return it->makeLightCopy();
+
+                auto child = it->makeLightCopy();
+                const auto & [left, right] = std::mismatch(path.begin(), path.end(), child.node_name.begin(), child.node_name.end());
+
+                if (right == child.node_name.end())
+                    return child.tryGetLeaf(path.substr(child.node_name.size()), level_, return_parent_node);
 
-                return child.tryGetLeafOrPrefix(path.substr(child.node_name.size()));
+                /// See `getLeaf`
+                size_t i = std::distance(path.begin(), left);
+                std::string_view prefix = path.substr(0, i);
+                std::string_view new_path = path.substr(i);
+
+                auto new_parent = createChildNode(prefix, level_);
+                child.node_name = child.node_name.substr(i);
+                new_parent.children = std::make_shared<Container>();
+                new_parent.min_flags_with_children = child.min_flags_with_children & flags;
+                new_parent.max_flags_with_children = child.max_flags_with_children | flags;
+                new_parent.children->push_back(std::move(child));
+
+                return new_parent.tryGetLeaf(new_path, level_, return_parent_node);
             }
         }
 
-        return {*this, false};
-    }
+        if (path.empty() || return_parent_node)
+            return createChildNode(path, level_);
 
-    /// Similar to `getLeaf`, but returns nullptr if no leaf was found.
-    const Node * tryGetLeaf(std::string_view path, bool return_parent_node = false) const
-    {
-        const auto & [node, final] = tryGetLeafOrPrefix(path, return_parent_node);
-        if (!final)
-            return nullptr;
-
-        return &node;
+        return createChildNode(path, level_).tryGetLeaf("", level_, return_parent_node);
     }
 
     /// Returns a child node with the given name. If no child was found, creates a new one with specified *level_*.
@@ -767,16 +799,24 @@ struct AccessRights::Node
             return *child;
 
         if (!children)
-            children = std::make_unique<Container>();
-
-        auto & new_child = children->emplace_back();
-        new_child.node_name = name;
-        new_child.level = level_;
-        new_child.flags = flags & new_child.getAllGrantableFlags();
+            children = std::make_shared<Container>();
 
+        auto & new_child = children->emplace_back(createChildNode(name, level_));
         return new_child;
     }
 
+    Node createChildNode(const std::string_view name, const Level level_ = Level::GLOBAL_LEVEL) const
+    {
+        Node child;
+        child.node_name = name;
+        child.level = level_;
+        child.flags = flags & child.getAllGrantableFlags();
+        child.min_flags_with_children = flags;
+        child.max_flags_with_children = flags;
+
+        return child;
+    }
+
     /// Similar to `getChildNode`, but returns nullptr if no child node was found.
     Node * tryGetChildNode(std::string_view name) const
     {
@@ -879,7 +919,13 @@ struct AccessRights::Node
         const AccessFlags & parent_flags_go,
         String path)
     {
-        auto grantable_flags = ::DB::getAllGrantableFlags(static_cast<Level>(full_name.size()));
+        Node * target_node = node;
+        if (!target_node)
+            target_node = node_go;
+
+        auto grantable_flags = target_node
+            ? ::DB::getAllGrantableFlags(target_node->level)
+            : ::DB::getAllGrantableFlags(static_cast<Level>(full_name.size()));
         auto parent_fl = parent_flags & grantable_flags;
         auto parent_fl_go = parent_flags_go & grantable_flags;
         auto flags = node ? node->flags : parent_fl;
@@ -889,10 +935,6 @@ struct AccessRights::Node
         auto grants_go = flags_go - parent_fl_go;
         auto grants = flags - parent_fl - grants_go;
 
-        Node * target_node = node;
-        if (!target_node)
-            target_node = node_go;
-
         /// Inserts into result only meaningful nodes (e.g. wildcards or leafs).
         if (target_node && (target_node->isLeaf() || target_node->wildcard_grant))
         {
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 03e47ed3b6d6..66cad391932c 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -298,7 +298,10 @@ bool Authentication::areCredentialsValid(
     const ClientInfo & client_info,
     SettingsChanges & settings)
 {
-    if (!credentials.isReady())
+    /// It is OK for TokenCredentials to be not ready:
+    /// When auth request happens, we do not even know the username.
+    /// Token is resolved a bit later and the user information will be put in credentials
+    if (!typeid_cast<const TokenCredentials *>(&credentials) && !credentials.isReady())
         return false;
 
     if (const auto * gss_acceptor_context = typeid_cast<const GSSAcceptorContext *>(&credentials))
@@ -340,6 +343,14 @@ bool Authentication::areCredentialsValid(
     }
 #endif
 
+    if (const auto * token_credentials = typeid_cast<const TokenCredentials *>(&credentials))
+    {
+        if (authentication_method.getType() != AuthenticationType::JWT)
+            return false;
+
+        return external_authenticators.checkTokenCredentials(*token_credentials);
+    }
+
     if ([[maybe_unused]] const auto * always_allow_credentials = typeid_cast<const AlwaysAllowCredentials *>(&credentials))
         return true;
 
diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h
index b4ba11c71ea3..2c73aa96698c 100644
--- a/src/Access/Authentication.h
+++ b/src/Access/Authentication.h
@@ -38,6 +38,9 @@ struct Authentication
         explicit Require(const String & realm_);
         const String & getRealm() const;
 
+        Require * clone() const override { return new Require(*this); }
+        void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
+
     private:
         const String realm;
     };
diff --git a/src/Access/AuthenticationData.cpp b/src/Access/AuthenticationData.cpp
index c6760c4a0928..3e8e2e42a8d0 100644
--- a/src/Access/AuthenticationData.cpp
+++ b/src/Access/AuthenticationData.cpp
@@ -27,6 +27,10 @@
 #     include <bcrypt.h>
 #endif
 
+#if USE_JWT_CPP
+#include <picojson/picojson.h>
+#endif
+
 namespace DB
 {
 
@@ -375,7 +379,10 @@ std::shared_ptr<ASTAuthenticationData> AuthenticationData::toAST() const
         }
         case AuthenticationType::JWT:
         {
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "JWT is available only in ClickHouse Cloud");
+            const auto & claims = getJWTClaims();
+            if (!claims.empty())
+                node->children.push_back(std::make_shared<ASTLiteral>(claims));
+            break;
         }
         case AuthenticationType::KERBEROS:
         {
@@ -653,6 +660,22 @@ AuthenticationData AuthenticationData::fromAST(const ASTAuthenticationData & que
         auth_data.setHTTPAuthenticationServerName(server);
         auth_data.setHTTPAuthenticationScheme(scheme);
     }
+#if USE_JWT_CPP
+    else if (query.type == AuthenticationType::JWT)
+    {
+        if (!args.empty())
+        {
+            String value = checkAndGetLiteralArgument<String>(args[0], "claims");
+            picojson::value json_obj;
+            auto error = picojson::parse(json_obj, value);
+            if (!error.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad JWT claims: {}", error);
+            if (!json_obj.is<picojson::object>())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad JWT claims: is not an object");
+            auth_data.setJWTClaims(value);
+        }
+    }
+#endif
     else
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected ASTAuthenticationData structure");
diff --git a/src/Access/AuthenticationData.h b/src/Access/AuthenticationData.h
index 187a17dca948..bcd7bd61270f 100644
--- a/src/Access/AuthenticationData.h
+++ b/src/Access/AuthenticationData.h
@@ -79,6 +79,12 @@ class AuthenticationData
     time_t getValidUntil() const { return valid_until; }
     void setValidUntil(time_t valid_until_) { valid_until = valid_until_; }
 
+    const String & getJWTClaims() const { return jwt_claims; }
+    void setJWTClaims(const String & jwt_claims_) { jwt_claims = jwt_claims_; }
+
+    const String & getTokenProcessorName() const { return token_processor_name; }
+    void setTokenProcessorName(const String & token_processor_name_) { token_processor_name = token_processor_name_; }
+
     friend bool operator ==(const AuthenticationData & lhs, const AuthenticationData & rhs);
     friend bool operator !=(const AuthenticationData & lhs, const AuthenticationData & rhs) { return !(lhs == rhs); }
 
@@ -117,6 +123,8 @@ class AuthenticationData
     String http_auth_server_name;
     HTTPAuthenticationScheme http_auth_scheme = HTTPAuthenticationScheme::BASIC;
     time_t valid_until = 0;
+    String jwt_claims;
+    String token_processor_name;
 };
 
 }
diff --git a/src/Access/Common/AccessType.h b/src/Access/Common/AccessType.h
index 13a9911c702e..3ebf43b0e6ae 100644
--- a/src/Access/Common/AccessType.h
+++ b/src/Access/Common/AccessType.h
@@ -210,6 +210,8 @@ enum class AccessType : uint8_t
                                                                        enabled implicitly by the grant ALTER_TABLE */\
     M(ALTER_SETTINGS, "ALTER SETTING, ALTER MODIFY SETTING, MODIFY SETTING, RESET SETTING", TABLE, ALTER_TABLE) /* allows to execute ALTER MODIFY SETTING */\
     M(ALTER_MOVE_PARTITION, "ALTER MOVE PART, MOVE PARTITION, MOVE PART", TABLE, ALTER_TABLE) \
+    M(ALTER_EXPORT_PART, "ALTER EXPORT PART, EXPORT PART", TABLE, ALTER_TABLE) \
+    M(ALTER_EXPORT_PARTITION, "ALTER EXPORT PARTITION, EXPORT PARTITION", TABLE, ALTER_TABLE) \
     M(ALTER_FETCH_PARTITION, "ALTER FETCH PART, FETCH PARTITION", TABLE, ALTER_TABLE) \
     M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION, UNFREEZE", TABLE, ALTER_TABLE) \
     M(ALTER_UNLOCK_SNAPSHOT, "UNLOCK SNAPSHOT", TABLE, ALTER_TABLE) \
@@ -320,6 +322,8 @@ enum class AccessType : uint8_t
     M(SYSTEM_DROP_SCHEMA_CACHE, "SYSTEM DROP SCHEMA CACHE, DROP SCHEMA CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_FORMAT_SCHEMA_CACHE, "SYSTEM DROP FORMAT SCHEMA CACHE, DROP FORMAT SCHEMA CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_S3_CLIENT_CACHE, "SYSTEM DROP S3 CLIENT, DROP S3 CLIENT CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
+    M(SYSTEM_DROP_OBJECT_STORAGE_LIST_OBJECTS_CACHE, "SYSTEM DROP OBJECT STORAGE LIST OBJECTS CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
+    M(SYSTEM_DROP_PARQUET_METADATA_CACHE, "SYSTEM DROP PARQUET METADATA 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_USERS, "RELOAD USERS", GLOBAL, SYSTEM_RELOAD) \
@@ -334,6 +338,7 @@ enum class AccessType : uint8_t
     M(SYSTEM_TTL_MERGES, "SYSTEM STOP TTL MERGES, SYSTEM START TTL MERGES, STOP TTL MERGES, START TTL MERGES", TABLE, SYSTEM) \
     M(SYSTEM_FETCHES, "SYSTEM STOP FETCHES, SYSTEM START FETCHES, STOP FETCHES, START FETCHES", TABLE, SYSTEM) \
     M(SYSTEM_MOVES, "SYSTEM STOP MOVES, SYSTEM START MOVES, STOP MOVES, START MOVES", TABLE, SYSTEM) \
+    M(SYSTEM_SWARM, "SYSTEM STOP SWARM MODE, SYSTEM START SWARM MODE, STOP SWARM MODE, START SWARM MODE", GLOBAL, SYSTEM) \
     M(SYSTEM_PULLING_REPLICATION_LOG, "SYSTEM STOP PULLING REPLICATION LOG, SYSTEM START PULLING REPLICATION LOG", TABLE, SYSTEM) \
     M(SYSTEM_CLEANUP, "SYSTEM STOP CLEANUP, SYSTEM START CLEANUP", TABLE, SYSTEM) \
     M(SYSTEM_VIEWS, "SYSTEM REFRESH VIEW, SYSTEM START VIEWS, SYSTEM STOP VIEWS, SYSTEM START VIEW, SYSTEM STOP VIEW, SYSTEM CANCEL VIEW, REFRESH VIEW, START VIEWS, STOP VIEWS, START VIEW, STOP VIEW, CANCEL VIEW", VIEW, SYSTEM) \
diff --git a/src/Access/Common/JWKSProvider.cpp b/src/Access/Common/JWKSProvider.cpp
new file mode 100644
index 000000000000..40814ea5eb86
--- /dev/null
+++ b/src/Access/Common/JWKSProvider.cpp
@@ -0,0 +1,106 @@
+#include <Access/Common/JWKSProvider.h>
+
+#if USE_JWT_CPP
+#include <Common/Exception.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/Net/HTTPSClientSession.h>
+#include <Poco/StreamCopier.h>
+#include <fstream>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int AUTHENTICATION_FAILED;
+    extern const int INVALID_CONFIG_PARAMETER;
+}
+
+JWKSType JWKSClient::getJWKS()
+{
+    std::shared_lock lock(mutex);
+
+    auto now = std::chrono::high_resolution_clock::now();
+    auto diff = std::chrono::duration<double>(now - last_request_send).count();
+
+    if (diff < refresh_timeout && cached_jwks.has_value())
+        return cached_jwks.value();
+
+    Poco::Net::HTTPResponse response;
+    std::string response_string;
+
+    Poco::Net::HTTPRequest request{Poco::Net::HTTPRequest::HTTP_GET, jwks_uri.getPathAndQuery()};
+
+    if (jwks_uri.getScheme() == "https")
+    {
+        Poco::Net::HTTPSClientSession session = Poco::Net::HTTPSClientSession(jwks_uri.getHost(), jwks_uri.getPort());
+        session.sendRequest(request);
+        std::istream & response_stream = session.receiveResponse(response);
+        if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK || !response_stream)
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Failed to get user info by access token, code: {}, reason: {}",
+                response.getStatus(), response.getReason());
+        Poco::StreamCopier::copyToString(response_stream, response_string);
+    }
+    else
+    {
+        Poco::Net::HTTPClientSession session = Poco::Net::HTTPClientSession(jwks_uri.getHost(), jwks_uri.getPort());
+        session.sendRequest(request);
+        std::istream & response_stream = session.receiveResponse(response);
+        if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK || !response_stream)
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Failed to get user info by access token, code: {}, reason: {}", response.getStatus(), response.getReason());
+        Poco::StreamCopier::copyToString(response_stream, response_string);
+    }
+
+    last_request_send = std::chrono::high_resolution_clock::now();
+
+    JWKSType parsed_jwks;
+
+    try
+    {
+        parsed_jwks = jwt::parse_jwks(response_string);
+    }
+    catch (const std::exception & e)
+    {
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Failed to parse JWKS: {}", e.what());
+    }
+
+    cached_jwks = std::move(parsed_jwks);
+    return cached_jwks.value();
+}
+
+StaticJWKSParams::StaticJWKSParams(const std::string & static_jwks_, const std::string & static_jwks_file_)
+{
+    if (static_jwks_.empty() && static_jwks_file_.empty())
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                        "JWT validator misconfigured: `static_jwks` or `static_jwks_file` keys must be present in static JWKS validator configuration");
+    if (!static_jwks_.empty() && !static_jwks_file_.empty())
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                        "JWT validator misconfigured: `static_jwks` and `static_jwks_file` keys cannot both be present in static JWKS validator configuration");
+
+    static_jwks = static_jwks_;
+    static_jwks_file = static_jwks_file_;
+}
+
+StaticJWKS::StaticJWKS(const StaticJWKSParams & params)
+{
+    String content = String(params.static_jwks);
+    if (!params.static_jwks_file.empty())
+    {
+        std::ifstream ifs(params.static_jwks_file);
+        Poco::StreamCopier::copyToString(ifs, content);
+    }
+    try
+    {
+        auto keys = jwt::parse_jwks(content);
+        jwks = std::move(keys);
+    }
+    catch (const std::exception & e)
+    {
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Failed to parse JWKS: {}", e.what());
+    }
+}
+
+}
+#endif
diff --git a/src/Access/Common/JWKSProvider.h b/src/Access/Common/JWKSProvider.h
new file mode 100644
index 000000000000..566effd6e21e
--- /dev/null
+++ b/src/Access/Common/JWKSProvider.h
@@ -0,0 +1,73 @@
+#include <config.h>
+
+#if USE_JWT_CPP
+#include <base/types.h>
+#include <jwt-cpp/jwt.h>
+#include <jwt-cpp/traits/kazuho-picojson/traits.h>
+#include <shared_mutex>
+
+#include <Poco/URI.h>
+
+namespace DB
+{
+
+using JWKSType = jwt::jwks<jwt::traits::kazuho_picojson>;
+
+/// JWKS (JSON Web Key Set) is a kind of a set of public keys that are used to validate JWT authenticity locally.
+/// They are usually exposed by identity providers (e.g. Keycloak) via a well-known URI (usually /.well-known/jwks.json)
+/// This interface is responsible for managing JWKS. Retrieving, caching and refreshing of JWKS happens here.
+/// JWKS can either be static (e.g. provided in config) or dynamic (fetched from a remote URI and).
+class IJWKSProvider
+{
+public:
+    virtual ~IJWKSProvider() = default;
+
+    virtual JWKSType getJWKS() = 0;
+};
+
+class JWKSClient : public IJWKSProvider
+{
+public:
+    explicit JWKSClient(const String & uri, const size_t refresh_ms_): refresh_timeout(refresh_ms_), jwks_uri(uri) {}
+
+    ~JWKSClient() override = default;
+    JWKSClient(const JWKSClient &) = delete;
+    JWKSClient(JWKSClient &&) = delete;
+    JWKSClient &operator=(const JWKSClient &) = delete;
+    JWKSClient &operator=(JWKSClient &&) = delete;
+
+    JWKSType getJWKS() override;
+
+private:
+    size_t refresh_timeout;
+    Poco::URI jwks_uri;
+
+    std::shared_mutex mutex;
+    std::optional<JWKSType> cached_jwks;
+    std::chrono::time_point<std::chrono::high_resolution_clock> last_request_send;
+};
+
+struct StaticJWKSParams
+{
+    StaticJWKSParams(const std::string &static_jwks_, const std::string &static_jwks_file_);
+
+    String static_jwks;
+    String static_jwks_file;
+};
+
+class StaticJWKS : public IJWKSProvider
+{
+public:
+    explicit StaticJWKS(const StaticJWKSParams &params);
+
+private:
+    JWKSType getJWKS() override
+    {
+        return jwks;
+    }
+
+    JWKSType jwks;
+};
+
+}
+#endif
diff --git a/src/Access/Credentials.cpp b/src/Access/Credentials.cpp
index 4887d0545656..c60fb3cfea67 100644
--- a/src/Access/Credentials.cpp
+++ b/src/Access/Credentials.cpp
@@ -2,6 +2,7 @@
 #include <Common/Exception.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Common/Crypto/X509Certificate.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -9,6 +10,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int AUTHENTICATION_FAILED;
 }
 
 Credentials::Credentials(const String & user_name_)
@@ -100,4 +102,7 @@ const String & BasicCredentials::getPassword() const
     return password;
 }
 
+/// Unless the token is validated, we will not use any data from it, including username.
+TokenCredentials::TokenCredentials(const String & token_) : Credentials(""), token(token_), expires_at(std::chrono::system_clock::now() + std::chrono::hours(1)) {}
+
 }
diff --git a/src/Access/Credentials.h b/src/Access/Credentials.h
index f98eb31ff0a2..bb81ef93a15c 100644
--- a/src/Access/Credentials.h
+++ b/src/Access/Credentials.h
@@ -16,6 +16,8 @@ namespace Poco::Net
     class SocketAddress;
 }
 
+#include <set>
+
 namespace DB
 {
 
@@ -195,4 +197,47 @@ class SSHPTYCredentials : public Credentials
 #endif
 
 
+class TokenCredentials : public Credentials
+{
+public:
+    explicit TokenCredentials(const String & token_);
+
+    const String & getToken() const
+    {
+        if (token.empty())
+        {
+            throwNotReady();
+        }
+        return token;
+    }
+    void setUserName(const String & user_name_)
+    {
+        user_name = user_name_;
+        if (!user_name.empty())
+        {
+            is_ready = true;
+        }
+    }
+    std::set<String> getGroups() const
+    {
+        return groups;
+    }
+    void setGroups(const std::set<String> & groups_)
+    {
+        groups = groups_;
+    }
+    std::optional<std::chrono::system_clock::time_point> getExpiresAt() const
+    {
+        return expires_at;
+    }
+    void setExpiresAt(std::chrono::system_clock::time_point expires_at_)
+    {
+        expires_at = expires_at_;
+    }
+private:
+    String token;
+    std::set<String> groups;
+    std::optional<std::chrono::system_clock::time_point> expires_at;
+};
+
 }
diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp
index ca61b55dc5dc..99e99c20f738 100644
--- a/src/Access/ExternalAuthenticators.cpp
+++ b/src/Access/ExternalAuthenticators.cpp
@@ -1,7 +1,10 @@
+#include <Access/Credentials.h>
 #include <Access/ExternalAuthenticators.h>
 #include <Access/LDAPClient.h>
 #include <Access/SettingsAuthResponseParser.h>
 #include <Access/resolveSetting.h>
+#include "Common/Logger.h"
+#include "Common/logger_useful.h"
 #include <Common/Exception.h>
 #include <Common/SettingsChanges.h>
 #include <Common/SipHash.h>
@@ -12,6 +15,8 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <Poco/Util/AbstractConfiguration.h>
 
+#include <map>
+#include <memory>
 #include <optional>
 #include <utility>
 
@@ -263,7 +268,6 @@ HTTPAuthClientParams parseHTTPAuthParams(const Poco::Util::AbstractConfiguration
 
     return http_auth_params;
 }
-
 }
 
 void parseLDAPRoleSearchParams(LDAPClient::RoleSearchParams & params, const Poco::Util::AbstractConfiguration & config, const String & prefix)
@@ -281,6 +285,9 @@ void ExternalAuthenticators::resetImpl()
     ldap_client_params_blueprint.clear();
     ldap_caches.clear();
     kerberos_params.reset();
+    token_processors.clear();
+    access_token_to_username_cache.clear();
+    username_to_access_token_cache.clear();
 }
 
 void ExternalAuthenticators::reset()
@@ -289,10 +296,41 @@ void ExternalAuthenticators::reset()
     resetImpl();
 }
 
-void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfiguration & config, LoggerPtr log)
+void parseTokenProcessors(std::unordered_map<String, std::unique_ptr<ITokenProcessor>> & token_processors,
+                        const Poco::Util::AbstractConfiguration & config,
+                        const String & token_processors_config,
+                        LoggerPtr log)
+{
+    Poco::Util::AbstractConfiguration::Keys token_processors_keys;
+    config.keys(token_processors_config, token_processors_keys);
+
+    token_processors.clear();
+
+    for (const auto & processor : token_processors_keys)
+    {
+        String prefix = fmt::format("{}.{}", token_processors_config, processor);
+        try
+        {
+            token_processors[processor] = ITokenProcessor::parseTokenProcessor(config, prefix, processor);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Could not parse token processor" + backQuote(processor));
+        }
+    }
+}
+
+bool ExternalAuthenticators::isTokenAuthEnabled() const
+{
+    std::lock_guard lock(mutex);
+    return token_auth_enabled;
+}
+
+void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfiguration & config, LoggerPtr log, bool token_auth_enabled_)
 {
     std::lock_guard lock(mutex);
     resetImpl();
+    token_auth_enabled = token_auth_enabled_;
 
     Poco::Util::AbstractConfiguration::Keys all_keys;
     config.keys("", all_keys);
@@ -300,8 +338,12 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
     std::size_t ldap_servers_key_count = 0;
     std::size_t kerberos_keys_count = 0;
     std::size_t http_auth_server_keys_count = 0;
+    std::size_t jwt_validators_count = 0;
+    std::size_t token_processors_count = 0;
 
     const String http_auth_servers_config = "http_authentication_servers";
+    const String jwt_validators_config = "jwt_validators";
+    const String token_processors_config = "token_processors";
 
     for (auto key : all_keys)
     {
@@ -314,6 +356,8 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
         ldap_servers_key_count += (key == "ldap_servers");
         kerberos_keys_count += (key == "kerberos");
         http_auth_server_keys_count += (key == http_auth_servers_config);
+        jwt_validators_count += (key == jwt_validators_config);
+        token_processors_count += (key == token_processors_config);
     }
 
     if (ldap_servers_key_count > 1)
@@ -325,6 +369,12 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
     if (http_auth_server_keys_count > 1)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Multiple http_authentication_servers sections are not allowed");
 
+    if (jwt_validators_count > 1)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Multiple {} sections are not allowed", jwt_validators_config);
+
+    if (token_processors_count > 1)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Multiple {} sections are not allowed", token_processors_config);
+
     Poco::Util::AbstractConfiguration::Keys http_auth_server_names;
     config.keys(http_auth_servers_config, http_auth_server_names);
     http_auth_servers.clear();
@@ -379,6 +429,11 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
     {
         tryLogCurrentException(log, "Could not parse Kerberos section");
     }
+
+    if (token_auth_enabled)
+        parseTokenProcessors(token_processors, config, token_processors_config, log);
+    else
+        LOG_INFO(log, "Token authentication is disabled, skipping token processors configuration");
 }
 
 static UInt128 computeParamsHash(const LDAPClient::Params & params, const LDAPClient::RoleSearchParamsList * role_search_params)
@@ -547,7 +602,7 @@ GSSAcceptorContext::Params ExternalAuthenticators::getKerberosParams() const
     return kerberos_params.value();
 }
 
-HTTPAuthClientParams ExternalAuthenticators::getHTTPAuthenticationParams(const String& server) const
+HTTPAuthClientParams ExternalAuthenticators::getHTTPAuthenticationParams(const String & server) const
 {
     std::lock_guard lock{mutex};
 
@@ -557,6 +612,96 @@ HTTPAuthClientParams ExternalAuthenticators::getHTTPAuthenticationParams(const S
     return it->second;
 }
 
+bool ExternalAuthenticators::checkCredentialsAgainstProcessor(const ITokenProcessor & processor,
+                                                              TokenCredentials & credentials) const
+{
+    if (processor.resolveAndValidate(credentials))
+    {
+        TokenCacheEntry cache_entry;
+        cache_entry.user_name = credentials.getUserName();
+        cache_entry.external_roles = credentials.getGroups();
+
+        auto default_expiration_ts = std::chrono::system_clock::now()
+                                     + std::chrono::minutes(processor.getTokenCacheLifetime());
+
+        if (credentials.getExpiresAt().has_value())
+        {
+            if (credentials.getExpiresAt().value() < default_expiration_ts)
+                cache_entry.expires_at = credentials.getExpiresAt().value();
+            else
+                LOG_TRACE(getLogger("AccessTokenAuthentication"), "Attempt to authenticate user {} with expired access token by {}", credentials.getUserName(), processor.getProcessorName());
+
+        }
+        else
+        {
+            cache_entry.expires_at = default_expiration_ts;
+        }
+
+        LOG_DEBUG(getLogger("AccessTokenAuthentication"), "Authenticated user {} with access token by {}", credentials.getUserName(), processor.getProcessorName());
+
+        // CHeck if a cache entry for the same user but with another token exists -- old cache entry is considered outdated and removed
+        auto old_token_iter = username_to_access_token_cache.find(cache_entry.user_name);
+        if (old_token_iter != username_to_access_token_cache.end())
+        {
+            access_token_to_username_cache.erase(old_token_iter->second);
+            username_to_access_token_cache.erase(old_token_iter);
+        }
+
+        access_token_to_username_cache[credentials.getToken()] = cache_entry;
+        username_to_access_token_cache[cache_entry.user_name] = credentials.getToken();
+        LOG_TRACE(getLogger("AccessTokenAuthentication"), "Cache entry for user {} added", cache_entry.user_name);
+
+        return true;
+    }
+    LOG_TRACE(getLogger("AccessTokenAuthentication"), "Failed authentication with access token by {}", processor.getProcessorName());
+
+    return false;
+}
+
+bool ExternalAuthenticators::checkTokenCredentials(const TokenCredentials & credentials, const String & processor_name) const
+{
+    std::lock_guard lock{mutex};
+
+    if (!token_auth_enabled)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Token authentication is disabled");
+
+    if (token_processors.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Token authentication is not configured");
+
+    /// lookup token in local cache if not expired.
+    auto cached_entry_iter = access_token_to_username_cache.find(credentials.getToken());
+    if (cached_entry_iter != access_token_to_username_cache.end())
+    {
+        if (cached_entry_iter->second.expires_at <= std::chrono::system_clock::now()) // Token found in cache, but already outdated -- need to remove it.
+        {
+            LOG_TRACE(getLogger("AccessTokenAuthentication"), "Cache entry for user {} expired, removing", cached_entry_iter->second.user_name);
+            access_token_to_username_cache.erase(cached_entry_iter);
+            username_to_access_token_cache.erase(cached_entry_iter->second.user_name);
+        }
+        else
+        {
+            const auto & user_data = cached_entry_iter->second;
+            const_cast<TokenCredentials &>(credentials).setUserName(user_data.user_name);
+            const_cast<TokenCredentials &>(credentials).setGroups(user_data.external_roles);
+            LOG_TRACE(getLogger("AccessTokenAuthentication"), "Cache entry for user {} found, using it to authenticate", cached_entry_iter->second.user_name);
+            return true;
+        }
+    }
+
+    if (processor_name.empty())
+    {
+        for (const auto & it: token_processors)
+        {
+            if (checkCredentialsAgainstProcessor(*it.second, const_cast<TokenCredentials &>(credentials)))
+                return true;
+        }
+    }
+    else
+        return token_processors.contains(processor_name) && checkCredentialsAgainstProcessor(*token_processors[processor_name], const_cast<TokenCredentials &>(credentials));
+
+    return false;
+}
+
 bool ExternalAuthenticators::checkHTTPBasicCredentials(
     const String & server, const BasicCredentials & credentials, const ClientInfo & client_info, SettingsChanges & settings) const
 {
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index 6aa26bb3842a..1601903c83a1 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Access/TokenProcessors.h>
 #include <Access/Credentials.h>
 #include <Access/GSSAcceptor.h>
 #include <Access/HTTPAuthClient.h>
@@ -13,6 +14,7 @@
 
 #include <chrono>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <optional>
 #include <unordered_map>
@@ -37,7 +39,9 @@ class ExternalAuthenticators
 {
 public:
     void reset();
-    void setConfiguration(const Poco::Util::AbstractConfiguration & config, LoggerPtr log);
+    void setConfiguration(const Poco::Util::AbstractConfiguration & config, LoggerPtr log, bool token_auth_enabled = true);
+
+    bool isTokenAuthEnabled() const;
 
     // The name and readiness of the credentials must be verified before calling these.
     bool checkLDAPCredentials(const String & server, const BasicCredentials & credentials,
@@ -45,6 +49,8 @@ class ExternalAuthenticators
     bool checkKerberosCredentials(const String & realm, const GSSAcceptorContext & credentials) const;
     bool checkHTTPBasicCredentials(const String & server, const BasicCredentials & credentials, const ClientInfo & client_info, SettingsChanges & settings) const;
 
+    bool checkTokenCredentials(const TokenCredentials & credentials, const String & processor_name = "") const;
+
     GSSAcceptorContext::Params getKerberosParams() const;
 
 private:
@@ -66,6 +72,26 @@ class ExternalAuthenticators
     mutable LDAPCaches ldap_caches TSA_GUARDED_BY(mutex) ;
     std::optional<GSSAcceptorContext::Params> kerberos_params TSA_GUARDED_BY(mutex) ;
     std::unordered_map<String, HTTPAuthClientParams> http_auth_servers TSA_GUARDED_BY(mutex) ;
+    mutable std::unordered_map<String, std::unique_ptr<ITokenProcessor>> token_processors TSA_GUARDED_BY(mutex) ;
+
+    struct TokenCacheEntry
+    {
+        std::chrono::system_clock::time_point expires_at;
+        String user_name;
+        std::set<String> external_roles;
+    };
+
+    /// Home-made simple bi-mapping, needed to effectively clean up cache from old tokens.
+    using TokenToUsernameCache = std::unordered_map<String, TokenCacheEntry>;  // Access token -> cache entry
+    using UsernameToTokenCache = std::unordered_map<String, String>;                 // User name -> access token
+
+    mutable TokenToUsernameCache access_token_to_username_cache TSA_GUARDED_BY(mutex) ;
+    mutable UsernameToTokenCache username_to_access_token_cache TSA_GUARDED_BY(mutex) ;
+
+    bool token_auth_enabled TSA_GUARDED_BY(mutex) = true;
+
+    bool checkCredentialsAgainstProcessor(const ITokenProcessor & processor,
+                                          TokenCredentials & credentials) const TSA_REQUIRES(mutex);
 
     void resetImpl() TSA_REQUIRES(mutex);
 };
diff --git a/src/Access/IAccessStorage.cpp b/src/Access/IAccessStorage.cpp
index 3ac24ff1e820..fdc96a6a9e0b 100644
--- a/src/Access/IAccessStorage.cpp
+++ b/src/Access/IAccessStorage.cpp
@@ -11,6 +11,7 @@
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 #include <Common/callOnce.h>
+#include "Access/Common/AuthenticationType.h"
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
@@ -33,6 +34,7 @@ namespace ErrorCodes
     extern const int ACCESS_ENTITY_NOT_FOUND;
     extern const int ACCESS_STORAGE_READONLY;
     extern const int ACCESS_STORAGE_DOESNT_ALLOW_BACKUP;
+    extern const int AUTHENTICATION_FAILED;
     extern const int WRONG_PASSWORD;
     extern const int IP_ADDRESS_NOT_ALLOWED;
     extern const int LOGICAL_ERROR;
@@ -538,6 +540,9 @@ std::optional<AuthResult> IAccessStorage::authenticateImpl(
     bool allow_no_password,
     bool allow_plaintext_password) const
 {
+    if (typeid_cast<const TokenCredentials *>(&credentials) && !typeid_cast<const TokenCredentials *>(&credentials)->isReady())
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Could not resolve username from token");
+
     if (auto id = find<User>(credentials.getUserName()))
     {
         if (auto user = tryRead<User>(*id))
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index fc55c6b081b3..7f39effce778 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -84,7 +84,7 @@ void LDAPAccessStorage::setConfiguration(const Poco::Util::AbstractConfiguration
     role_search_params.swap(role_search_params_cfg);
     common_role_names.swap(common_roles_cfg);
 
-    external_role_hashes.clear();
+    users_external_roles.clear();
     users_per_roles.clear();
     roles_per_users.clear();
     granted_role_names.clear();
@@ -197,13 +197,6 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
 
 
 void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles) const
-{
-    const auto external_roles_hash = boost::hash<LDAPClient::SearchResultsList>{}(external_roles);
-    assignRolesNoLock(user, external_roles, external_roles_hash);
-}
-
-
-void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, std::size_t external_roles_hash) const
 {
     const auto & user_name = user.getName();
     auto & granted_roles = user.granted_roles;
@@ -232,7 +225,7 @@ void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchR
         }
     };
 
-    external_role_hashes.erase(user_name);
+    users_external_roles.erase(user_name);
     granted_roles = {};
     const auto old_role_names = std::move(roles_per_users[user_name]);
 
@@ -280,32 +273,29 @@ void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchR
         granted_role_ids.erase(iit);
     }
 
-    // Actualize roles_per_users mapping and external_role_hashes cache.
+    // Actualize roles_per_users mapping and users_external_roles cache.
     if (local_role_names.empty())
         roles_per_users.erase(user_name);
     else
         roles_per_users[user_name] = std::move(local_role_names);
 
-    external_role_hashes[user_name] = external_roles_hash;
+    users_external_roles[user_name] = external_roles;
 }
 
 
 void LDAPAccessStorage::updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPClient::SearchResultsList & external_roles) const
 {
-    // No need to include common_role_names in this hash each time, since they don't change.
-    const auto external_roles_hash = boost::hash<LDAPClient::SearchResultsList>{}(external_roles);
-
     // Map and grant the roles from scratch only if the list of external role has changed.
-    const auto it = external_role_hashes.find(user_name);
-    if (it != external_role_hashes.end() && it->second == external_roles_hash)
+    const auto it = users_external_roles.find(user_name);
+    if (it != users_external_roles.end() && it->second == external_roles)
         return;
 
-    auto update_func = [this, &external_roles, external_roles_hash] (const AccessEntityPtr & entity_, const UUID &) -> AccessEntityPtr
+    auto update_func = [this, &external_roles] (const AccessEntityPtr & entity_, const UUID &) -> AccessEntityPtr
     {
         if (auto user = typeid_cast<std::shared_ptr<const User>>(entity_))
         {
             auto changed_user = typeid_cast<std::shared_ptr<User>>(user->clone());
-            assignRolesNoLock(*changed_user, external_roles, external_roles_hash);
+            assignRolesNoLock(*changed_user, external_roles);
             return changed_user;
         }
         return entity_;
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index 7efc4704b07e..0c80d77a98d7 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -55,7 +55,6 @@ class LDAPAccessStorage : public IAccessStorage
 
     void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
     void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles) const;
-    void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, std::size_t external_roles_hash) const;
     void updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPClient::SearchResultsList & external_roles) const;
     std::set<String> mapExternalRolesNoLock(const LDAPClient::SearchResultsList & external_roles) const;
     bool areLDAPCredentialsValidNoLock(const User & user, const Credentials & credentials,
@@ -66,7 +65,7 @@ class LDAPAccessStorage : public IAccessStorage
     String ldap_server_name;
     LDAPClient::RoleSearchParamsList role_search_params;
     std::set<String> common_role_names;                         // role name that should be granted to all users at all times
-    mutable std::map<String, std::size_t> external_role_hashes; // user name -> LDAPClient::SearchResultsList hash (most recently retrieved and processed)
+    mutable std::map<String, LDAPClient::SearchResultsList> users_external_roles; // user name -> LDAPClient::SearchResultsList (most recently retrieved and processed)
     mutable std::map<String, std::set<String>> users_per_roles; // role name -> user names (...it should be granted to; may but don't have to exist for common roles)
     mutable std::map<String, std::set<String>> roles_per_users; // user name -> role names (...that should be granted to it; may but don't have to include common roles)
     mutable std::map<UUID, String> granted_role_names;          // (currently granted) role id -> its name
diff --git a/src/Access/TokenAccessStorage.cpp b/src/Access/TokenAccessStorage.cpp
new file mode 100644
index 000000000000..e17bc7159cef
--- /dev/null
+++ b/src/Access/TokenAccessStorage.cpp
@@ -0,0 +1,591 @@
+#include <Access/TokenAccessStorage.h>
+#include <Access/AccessControl.h>
+#include <Access/ExternalAuthenticators.h>
+#include <Access/User.h>
+#include <Access/Role.h>
+#include <Access/SettingsProfile.h>
+#include <Access/Credentials.h>
+#include <Common/Exception.h>
+#include <Common/logger_useful.h>
+#include <Poco/JSON/JSON.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Stringifier.h>
+#include <boost/container_hash/hash.hpp>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace
+{
+    struct ParsedTransform
+    {
+        String pattern;
+        String replacement;
+        bool global;
+    };
+
+    /// Unescape a string segment
+    String unescapeSegment(const String & str, size_t start, size_t end)
+    {
+        String result;
+        result.reserve(end - start);
+        bool escaped = false;
+
+        for (size_t i = start; i < end; ++i)
+        {
+            if (escaped)
+            {
+                result += str[i];
+                escaped = false;
+            }
+            else if (str[i] == '\\')
+                escaped = true;
+            else
+                result += str[i];
+        }
+
+        return result;
+    }
+
+    /// Parse sed-style transform pattern: s/pattern/replacement/flags
+    ParsedTransform parseSedTransform(const String & transform)
+    {
+        if (transform.size() < 4 || transform[0] != 's' || transform[1] != '/')
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid roles_transform format. Expected sed-style pattern like 's/pattern/replacement/g'");
+        }
+
+        bool escaped = false;
+        size_t first_slash = 1;
+        size_t second_slash = String::npos;
+        size_t third_slash = String::npos;
+
+        // Find delimiters using simple state machine
+        for (size_t i = first_slash + 1; i < transform.size(); ++i)
+        {
+            if (escaped)
+            {
+                escaped = false;
+                continue;
+            }
+
+            if (transform[i] == '\\')
+            {
+                escaped = true;
+                continue;
+            }
+
+            if (transform[i] == '/')
+            {
+                if (second_slash == String::npos)
+                    second_slash = i;
+                else if (third_slash == String::npos)
+                    third_slash = i;
+                else
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid roles_transform format. Too many unescaped slashes. Expected sed-style pattern like 's/pattern/replacement/g'");
+            }
+        }
+
+        if (second_slash == String::npos || third_slash == String::npos)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid roles_transform format. Expected sed-style pattern like 's/pattern/replacement/g'");
+
+        ParsedTransform result;
+
+        result.pattern = unescapeSegment(transform, first_slash + 1, second_slash);
+
+        size_t replacement_end = (third_slash != String::npos) ? third_slash : transform.size();
+        result.replacement = unescapeSegment(transform, second_slash + 1, replacement_end);
+
+        String flags = transform.substr(third_slash + 1);
+        result.global = (flags.find('g') != String::npos);
+
+        return result;
+    }
+
+    String applyTransform(const String & input, const String & pattern, const String & replacement, bool global)
+    {
+        if (pattern.empty())
+            return input;
+
+        re2::RE2 re(pattern);
+        if (!re.ok())
+            return input;
+
+        String result = input;
+        if (global)
+        {
+            RE2::GlobalReplace(&result, re, replacement);
+        }
+        else
+        {
+            RE2::Replace(&result, re, replacement);
+        }
+        return result;
+    }
+}
+
+TokenAccessStorage::TokenAccessStorage(const String & storage_name_, AccessControl & access_control_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_)
+        : IAccessStorage(storage_name_), access_control(access_control_), config(config_), prefix(prefix_),
+        memory_storage(storage_name_, access_control.getChangesNotifier(), false)
+{
+    std::lock_guard lock(mutex);
+
+    const String prefix_str = (prefix.empty() ? "" : prefix + ".");
+
+    if (config.has(prefix_str + "roles_filter"))
+        roles_filter.emplace(config.getString(prefix_str + "roles_filter"));
+
+    if (config.has(prefix_str + "roles_transform"))
+    {
+        String transform = config.getString(prefix_str + "roles_transform");
+        ParsedTransform parsed = parseSedTransform(transform);
+        roles_transform_pattern = parsed.pattern;
+        roles_transform_replacement = parsed.replacement;
+        roles_transform_global = parsed.global;
+    }
+
+    provider_name = config.getString(prefix_str + "processor");
+    if (provider_name.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "'processor' must be specified for Token user directory");
+
+    std::set<String> common_roles_cfg;
+    if (config.has(prefix_str + "common_roles"))
+    {
+        Poco::Util::AbstractConfiguration::Keys role_names;
+        config.keys(prefix_str + "common_roles", role_names);
+
+        common_roles_cfg.insert(role_names.begin(), role_names.end());
+    }
+    common_role_names.swap(common_roles_cfg);
+
+    if (config.has(prefix_str + "default_profile"))
+        default_profile_name = config.getString(prefix_str + "default_profile");
+
+    user_external_roles.clear();
+    users_per_roles.clear();
+    roles_per_users.clear();
+    granted_role_names.clear();
+    granted_role_ids.clear();
+
+    role_change_subscription = access_control.subscribeForChanges<Role>(
+            [this] (const UUID & id, const AccessEntityPtr & entity)
+            {
+                this->processRoleChange(id, entity);
+            }
+    );
+}
+
+void TokenAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name)
+{
+    std::vector<UUID> user_ids;
+
+    // Build a list of ids of the relevant users.
+    if (common_role_names.contains(role_name))
+    {
+        user_ids = memory_storage.findAll<User>();
+    }
+    else
+    {
+        const auto it = users_per_roles.find(role_name);
+        if (it != users_per_roles.end())
+        {
+            const auto & user_names = it->second;
+            user_ids.reserve(user_names.size());
+
+            for (const auto & user_name : user_names)
+            {
+                if (const auto user_id = memory_storage.find<User>(user_name))
+                    user_ids.emplace_back(*user_id);
+            }
+        }
+    }
+
+    // Update the granted roles of the relevant users.
+    if (!user_ids.empty())
+    {
+        auto update_func = [&role_id, &grant] (const AccessEntityPtr & entity_, const UUID &) -> AccessEntityPtr
+        {
+            if (auto user = typeid_cast<std::shared_ptr<const User>>(entity_))
+            {
+                auto changed_user = typeid_cast<std::shared_ptr<User>>(user->clone());
+                if (grant)
+                    changed_user->granted_roles.grant(role_id);
+                else
+                    changed_user->granted_roles.revoke(role_id);
+                return changed_user;
+            }
+            return entity_;
+        };
+
+        memory_storage.update(user_ids, update_func);
+    }
+
+    // Actualize granted_role_* mappings.
+    if (grant)
+    {
+        if (!user_ids.empty())
+        {
+            granted_role_names.insert_or_assign(role_id, role_name);
+            granted_role_ids.insert_or_assign(role_name, role_id);
+        }
+    }
+    else
+    {
+        granted_role_ids.erase(role_name);
+        granted_role_names.erase(role_id);
+    }
+}
+
+void TokenAccessStorage::processRoleChange(const UUID & id, const AccessEntityPtr & entity)
+{
+    std::lock_guard lock(mutex);
+    const auto role = typeid_cast<std::shared_ptr<const Role>>(entity);
+    const auto it = granted_role_names.find(id);
+
+    if (role) // Added or renamed a role.
+    {
+        const auto & new_role_name = role->getName();
+        if (it != granted_role_names.end()) // Renamed a granted role.
+        {
+            const auto & old_role_name = it->second;
+            if (new_role_name != old_role_name)
+            {
+                // Revoke the old role first, then grant the new role.
+                applyRoleChangeNoLock(false /* revoke */, id, old_role_name);
+                applyRoleChangeNoLock(true /* grant */, id, new_role_name);
+            }
+        }
+        else // Added a role.
+        {
+            applyRoleChangeNoLock(true /* grant */, id, new_role_name);
+        }
+    }
+    else // Removed a role.
+    {
+        if (it != granted_role_names.end()) // Removed a granted role.
+        {
+            const auto & old_role_name = it->second;
+            applyRoleChangeNoLock(false /* revoke */, id, old_role_name);
+        }
+    }
+}
+
+const char * TokenAccessStorage::getStorageType() const
+{
+    return STORAGE_TYPE;
+}
+
+bool TokenAccessStorage::exists(const UUID & id) const
+{
+    std::lock_guard lock(mutex);
+    return memory_storage.exists(id);
+}
+
+String TokenAccessStorage::getStorageParamsJSON() const
+{
+    std::lock_guard lock(mutex);
+    Poco::JSON::Object params_json;
+
+    params_json.set("provider", provider_name);
+
+    Poco::JSON::Array common_role_names_json;
+    for (const auto & role : common_role_names)
+    {
+        common_role_names_json.add(role);
+    }
+    params_json.set("roles", common_role_names_json);
+
+    std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    oss.exceptions(std::ios::failbit);
+    Poco::JSON::Stringifier::stringify(params_json, oss);
+
+    return oss.str();
+}
+
+bool TokenAccessStorage::areTokenCredentialsValidNoLock(const User & user, const Credentials & credentials, const ExternalAuthenticators & external_authenticators) const
+{
+    if (!credentials.isReady())
+        return false;
+
+    if (credentials.getUserName() != user.getName())
+        return false;
+
+    if (const auto * token_credentials = dynamic_cast<const TokenCredentials *>(&credentials))
+        return external_authenticators.checkTokenCredentials(*token_credentials);
+
+    return false;
+}
+
+std::optional<UUID> TokenAccessStorage::findImpl(AccessEntityType type, const String & name) const
+{
+    std::lock_guard lock(mutex);
+    return memory_storage.find(type, name);
+}
+
+
+std::vector<UUID> TokenAccessStorage::findAllImpl(AccessEntityType type) const
+{
+    std::lock_guard lock(mutex);
+    return memory_storage.findAll(type);
+}
+
+AccessEntityPtr TokenAccessStorage::readImpl(const UUID & id, bool throw_if_not_exists) const
+{
+    std::lock_guard lock(mutex);
+    return memory_storage.read(id, throw_if_not_exists);
+}
+
+std::optional<std::pair<String, AccessEntityType>> TokenAccessStorage::readNameWithTypeImpl(const UUID & id, bool throw_if_not_exists) const
+{
+    std::lock_guard lock(mutex);
+    return memory_storage.readNameWithType(id, throw_if_not_exists);
+}
+
+void TokenAccessStorage::assignRolesNoLock(User & user, const std::set<String> & external_roles) const
+{
+    const auto & user_name = user.getName();
+    auto & granted_roles = user.granted_roles;
+
+    auto grant_role = [this, &user_name, &granted_roles] (const String & role_name, const bool common)
+    {
+        auto it = granted_role_ids.find(role_name);
+        if (it == granted_role_ids.end())
+        {
+            if (const auto role_id = access_control.find<Role>(role_name))
+            {
+                granted_role_names.insert_or_assign(*role_id, role_name);
+                it = granted_role_ids.insert_or_assign(role_name, *role_id).first;
+            }
+        }
+
+        if (it != granted_role_ids.end())
+        {
+            const auto & role_id = it->second;
+            granted_roles.grant(role_id);
+        }
+        else
+        {
+            LOG_TRACE(getLogger(), "Did not grant {} role '{}' to user '{}': role not found", (common ? "common" : "mapped"), role_name, user_name);
+        }
+    };
+
+    user_external_roles.erase(user_name);
+    granted_roles = {};
+    const auto old_role_names = std::move(roles_per_users[user_name]);
+
+    // Grant the common roles first.
+    for (const auto & role_name : common_role_names)
+    {
+        grant_role(role_name, true /* common */);
+    }
+
+    // Grant the mapped external roles and actualize users_per_roles mapping.
+    // external_roles allowed to overlap with common_role_names.
+    for (const auto & role_name : external_roles)
+    {
+        grant_role(role_name, false /* mapped */);
+        users_per_roles[role_name].insert(user_name);
+    }
+
+    // Cleanup users_per_roles and granted_role_* mappings.
+    for (const auto & old_role_name : old_role_names)
+    {
+        if (external_roles.contains(old_role_name))
+            continue;
+
+        const auto rit = users_per_roles.find(old_role_name);
+        if (rit == users_per_roles.end())
+            continue;
+
+        auto & user_names = rit->second;
+        user_names.erase(user_name);
+
+        if (!user_names.empty())
+            continue;
+
+        users_per_roles.erase(rit);
+
+        if (common_role_names.contains(old_role_name))
+            continue;
+
+        const auto iit = granted_role_ids.find(old_role_name);
+        if (iit == granted_role_ids.end())
+            continue;
+
+        const auto old_role_id = iit->second;
+        granted_role_names.erase(old_role_id);
+        granted_role_ids.erase(iit);
+    }
+
+    // Actualize roles_per_users mapping and user_external_roles cache.
+    if (external_roles.empty())
+        roles_per_users.erase(user_name);
+    else
+        roles_per_users[user_name] = external_roles;
+
+    user_external_roles[user_name] = external_roles;
+}
+
+void TokenAccessStorage::assignProfileNoLock(User & user) const
+{
+    if (default_profile_name.empty())
+        return;
+
+    const auto & user_name = user.getName();
+    auto & settings = user.settings;
+
+    // Look up the profile ID once
+    const auto profile_id = access_control.find<SettingsProfile>(default_profile_name);
+    if (!profile_id)
+    {
+        LOG_TRACE(getLogger(), "Did not assign profile '{}' to user '{}': profile not found", default_profile_name, user_name);
+        return;
+    }
+
+    // Check if profile is already assigned
+    bool profile_already_assigned = false;
+    for (const auto & element : settings)
+    {
+        if (element.parent_profile.has_value() && element.parent_profile == *profile_id)
+        {
+            profile_already_assigned = true;
+            break;
+        }
+    }
+
+    if (!profile_already_assigned)
+    {
+        SettingsProfileElement profile_element;
+        profile_element.parent_profile = *profile_id;
+        settings.push_back(std::move(profile_element));
+        LOG_TRACE(getLogger(), "Assigned profile '{}' to user '{}'", default_profile_name, user_name);
+    }
+}
+
+void TokenAccessStorage::updateAssignedRolesNoLock(const UUID & id, const String & user_name, const std::set<String> & external_roles) const
+{
+    // Map and grant the roles from scratch only if the list of external role has changed.
+    const auto it = user_external_roles.find(user_name);
+    if (it != user_external_roles.end() && it->second == external_roles)
+        return;
+
+    auto update_func = [this, &external_roles] (const AccessEntityPtr & entity_, const UUID &) -> AccessEntityPtr
+    {
+        if (auto user = typeid_cast<std::shared_ptr<const User>>(entity_))
+        {
+            auto changed_user = typeid_cast<std::shared_ptr<User>>(user->clone());
+            assignRolesNoLock(*changed_user, external_roles);
+            return changed_user;
+        }
+        return entity_;
+    };
+
+    memory_storage.update(id, update_func);
+}
+
+
+std::optional<AuthResult> TokenAccessStorage::authenticateImpl(
+        const Credentials & credentials,
+        const Poco::Net::IPAddress & address,
+        const ExternalAuthenticators & external_authenticators,
+        const ClientInfo & /* client_info */,
+        bool throw_if_user_not_exists,
+        bool /* allow_no_password */,
+        bool /* allow_plaintext_password */) const
+{
+    std::lock_guard lock(mutex);
+    auto id = memory_storage.find<User>(credentials.getUserName());
+    UserPtr user = id ? memory_storage.read<User>(*id) : nullptr;
+
+    const auto & token_credentials = typeid_cast<const TokenCredentials &>(credentials);
+
+    if (!external_authenticators.checkTokenCredentials(token_credentials, provider_name))
+    {
+        // Even though token itself may be valid (especially in case of a jwt token), authentication has just failed.
+        if (throw_if_user_not_exists)
+            throwNotFound(AccessEntityType::USER, credentials.getUserName(), getStorageName());
+
+        return {};
+    }
+
+    std::shared_ptr<User> new_user;
+    if (!user)
+    {
+        // User does not exist, so we create one, and will add it if authentication is successful.
+        new_user = std::make_shared<User>();
+        new_user->setName(credentials.getUserName());
+        new_user->authentication_methods.emplace_back(AuthenticationType::JWT);
+        user = new_user;
+    }
+
+    if (!isAddressAllowed(*user, address))
+        throwAddressNotAllowed(address);
+
+    std::set<String> external_roles;
+    if (roles_filter.has_value() && roles_filter.value().ok())
+    {
+        LOG_TRACE(getLogger(), "{}: External role filter found, applying only matching groups", getStorageName());
+        for (const auto & group: token_credentials.getGroups()) {
+            if (RE2::FullMatch(group, roles_filter.value()))
+            {
+                String transformed_group = group;
+                if (roles_transform_pattern.has_value() && roles_transform_replacement.has_value())
+                {
+                    transformed_group = applyTransform(group, roles_transform_pattern.value(), roles_transform_replacement.value(), roles_transform_global);
+                    LOG_TRACE(getLogger(), "{}: Transformed group '{}' to '{}'", getStorageName(), group, transformed_group);
+                }
+                external_roles.insert(transformed_group);
+                LOG_TRACE(getLogger(), "{}: Granted role (group) {} to user", getStorageName(), transformed_group);
+            }
+        }
+    }
+    else
+    {
+        LOG_TRACE(getLogger(), "{}: No external role filtering set, applying all available groups", getStorageName());
+        for (const auto & group: token_credentials.getGroups())
+        {
+            String transformed_group = group;
+            if (roles_transform_pattern.has_value() && roles_transform_replacement.has_value())
+            {
+                transformed_group = applyTransform(group, roles_transform_pattern.value(), roles_transform_replacement.value(), roles_transform_global);
+                LOG_TRACE(getLogger(), "{}: Transformed group '{}' to '{}'", getStorageName(), group, transformed_group);
+            }
+            external_roles.insert(transformed_group);
+        }
+    }
+
+    if (new_user)
+    {
+        assignRolesNoLock(*new_user, external_roles);
+        assignProfileNoLock(*new_user);
+        id = memory_storage.insert(new_user);
+    }
+    else
+    {
+        // Just in case external_roles are changed.
+        updateAssignedRolesNoLock(*id, user->getName(), external_roles);
+
+        // Also update profile if needed
+        memory_storage.update(*id, [this] (const AccessEntityPtr & entity_, const UUID &) -> AccessEntityPtr
+        {
+            if (auto user_entity = typeid_cast<std::shared_ptr<const User>>(entity_))
+            {
+                auto changed_user = typeid_cast<std::shared_ptr<User>>(user_entity->clone());
+                assignProfileNoLock(*changed_user);
+                return changed_user;
+            }
+            return entity_;
+        });
+    }
+
+    if (id)
+        return AuthResult{ .user_id = *id, .authentication_data = AuthenticationData(AuthenticationType::JWT) };
+    return std::nullopt;
+}
+
+
+}
diff --git a/src/Access/TokenAccessStorage.h b/src/Access/TokenAccessStorage.h
new file mode 100644
index 000000000000..aedf8843f2b9
--- /dev/null
+++ b/src/Access/TokenAccessStorage.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include <Access/MemoryAccessStorage.h>
+#include <Access/Credentials.h>
+#include <Access/SettingsProfile.h>
+#include <Common/re2.h>
+#include <base/types.h>
+#include <base/scope_guard.h>
+#include <map>
+#include <mutex>
+#include <set>
+#include <vector>
+
+
+namespace Poco
+{
+    namespace Util
+    {
+        class AbstractConfiguration;
+    }
+}
+
+
+namespace DB
+{
+class AccessControl;
+
+/// Implementation of IAccessStorage which allows to import user data from oauth server using access token.
+/// Normally, this should be unified with LDAPAccessStorage, but not done to minimize changes to code that is common with upstream.
+class TokenAccessStorage : public IAccessStorage
+{
+public:
+    static constexpr char STORAGE_TYPE[] = "token";
+
+    explicit TokenAccessStorage(const String & storage_name_, AccessControl & access_control_, const Poco::Util::AbstractConfiguration & config, const String & prefix);
+    ~TokenAccessStorage() override = default;
+
+    // IAccessStorage implementations.
+    const char * getStorageType() const override;
+    String getStorageParamsJSON() const override;
+    bool isReadOnly() const override { return true; }
+    bool exists(const UUID & id) const override;
+
+private:
+    mutable std::recursive_mutex mutex; // Note: Reentrance possible by internal role lookup via access_control
+    AccessControl & access_control;
+    const Poco::Util::AbstractConfiguration & config;
+    const String & prefix;
+
+    String provider_name;
+    std::optional<re2::RE2> roles_filter = std::nullopt;
+    std::optional<String> roles_transform_pattern = std::nullopt;
+    std::optional<String> roles_transform_replacement = std::nullopt;
+    bool roles_transform_global = false;
+
+    std::set<String> common_role_names;                         // role name that should be granted to all users at all times
+    String default_profile_name;                                // settings profile name that should be assigned to all users
+    mutable std::map<String, std::set<String>> user_external_roles;
+    mutable std::map<String, std::set<String>> users_per_roles; // role name -> user names (...it should be granted to; may but don't have to exist for common roles)
+    mutable std::map<String, std::set<String>> roles_per_users; // user name -> role names (...that should be granted to it; may but don't have to include common roles)
+    mutable std::map<UUID, String> granted_role_names;          // (currently granted) role id -> its name
+    mutable std::map<String, UUID> granted_role_ids;            // (currently granted) role name -> its id
+    mutable MemoryAccessStorage memory_storage;
+    scope_guard role_change_subscription;
+
+    void processRoleChange(const UUID & id, const AccessEntityPtr & entity);
+
+    bool areTokenCredentialsValidNoLock(const User & user, const Credentials & credentials, const ExternalAuthenticators & external_authenticators) const;
+
+    void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
+    void assignRolesNoLock(User & user, const std::set<String> & external_roles) const;
+    void assignProfileNoLock(User & user) const;
+    void updateAssignedRolesNoLock(const UUID & id, const String & user_name, const std::set<String> & external_roles) const;
+
+protected:
+    std::optional<UUID> findImpl(AccessEntityType type, const String & name) const override;
+    std::vector<UUID> findAllImpl(AccessEntityType type) const override;
+    AccessEntityPtr readImpl(const UUID & id, bool throw_if_not_exists) const override;
+    std::optional<std::pair<String, AccessEntityType>> readNameWithTypeImpl(const UUID & id, bool throw_if_not_exists) const override;
+    std::optional<AuthResult> authenticateImpl(const Credentials & credentials,
+                                               const Poco::Net::IPAddress & address,
+                                               const ExternalAuthenticators & external_authenticators,
+                                               const ClientInfo & client_info,
+                                               bool throw_if_user_not_exists,
+                                               bool allow_no_password,
+                                               bool allow_plaintext_password) const override;
+};
+}
diff --git a/src/Access/TokenProcessors.h b/src/Access/TokenProcessors.h
new file mode 100644
index 000000000000..c30b5e713236
--- /dev/null
+++ b/src/Access/TokenProcessors.h
@@ -0,0 +1,225 @@
+#pragma once
+
+#include <Access/Credentials.h>
+#include <Poco/Util/AbstractConfiguration.h>
+
+#if USE_JWT_CPP
+#include <Access/Common/JWKSProvider.h>
+#include <jwt-cpp/jwt.h>
+#include <jwt-cpp/traits/kazuho-picojson/traits.h>
+#endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int NOT_IMPLEMENTED;
+}
+
+class ITokenProcessor
+{
+public:
+    explicit ITokenProcessor(const String & processor_name_,
+                             UInt64 token_cache_lifetime_,
+                             const String & username_claim_ = "sub",
+                             const String & groups_claim_ = "groups")
+    : processor_name(processor_name_), token_cache_lifetime(token_cache_lifetime_), username_claim(username_claim_), groups_claim(groups_claim_) {}
+    virtual ~ITokenProcessor() = default;
+
+    virtual bool resolveAndValidate(TokenCredentials &) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for ITokenProcessor interface");
+    }
+
+    virtual bool checkClaims(const TokenCredentials &, const String &) { return true; }
+
+    UInt64 getTokenCacheLifetime() const { return token_cache_lifetime; }
+    String getProcessorName() const { return processor_name; }
+
+    static std::unique_ptr<DB::ITokenProcessor> parseTokenProcessor(
+            const Poco::Util::AbstractConfiguration & config,
+            const String & prefix,
+            const String & processor_name);
+
+protected:
+    const String processor_name;
+    const UInt64 token_cache_lifetime;
+    const String username_claim;
+    const String groups_claim;
+};
+
+#if USE_JWT_CPP
+
+struct StaticKeyJwtParams
+{
+    /// Algorithm name (required). Supported: "none", "hs256", "hs384", "hs512",
+    /// "ps256", "ps384", "ps512", "ed25519", "ed448", "rs256", "rs384", "rs512",
+    /// "es256", "es256k", "es384", "es512"
+    String algo;
+
+    /// For HS algorithms (hs256, hs384, hs512): symmetric key (required for HS algorithms)
+    String static_key;
+
+    /// For HS algorithms: whether static_key is base64 encoded (optional, defaults to false)
+    bool static_key_in_base64 = false;
+
+    /// For PS/ED/RSA/ES algorithms: public key (required for PS/ED/RSA/ES algorithms)
+    String public_key;
+
+    /// For PS/ED/RSA/ES algorithms: private key (optional)
+    String private_key;
+
+    /// For PS/ED/RSA/ES algorithms: public key password (optional)
+    String public_key_password;
+
+    /// For PS/ED/RSA/ES algorithms: private key password (optional)
+    String private_key_password;
+
+    /// JWT claims to validate (optional)
+    String claims;
+};
+
+class StaticKeyJwtProcessor : public ITokenProcessor
+{
+public:
+    explicit StaticKeyJwtProcessor(const String & processor_name_,
+                                   UInt64 token_cache_lifetime_,
+                                   const String & username_claim_,
+                                   const String & groups_claim_,
+                                   const String & expected_issuer_,
+                                   const String & expected_audience_,
+                                   bool allow_no_expiration_,
+                                   const StaticKeyJwtParams & params);
+
+    bool resolveAndValidate(TokenCredentials & credentials) const override;
+    bool checkClaims(const TokenCredentials & credentials, const String & claims_to_check) override;
+
+private:
+    const String claims;
+    const String expected_issuer;
+    const String expected_audience;
+    const bool allow_no_expiration;
+    jwt::verifier<jwt::default_clock, jwt::traits::kazuho_picojson> verifier = jwt::verify();
+};
+
+
+class JwksJwtProcessor : public ITokenProcessor
+{
+public:
+    explicit JwksJwtProcessor(const String & processor_name_,
+                              UInt64 token_cache_lifetime_,
+                              const String & username_claim_,
+                              const String & groups_claim_,
+                              const String & expected_issuer_,
+                              const String & expected_audience_,
+                              bool allow_no_expiration_,
+                              const String & claims_,
+                              size_t verifier_leeway_,
+                              std::shared_ptr<IJWKSProvider> provider_)
+                              : ITokenProcessor(processor_name_, token_cache_lifetime_, username_claim_, groups_claim_),
+                                claims(claims_), expected_issuer(expected_issuer_), expected_audience(expected_audience_),
+                                allow_no_expiration(allow_no_expiration_), provider(provider_), verifier_leeway(verifier_leeway_) {}
+
+    explicit JwksJwtProcessor(const String & processor_name_,
+                              UInt64 token_cache_lifetime_,
+                              const String & username_claim_,
+                              const String & groups_claim_,
+                              const String & expected_issuer_,
+                              const String & expected_audience_,
+                              bool allow_no_expiration_,
+                              const String & claims_,
+                              size_t verifier_leeway_,
+                              const String & jwks_uri_,
+                              size_t jwks_cache_lifetime_)
+                              : JwksJwtProcessor(processor_name_,
+                                                 token_cache_lifetime_,
+                                                 username_claim_,
+                                                 groups_claim_,
+                                                 expected_issuer_,
+                                                 expected_audience_,
+                                                 allow_no_expiration_,
+                                                 claims_,
+                                                 verifier_leeway_,
+                                                 std::make_shared<JWKSClient>(jwks_uri_, jwks_cache_lifetime_)) {}
+
+    bool resolveAndValidate(TokenCredentials & credentials) const override;
+    bool checkClaims(const TokenCredentials & credentials, const String & claims_to_check) override;
+
+private:
+    const String claims;
+    const String expected_issuer;
+    const String expected_audience;
+    const bool allow_no_expiration;
+    mutable jwt::verifier<jwt::default_clock, jwt::traits::kazuho_picojson> verifier = jwt::verify();
+    std::shared_ptr<IJWKSProvider> provider;
+    const size_t verifier_leeway;
+};
+
+/// Opaque tokens
+
+class GoogleTokenProcessor : public ITokenProcessor
+{
+public:
+    GoogleTokenProcessor(const String & processor_name_,
+                         UInt64 token_cache_lifetime_,
+                         const String & username_claim_,
+                         const String & groups_claim_)
+            : ITokenProcessor(processor_name_, token_cache_lifetime_, username_claim_, groups_claim_) {}
+
+    bool resolveAndValidate(TokenCredentials & credentials) const override;
+};
+
+class AzureTokenProcessor : public ITokenProcessor
+{
+public:
+    AzureTokenProcessor(const String & processor_name_,
+                        UInt64 token_cache_lifetime_,
+                        const String & username_claim_,
+                        const String & groups_claim_)
+            : ITokenProcessor(processor_name_, token_cache_lifetime_, username_claim_, groups_claim_) {}
+
+    bool resolveAndValidate(TokenCredentials & credentials) const override;
+};
+
+class OpenIdTokenProcessor : public ITokenProcessor
+{
+public:
+    /// Specify endpoints manually
+    OpenIdTokenProcessor(const String & processor_name_,
+                         UInt64 token_cache_lifetime_,
+                         const String & username_claim_,
+                         const String & groups_claim_,
+                         const String & expected_issuer_,
+                         const String & expected_audience_,
+                         bool allow_no_expiration_,
+                         const String & userinfo_endpoint_,
+                         const String & token_introspection_endpoint_,
+                         UInt64 verifier_leeway_,
+                         const String & jwks_uri_,
+                         UInt64 jwks_cache_lifetime_);
+
+    /// Obtain endpoints from openid-configuration URL
+    OpenIdTokenProcessor(const String & processor_name_,
+                         UInt64 token_cache_lifetime_,
+                         const String & username_claim_,
+                         const String & groups_claim_,
+                         const String & expected_issuer_,
+                         const String & expected_audience_,
+                         bool allow_no_expiration_,
+                         const String & openid_config_endpoint_,
+                         UInt64 verifier_leeway_,
+                         UInt64 jwks_cache_lifetime_);
+
+    bool resolveAndValidate(TokenCredentials & credentials) const override;
+private:
+    Poco::URI userinfo_endpoint;
+    Poco::URI token_introspection_endpoint;
+
+    /// Access token is often a valid JWT, so we can validate it locally to avoid unnecesary network requests.
+    std::optional<JwksJwtProcessor> jwt_validator = std::nullopt;
+};
+
+#endif
+
+}
diff --git a/src/Access/TokenProcessorsJWT.cpp b/src/Access/TokenProcessorsJWT.cpp
new file mode 100644
index 000000000000..e041e4329b24
--- /dev/null
+++ b/src/Access/TokenProcessorsJWT.cpp
@@ -0,0 +1,440 @@
+#include "TokenProcessors.h"
+
+#if USE_JWT_CPP
+#include <Common/Base64.h>
+#include <Common/logger_useful.h>
+#include <Poco/String.h>
+
+namespace DB {
+
+namespace ErrorCodes
+{
+    extern const int AUTHENTICATION_FAILED;
+    extern const int INVALID_CONFIG_PARAMETER;
+}
+
+namespace
+{
+
+bool check_claims(const picojson::value & claims, const picojson::value & payload, const String & path);
+bool check_claims(const picojson::value::object & claims, const picojson::value::object & payload, const String & path)
+{
+    for (const auto & it : claims)
+    {
+        const auto & payload_it = payload.find(it.first);
+        if (payload_it == payload.end())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "Key '{}.{}' not found in JWT payload", path, it.first);
+            return false;
+        }
+        if (!check_claims(it.second, payload_it->second, path + "." + it.first))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool check_claims(const picojson::value::array & claims, const picojson::value::array & payload, const String & path)
+{
+    if (claims.size() > payload.size())
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload too small for claims key '{}'", path);
+        return false;
+    }
+    for (size_t claims_i = 0; claims_i < claims.size(); ++claims_i)
+    {
+        bool found = false;
+        const auto & claims_val = claims.at(claims_i);
+        for (const auto & payload_val : payload)
+        {
+            if (!check_claims(claims_val, payload_val, path + "[" + std::to_string(claims_i) + "]"))
+                continue;
+            found = true;
+        }
+        if (!found)
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not contain an object matching claims key '{}[{}]'", path, claims_i);
+            return false;
+        }
+    }
+    return true;
+}
+
+bool check_claims(const picojson::value & claims, const picojson::value & payload, const String & path)
+{
+    if (claims.is<picojson::array>())
+    {
+        if (!payload.is<picojson::array>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match key type 'array' in claims '{}'", path);
+            return false;
+        }
+        return check_claims(claims.get<picojson::array>(), payload.get<picojson::array>(), path);
+    }
+    if (claims.is<picojson::object>())
+    {
+        if (!payload.is<picojson::object>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match key type 'object' in claims '{}'", path);
+            return false;
+        }
+        return check_claims(claims.get<picojson::object>(), payload.get<picojson::object>(), path);
+    }
+    if (claims.is<bool>())
+    {
+        if (!payload.is<bool>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match key type 'bool' in claims '{}'", path);
+            return false;
+        }
+        if (claims.get<bool>() != payload.get<bool>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match the value in the '{}' assertions. Expected '{}' but given '{}'", path, claims.get<bool>(), payload.get<bool>());
+            return false;
+        }
+        return true;
+    }
+    if (claims.is<double>())
+    {
+        if (!payload.is<double>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match key type 'double' in claims '{}'", path);
+            return false;
+        }
+        if (claims.get<double>() != payload.get<double>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match the value in the '{}' assertions. Expected '{}' but given '{}'", path, claims.get<double>(), payload.get<double>());
+            return false;
+        }
+        return true;
+    }
+    if (claims.is<std::string>())
+    {
+        if (!payload.is<std::string>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match key type 'std::string' in claims '{}'", path);
+            return false;
+        }
+        if (claims.get<std::string>() != payload.get<std::string>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match the value in the '{}' assertions. Expected '{}' but given '{}'", path, claims.get<std::string>(), payload.get<std::string>());
+            return false;
+        }
+        return true;
+    }
+#ifdef PICOJSON_USE_INT64
+    if (claims.is<int64_t>())
+    {
+        if (!payload.is<int64_t>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match key type 'int64_t' in claims '{}'", path);
+            return false;
+        }
+        if (claims.get<int64_t>() != payload.get<int64_t>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "JWT payload does not match the value in claims '{}'. Expected '{}' but given '{}'", path, claims.get<int64_t>(), payload.get<int64_t>());
+            return false;
+        }
+        return true;
+    }
+#endif
+    LOG_ERROR(getLogger("TokenAuthentication"), "JWT claim '{}' does not match any known type", path);
+    return false;
+}
+
+bool check_claims(const String & claims, const picojson::value::object & payload)
+{
+    if (claims.empty())
+        return true;
+    picojson::value json;
+    auto errors = picojson::parse(json, claims);
+    if (!errors.empty())
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Bad JWT claims: {}", errors);
+    if (!json.is<picojson::object>())
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Bad JWT claims: is not an object");
+    return check_claims(json.get<picojson::value::object>(), payload, "");
+}
+
+}
+
+namespace
+{
+std::set<String> parseGroupsFromJsonArray(picojson::array groups_array)
+{
+    std::set<String> external_groups_names;
+
+    for (const auto & group : groups_array)
+    {
+        if (group.is<std::string>())
+            external_groups_names.insert(group.get<std::string>());
+    }
+
+    return external_groups_names;
+}
+}
+
+StaticKeyJwtProcessor::StaticKeyJwtProcessor(const String & processor_name_,
+                                             UInt64 token_cache_lifetime_,
+                                             const String & username_claim_,
+                                             const String & groups_claim_,
+                                             const String & expected_issuer_,
+                                             const String & expected_audience_,
+                                             bool allow_no_expiration_,
+                                             const StaticKeyJwtParams & params)
+                                             : ITokenProcessor(processor_name_, token_cache_lifetime_, username_claim_, groups_claim_),
+                                             claims(params.claims), expected_issuer(expected_issuer_), expected_audience(expected_audience_),
+                                             allow_no_expiration(allow_no_expiration_)
+{
+    const String & algo = params.algo;
+    const String & static_key = params.static_key;
+    bool static_key_in_base64 = params.static_key_in_base64;
+    const String & public_key = params.public_key;
+    const String & private_key = params.private_key;
+    const String & public_key_password = params.public_key_password;
+    const String & private_key_password = params.private_key_password;
+
+    if (algo == "ps256"   ||
+        algo == "ps384"   ||
+        algo == "ps512"   ||
+        algo == "ed25519" ||
+        algo == "ed448"   ||
+        algo == "rs256"   ||
+        algo == "rs384"   ||
+        algo == "rs512"   ||
+        algo == "es256"   ||
+        algo == "es256k"  ||
+        algo == "es384"   ||
+        algo == "es512"   )
+    {
+        if (public_key.empty())
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "{}: Invalid token processor definition, `public_key` parameter required for {}", processor_name, algo);
+    }
+    else if (algo == "hs256" ||
+             algo == "hs384" ||
+             algo == "hs512" )
+    {
+        if (static_key.empty())
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "{}: Invalid token processor definition, `static_key` parameter required for {}", processor_name, algo);
+    }
+    else if (algo != "none")
+        throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "{}: Invalid token processor definition, unknown algorithm {}", processor_name, algo);
+
+    if (algo == "none")
+        verifier = verifier.allow_algorithm(jwt::algorithm::none());
+    else if (algo == "ps256")
+        verifier = verifier.allow_algorithm(jwt::algorithm::ps256(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "ps384")
+        verifier = verifier.allow_algorithm(jwt::algorithm::ps384(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "ps512")
+        verifier = verifier.allow_algorithm(jwt::algorithm::ps512(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "ed25519")
+        verifier = verifier.allow_algorithm(jwt::algorithm::ed25519(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "ed448")
+        verifier = verifier.allow_algorithm(jwt::algorithm::ed448(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "rs256")
+        verifier = verifier.allow_algorithm(jwt::algorithm::rs256(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "rs384")
+        verifier = verifier.allow_algorithm(jwt::algorithm::rs384(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "rs512")
+        verifier = verifier.allow_algorithm(jwt::algorithm::rs512(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "es256")
+        verifier = verifier.allow_algorithm(jwt::algorithm::es256(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "es256k")
+        verifier = verifier.allow_algorithm(jwt::algorithm::es256k(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "es384")
+        verifier = verifier.allow_algorithm(jwt::algorithm::es384(public_key, private_key, public_key_password, private_key_password));
+    else if (algo == "es512")
+        verifier = verifier.allow_algorithm(jwt::algorithm::es512(public_key, private_key, public_key_password, private_key_password));
+    else if (algo.starts_with("hs"))
+    {
+        auto key = static_key;
+        if (static_key_in_base64)
+            key = base64Decode(key);
+        if (algo == "hs256")
+            verifier = verifier.allow_algorithm(jwt::algorithm::hs256(key));
+        else if (algo == "hs384")
+            verifier = verifier.allow_algorithm(jwt::algorithm::hs384(key));
+        else if (algo == "hs512")
+            verifier = verifier.allow_algorithm(jwt::algorithm::hs512(key));
+        else
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "{}: Invalid token processor definition, unknown algorithm {}", processor_name, algo);
+    }
+    else
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "{}: Invalid token processor definition, unknown algorithm {}", processor_name, algo);
+
+    if (!expected_issuer.empty())
+        verifier = verifier.with_issuer(expected_issuer);
+
+    if (!expected_audience.empty())
+        verifier = verifier.with_audience(expected_audience);
+}
+
+namespace
+{
+bool checkUserClaims(const TokenCredentials & credentials, const String & claims_to_check)
+{
+    try {
+        auto decoded_jwt = jwt::decode(credentials.getToken());
+        return check_claims(claims_to_check, decoded_jwt.get_payload_json());
+    }
+    catch (const std::exception &)
+    {
+        return false;
+    }
+}
+}
+
+bool StaticKeyJwtProcessor::checkClaims(const TokenCredentials & credentials, const String & claims_to_check)
+{
+    return checkUserClaims(credentials, claims_to_check);
+}
+
+bool JwksJwtProcessor::checkClaims(const TokenCredentials & credentials, const String & claims_to_check)
+{
+    return checkUserClaims(credentials, claims_to_check);
+}
+
+bool StaticKeyJwtProcessor::resolveAndValidate(TokenCredentials & credentials) const
+{
+    try
+    {
+        auto decoded_jwt = jwt::decode(credentials.getToken());
+        verifier.verify(decoded_jwt);
+
+        if (!allow_no_expiration && !decoded_jwt.has_expires_at())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "{}: Token missing 'exp' claim, rejecting", processor_name);
+            return false;
+        }
+
+        if (!check_claims(claims, decoded_jwt.get_payload_json()))
+            return false;
+
+        if (!decoded_jwt.has_payload_claim(username_claim))
+        {
+            LOG_ERROR(getLogger("TokenAuthentication"), "{}: Specified username_claim {} not found in token", processor_name, username_claim);
+            return false;
+        }
+
+        credentials.setUserName(decoded_jwt.get_payload_claim(username_claim).as_string());
+
+        if (decoded_jwt.has_payload_claim(groups_claim))
+            credentials.setGroups(parseGroupsFromJsonArray(decoded_jwt.get_payload_claim(groups_claim).as_array()));
+        else
+            LOG_TRACE(getLogger("TokenAuthentication"), "{}: Specified groups_claim {} not found in token, no external roles will be mapped", processor_name, groups_claim);
+
+        return true;
+    }
+    catch (const std::exception & ex)
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: Failed to validate JWT: {}", processor_name, ex.what());
+        return false;
+    }
+}
+
+bool JwksJwtProcessor::resolveAndValidate(TokenCredentials & credentials) const
+{
+    auto decoded_jwt = jwt::decode(credentials.getToken());
+
+    if (!allow_no_expiration && !decoded_jwt.has_expires_at())
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: Token missing 'exp' claim, rejecting", processor_name);
+        return false;
+    }
+
+    if (!decoded_jwt.has_payload_claim(username_claim))
+    {
+        LOG_ERROR(getLogger("TokenAuthentication"), "{}: Specified username_claim not found in token", processor_name);
+        return false;
+    }
+
+    if (!decoded_jwt.has_key_id())
+    {
+        LOG_ERROR(getLogger("TokenAuthentication"), "{}: 'kid' (key ID) claim not found in token", processor_name);
+        return false;
+    }
+
+    if (!provider->getJWKS().has_jwk(decoded_jwt.get_key_id()))
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "JWKS error: no JWK found for JWT");
+
+    auto jwk = provider->getJWKS().get_jwk(decoded_jwt.get_key_id());
+    auto username = decoded_jwt.get_payload_claim(username_claim).as_string();
+
+    if (!decoded_jwt.has_algorithm())
+    {
+        LOG_ERROR(getLogger("TokenAuthentication"), "{}: Algorithm not specified in token", processor_name);
+        return false;
+    }
+    auto algo = Poco::toLower(decoded_jwt.get_algorithm());
+
+
+    String public_key;
+
+    try
+    {
+        auto x5c = jwk.get_x5c_key_value();
+
+        if (!x5c.empty())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "{}: Verifying {} with 'x5c' key", processor_name, username);
+            public_key = jwt::helper::convert_base64_der_to_pem(x5c);
+        }
+    }
+    catch (const jwt::error::claim_not_present_exception &)
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: x5c was not specified in JWK, will try RSA components", processor_name);
+    }
+    catch (const std::bad_cast &)
+    {
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "JWT cannot be validated: invalid claim value type found, claims must be strings");
+    }
+
+    if (public_key.empty())
+    {
+        if (!(jwk.has_jwk_claim("n") && jwk.has_jwk_claim("e")))
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "{}: invalid JWK: 'n' or 'e' not found", processor_name);
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: `issuer` or `x5c` not present, verifying {} with RSA components", processor_name, username);
+        const auto modulus = jwk.get_jwk_claim("n").as_string();
+        const auto exponent = jwk.get_jwk_claim("e").as_string();
+        public_key = jwt::helper::create_public_key_from_rsa_components(modulus, exponent);
+    }
+
+    if (jwk.has_algorithm() && Poco::toLower(jwk.get_algorithm()) != algo)
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "JWT validation error: `alg` in JWK does not match the algorithm used in JWT");
+
+    if (algo == "rs256")
+        verifier = verifier.allow_algorithm(jwt::algorithm::rs256(public_key, "", "", ""));
+    else if (algo == "rs384")
+        verifier = verifier.allow_algorithm(jwt::algorithm::rs384(public_key, "", "", ""));
+    else if (algo == "rs512")
+        verifier = verifier.allow_algorithm(jwt::algorithm::rs512(public_key, "", "", ""));
+    else
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "JWT cannot be validated: unknown algorithm {}", algo);
+
+    verifier = verifier.leeway(verifier_leeway);
+
+    if (!expected_issuer.empty())
+        verifier = verifier.with_issuer(expected_issuer);
+
+    if (!expected_audience.empty())
+        verifier = verifier.with_audience(expected_audience);
+
+    verifier.verify(decoded_jwt);
+
+    if (!claims.empty() && !check_claims(claims, decoded_jwt.get_payload_json()))
+        return false;
+
+    credentials.setUserName(decoded_jwt.get_payload_claim(username_claim).as_string());
+
+    if (decoded_jwt.has_payload_claim(groups_claim))
+        credentials.setGroups(parseGroupsFromJsonArray(decoded_jwt.get_payload_claim(groups_claim).as_array()));
+    else
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: Specified groups_claim {} not found in token, no external roles will be mapped", processor_name, groups_claim);
+
+    return true;
+}
+
+}
+
+#endif
diff --git a/src/Access/TokenProcessorsOpaque.cpp b/src/Access/TokenProcessorsOpaque.cpp
new file mode 100644
index 000000000000..7de06f0571ea
--- /dev/null
+++ b/src/Access/TokenProcessorsOpaque.cpp
@@ -0,0 +1,399 @@
+#include "TokenProcessors.h"
+
+#if USE_JWT_CPP
+#include <Common/logger_useful.h>
+#include <Poco/StreamCopier.h>
+#include <Poco/Net/HTTPSClientSession.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+
+namespace DB {
+
+namespace ErrorCodes
+{
+    extern const int AUTHENTICATION_FAILED;
+    extern const int INVALID_CONFIG_PARAMETER;
+}
+
+namespace
+{
+    /// The JSON reply from provider has only a few key-value pairs, so no need for any advanced parsing.
+    /// Reduce complexity by using picojson.
+    picojson::object parseJSON(const String & json_string) {
+        picojson::value jsonValue;
+        std::string err = picojson::parse(jsonValue, json_string);
+
+        if (!err.empty()) {
+            throw std::runtime_error("JSON parsing error: " + err);
+        }
+
+        if (!jsonValue.is<picojson::object>()) {
+            throw std::runtime_error("JSON is not an object");
+        }
+
+        return jsonValue.get<picojson::object>();
+    }
+
+    template<typename ValueType = std::string, bool throw_on_exception = true>
+    std::optional<ValueType> getValueByKey(const picojson::object & jsonObject, const std::string & key) {
+        auto it = jsonObject.find(key); // Find the key in the object
+        if (it == jsonObject.end())
+        {
+            if constexpr (throw_on_exception)
+                throw std::runtime_error("Key not found: " + key);
+            else
+                return std::nullopt;
+        }
+
+        const picojson::value & value = it->second;
+        if (!value.is<ValueType>()) {
+            if constexpr (throw_on_exception)
+                throw std::runtime_error("Value for key '" + key + "' has incorrect type.");
+            else
+                return std::nullopt;
+        }
+
+        return value.get<ValueType>();
+    }
+
+    picojson::object getObjectFromURI(const Poco::URI & uri, const String & token = "")
+    {
+        Poco::Net::HTTPResponse response;
+        std::ostringstream responseString;
+
+        Poco::Net::HTTPRequest request{Poco::Net::HTTPRequest::HTTP_GET, uri.getPathAndQuery()};
+        if (!token.empty())
+            request.add("Authorization", "Bearer " + token);
+
+        if (uri.getScheme() == "https") {
+            Poco::Net::HTTPSClientSession session(uri.getHost(), uri.getPort());
+            session.sendRequest(request);
+            Poco::StreamCopier::copyStream(session.receiveResponse(response), responseString);
+        }
+        else
+        {
+            Poco::Net::HTTPClientSession session(uri.getHost(), uri.getPort());
+            session.sendRequest(request);
+            Poco::StreamCopier::copyStream(session.receiveResponse(response), responseString);
+        }
+
+        if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK)
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED,
+                            "Failed to get user info by access token, code: {}, reason: {}", response.getStatus(),
+                            response.getReason());
+
+        try
+        {
+            return parseJSON(responseString.str());
+        }
+        catch (const std::runtime_error & e)
+        {
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Failed to parse server response: {}", e.what());
+        }
+    }
+}
+
+bool GoogleTokenProcessor::resolveAndValidate(TokenCredentials & credentials) const
+{
+    const String & token = credentials.getToken();
+
+    std::unordered_map<String, String> user_info;
+    picojson::object user_info_json = getObjectFromURI(Poco::URI("https://www.googleapis.com/oauth2/v3/userinfo"), token);
+
+    if (!user_info_json.contains("email"))
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED,
+                        "{}: Specified username_claim {} not found in token", processor_name, username_claim);
+
+    user_info["email"] = getValueByKey<std::string, false>(user_info_json, "email").value_or("");
+
+    user_info[username_claim] = getValueByKey(user_info_json, username_claim).value();
+
+    String user_name = user_info[username_claim];
+
+    credentials.setUserName(user_name);
+
+    auto token_info = getObjectFromURI(Poco::URI("https://www.googleapis.com/oauth2/v3/tokeninfo"), token);
+    if (token_info.contains("exp"))
+        credentials.setExpiresAt(std::chrono::system_clock::from_time_t((getValueByKey<time_t>(token_info, "exp").value())));
+
+    /// Groups info can only be retrieved if user email is known.
+    /// If no email found in user info, we skip this step and there are no external roles for the user.
+    if (!user_info["email"].empty())
+    {
+        std::set<String> external_groups_names;
+        const Poco::URI get_groups_uri = Poco::URI("https://cloudidentity.googleapis.com/v1/groups/-/memberships:searchDirectGroups?query=member_key_id==" + user_info["email"] + "'");
+
+        try
+        {
+            auto groups_response = getObjectFromURI(get_groups_uri, token);
+
+            if (!groups_response.contains("memberships") || !groups_response["memberships"].is<picojson::array>())
+            {
+                LOG_TRACE(getLogger("TokenAuthentication"),
+                          "{}: Failed to get Google groups: invalid content in response from server", processor_name);
+                return true;
+            }
+
+            for (const auto & group: groups_response["memberships"].get<picojson::array>())
+            {
+                if (!group.is<picojson::object>())
+                {
+                    LOG_TRACE(getLogger("TokenAuthentication"),
+                              "{}: Failed to get Google groups: invalid content in response from server", processor_name);
+                    continue;
+                }
+
+                auto group_data = group.get<picojson::object>();
+                String group_name = getValueByKey<std::string, false>(group_data["groupKey"].get<picojson::object>(), "id").value_or("");
+                if (!group_name.empty())
+                {
+                    external_groups_names.insert(group_name);
+                    LOG_TRACE(getLogger("TokenAuthentication"),
+                              "{}: User {}: new external group {}", processor_name, user_name, group_name);
+                }
+            }
+
+            credentials.setGroups(external_groups_names);
+        }
+        catch (const Exception & e)
+        {
+            /// Could not get groups info. Log it and skip it.
+            LOG_TRACE(getLogger("TokenAuthentication"),
+                      "{}: Failed to get Google groups, no external roles will be mapped. reason: {}", processor_name, e.what());
+            return true;
+        }
+    }
+
+    return true;
+}
+
+bool AzureTokenProcessor::resolveAndValidate(TokenCredentials & credentials) const
+{
+    /// Token is a JWT in this case, but we cannot directly verify it against Azure AD JWKS.
+    /// We will not trust user data in this token except for 'exp' value to determine caching duration.
+    /// Explanation here: https://stackoverflow.com/questions/60778634/failing-signature-validation-of-jwt-tokens-from-azure-ad
+    /// Let Azure validate it: only valid tokens will be accepted.
+    /// Use GET https://graph.microsoft.com/oidc/userinfo to verify token and get user info at the same time
+
+    const String & token = credentials.getToken();
+
+    try
+    {
+        picojson::object user_info_json = getObjectFromURI(Poco::URI("https://graph.microsoft.com/oidc/userinfo"), token);
+        String username = getValueByKey(user_info_json, username_claim).value();
+
+        if (!username.empty())
+            credentials.setUserName(username);
+        else
+            LOG_TRACE(getLogger("TokenAuthentication"), "{}: Failed to get username with token", processor_name);
+
+    }
+    catch (...)
+    {
+        return false;
+    }
+
+    try
+    {
+        credentials.setExpiresAt(jwt::decode(token).get_expires_at());
+    }
+    catch (...) {
+        LOG_TRACE(getLogger("TokenAuthentication"),
+                  "{}: No expiration data found in a valid token, will use default cache lifetime", processor_name);
+    }
+
+    std::set<String> external_groups_names;
+    const Poco::URI get_groups_uri = Poco::URI("https://graph.microsoft.com/v1.0/me/memberOf");
+
+    try
+    {
+        auto groups_response = getObjectFromURI(get_groups_uri, token);
+
+        if (!groups_response.contains("value") || !groups_response["value"].is<picojson::array>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"),
+                      "{}: Failed to get Azure groups: invalid content in response from server", processor_name);
+            return true;
+        }
+
+        picojson::array groups_array = groups_response["value"].get<picojson::array>();
+
+        for (const auto & group: groups_array)
+        {
+            /// Got some invalid response. Ignore this, log this.
+            if (!group.is<picojson::object >())
+            {
+                LOG_TRACE(getLogger("TokenAuthentication"),
+                          "{}: Failed to get Azure groups: invalid content in response from server", processor_name);
+                continue;
+            }
+
+            auto group_data = group.get<picojson::object>();
+            if (!group_data.contains("displayName"))
+                continue;
+
+            String group_name = getValueByKey<std::string, false>(group_data, "displayName").value_or("");
+            if (!group_name.empty())
+            {
+                external_groups_names.insert(group_name);
+                LOG_TRACE(getLogger("TokenAuthentication"), "{}: User {}: new external group {}", processor_name, credentials.getUserName(), group_name);
+            }
+        }
+    }
+    catch (const Exception & e)
+    {
+        /// Could not get groups info. Log it and skip it.
+        LOG_TRACE(getLogger("TokenAuthentication"),
+                  "{}: Failed to get Azure groups, no external roles will be mapped. reason: {}", processor_name, e.what());
+        return true;
+    }
+
+    credentials.setGroups(external_groups_names);
+    return true;
+}
+
+OpenIdTokenProcessor::OpenIdTokenProcessor(const String & processor_name_,
+                                           UInt64 token_cache_lifetime_,
+                                           const String & username_claim_,
+                                           const String & groups_claim_,
+                                           const String & expected_issuer_,
+                                           const String & expected_audience_,
+                                           bool allow_no_expiration_,
+                                           const String & userinfo_endpoint_,
+                                           const String & token_introspection_endpoint_,
+                                           UInt64 verifier_leeway_,
+                                           const String & jwks_uri_,
+                                           UInt64 jwks_cache_lifetime_)
+        : ITokenProcessor(processor_name_, token_cache_lifetime_, username_claim_, groups_claim_),
+          userinfo_endpoint(userinfo_endpoint_), token_introspection_endpoint(token_introspection_endpoint_)
+{
+    if (!jwks_uri_.empty())
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: JWKS URI set, local JWT processing will be attempted", processor_name_);
+        jwt_validator.emplace(processor_name_ + "jwks_val",
+                              token_cache_lifetime_,
+                              username_claim_,
+                              groups_claim_,
+                              expected_issuer_,
+                              expected_audience_,
+                              allow_no_expiration_,
+                              "",
+                              verifier_leeway_,
+                              jwks_uri_,
+                              jwks_cache_lifetime_);
+    }
+}
+
+OpenIdTokenProcessor::OpenIdTokenProcessor(const String & processor_name_,
+                                           UInt64 token_cache_lifetime_,
+                                           const String & username_claim_,
+                                           const String & groups_claim_,
+                                           const String & expected_issuer_,
+                                           const String & expected_audience_,
+                                           bool allow_no_expiration_,
+                                           const String & openid_config_endpoint_,
+                                           UInt64 verifier_leeway_,
+                                           UInt64 jwks_cache_lifetime_)
+    : ITokenProcessor(processor_name_, token_cache_lifetime_, username_claim_, groups_claim_)
+{
+    const picojson::object openid_config = getObjectFromURI(Poco::URI(openid_config_endpoint_));
+
+    if (!openid_config.contains("userinfo_endpoint") || !openid_config.contains("introspection_endpoint"))
+        throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "{}: Cannot extract userinfo_endpoint or introspection_endpoint from OIDC configuration, consider manual configuration.", processor_name);
+
+    if (openid_config.contains("jwks_uri"))
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: JWKS URI set, local JWT processing will be attempted", processor_name_);
+        jwt_validator.emplace(processor_name_ + "jwks_val",
+                              token_cache_lifetime_,
+                              username_claim_,
+                              groups_claim_,
+                              expected_issuer_,
+                              expected_audience_,
+                              allow_no_expiration_,
+                              "",
+                              verifier_leeway_,
+                              getValueByKey(openid_config, "jwks_uri").value(),
+                              jwks_cache_lifetime_);
+    }
+}
+
+bool OpenIdTokenProcessor::resolveAndValidate(TokenCredentials & credentials) const
+{
+    const String & token = credentials.getToken();
+    String username;
+    picojson::object user_info_json;
+
+    if (jwt_validator.has_value() && jwt_validator.value().resolveAndValidate(credentials))
+    {
+        try
+        {
+            auto decoded_token = jwt::decode(token);
+            user_info_json = decoded_token.get_payload_json();
+            username = getValueByKey(user_info_json, username_claim).value();
+
+            /// TODO: Now we work only with Keycloak -- and it provides expires_at in token itself. Need to add actual token introspection logic for other OIDC providers.
+            if (decoded_token.has_expires_at())
+                credentials.setExpiresAt(decoded_token.get_expires_at());
+        }
+        catch (const std::exception & ex)
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"), "{}: Failed to process token as JWT: {}", processor_name, ex.what());
+        }
+    }
+
+    /// If username or user info is empty -- local validation failed, trying introspection via provider
+    if (username.empty() || user_info_json.empty())
+    {
+        try
+        {
+            user_info_json = getObjectFromURI(userinfo_endpoint, token);
+            username = getValueByKey(user_info_json, username_claim).value();
+        }
+        catch (...)
+        {
+            return false;
+        }
+    }
+
+    if (user_info_json.empty())
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: Failed to obtain user info", processor_name);
+        return false;
+    }
+
+    if (username.empty())
+    {
+        LOG_TRACE(getLogger("TokenAuthentication"), "{}: Failed to get username", processor_name);
+        return false;
+    }
+
+    credentials.setUserName(username);
+
+    /// For now, list of groups is expected in a claim with specified name either in token itself or in userinfo response (Keycloak works this way)
+    /// TODO: add support for custom endpoints for retrieving groups. Keycloak lists groups in /userinfo and token itself, which is not always the case.
+    if (!groups_claim.empty() && user_info_json.contains(groups_claim))
+    {
+        if (!user_info_json[groups_claim].is<picojson::array>())
+        {
+            LOG_TRACE(getLogger("TokenAuthentication"),
+                      "{}: Failed to extract groups: invalid content in user data", processor_name);
+            return true;
+        }
+
+        std::set<String> external_groups_names;
+
+        picojson::array groups_array = user_info_json[groups_claim].get<picojson::array>();
+        for (const auto & group: groups_array)
+        {
+            if (group.is<std::string>())
+                external_groups_names.insert(group.get<std::string>());
+        }
+        credentials.setGroups(external_groups_names);
+    }
+
+    return true;
+}
+
+}
+#endif
diff --git a/src/Access/TokenProcessorsParse.cpp b/src/Access/TokenProcessorsParse.cpp
new file mode 100644
index 000000000000..fa83c5fa6a34
--- /dev/null
+++ b/src/Access/TokenProcessorsParse.cpp
@@ -0,0 +1,139 @@
+#include "TokenProcessors.h"
+
+#include <Common/logger_useful.h>
+#include <Poco/String.h>
+
+namespace DB {
+
+namespace ErrorCodes
+{
+    extern const int INVALID_CONFIG_PARAMETER;
+    extern const int SUPPORT_IS_DISABLED;
+}
+
+#if USE_JWT_CPP
+std::unique_ptr<DB::ITokenProcessor> ITokenProcessor::parseTokenProcessor(
+        const Poco::Util::AbstractConfiguration & config,
+        const String & prefix,
+        const String & processor_name)
+{
+    if (!config.hasProperty(prefix + ".type"))
+        throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'type' parameter shall be specified in token_processor configuration.'");
+
+    auto provider_type = Poco::toLower(config.getString(prefix + ".type"));
+
+    auto token_cache_lifetime = config.getUInt64(prefix + ".token_cache_lifetime", 3600);
+    auto username_claim = config.getString(prefix + ".username_claim", "sub");
+    auto groups_claim = config.getString(prefix + ".groups_claim", "groups");
+    auto expected_issuer = config.getString(prefix + ".expected_issuer", "");
+    auto expected_audience = config.getString(prefix + ".expected_audience", "");
+    auto allow_no_expiration = config.getBool(prefix + ".allow_no_expiration", false);
+
+    if (provider_type == "google")
+    {
+        return std::make_unique<GoogleTokenProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim);
+    }
+    else if (provider_type == "azure")
+    {
+        return std::make_unique<AzureTokenProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim);
+    }
+    else if (provider_type == "openid")
+    {
+        auto verifier_leeway = config.getUInt64(prefix + ".verifier_leeway", 60);
+        auto jwks_cache_lifetime = config.getUInt64(prefix + ".jwks_cache_lifetime", 3600);
+
+        bool externally_configured = config.hasProperty(prefix + ".configuration_endpoint") && !config.hasProperty(prefix + ".jwks_uri");
+        bool locally_configured = config.hasProperty(prefix + ".userinfo_endpoint") && config.hasProperty(prefix + ".token_introspection_endpoint");
+
+        if (externally_configured && ! locally_configured)
+        {
+            return std::make_unique<OpenIdTokenProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim,
+                                                          expected_issuer, expected_audience, allow_no_expiration,
+                                                          config.getString(prefix + ".configuration_endpoint"),
+                                                          verifier_leeway,
+                                                          jwks_cache_lifetime);
+        }
+        else if (locally_configured && !externally_configured)
+        {
+            return std::make_unique<OpenIdTokenProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim,
+                                                          expected_issuer, expected_audience, allow_no_expiration,
+                                                          config.getString(prefix + ".userinfo_endpoint"),
+                                                          config.getString(prefix + ".token_introspection_endpoint"),
+                                                          verifier_leeway,
+                                                          config.getString(prefix + ".jwks_uri", ""),
+                                                          jwks_cache_lifetime);
+        }
+
+        throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Either 'configuration_endpoint' or both 'userinfo_endpoint' and 'token_introspection_endpoint' (and, optionally, 'jwks_uri') must be specified for 'openid' processor");
+    }
+    else if (provider_type == "jwt_static_key")
+    {
+        if (!config.hasProperty(prefix + ".static_key"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'static_key' must be specified for 'jwt_static_key' processor");
+
+        if (!config.hasProperty(prefix + ".algo"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'algo' must be specified for 'jwt_static_key' processor");
+
+        StaticKeyJwtParams params = {Poco::toLower(config.getString(prefix + ".algo")),
+                                     config.getString(prefix + ".static_key", ""),
+                                     config.getBool(prefix + ".static_key_in_base64", false),
+                                     config.getString(prefix + ".public_key", ""),
+                                     config.getString(prefix + ".private_key", ""),
+                                     config.getString(prefix + ".public_key_password", ""),
+                                     config.getString(prefix + ".private_key_password", ""),
+                                     config.getString(prefix + ".claims", "")};
+        return std::make_unique<StaticKeyJwtProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim, expected_issuer, expected_audience, allow_no_expiration, params);
+    }
+    else if (provider_type == "jwt_static_jwks")
+    {
+        if (config.hasProperty(prefix + ".static_jwks") && config.hasProperty(prefix + ".static_jwks_file"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'static_jwks' and 'static_jwks_file' cannot be specified simultaneously for 'jwt_static_jwks' processor");
+
+        if (!config.hasProperty(prefix + ".static_jwks") && !config.hasProperty(prefix + ".static_jwks_file"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'static_jwks' or 'static_jwks_file' must be specified for 'jwt_static_jwks' processor");
+
+        if (config.hasProperty(prefix + ".jwks_uri"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'jwks_uri' cannot be specified for 'jwt_static_jwks' processor");
+
+        StaticJWKSParams params
+        {
+            config.getString(prefix + ".static_jwks", ""),
+            config.getString(prefix + ".static_jwks_file", "")
+        };
+        return std::make_unique<JwksJwtProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim,
+                                                  expected_issuer, expected_audience, allow_no_expiration,
+                                                  config.getString(prefix + ".claims", ""),
+                                                  config.getUInt64(prefix + ".verifier_leeway", 0),
+                                                  std::make_shared<StaticJWKS>(params));
+    }
+    if (provider_type == "jwt_dynamic_jwks")
+    {
+        if (config.hasProperty(prefix + ".static_jwks") || config.hasProperty(prefix + ".static_jwks_file"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'static_jwks' and 'static_jwks_file' cannot be specified for 'jwt_dynamic_jwks' processor");
+        if (!config.hasProperty(prefix + ".jwks_uri"))
+            throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "'jwks_uri' must be specified for 'jwt_dynamic_jwks' processor");
+
+        return std::make_unique<JwksJwtProcessor>(processor_name, token_cache_lifetime, username_claim, groups_claim,
+                                                  expected_issuer, expected_audience, allow_no_expiration,
+                                                  config.getString(prefix + ".claims", ""),
+                                                  config.getUInt64(prefix + ".verifier_leeway", 0),
+                                                  config.getString(prefix + ".jwks_uri"),
+                                                  config.getUInt(prefix + ".jwks_cache_lifetime", 3600));
+    }
+    else
+        throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Invalid type: {}", provider_type);
+
+    // throw DB::Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Failed to parse token processor: {}", processor_name);
+}
+
+#else
+std::unique_ptr<DB::ITokenProcessor> ITokenProcessor::parseTokenProcessor(
+    const Poco::Util::AbstractConfiguration &,
+    const String &,
+    const String &)
+{
+    throw DB::Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Failed to parse token_processor, ClickHouse was built without JWT support.");
+}
+#endif
+
+}
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index fec9db829eb7..e0cab5b337e8 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -13,6 +13,7 @@
 #include <Common/StringUtils.h>
 #include <Common/quoteString.h>
 #include <Common/transformEndianness.h>
+#include "Access/Credentials.h"
 #include <Core/Settings.h>
 #include <Interpreters/executeQuery.h>
 #include <Parsers/Access/ASTGrantQuery.h>
@@ -131,6 +132,7 @@ namespace
         bool has_password_double_sha1_hex = config.has(user_config + ".password_double_sha1_hex");
         bool has_ldap = config.has(user_config + ".ldap");
         bool has_kerberos = config.has(user_config + ".kerberos");
+        bool has_jwt = config.has(user_config + ".jwt");
 
         const auto certificates_config = user_config + ".ssl_certificates";
         bool has_certificates = config.has(certificates_config);
@@ -142,18 +144,18 @@ namespace
         bool has_http_auth = config.has(http_auth_config);
 
         size_t num_password_fields = has_no_password + has_password_plaintext + has_password_sha256_hex + has_password_double_sha1_hex
-            + has_ldap + has_kerberos + has_certificates + has_ssh_keys + has_http_auth + has_scram_password_sha256_hex;
+            + has_ldap + has_kerberos + has_certificates + has_ssh_keys + has_http_auth + has_scram_password_sha256_hex + has_jwt;
 
         if (num_password_fields > 1)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "More than one field of 'password', 'password_sha256_hex', "
                             "'password_double_sha1_hex', 'no_password', 'ldap', 'kerberos', 'ssl_certificates', 'ssh_keys', "
-                            "'http_authentication' are used to specify authentication info for user {}. "
+                            "'http_authentication', 'jwt' are used to specify authentication info for user {}. "
                             "Must be only one of them.", user_name);
 
         if (num_password_fields < 1)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Either 'password' or 'password_sha256_hex' "
                             "or 'password_double_sha1_hex' or 'no_password' or 'ldap' or 'kerberos "
-                            "or 'ssl_certificates' or 'ssh_keys' or 'http_authentication' must be specified for user {}.", user_name);
+                            "or 'ssl_certificates' or 'ssh_keys' or 'http_authentication' or 'jwt' must be specified for user {}.", user_name);
 
         if (has_password_plaintext)
         {
@@ -277,6 +279,10 @@ namespace
             auto scheme = config.getString(http_auth_config + ".scheme");
             user->authentication_methods.back().setHTTPAuthenticationScheme(parseHTTPAuthenticationScheme(scheme));
         }
+        else if (has_jwt)
+        {
+            user->authentication_methods.emplace_back(AuthenticationType::JWT);
+        }
         else
         {
             user->authentication_methods.emplace_back();
diff --git a/src/Access/tests/gtest_access_rights_ops.cpp b/src/Access/tests/gtest_access_rights_ops.cpp
index 01190e8ec7ff..b7d1c102085f 100644
--- a/src/Access/tests/gtest_access_rights_ops.cpp
+++ b/src/Access/tests/gtest_access_rights_ops.cpp
@@ -546,3 +546,600 @@ TEST(AccessRights, Filter)
     res = root.getFilters("URL");
     ASSERT_EQ(res.size(), 0);
 }
+
+TEST(AccessRights, RevokeWithParameters)
+{
+    AccessRights root;
+    root.grantWithGrantOption(AccessType::SELECT);
+    root.grantWithGrantOption(AccessType::CREATE_USER);
+    root.revokeWildcard(AccessType::SELECT, "default", "zoo");
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON *.* WITH GRANT OPTION, GRANT CREATE USER ON * WITH GRANT OPTION, REVOKE SELECT ON default.zoo*");
+
+    root = {};
+    root.grantWithGrantOption(AccessType::SELECT);
+    root.grantWithGrantOption(AccessType::CREATE_USER);
+    root.revokeWildcard(AccessType::SELECT, "default", "foo", "bar");
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON *.* WITH GRANT OPTION, GRANT CREATE USER ON * WITH GRANT OPTION, REVOKE SELECT(bar*) ON default.foo");
+}
+
+TEST(AccessRights, RevokeWithParametersWithGrantOption)
+{
+    AccessRights root;
+    root.grantWithGrantOption(AccessType::ALL);
+    root.revokeWildcard(AccessType::INTROSPECTION, "system");  // global grant, do nothing for database revoke
+    ASSERT_EQ(root.toString(), "GRANT ALL ON *.* WITH GRANT OPTION");
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.grant(AccessType::INTROSPECTION);
+    root.grant(AccessType::CREATE_USER);
+    root.revokeWildcard(AccessType::CREATE_USER, "system");
+    ASSERT_EQ(root.toString(), "GRANT SELECT, INTROSPECTION ON *.*, GRANT CREATE USER ON *, REVOKE CREATE USER ON system*");
+
+    root.grantWithGrantOption(AccessType::SELECT);
+    root.grantWithGrantOption(AccessType::INTROSPECTION);
+    root.grantWithGrantOption(AccessType::CREATE_USER);
+    root.revokeWildcard(AccessType::CREATE_USER, "system");
+    ASSERT_EQ(root.toString(), "GRANT SELECT, INTROSPECTION ON *.* WITH GRANT OPTION, GRANT CREATE USER ON * WITH GRANT OPTION, REVOKE CREATE USER ON system*");
+}
+
+TEST(AccessRights, ParialRevokeWithGrantOption)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT);
+    root.revoke(AccessType::SELECT, "default", "zookeeper");
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "default", "zoo"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "default", "zoo"));
+
+    root = {};
+    root.grantWithGrantOption(AccessType::SELECT);
+    root.revoke(AccessType::SELECT, "default", "zookeeper");
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "default", "zoo"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "default", "zoo"));
+}
+
+TEST(AccessRights, WildcardGrantEdgeCases)
+{
+    AccessRights root;
+    root.grantWildcard(AccessType::SELECT, "a");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "abc"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "a"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "bcd"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON a*.*");
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "test");
+    root.grant(AccessType::INSERT, "test");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "test"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "test"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "testing"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON test*.*, GRANT INSERT ON test.*");
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "prod");
+    root.grantWildcard(AccessType::INSERT, "production");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "production"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "product"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "prod"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "product"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "production"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "production_v2"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "db", "tbl");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl_backup"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl123"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "other"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db2", "tbl"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "db", "tbl", "col");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl", "col"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl", "col_id"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl", "column"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "tbl", "other"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "tbl"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "sys");
+    root.grantWildcard(AccessType::INSERT, "sys", "log");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "sys", "any_table", "any_col"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "system", "tables"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "sys", "log_events"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "sys", "data"));
+}
+
+TEST(AccessRights, PartialRevokeWithWildcard)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT);
+    root.revokeWildcard(AccessType::SELECT, "system");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "default"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "production"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "system"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "system_logs"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON *.*, REVOKE SELECT ON system*.*");
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "prod");
+    root.revoke(AccessType::SELECT, "production");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "product"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "production"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON prod*.*, REVOKE SELECT ON production.*");
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "test");
+    root.revokeWildcard(AccessType::SELECT, "testing");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "test"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "test_env"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "testing_v2"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON test*.*, REVOKE SELECT ON testing*.*");
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "db");
+    root.revoke(AccessType::SELECT, "db", "secret");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "public"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db123", "any"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "secret"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON db*.*, REVOKE SELECT ON db.secret");
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.revokeWildcard(AccessType::SELECT, "secret");
+    root.revokeWildcard(AccessType::SELECT, "private");
+    root.revoke(AccessType::SELECT, "system");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "public"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "secret"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "secret_data"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "private"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "private_logs"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "system"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "system_public"));
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.revokeWildcard(AccessType::SELECT, "internal");
+    root.grant(AccessType::SELECT, "internal_public");
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "internal"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "internal_data"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "internal_public"));
+    ASSERT_EQ(root.toString(), "GRANT SELECT ON *.*, REVOKE SELECT ON internal*.*, GRANT SELECT ON internal_public.*");
+}
+
+TEST(AccessRights, WildcardGrantOptionInteractions)
+{
+    AccessRights root;
+    root.grantWildcardWithGrantOption(AccessType::SELECT, "db");
+    root.revokeGrantOption(AccessType::SELECT, "db", "sensitive");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "sensitive"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "db", "public"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "db", "sensitive"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "db123", "any"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "prod");
+    root.grantWithGrantOption(AccessType::SELECT, "production");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "production"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "prod"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "production"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "product"));
+
+    root = {};
+    root.grantWildcardWithGrantOption(AccessType::SELECT, "test");
+    root.revokeWildcardGrantOption(AccessType::SELECT, "testing");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "test"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "testing"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "testing_v2"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "test_env"));
+
+    root = {};
+    root.grantWildcardWithGrantOption(AccessType::INSERT, "analytics");
+    ASSERT_TRUE(root.hasGrantOptionWildcard(AccessType::INSERT, "analytics"));
+    ASSERT_TRUE(root.hasGrantOptionWildcard(AccessType::INSERT, "analytics_v2"));
+    ASSERT_FALSE(root.hasGrantOptionWildcard(AccessType::INSERT, "other"));
+
+    root = {};
+    root.grantWildcardWithGrantOption(AccessType::SELECT, "db");
+    root.revokeWildcardGrantOption(AccessType::SELECT, "db", "tbl");
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "db", "other"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "db123", "any"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "db", "tbl"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "db", "tbl_backup"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "tbl"));
+}
+
+TEST(AccessRights, UnionWithPartialRevokes)
+{
+    AccessRights lhs;
+    AccessRights rhs;
+
+    lhs.grant(AccessType::SELECT);
+    lhs.revoke(AccessType::SELECT, "secret");
+    rhs.grant(AccessType::SELECT, "secret", "public_table");
+    lhs.makeUnion(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "default"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "secret", "public_table"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "secret"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    lhs.revokeWildcard(AccessType::SELECT, "sys");
+    rhs.grantWildcard(AccessType::SELECT, "system");
+    lhs.makeUnion(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "default"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "system"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "system_logs"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "sys"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "prod");
+    rhs.grantWildcard(AccessType::INSERT, "prod");
+    lhs.makeUnion(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "production"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::INSERT, "production"));
+    ASSERT_EQ(lhs.toString(), "GRANT SELECT, INSERT ON prod*.*");
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "test");
+    rhs.grantWildcard(AccessType::SELECT, "testing");
+    lhs.makeUnion(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "test"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_EQ(lhs.toString(), "GRANT SELECT ON test*.*");
+}
+
+TEST(AccessRights, IntersectionWithPartialRevokes)
+{
+    AccessRights lhs;
+    AccessRights rhs;
+
+    lhs.grant(AccessType::SELECT);
+    lhs.revoke(AccessType::SELECT, "secret");
+    rhs.grant(AccessType::SELECT);
+    rhs.revoke(AccessType::SELECT, "private");
+    lhs.makeIntersection(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "default"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "secret"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "private"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "test");
+    rhs.grant(AccessType::SELECT, "test");
+    rhs.grant(AccessType::SELECT, "testing");
+    lhs.makeIntersection(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "test"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "test_env"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "prod");
+    rhs.grantWildcard(AccessType::SELECT, "production");
+    lhs.makeIntersection(rhs);
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "prod"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "product"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "production"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "production_v2"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    rhs.grant(AccessType::SELECT);
+    rhs.revokeWildcard(AccessType::SELECT, "sys");
+    lhs.makeIntersection(rhs);
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "default"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "sys"));
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "system"));
+}
+
+TEST(AccessRights, DifferenceWithPartialRevokes)
+{
+    AccessRights lhs;
+    AccessRights rhs;
+
+    lhs.grant(AccessType::SELECT);
+    rhs.grant(AccessType::SELECT);
+    rhs.revoke(AccessType::SELECT, "secret");
+    lhs.makeDifference(rhs);
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "default"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "secret"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "test");
+    rhs.grant(AccessType::SELECT, "test");
+    lhs.makeDifference(rhs);
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "test"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "test_env"));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    rhs.grant(AccessType::SELECT);
+    rhs.revokeWildcard(AccessType::SELECT, "internal");
+    lhs.makeDifference(rhs);
+    ASSERT_FALSE(lhs.isGranted(AccessType::SELECT, "default"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "internal"));
+    ASSERT_TRUE(lhs.isGranted(AccessType::SELECT, "internal_data"));
+}
+
+TEST(AccessRights, ContainsWithWildcardsAndPartialRevokes)
+{
+    AccessRights lhs;
+    AccessRights rhs;
+
+    lhs.grantWildcard(AccessType::SELECT, "test");
+    rhs.grant(AccessType::SELECT, "testing");
+    ASSERT_TRUE(lhs.contains(rhs));
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "test");
+    rhs.grant(AccessType::SELECT, "prod");
+    ASSERT_FALSE(lhs.contains(rhs));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    lhs.revoke(AccessType::SELECT, "secret");
+    rhs.grant(AccessType::SELECT, "default");
+    ASSERT_TRUE(lhs.contains(rhs));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    lhs.revoke(AccessType::SELECT, "secret");
+    rhs.grant(AccessType::SELECT, "secret");
+    ASSERT_FALSE(lhs.contains(rhs));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    lhs.revokeWildcard(AccessType::SELECT, "sys");
+    rhs.grant(AccessType::SELECT, "default");
+    rhs.grant(AccessType::SELECT, "prod");
+    ASSERT_TRUE(lhs.contains(rhs));
+
+    lhs = {};
+    rhs = {};
+    lhs.grant(AccessType::SELECT);
+    lhs.revokeWildcard(AccessType::SELECT, "sys");
+    rhs.grant(AccessType::SELECT, "system");
+    ASSERT_FALSE(lhs.contains(rhs));
+
+    lhs = {};
+    rhs = {};
+    lhs.grantWildcard(AccessType::SELECT, "testing");
+    rhs.grantWildcard(AccessType::SELECT, "test");
+    ASSERT_FALSE(lhs.contains(rhs));
+}
+
+TEST(AccessRights, ColumnLevelWildcardOperations)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT, "db", "users");
+    root.revokeWildcard(AccessType::SELECT, "db", "users", "secret");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "users", "name"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "users", "email"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "users", "secret"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "users", "secret_key"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "users"));
+
+    root = {};
+    root.grant(AccessType::SELECT, "db", "table");
+    root.revokeWildcard(AccessType::SELECT, "db", "table", "private");
+    root.revokeWildcard(AccessType::SELECT, "db", "table", "secret");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "table", "public_col"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "table", "private_data"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "table", "secret_key"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "db", "table", "col");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "table", "col"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "table", "col_id"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "table", "column"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "table", "other"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "table"));
+
+    root = {};
+    root.grantWildcardWithGrantOption(AccessType::SELECT, "db", "table", "visible");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "table", "visible"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "table", "visible_data"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "db", "table", "visible"));
+    ASSERT_TRUE(root.hasGrantOption(AccessType::SELECT, "db", "table", "visible_data"));
+    ASSERT_FALSE(root.hasGrantOption(AccessType::SELECT, "db", "table", "hidden"));
+}
+
+TEST(AccessRights, ComplexWildcardScenarios)
+{
+    AccessRights root;
+    root.grant(AccessType::ALL);
+    root.revokeWildcard(AccessType::SELECT, "internal");
+    root.grantWildcard(AccessType::SELECT, "internal_public");
+    root.revoke(AccessType::SELECT, "internal_public_secret");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "default"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "internal"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "internal_data"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "internal_public"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "internal_public_api"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "internal_public_secret"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "prod");
+    root.revokeWildcard(AccessType::SELECT, "prod", "secret");
+    root.grant(AccessType::SELECT, "prod", "secret_allowed");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "production", "users"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "prod", "secret_data"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod", "secret_allowed"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod", "public"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "analytics");
+    root.grantWildcard(AccessType::INSERT, "analytics_write");
+    root.revoke(AccessType::SELECT, "analytics_read_only", "sensitive");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "analytics", "any"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "analytics_read_only", "normal"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "analytics_read_only", "sensitive"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "analytics_write", "data"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "analytics", "data"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "");
+    root.revokeWildcard(AccessType::SELECT, "a");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "b"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "z"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "a"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "abc"));
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.revoke(AccessType::SELECT);
+    root.grantWildcard(AccessType::SELECT, "allowed");
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "default"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "allowed"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "allowed_db"));
+}
+
+TEST(AccessRights, PartialRevokePropagation)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT);
+    root.revoke(AccessType::SELECT, "db1", "secret");
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db1", "secret"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db1", "public"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db2", "secret"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db2"));
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.revokeWildcard(AccessType::SELECT, "temp");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "permanent"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "temp"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "temp1"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "temporary"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "team"));
+
+    root = {};
+    root.grant(AccessType::SELECT, "db");
+    root.revoke(AccessType::SELECT, "db", "t1", "col1");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "t1", "col2"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "db", "t2"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "t1", "col1"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "db", "t1"));
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.grant(AccessType::INSERT);
+    root.revokeWildcard(AccessType::SELECT, "readonly");
+    root.revokeWildcard(AccessType::INSERT, "writeonly");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "normal"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "normal"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "readonly"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "readonly"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "writeonly"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "writeonly"));
+}
+
+TEST(AccessRights, PartialRevokeIsGrantedWildcard)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT);
+    root.revoke(AccessType::SELECT, "system", "zookeeper");
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "normal"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "system", "query_log"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "system", "zookeeper"));
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "system", "zookeeper"));
+
+    // system.zookeeper is revoked, but system.zookeeper2 is not
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "system", "zookeeper2"));
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::SELECT, "system", "zookeeper2"));
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::SELECT, "system", "query_log"));
+
+    root = {};
+    root.grant(AccessType::SELECT);
+    root.revokeWildcard(AccessType::SELECT, "system", "zookeeper");
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "system", "zookeeper"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "system", "zookeeper2"));
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::SELECT, "system", "query_log"));
+}
+
+TEST(AccessRights, SamePrefixDifferentLevels)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT);
+    root.revoke(AccessType::SELECT, "test");
+    root.revoke(AccessType::SELECT, "prod", "test");
+    root.revoke(AccessType::SELECT, "dev", "data", "test");
+
+    // "test" is revoked
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "test"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "test", "anytable"));
+
+    // "prod.test" is revoked
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "prod"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "prod", "test"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod", "foo"));
+
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "prod", "other"));
+
+    // "dev.data.test" is revoked
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "dev", "data", "other"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "dev", "data", "test"));
+}
+
+TEST(AccessRights, IsGrantedWildcardDatabaseLevel)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT, "mydb");
+
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "mydb"));
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "mydb2"));
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::SELECT, "mydb", "anytable"));
+
+    root = {};
+    root.grantWildcard(AccessType::SELECT, "test");
+
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "test"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "testing"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "test123"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "tes"));
+
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::SELECT, "test"));
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::SELECT, "testing"));
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "te"));
+}
+
+TEST(AccessRights, MultipleAccessTypesPartialRevoke)
+{
+    AccessRights root;
+    root.grant(AccessType::SELECT);
+    root.grant(AccessType::INSERT);
+    root.revoke(AccessType::SELECT, "readonly");
+    root.revoke(AccessType::INSERT, "readwrite");
+
+    // SELECT
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "normal"));
+    ASSERT_FALSE(root.isGranted(AccessType::SELECT, "readonly"));
+    ASSERT_TRUE(root.isGranted(AccessType::SELECT, "readwrite"));
+
+    // INSERT
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "normal"));
+    ASSERT_TRUE(root.isGranted(AccessType::INSERT, "readonly"));
+    ASSERT_FALSE(root.isGranted(AccessType::INSERT, "readwrite"));
+
+    // Wildcard checks
+    ASSERT_FALSE(root.isGrantedWildcard(AccessType::SELECT, "readonl"));
+    ASSERT_TRUE(root.isGrantedWildcard(AccessType::INSERT, "readonl"));
+}
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
index 10a92ac7304d..6e0d144efb4a 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
@@ -1,6 +1,7 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/KeyHolderHelpers.h>
 #include <Interpreters/Context.h>
 #include <Core/ServerSettings.h>
 
@@ -456,7 +457,8 @@ struct GroupArrayNodeGeneral : public GroupArrayNodeBase<GroupArrayNodeGeneral>
     static Node * allocate(const IColumn & column, size_t row_num, Arena * arena)
     {
         const char * begin = arena->alignedAlloc(sizeof(Node), alignof(Node));
-        StringRef value = column.serializeValueIntoArena(row_num, *arena, begin);
+        auto settings = IColumn::SerializationSettings::createForAggregationState();
+        auto value = column.serializeValueIntoArena(row_num, *arena, begin, &settings);
 
         Node * node = reinterpret_cast<Node *>(const_cast<char *>(begin));
         node->size = value.size;
@@ -464,7 +466,10 @@ struct GroupArrayNodeGeneral : public GroupArrayNodeBase<GroupArrayNodeGeneral>
         return node;
     }
 
-    void insertInto(IColumn & column) { std::ignore = column.deserializeAndInsertFromArena(data()); }
+    void insertInto(IColumn & column)
+    {
+        deserializeAndInsert<false>({data(), size}, column);
+    }
 };
 
 template <typename Node, bool has_sampler>
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
index 1289e29cac15..de5225225648 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
@@ -21,6 +21,7 @@
 #include <AggregateFunctions/FactoryHelpers.h>
 #include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/KeyHolderHelpers.h>
 
 #include <memory>
 
@@ -235,7 +236,8 @@ class AggregateFunctionGroupArrayIntersectGeneric final
                 else
                 {
                     const char * begin = nullptr;
-                    StringRef serialized = data_column->serializeValueIntoArena(offset + i, *arena, begin);
+                    auto settings = IColumn::SerializationSettings::createForAggregationState();
+                    auto serialized = data_column->serializeValueIntoArena(offset + i, *arena, begin, &settings);
                     chassert(serialized.data != nullptr);
                     set.emplace(SerializedKeyHolder{serialized, *arena}, it, inserted);
                 }
@@ -255,7 +257,8 @@ class AggregateFunctionGroupArrayIntersectGeneric final
                 else
                 {
                     const char * begin = nullptr;
-                    StringRef serialized = data_column->serializeValueIntoArena(offset + i, *arena, begin);
+                    auto settings = IColumn::SerializationSettings::createForAggregationState();
+                    auto serialized = data_column->serializeValueIntoArena(offset + i, *arena, begin, &settings);
                     chassert(serialized.data != nullptr);
                     it = set.find(serialized);
 
@@ -341,10 +344,7 @@ class AggregateFunctionGroupArrayIntersectGeneric final
 
         for (auto & elem : set)
         {
-            if constexpr (is_plain_column)
-                data_to.insertData(elem.getValue().data, elem.getValue().size);
-            else
-                std::ignore = data_to.deserializeAndInsertFromArena(elem.getValue().data);
+            deserializeAndInsert<is_plain_column>(elem.getValue(), data_to);
         }
     }
 };
diff --git a/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp b/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp
index b1ff062f2705..2030e46a5873 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp
@@ -172,9 +172,25 @@ void GroupConcatImpl<has_limit>::deserialize(AggregateDataPtr __restrict place,
     if constexpr (has_limit)
     {
         readVarUInt(cur_data.num_rows, buf);
+
+        if (cur_data.num_rows > std::numeric_limits<UInt64>::max() / 2)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid groupConcat state: num_rows ({}) is too large and would overflow the offsets array.", cur_data.num_rows);
+
         cur_data.offsets.resize_exact(cur_data.num_rows * 2, arena);
-        for (auto & offset : cur_data.offsets)
-            readVarUInt(offset, buf);
+
+        for (size_t i = 0; i < cur_data.offsets.size(); ++i)
+        {
+            readVarUInt(cur_data.offsets[i], buf);
+
+            if (cur_data.offsets[i] > cur_data.data_size)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid offset {} in groupConcat state: exceeds data size {}", cur_data.offsets[i], cur_data.data_size);
+
+            if (i != 0 && cur_data.offsets[i] < cur_data.offsets[i - 1])
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid offsets in groupConcat state: end offset {} is less than start offset {}", cur_data.offsets[i], cur_data.offsets[i - 1]);
+        }
+
+        if (cur_data.num_rows != 0 && cur_data.offsets.back() != cur_data.data_size)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid offsets in groupConcat state: last offset {} is not equal to data size {}", cur_data.offsets.back(), cur_data.data_size);
     }
 }
 
diff --git a/src/AggregateFunctions/AggregateFunctionTopK.cpp b/src/AggregateFunctions/AggregateFunctionTopK.cpp
index f2e40cc89546..0cd48eca0a1d 100644
--- a/src/AggregateFunctions/AggregateFunctionTopK.cpp
+++ b/src/AggregateFunctions/AggregateFunctionTopK.cpp
@@ -310,7 +310,8 @@ class AggregateFunctionTopKGeneric final
         else
         {
             const char * begin = nullptr;
-            StringRef str_serialized = columns[0]->serializeValueIntoArena(row_num, *arena, begin);
+            auto settings = IColumn::SerializationSettings::createForAggregationState();
+            auto str_serialized = columns[0]->serializeValueIntoArena(row_num, *arena, begin, &settings);
             if constexpr (is_weighted)
                 set.insert(str_serialized, columns[1]->getUInt(row_num));
             else
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h b/src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h
index adee1a6edccd..6351664d20ad 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h
@@ -116,7 +116,8 @@ struct AggregateFunctionDistinctMultipleGenericData : public AggregateFunctionDi
         StringRef value(begin, 0);
         for (size_t i = 0; i < columns_num; ++i)
         {
-            auto cur_ref = columns[i]->serializeValueIntoArena(row_num, *arena, begin);
+            auto settings = IColumn::SerializationSettings::createForAggregationState();
+            auto cur_ref = columns[i]->serializeValueIntoArena(row_num, *arena, begin, &settings);
             value.data = cur_ref.data - value.size;
             value.size += cur_ref.size;
         }
@@ -138,9 +139,11 @@ struct AggregateFunctionDistinctMultipleGenericData : public AggregateFunctionDi
                 Set::LookupResult it;
                 bool inserted;
                 history.emplace(ArenaKeyHolder{value, *arena}, it, inserted);
-                const char * pos = it->getValue().data;
+                ReadBufferFromString in({it->getValue().data, it->getValue().size});
+                /// Multiple columns are serialized one by one
+                auto settings = IColumn::SerializationSettings::createForAggregationState();
                 for (auto & column : argument_columns)
-                    pos = column->deserializeAndInsertFromArena(pos);
+                    column->deserializeAndInsertFromArena(in, &settings);
             }
         }
     }
diff --git a/src/AggregateFunctions/DDSketch.h b/src/AggregateFunctions/DDSketch.h
index 16b6318181cc..7c2b042699a3 100644
--- a/src/AggregateFunctions/DDSketch.h
+++ b/src/AggregateFunctions/DDSketch.h
@@ -1,49 +1,49 @@
 #pragma once
 
-#include <memory> // for std::unique_ptr
-#include <cmath>
-#include <stdexcept>
 #include <limits>
-#include <iostream>
+#include <memory> // for std::unique_ptr
 #include <base/types.h>
 
-#include <IO/ReadBuffer.h>
-#include <IO/WriteBuffer.h>
-
+#include <AggregateFunctions/DDSketch/DDSketchEncoding.h>
 #include <AggregateFunctions/DDSketch/Mapping.h>
 #include <AggregateFunctions/DDSketch/Store.h>
-#include <AggregateFunctions/DDSketch/DDSketchEncoding.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
-    extern const int INCORRECT_DATA;
+extern const int BAD_ARGUMENTS;
+extern const int INCORRECT_DATA;
 }
 
 class DDSketchDenseLogarithmic
 {
 public:
     explicit DDSketchDenseLogarithmic(Float64 relative_accuracy = 0.01)
-        : mapping(std::make_unique<DDSketchLogarithmicMapping>(relative_accuracy)),
-          store(std::make_unique<DDSketchDenseStore>()),
-          negative_store(std::make_unique<DDSketchDenseStore>()),
-          zero_count(0.0),
-          count(0.0)
+        : mapping(std::make_unique<DDSketchLogarithmicMapping>(relative_accuracy))
+        , store(std::make_unique<DDSketchDenseStore>())
+        , negative_store(std::make_unique<DDSketchDenseStore>())
+        , zero_count(0.0)
+        , count(0.0)
     {
     }
 
-    DDSketchDenseLogarithmic(std::unique_ptr<DDSketchLogarithmicMapping> mapping_,
-             std::unique_ptr<DDSketchDenseStore> store_,
-             std::unique_ptr<DDSketchDenseStore> negative_store_,
-             Float64 zero_count_)
-        : mapping(std::move(mapping_)),
-          store(std::move(store_)),
-          negative_store(std::move(negative_store_)),
-          zero_count(zero_count_),
-          count(store->count + negative_store->count + zero_count_)
+    DDSketchDenseLogarithmic(
+        std::unique_ptr<DDSketchLogarithmicMapping> mapping_,
+        std::unique_ptr<DDSketchDenseStore> store_,
+        std::unique_ptr<DDSketchDenseStore> negative_store_,
+        Float64 zero_count_)
+        : mapping(std::move(mapping_))
+        , store(std::move(store_))
+        , negative_store(std::move(negative_store_))
+        , zero_count(zero_count_)
+        , count(store->count + negative_store->count + zero_count_)
     {
     }
 
@@ -97,7 +97,11 @@ class DDSketchDenseLogarithmic
         return quantile_value;
     }
 
-    void copy(const DDSketchDenseLogarithmic& other)
+    Float64 getGamma() const { return mapping->getGamma(); }
+
+    Float64 getCount() const { return count; }
+
+    void copy(const DDSketchDenseLogarithmic & other)
     {
         Float64 rel_acc = (other.mapping->getGamma() - 1) / (other.mapping->getGamma() + 1);
         mapping = std::make_unique<DDSketchLogarithmicMapping>(rel_acc);
@@ -109,9 +113,9 @@ class DDSketchDenseLogarithmic
         count = other.count;
     }
 
-    void merge(const DDSketchDenseLogarithmic& other)
+    void merge(const DDSketchDenseLogarithmic & other)
     {
-        if (mapping->getGamma() != other.mapping->getGamma())
+        if (*mapping != *other.mapping)
         {
             // modify the one with higher precision to match the one with lower precision
             if (mapping->getGamma() > other.mapping->getGamma())
@@ -147,7 +151,7 @@ class DDSketchDenseLogarithmic
 
     /// NOLINTBEGIN(readability-static-accessed-through-instance)
 
-    void serialize(WriteBuffer& buf) const
+    void serialize(WriteBuffer & buf) const
     {
         // Write the mapping
         writeBinary(enc.FlagIndexMappingBaseLogarithmic.byte, buf);
@@ -165,7 +169,7 @@ class DDSketchDenseLogarithmic
         writeBinary(zero_count, buf);
     }
 
-    void deserialize(ReadBuffer& buf)
+    void deserialize(ReadBuffer & buf)
     {
         // Read the mapping
         UInt8 flag = 0;
@@ -219,7 +223,7 @@ class DDSketchDenseLogarithmic
         auto new_positive_store = std::make_unique<DDSketchDenseStore>();
         auto new_negative_store = std::make_unique<DDSketchDenseStore>();
 
-        auto remap_store = [this, &new_mapping](DDSketchDenseStore& old_store, std::unique_ptr<DDSketchDenseStore>& target_store)
+        auto remap_store = [this, &new_mapping](DDSketchDenseStore & old_store, std::unique_ptr<DDSketchDenseStore> & target_store)
         {
             for (int i = 0; i < old_store.length(); ++i)
             {
diff --git a/src/AggregateFunctions/DDSketch/DDSketchEncoding.h b/src/AggregateFunctions/DDSketch/DDSketchEncoding.h
index 477bc3f54495..64dc8c0e55ed 100644
--- a/src/AggregateFunctions/DDSketch/DDSketchEncoding.h
+++ b/src/AggregateFunctions/DDSketch/DDSketchEncoding.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <vector>
-#include <stdexcept>
+#include <base/types.h>
 
 /**
   * An encoded DDSketch comprises multiple contiguous blocks (sequences of bytes).
@@ -36,7 +35,10 @@ class DDSketchEncoding
     {
     public:
         UInt8 byte;
-        Flag(UInt8 t, UInt8 s) : byte(t | s) { }
+        Flag(UInt8 t, UInt8 s)
+            : byte(t | s)
+        {
+        }
         [[maybe_unused]] UInt8 Type() const { return byte & flagTypeMask; }
         [[maybe_unused]] UInt8 SubFlag() const { return byte & subFlagMask; }
     };
diff --git a/src/AggregateFunctions/DDSketch/Mapping.h b/src/AggregateFunctions/DDSketch/Mapping.h
index 0d1ff785d59d..0f4d939f8f56 100644
--- a/src/AggregateFunctions/DDSketch/Mapping.h
+++ b/src/AggregateFunctions/DDSketch/Mapping.h
@@ -1,26 +1,29 @@
 #pragma once
 
-#include <base/types.h>
 #include <cmath>
-#include <stdexcept>
 #include <limits>
+#include <base/types.h>
 
 #include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
+extern const int BAD_ARGUMENTS;
 }
 
 class DDSketchLogarithmicMapping
 {
 public:
     explicit DDSketchLogarithmicMapping(Float64 relative_accuracy_, Float64 offset_ = 0.0)
-        : relative_accuracy(relative_accuracy_), offset(offset_)
+        : relative_accuracy(relative_accuracy_)
+        , offset(offset_)
     {
         if (relative_accuracy <= 0 || relative_accuracy >= 1)
         {
@@ -44,48 +47,40 @@ class DDSketchLogarithmicMapping
         return static_cast<int>(logGamma(value) + offset);
     }
 
-    Float64 value(int key) const
-    {
-        return lowerBound(key) * (1 + relative_accuracy);
-    }
+    Float64 value(int key) const { return lowerBound(key) * (1 + relative_accuracy); }
 
-    Float64 logGamma(Float64 value) const
-    {
-        return std::log(value) * multiplier;
-    }
+    Float64 logGamma(Float64 value) const { return std::log(value) * multiplier; }
 
-    Float64 powGamma(Float64 value) const
-    {
-        return std::exp(value / multiplier);
-    }
+    Float64 powGamma(Float64 value) const { return std::exp(value / multiplier); }
 
-    Float64 lowerBound(int index) const
-    {
-        return powGamma(static_cast<Float64>(index) - offset);
-    }
+    Float64 lowerBound(int index) const { return powGamma(static_cast<Float64>(index) - offset); }
 
-    Float64 getGamma() const
-    {
-        return gamma;
-    }
+    Float64 getGamma() const { return gamma; }
 
-    Float64 getMinPossible() const
-    {
-        return min_possible;
-    }
+    Float64 getMinPossible() const { return min_possible; }
 
-    [[maybe_unused]] Float64 getMaxPossible() const
+    [[maybe_unused]] Float64 getMaxPossible() const { return max_possible; }
+
+    bool operator==(const DDSketchLogarithmicMapping & other) const
     {
-        return max_possible;
+        if (gamma == other.gamma)
+        {
+            return true;
+        }
+
+        auto [min, max] = std::minmax(gamma, other.gamma);
+        const Float64 difference = max - min;
+        const Float64 acceptable = (std::nextafter(min, max) - min) * min;
+        return difference <= acceptable;
     }
 
-    void serialize(WriteBuffer& buf) const
+    void serialize(WriteBuffer & buf) const
     {
         writeBinary(gamma, buf);
         writeBinary(offset, buf);
     }
 
-    void deserialize(ReadBuffer& buf)
+    void deserialize(ReadBuffer & buf)
     {
         readBinary(gamma, buf);
         readBinary(offset, buf);
diff --git a/src/AggregateFunctions/DDSketch/Store.h b/src/AggregateFunctions/DDSketch/Store.h
index 0e499e445d2a..594746f73e10 100644
--- a/src/AggregateFunctions/DDSketch/Store.h
+++ b/src/AggregateFunctions/DDSketch/Store.h
@@ -1,13 +1,15 @@
 #pragma once
 
-#include <base/types.h>
-#include <vector>
 #include <cmath>
 #include <limits>
+#include <vector>
+#include <base/types.h>
 
+#include <AggregateFunctions/DDSketch/DDSketchEncoding.h>
 #include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteBuffer.h>
-#include <AggregateFunctions/DDSketch/DDSketchEncoding.h>
+#include <IO/WriteHelpers.h>
 
 
 // We start with 128 bins and grow the number of bins by 128
@@ -18,6 +20,11 @@ constexpr UInt32 CHUNK_SIZE = 128;
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int INCORRECT_DATA;
+}
+
 class DDSketchDenseStore
 {
 public:
@@ -27,9 +34,12 @@ class DDSketchDenseStore
     int offset = 0;
     std::vector<Float64> bins;
 
-    explicit DDSketchDenseStore(UInt32 chunk_size_ = CHUNK_SIZE) : chunk_size(chunk_size_) {}
+    explicit DDSketchDenseStore(UInt32 chunk_size_ = CHUNK_SIZE)
+        : chunk_size(chunk_size_)
+    {
+    }
 
-    void copy(DDSketchDenseStore* other)
+    void copy(DDSketchDenseStore * other)
     {
         bins = other->bins;
         count = other->count;
@@ -38,10 +48,7 @@ class DDSketchDenseStore
         offset = other->offset;
     }
 
-    int length() const
-    {
-        return static_cast<int>(bins.size());
-    }
+    int length() const { return static_cast<int>(bins.size()); }
 
     void add(int key, Float64 weight)
     {
@@ -64,9 +71,10 @@ class DDSketchDenseStore
         return max_key;
     }
 
-    void merge(DDSketchDenseStore* other)
+    void merge(DDSketchDenseStore * other)
     {
-        if (other->count == 0) return;
+        if (other->count == 0)
+            return;
 
         if (count == 0)
         {
@@ -89,9 +97,8 @@ class DDSketchDenseStore
 
     /// NOLINTBEGIN(readability-static-accessed-through-instance)
 
-    void serialize(WriteBuffer& buf) const
+    void serialize(WriteBuffer & buf) const
     {
-
         // Calculate the size of the dense and sparse encodings to choose the smallest one
         UInt64 num_bins = 0;
         UInt64 num_non_empty_bins = 0;
@@ -144,8 +151,10 @@ class DDSketchDenseStore
         }
     }
 
-    void deserialize(ReadBuffer& buf)
+    void deserialize(ReadBuffer & buf)
     {
+        count = 0;
+
         UInt8 encoding_mode;
         readBinary(encoding_mode, buf);
         if (encoding_mode == enc.BinEncodingContiguousCounts)
@@ -165,7 +174,7 @@ class DDSketchDenseStore
                 start_key += index_delta;
             }
         }
-        else
+        else if (encoding_mode == enc.BinEncodingIndexDeltasAndCounts)
         {
             UInt64 num_non_empty_bins;
             readVarUInt(num_non_empty_bins, buf);
@@ -180,6 +189,10 @@ class DDSketchDenseStore
                 add(previous_index, bin_count);
             }
         }
+        else
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid flag for encoding mode");
+        }
     }
 
     /// NOLINTEND(readability-static-accessed-through-instance)
diff --git a/src/AggregateFunctions/KeyHolderHelpers.h b/src/AggregateFunctions/KeyHolderHelpers.h
index b48c396046b8..2cf0dd318ef1 100644
--- a/src/AggregateFunctions/KeyHolderHelpers.h
+++ b/src/AggregateFunctions/KeyHolderHelpers.h
@@ -1,12 +1,18 @@
 #pragma once
 
-#include <Common/HashTable/HashTableKeyHolder.h>
 #include <Columns/IColumn.h>
+#include <Common/HashTable/HashTableKeyHolder.h>
+#include <IO/ReadBufferFromString.h>
 
 namespace DB
 {
 struct Settings;
 
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DATA;
+}
+
 template <bool is_plain_column = false>
 static auto getKeyHolder(const IColumn & column, size_t row_num, Arena & arena)
 {
@@ -17,7 +23,8 @@ static auto getKeyHolder(const IColumn & column, size_t row_num, Arena & arena)
     else
     {
         const char * begin = nullptr;
-        StringRef serialized = column.serializeValueIntoArena(row_num, arena, begin);
+        auto settings = IColumn::SerializationSettings::createForAggregationState();
+        auto serialized = column.serializeValueIntoArena(row_num, arena, begin, &settings);
         assert(serialized.data != nullptr);
         return SerializedKeyHolder{serialized, arena};
     }
@@ -29,7 +36,15 @@ static void deserializeAndInsert(StringRef str, IColumn & data_to)
     if constexpr (is_plain_column)
         data_to.insertData(str.data, str.size);
     else
-        std::ignore = data_to.deserializeAndInsertFromArena(str.data);
+    {
+        ReadBufferFromString in({str.data, str.size});
+        auto settings = IColumn::SerializationSettings::createForAggregationState();
+        data_to.deserializeAndInsertFromArena(in, &settings);
+        if (!in.eof())
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Extra bytes ({}) found after deserializing aggregation state", in.available());
+        }
+    }
 }
 
 }
diff --git a/src/AggregateFunctions/ThetaSketchData.h b/src/AggregateFunctions/ThetaSketchData.h
index 476ecda06fdc..f243dccce90a 100644
--- a/src/AggregateFunctions/ThetaSketchData.h
+++ b/src/AggregateFunctions/ThetaSketchData.h
@@ -21,7 +21,9 @@ template <typename Key>
 class ThetaSketchData : private boost::noncopyable
 {
 private:
+    /// Used for insertions
     std::unique_ptr<datasketches::update_theta_sketch> sk_update;
+    /// Used for merging
     std::unique_ptr<datasketches::theta_union> sk_union;
 
     datasketches::update_theta_sketch * getSkUpdate()
@@ -48,12 +50,26 @@ class ThetaSketchData : private boost::noncopyable
     void insertOriginal(StringRef value)
     {
         getSkUpdate()->update(value.data, value.size);
+        /// In case of optimization for u8 keys (see addBatchLookupTable()) it is possible to have few calls of insert() after merge(),
+        /// and we should update sk_union as well, note, that there should not be too many, so performance wise it should be OK
+        if (sk_union)
+        {
+            sk_union->update(*sk_update);
+            sk_update.reset(nullptr);
+        }
     }
 
     /// Note that `datasketches::update_theta_sketch.update` will do the hash again.
     void insert(Key value)
     {
         getSkUpdate()->update(value);
+        /// In case of optimization for u8 keys (see addBatchLookupTable()) it is possible to have few calls of insert() after merge(),
+        /// and we should update sk_union as well, note, that there should not be too many, so performance wise it should be OK
+        if (sk_union)
+        {
+            sk_union->update(*sk_update);
+            sk_update.reset(nullptr);
+        }
     }
 
     UInt64 size() const
diff --git a/src/AggregateFunctions/UniqExactSet.h b/src/AggregateFunctions/UniqExactSet.h
index a59e0c9ad15c..f7fb5bfaf10e 100644
--- a/src/AggregateFunctions/UniqExactSet.h
+++ b/src/AggregateFunctions/UniqExactSet.h
@@ -132,7 +132,7 @@ class UniqExactSet
         }
         else
         {
-            auto & lhs = asTwoLevel();
+            auto & lhs = asTwoLevelChecked();
 
             if (other.isSingleLevel())
                 return lhs.merge(other.asSingleLevel());
@@ -225,6 +225,7 @@ class UniqExactSet
     /// To convert set to two level before merging (we cannot just call convertToTwoLevel() on right hand side set, because it is declared const).
     std::shared_ptr<TwoLevelSet> getTwoLevelSet() const
     {
+        doDeepCopyIfNeeded();
         return two_level_set ? two_level_set : std::make_shared<TwoLevelSet>(asSingleLevel());
     }
 
@@ -243,10 +244,28 @@ class UniqExactSet
     SingleLevelSet & asSingleLevel() { return single_level_set; }
     const SingleLevelSet & asSingleLevel() const { return single_level_set; }
 
+    TwoLevelSet & asTwoLevelChecked()
+    {
+        doDeepCopyIfNeeded();
+        return *two_level_set;
+    }
+
     TwoLevelSet & asTwoLevel() { return *two_level_set; }
     const TwoLevelSet & asTwoLevel() const { return *two_level_set; }
 
+    /// Needed when a row can participate in more than one merge, e.g., ROLLUP/CUBE
+    void doDeepCopyIfNeeded() const
+    {
+        if (two_level_set && two_level_set.use_count() > 1)
+        {
+            auto copy = std::make_shared<TwoLevelSet>(two_level_set->size());
+            for (size_t i = 0; i < two_level_set->NUM_BUCKETS; ++i)
+                copy->impls[i].merge(two_level_set->impls[i]);
+            two_level_set = std::move(copy);
+        }
+    }
+
     SingleLevelSet single_level_set;
-    std::shared_ptr<TwoLevelSet> two_level_set;
+    mutable std::shared_ptr<TwoLevelSet> two_level_set;
 };
 }
diff --git a/src/AggregateFunctions/tests/gtest_ddsketch.cpp b/src/AggregateFunctions/tests/gtest_ddsketch.cpp
new file mode 100644
index 000000000000..69c01d81fcd1
--- /dev/null
+++ b/src/AggregateFunctions/tests/gtest_ddsketch.cpp
@@ -0,0 +1,89 @@
+#include <string>
+#include <vector>
+#include <base/types.h>
+
+#include <AggregateFunctions/DDSketch.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromVector.h>
+#include <Common/Base64.h>
+
+#include <gtest/gtest.h>
+
+TEST(DDSketch, MergeDifferentGammasWithoutSegfault)
+{
+    using namespace DB;
+
+    DDSketchDenseLogarithmic lhs{};
+    DDSketchDenseLogarithmic rhs{};
+
+    /*
+    {
+      "mapping": {
+        "gamma": 2.0,
+        "index_offset": 0.0,
+        "interpolation": 0
+      },
+      "positive_values": {
+        "bin_counts": {},
+        "contiguous_bin_counts": [
+          1.0
+        ],
+        "contiguous_bin_index_offset": -8
+      },
+      "negative_values": {
+        "bin_counts": {},
+        "contiguous_bin_counts": [],
+        "contiguous_bin_index_offset": 0
+      },
+      "zero_count": 0.0
+    }
+    */
+    std::string lhs_data = base64Decode("AgAAAAAAAABAAAAAAAAAAAABDAEPAgAAAAAAAPA/AwwA/v///w8CBAAAAAAAAAAA");
+    ReadBufferFromString lhs_buffer{lhs_data};
+    lhs.deserialize(lhs_buffer);
+
+    ASSERT_DOUBLE_EQ(lhs.getCount(), 1);
+    ASSERT_DOUBLE_EQ(lhs.getGamma(), 2.0);
+
+    /*
+    {
+      "mapping": {
+        "gamma": 1.4142135623730951,
+        "index_offset": 0.0,
+        "interpolation": 0
+      },
+      "positive_values": {
+        "bin_counts": {},
+        "contiguous_bin_counts": [
+          1.0
+        ],
+        "contiguous_bin_index_offset": -18
+      },
+      "negative_values": {
+        "bin_counts": {},
+        "contiguous_bin_counts": [],
+        "contiguous_bin_index_offset": 0
+      },
+      "zero_count": 0.0
+    }
+    */
+    std::string rhs_data = base64Decode("As07f2aeoPY/AAAAAAAAAAABDAEjAgAAAAAAAPA/AwwA/v///w8CBAAAAAAAAAAA");
+    ReadBufferFromString rhs_buffer{rhs_data};
+    rhs.deserialize(rhs_buffer);
+
+    ASSERT_DOUBLE_EQ(rhs.getCount(), 1);
+    ASSERT_DOUBLE_EQ(rhs.getGamma(), 1.4142135623730951);
+
+    lhs.merge(rhs);
+    std::vector<UInt8> merge_buffer;
+
+    WriteBufferFromVector<std::vector<UInt8>> writer{merge_buffer};
+    lhs.serialize(writer);
+
+    ReadBufferFromMemory reader{merge_buffer.data(), merge_buffer.size()};
+    ASSERT_NO_THROW(rhs.deserialize(reader));
+
+    ASSERT_FLOAT_EQ(rhs.getCount(), 2);
+    ASSERT_DOUBLE_EQ(rhs.getGamma(), 2.0);
+}
diff --git a/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h b/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h
index 8bcb6e147420..e4f63192c95b 100644
--- a/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h
+++ b/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h
@@ -71,8 +71,14 @@ class FunctionTreeNodeImpl : public AbstractFunction
     {
     public:
         explicit ArgumentsTreeNode(const QueryTreeNodes * arguments_) : arguments(arguments_) {}
-        size_t size() const override { return arguments ? arguments->size() : 0; }
-        std::unique_ptr<Argument> at(size_t n) const override { return std::make_unique<ArgumentTreeNode>(arguments->at(n).get()); }
+        size_t size() const override
+        { /// size withous skipped indexes
+            return arguments ? arguments->size() - skippedSize() : 0;
+        }
+        std::unique_ptr<Argument> at(size_t n) const override
+        { /// n is relative index, some can be skipped
+            return std::make_unique<ArgumentTreeNode>(arguments->at(getRealIndex(n)).get());
+        }
     private:
         const QueryTreeNodes * arguments = nullptr;
     };
diff --git a/src/Analyzer/Passes/CountDistinctPass.cpp b/src/Analyzer/Passes/CountDistinctPass.cpp
index b00e04859df9..027688d0cb0f 100644
--- a/src/Analyzer/Passes/CountDistinctPass.cpp
+++ b/src/Analyzer/Passes/CountDistinctPass.cpp
@@ -55,7 +55,7 @@ class CountDistinctVisitor : public InDepthQueryTreeVisitorWithContext<CountDist
         /// Check that query single projection node is `countDistinct` function
         auto & projection_node = projection_nodes[0];
         auto * function_node = projection_node->as<FunctionNode>();
-        if (!function_node)
+        if (!function_node || function_node->hasWindow())
             return;
 
         auto lower_function_name = Poco::toLower(function_node->getFunctionName());
@@ -64,7 +64,7 @@ class CountDistinctVisitor : public InDepthQueryTreeVisitorWithContext<CountDist
 
         /// Check that `countDistinct` function has single COLUMN argument
         auto & count_distinct_arguments_nodes = function_node->getArguments().getNodes();
-        if (count_distinct_arguments_nodes.size() != 1 && count_distinct_arguments_nodes[0]->getNodeType() != QueryTreeNodeType::COLUMN)
+        if (count_distinct_arguments_nodes.size() != 1 || count_distinct_arguments_nodes[0]->getNodeType() != QueryTreeNodeType::COLUMN)
             return;
 
         auto & count_distinct_argument_column = count_distinct_arguments_nodes[0];
diff --git a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
index c1d5174c4b84..824d31c59703 100644
--- a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
+++ b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
@@ -46,12 +46,39 @@ struct ColumnContext
 
 using NodeToSubcolumnTransformer = std::function<void(QueryTreeNodePtr &, FunctionNode &, ColumnContext &)>;
 
+/// Before columns to substream optimization, we need to make sure, that column with such name as substream does not exists, otherwise the optimize will use it instead of substream.
+bool sourceHasColumn(QueryTreeNodePtr column_source, const String & column_name)
+{
+    auto * table_node = column_source->as<TableNode>();
+    if (!table_node)
+        return {};
+
+    const auto & storage_snapshot = table_node->getStorageSnapshot();
+    return storage_snapshot->tryGetColumn(GetColumnsOptions::All, column_name).has_value();
+}
+
+/// Sometimes we cannot optimize function to subcolumn because there is no such subcolumn in the table.
+/// For example, for column "a Array(Tuple(b UInt32))" function length(a.b) cannot be replaced to
+/// a.b.size0, because there is no such subcolumn, even though a.b has type Array(UInt32)
+bool canOptimizeToSubcolumn(QueryTreeNodePtr column_source, const String & subcolumn_name)
+{
+    auto * table_node = column_source->as<TableNode>();
+    if (!table_node)
+        return {};
+
+    const auto & storage_snapshot = table_node->getStorageSnapshot();
+    return storage_snapshot->tryGetColumn(GetColumnsOptions(GetColumnsOptions::All).withRegularSubcolumns(), subcolumn_name).has_value();
+}
+
 void optimizeFunctionLength(QueryTreeNodePtr & node, FunctionNode &, ColumnContext & ctx)
 {
     /// Replace `length(argument)` with `argument.size0`.
     /// `argument` may be Array or Map.
 
     NameAndTypePair column{ctx.column.name + ".size0", std::make_shared<DataTypeUInt64>()};
+    if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+        return;
+
     node = std::make_shared<ColumnNode>(column, ctx.column_source);
 }
 
@@ -63,6 +90,9 @@ void optimizeFunctionEmpty(QueryTreeNodePtr &, FunctionNode & function_node, Col
     /// `argument` may be Array or Map.
 
     NameAndTypePair column{ctx.column.name + ".size0", std::make_shared<DataTypeUInt64>()};
+    if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+        return;
+
     auto & function_arguments_nodes = function_node.getArguments().getNodes();
 
     function_arguments_nodes.clear();
@@ -137,6 +167,8 @@ void optimizeTupleOrVariantElement(QueryTreeNodePtr & node, FunctionNode & funct
         return;
 
     NameAndTypePair column{ctx.column.name + "." + subcolumn->name, subcolumn->type};
+    if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+        return;
     node = std::make_shared<ColumnNode>(column, ctx.column_source);
 }
 
@@ -169,6 +201,8 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
             auto key_type = std::make_shared<DataTypeArray>(data_type_map.getKeyType());
 
             NameAndTypePair column{ctx.column.name + ".keys", key_type};
+            if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+                return;
             node = std::make_shared<ColumnNode>(column, ctx.column_source);
         },
     },
@@ -181,6 +215,8 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
             auto value_type = std::make_shared<DataTypeArray>(data_type_map.getValueType());
 
             NameAndTypePair column{ctx.column.name + ".values", value_type};
+            if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+                return;
             node = std::make_shared<ColumnNode>(column, ctx.column_source);
         },
     },
@@ -192,6 +228,8 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
             const auto & data_type_map = assert_cast<const DataTypeMap &>(*ctx.column.type);
 
             NameAndTypePair column{ctx.column.name + ".keys", std::make_shared<DataTypeArray>(data_type_map.getKeyType())};
+            if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+                return;
             auto & function_arguments_nodes = function_node.getArguments().getNodes();
 
             auto has_function_argument = std::make_shared<ColumnNode>(column, ctx.column_source);
@@ -206,6 +244,8 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
         {
             /// Replace `count(nullable_argument)` with `sum(not(nullable_argument.null))`
             NameAndTypePair column{ctx.column.name + ".null", std::make_shared<DataTypeUInt8>()};
+            if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+                return;
             auto & function_arguments_nodes = function_node.getArguments().getNodes();
 
             auto new_column_node = std::make_shared<ColumnNode>(column, ctx.column_source);
@@ -224,6 +264,8 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
         {
             /// Replace `isNull(nullable_argument)` with `nullable_argument.null`
             NameAndTypePair column{ctx.column.name + ".null", std::make_shared<DataTypeUInt8>()};
+            if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+                return;
             node = std::make_shared<ColumnNode>(column, ctx.column_source);
         },
     },
@@ -233,6 +275,8 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
         {
             /// Replace `isNotNull(nullable_argument)` with `not(nullable_argument.null)`
             NameAndTypePair column{ctx.column.name + ".null", std::make_shared<DataTypeUInt8>()};
+            if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
+                return;
             auto & function_arguments_nodes = function_node.getArguments().getNodes();
 
             function_arguments_nodes = {std::make_shared<ColumnNode>(column, ctx.column_source)};
@@ -279,7 +323,7 @@ std::tuple<FunctionNode *, ColumnNode *, TableNode *> getTypedNodesForOptimizati
     if (!storage->supportsOptimizationToSubcolumns() || storage->isVirtualColumn(column.name, storage_snapshot->metadata))
         return {};
 
-    auto column_in_table = storage_snapshot->tryGetColumn(GetColumnsOptions::All, column.name);
+    auto column_in_table = storage_snapshot->tryGetColumn(GetColumnsOptions(GetColumnsOptions::All).withSubcolumns(), column.name);
     if (!column_in_table || !column_in_table->type->equals(*column.type))
         return {};
 
diff --git a/src/Analyzer/Passes/HybridCastsPass.cpp b/src/Analyzer/Passes/HybridCastsPass.cpp
new file mode 100644
index 000000000000..f40e7664df50
--- /dev/null
+++ b/src/Analyzer/Passes/HybridCastsPass.cpp
@@ -0,0 +1,150 @@
+#include <Analyzer/Passes/HybridCastsPass.h>
+
+#include <Analyzer/QueryTreeBuilder.h>
+#include <Analyzer/QueryTreePassManager.h>
+#include <Analyzer/Passes/QueryAnalysisPass.h>
+#include <Analyzer/Utils.h>
+#include <Analyzer/Resolve/IdentifierResolver.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/UnionNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+
+#include <Storages/IStorage.h>
+#include <Storages/StorageDistributed.h>
+
+#include <Core/Settings.h>
+#include <Core/SettingsEnums.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace Setting
+{
+    extern const SettingsBool hybrid_table_auto_cast_columns;
+}
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+/// Collect Hybrid table expressions that require casts to normalize headers across segments.
+///
+/// Hybrid is currently exposed only as an engine (TableNode). If it ever gets a table function
+/// wrapper, this visitor must also look at TableFunctionNode and unwrap to the underlying
+/// StorageDistributed so cached casts can be picked up there as well.
+class HybridCastTablesCollector : public InDepthQueryTreeVisitor<HybridCastTablesCollector>
+{
+public:
+    explicit HybridCastTablesCollector(std::unordered_map<const IQueryTreeNode *, ColumnsDescription> & cast_map_)
+        : cast_map(cast_map_)
+    {}
+
+    static bool needChildVisit(QueryTreeNodePtr &, QueryTreeNodePtr &) { return true; }
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        const auto * table = node->as<TableNode>();
+        if (!table)
+            return;
+
+        const auto * storage = table->getStorage().get();
+        if (const auto * distributed = typeid_cast<const StorageDistributed *>(storage))
+        {
+            ColumnsDescription to_cast = distributed->getColumnsToCast();
+            if (!to_cast.empty())
+                cast_map.emplace(node.get(), std::move(to_cast)); // repeated table_expression can overwrite
+        }
+    }
+
+private:
+    std::unordered_map<const IQueryTreeNode *, ColumnsDescription> & cast_map;
+};
+
+// Visitor replaces all usages of the column with CAST(column, type) in the query tree.
+class HybridCastVisitor : public InDepthQueryTreeVisitor<HybridCastVisitor>
+{
+public:
+    HybridCastVisitor(
+        const std::unordered_map<const IQueryTreeNode *, ColumnsDescription> & cast_map_,
+        ContextPtr context_)
+        : cast_map(cast_map_)
+        , context(std::move(context_))
+    {}
+
+    bool shouldTraverseTopToBottom() const { return false; }
+
+    static bool needChildVisit(QueryTreeNodePtr &, QueryTreeNodePtr & child)
+    {
+        /// Traverse all child nodes so casts also apply inside subqueries and UNION branches.
+        (void)child;
+        return true;
+    }
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * column_node = node->as<ColumnNode>();
+        if (!column_node)
+            return;
+
+        auto column_source = column_node->getColumnSourceOrNull();
+        if (!column_source)
+            return;
+
+        auto it = cast_map.find(column_source.get());
+        if (it == cast_map.end())
+            return;
+
+        const auto & column_name = column_node->getColumnName();
+        auto expected_column_opt = it->second.tryGetPhysical(column_name);
+        if (!expected_column_opt)
+            return;
+
+        auto column_clone = std::static_pointer_cast<ColumnNode>(column_node->clone());
+
+        auto cast_node = buildCastFunction(column_clone, expected_column_opt->type, context);
+        const auto & alias = node->getAlias();
+        if (!alias.empty())
+            cast_node->setAlias(alias);
+        else
+            cast_node->setAlias(expected_column_opt->name);
+
+        node = cast_node;
+    }
+
+private:
+    const std::unordered_map<const IQueryTreeNode *, ColumnsDescription> & cast_map;
+    ContextPtr context;
+};
+
+
+} // namespace
+
+void HybridCastsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
+{
+    const auto & settings = context->getSettingsRef();
+    if (!settings[Setting::hybrid_table_auto_cast_columns])
+        return;
+
+    auto * query = query_tree_node->as<QueryNode>();
+    if (!query)
+        return;
+
+    std::unordered_map<const IQueryTreeNode *, ColumnsDescription> cast_map;
+    HybridCastTablesCollector collector(cast_map);
+    collector.visit(query_tree_node);
+    if (cast_map.empty())
+        return;
+
+    HybridCastVisitor visitor(cast_map, context);
+    visitor.visit(query_tree_node);
+}
+
+}
diff --git a/src/Analyzer/Passes/HybridCastsPass.h b/src/Analyzer/Passes/HybridCastsPass.h
new file mode 100644
index 000000000000..6b3159d6e925
--- /dev/null
+++ b/src/Analyzer/Passes/HybridCastsPass.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+#include <Interpreters/Context_fwd.h>
+
+namespace DB
+{
+
+/// Adds CASTs for Hybrid segments when physical types differ from the Hybrid schema
+///
+/// It normalizes headers coming from different segments when table structure in some segments
+/// differs from the Hybrid table definition. For example column X is UInt32 in the Hybrid table,
+/// but Int64 in an additional segment.
+///
+/// Without these casts ConvertingActions may fail to reconcile mismatched headers when casts are impossible
+/// (e.g. AggregateFunction states carry hashed data tied to their argument type and cannot be recast), for example:
+/// "Conversion from AggregateFunction(uniq, Decimal(38, 0)) to AggregateFunction(uniq, UInt64) is not supported"
+/// (CANNOT_CONVERT_TYPE).
+///
+/// Per-segment casts are not reliable because WithMergeState strips aliases, so merged pipelines
+/// from different segments would return different headers (with or without CAST), leading to errors
+/// like "Cannot find column `max(value)` in source stream, there are only columns: [max(_CAST(value, 'UInt64'))]"
+/// (THERE_IS_NO_COLUMN).
+class HybridCastsPass : public IQueryTreePass
+{
+public:
+    String getName() override { return "HybridCastsPass"; }
+    String getDescription() override { return "Inject casts for Hybrid columns to match schema types"; }
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
+};
+
+}
diff --git a/src/Analyzer/Passes/IfChainToMultiIfPass.cpp b/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
index 92d70e30b099..6b5087345c34 100644
--- a/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
+++ b/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
@@ -13,7 +13,6 @@ namespace DB
 namespace Setting
 {
     extern const SettingsBool allow_execute_multiif_columnar;
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool optimize_if_chain_to_multiif;
     extern const SettingsBool use_variant_as_common_type;
 }
@@ -92,7 +91,7 @@ void IfChainToMultiIfPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr co
 {
     const auto & settings = context->getSettingsRef();
     auto multi_if_function_ptr = createInternalMultiIfOverloadResolver(
-        settings[Setting::allow_execute_multiif_columnar], settings[Setting::allow_experimental_variant_type], settings[Setting::use_variant_as_common_type]);
+        settings[Setting::allow_execute_multiif_columnar], settings[Setting::use_variant_as_common_type]);
     IfChainToMultiIfPassVisitor visitor(std::move(multi_if_function_ptr), std::move(context));
     visitor.visit(query_tree_node);
 }
diff --git a/src/Analyzer/Passes/MultiIfToIfPass.cpp b/src/Analyzer/Passes/MultiIfToIfPass.cpp
index 26a7270a2a2d..f6f4f3d88a3f 100644
--- a/src/Analyzer/Passes/MultiIfToIfPass.cpp
+++ b/src/Analyzer/Passes/MultiIfToIfPass.cpp
@@ -10,7 +10,6 @@ namespace DB
 {
 namespace Setting
 {
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool optimize_multiif_to_if;
     extern const SettingsBool use_variant_as_common_type;
 }
@@ -64,7 +63,7 @@ void MultiIfToIfPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context
 {
     const auto & settings = context->getSettingsRef();
     auto if_function_ptr
-        = createInternalFunctionIfOverloadResolver(settings[Setting::allow_experimental_variant_type], settings[Setting::use_variant_as_common_type]);
+        = createInternalFunctionIfOverloadResolver(settings[Setting::use_variant_as_common_type]);
     MultiIfToIfVisitor visitor(std::move(if_function_ptr), std::move(context));
     visitor.visit(query_tree_node);
 }
diff --git a/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
index 9e1c21375fae..5293ba0bf860 100644
--- a/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
+++ b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
@@ -13,6 +13,7 @@ namespace Setting
 {
     extern const SettingsBool group_by_use_nulls;
     extern const SettingsBool optimize_injective_functions_in_group_by;
+    extern const SettingsBool allow_suspicious_types_in_group_by;
 }
 
 namespace
@@ -88,7 +89,8 @@ class OptimizeGroupByInjectiveFunctionsVisitor : public InDepthQueryTreeVisitorW
 
                 // Aggregate functions are not allowed in GROUP BY clause
                 auto function = function_node->getFunctionOrThrow();
-                bool can_be_eliminated = function->isInjective(function_node->getArgumentColumns());
+                auto arguments = function_node->getArgumentColumns();
+                bool can_be_eliminated = function->isInjective(arguments) && isValidGroupByKeyTypes(arguments);
 
                 if (can_be_eliminated)
                 {
@@ -106,6 +108,29 @@ class OptimizeGroupByInjectiveFunctionsVisitor : public InDepthQueryTreeVisitorW
 
         grouping_set = std::move(new_group_by_keys);
     }
+
+    bool isValidGroupByKeyTypes(const ColumnsWithTypeAndName & columns) const
+    {
+        if (getContext()->getSettingsRef()[Setting::allow_suspicious_types_in_group_by])
+            return true;
+
+        bool is_valid = true;
+        auto check = [&](const IDataType & type)
+        {
+            /// Dynamic and Variant types are not allowed in GROUP BY by default.
+            is_valid &= !isDynamic(type) && !isVariant(type);
+        };
+
+        for (const auto & column : columns)
+        {
+            check(*column.type);
+            column.type->forEachChild(check);
+            if (!is_valid)
+                break;
+        }
+
+        return is_valid;
+    }
 };
 
 }
diff --git a/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp b/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp
index c9b60f0d4722..38a7a21b7c68 100644
--- a/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp
+++ b/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp
@@ -5,102 +5,19 @@
 #include <Analyzer/AggregationUtils.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
-#include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/SortNode.h>
 #include <Analyzer/UnionNode.h>
 #include <Analyzer/Utils.h>
 
+#include <Analyzer/traverseQueryTree.h>
+
 namespace DB
 {
 
 namespace
 {
 
-class CollectUsedColumnsVisitor : public InDepthQueryTreeVisitorWithContext<CollectUsedColumnsVisitor>
-{
-public:
-    using Base = InDepthQueryTreeVisitorWithContext<CollectUsedColumnsVisitor>;
-    using Base::Base;
-
-    bool needChildVisit(QueryTreeNodePtr &, QueryTreeNodePtr & child)
-    {
-        if (isQueryOrUnionNode(child))
-        {
-            subqueries_nodes_to_visit.insert(child);
-            return false;
-        }
-
-        return true;
-    }
-
-    void enterImpl(QueryTreeNodePtr & node)
-    {
-        auto node_type = node->getNodeType();
-
-        if (node_type == QueryTreeNodeType::QUERY)
-        {
-            auto & query_node = node->as<QueryNode &>();
-            auto table_expressions = extractTableExpressions(query_node.getJoinTree());
-            for (const auto & table_expression : table_expressions)
-                if (isQueryOrUnionNode(table_expression))
-                    query_or_union_node_to_used_columns.emplace(table_expression, std::unordered_set<std::string>());
-
-            return;
-        }
-
-        if (node_type == QueryTreeNodeType::FUNCTION)
-        {
-            auto & function_node = node->as<FunctionNode &>();
-
-            if (function_node.getFunctionName() != "exists")
-                return;
-
-            const auto & subquery_argument = function_node.getArguments().getNodes().front();
-            auto * query_node = subquery_argument->as<QueryNode>();
-            auto * union_node = subquery_argument->as<UnionNode>();
-
-            const auto & correlated_columns = query_node != nullptr ? query_node->getCorrelatedColumns() : union_node->getCorrelatedColumns();
-            for (const auto & correlated_column : correlated_columns)
-            {
-                auto * column_node = correlated_column->as<ColumnNode>();
-                auto column_source_node = column_node->getColumnSource();
-                auto column_source_node_type = column_source_node->getNodeType();
-                if (column_source_node_type == QueryTreeNodeType::QUERY || column_source_node_type == QueryTreeNodeType::UNION)
-                    query_or_union_node_to_used_columns[column_source_node].insert(column_node->getColumnName());
-            }
-            return;
-        }
-
-        if (node_type != QueryTreeNodeType::COLUMN)
-            return;
-
-        auto & column_node = node->as<ColumnNode &>();
-        if (column_node.getColumnName() == "__grouping_set")
-            return;
-
-        auto column_source_node = column_node.getColumnSource();
-
-        auto it = query_or_union_node_to_used_columns.find(column_source_node);
-        /// If the source node is not found in the map then:
-        /// 1. Tt's either not a Query or Union node.
-        /// 2. It's a correlated column and it comes from the outer scope.
-        if (it != query_or_union_node_to_used_columns.end())
-        {
-            it->second.insert(column_node.getColumnName());
-        }
-    }
-
-    void reset()
-    {
-        subqueries_nodes_to_visit.clear();
-        query_or_union_node_to_used_columns.clear();
-    }
-
-    std::unordered_set<QueryTreeNodePtr> subqueries_nodes_to_visit;
-    std::unordered_map<QueryTreeNodePtr, std::unordered_set<std::string>> query_or_union_node_to_used_columns;
-};
-
 std::unordered_set<size_t> convertUsedColumnNamesToUsedProjectionIndexes(const QueryTreeNodePtr & query_or_union_node, const std::unordered_set<std::string> & used_column_names)
 {
     std::unordered_set<size_t> result;
@@ -161,21 +78,80 @@ void updateUsedProjectionIndexes(const QueryTreeNodePtr & query_or_union_node, s
 
 }
 
-void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
+void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr /*context*/)
 {
-    std::vector<QueryTreeNodePtr> nodes_to_visit;
-    nodes_to_visit.push_back(query_tree_node);
-
-    CollectUsedColumnsVisitor visitor(std::move(context));
+    QueryTreeNodes nodes_to_visit = { query_tree_node };
 
     while (!nodes_to_visit.empty())
     {
         auto node_to_visit = std::move(nodes_to_visit.back());
         nodes_to_visit.pop_back();
 
-        visitor.visit(node_to_visit);
+        std::unordered_set<QueryTreeNodePtr> subqueries_nodes_to_visit;
+        std::unordered_map<QueryTreeNodePtr, std::unordered_set<std::string>> node_to_used_columns;
+
+        /// Initialize map with query and union nodes in the FROM clause
+        if (auto * query_node = node_to_visit->as<QueryNode>())
+        {
+            for (const auto & table_expression : extractTableExpressions(query_node->getJoinTree()))
+                if (isQueryOrUnionNode(table_expression))
+                    node_to_used_columns.emplace(table_expression, std::unordered_set<std::string>());
+        }
 
-        for (auto & [query_or_union_node, used_columns] : visitor.query_or_union_node_to_used_columns)
+        /// Collect information about what columns are used in the query.
+        traverseQueryTree(node_to_visit,
+            [&subqueries_nodes_to_visit, &node_to_used_columns](
+                const QueryTreeNodePtr & /*parent*/,
+                const QueryTreeNodePtr & child
+            )
+            {
+                if (isQueryOrUnionNode(child))
+                {
+                    subqueries_nodes_to_visit.insert(child);
+
+                    auto * query_node = child->as<QueryNode>();
+                    auto * union_node = child->as<UnionNode>();
+
+                    const auto & correlated_columns = query_node != nullptr ? query_node->getCorrelatedColumns() : union_node->getCorrelatedColumns();
+                    for (const auto & correlated_column : correlated_columns)
+                    {
+                        auto * column_node = correlated_column->as<ColumnNode>();
+                        auto column_source_node = column_node->getColumnSource();
+                        auto column_source_node_type = column_source_node->getNodeType();
+                        if (column_source_node_type == QueryTreeNodeType::QUERY || column_source_node_type == QueryTreeNodeType::UNION)
+                        {
+                            if (auto it = node_to_used_columns.find(column_source_node); it != node_to_used_columns.end())
+                                it->second.insert(column_node->getColumnName());
+                        }
+                    }
+                    return false;
+                }
+                return true;
+            },
+            [&node_to_used_columns](const QueryTreeNodePtr & node)
+            {
+                const auto node_type = node->getNodeType();
+                if (node_type != QueryTreeNodeType::COLUMN)
+                    return;
+
+                auto & column_node = node->as<ColumnNode &>();
+                if (column_node.getColumnName() == "__grouping_set")
+                    return;
+
+                auto column_source_node = column_node.getColumnSource();
+
+                auto it = node_to_used_columns.find(column_source_node);
+                /// If the source node is not found in the map then:
+                /// 1. Tt's either not a Query or Union node.
+                /// 2. It's a correlated column and it comes from the outer scope.
+                if (it != node_to_used_columns.end())
+                {
+                    it->second.insert(column_node.getColumnName());
+                }
+            });
+
+        /// Pass information about used columns to subqueries and remove unused projection columns
+        for (auto & [query_or_union_node, used_columns] : node_to_used_columns)
         {
             /// can't remove columns from distinct, see example - 03023_remove_unused_column_distinct.sql
             if (auto * query_node = query_or_union_node->as<QueryNode>())
@@ -183,40 +159,6 @@ void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr & query_tree_node,
                 if (query_node->isDistinct())
                     continue;
             }
-            else
-            {
-                auto * union_node = query_or_union_node->as<UnionNode>();
-                chassert(union_node != nullptr);
-
-                /// We can't remove unused projections in the case of EXCEPT and INTERSECT
-                /// because it can lead to incorrect query results. Example:
-                ///
-                /// SELECT count()
-                /// FROM
-                /// (
-                ///     SELECT
-                ///         1 AS a,
-                ///         2 AS b
-                ///     INTERSECT ALL
-                ///     SELECT
-                ///         1,
-                ///         1
-                /// )
-                ///
-                /// Will be transformed into the following query with output 1 instead of 0:
-                ///
-                /// SELECT count()
-                /// FROM
-                /// (
-                ///     SELECT
-                ///         1 AS a, -- we must keep at least 1 column
-                ///     INTERSECT ALL
-                ///     SELECT
-                ///         1
-                /// );
-                if (union_node->getUnionMode() > SelectUnionMode::UNION_DISTINCT)
-                    continue;
-            }
 
             auto used_projection_indexes = convertUsedColumnNamesToUsedProjectionIndexes(query_or_union_node, used_columns);
             updateUsedProjectionIndexes(query_or_union_node, used_projection_indexes);
@@ -231,10 +173,8 @@ void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr & query_tree_node,
                 query_node->removeUnusedProjectionColumns(used_projection_indexes);
         }
 
-        for (const auto & subquery_node_to_visit : visitor.subqueries_nodes_to_visit)
+        for (const auto & subquery_node_to_visit : subqueries_nodes_to_visit)
             nodes_to_visit.push_back(subquery_node_to_visit);
-
-        visitor.reset();
     }
 }
 
diff --git a/src/Analyzer/QueryTreeBuilder.cpp b/src/Analyzer/QueryTreeBuilder.cpp
index 679774de81c7..5f74ad70647a 100644
--- a/src/Analyzer/QueryTreeBuilder.cpp
+++ b/src/Analyzer/QueryTreeBuilder.cpp
@@ -54,7 +54,6 @@ namespace DB
 
 namespace Setting
 {
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool any_join_distinct_right_table_keys;
     extern const SettingsJoinStrictness join_default_strictness;
     extern const SettingsBool enable_order_by_all;
@@ -621,7 +620,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildExpression(const ASTPtr & expression, co
     {
         if (ast_literal->custom_type)
             result = std::make_shared<ConstantNode>(ast_literal->value, ast_literal->custom_type);
-        else if (context->getSettingsRef()[Setting::allow_experimental_variant_type] && context->getSettingsRef()[Setting::use_variant_as_common_type])
+        else if (context->getSettingsRef()[Setting::use_variant_as_common_type])
             result = std::make_shared<ConstantNode>(ast_literal->value, ast_literal->custom_type ? ast_literal->custom_type : applyVisitor(FieldToDataType<LeastSupertypeOnError::Variant>(), ast_literal->value));
         else
             result = std::make_shared<ConstantNode>(ast_literal->value);
diff --git a/src/Analyzer/QueryTreePassManager.cpp b/src/Analyzer/QueryTreePassManager.cpp
index a818ad348020..3f94444cdc53 100644
--- a/src/Analyzer/QueryTreePassManager.cpp
+++ b/src/Analyzer/QueryTreePassManager.cpp
@@ -48,6 +48,7 @@
 #include <Analyzer/Passes/SumIfToCountIfPass.h>
 #include <Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.h>
 #include <Analyzer/Passes/UniqToCountPass.h>
+#include <Analyzer/Passes/HybridCastsPass.h>
 #include <Analyzer/Utils.h>
 
 namespace DB
@@ -309,6 +310,8 @@ void addQueryTreePasses(QueryTreePassManager & manager, bool only_analyze)
     manager.addPass(std::make_unique<ShardNumColumnToFunctionPass>());
 
     manager.addPass(std::make_unique<OptimizeDateOrDateTimeConverterWithPreimagePass>());
+
+    manager.addPass(std::make_unique<HybridCastsPass>());
 }
 
 }
diff --git a/src/Analyzer/Resolve/IdentifierResolveScope.h b/src/Analyzer/Resolve/IdentifierResolveScope.h
index aec30231bbbf..73aec05cb5f2 100644
--- a/src/Analyzer/Resolve/IdentifierResolveScope.h
+++ b/src/Analyzer/Resolve/IdentifierResolveScope.h
@@ -147,8 +147,8 @@ struct IdentifierResolveScope
     /// Store current scope aliases defined in WITH clause if `enable_scopes_for_with_statement` setting is disabled.
     ScopeAliases global_with_aliases;
 
-    /// Table column name to column node. Valid only during table ALIAS columns resolve.
-    ColumnNameToColumnNodeMap column_name_to_column_node;
+    /// Valid only during table ALIAS columns resolve.
+    AnalysisTableExpressionData * table_expression_data_for_alias_resolution = nullptr;
 
     std::list<std::unordered_map<std::string, ColumnNodePtr> *> join_using_columns;
 
@@ -198,14 +198,6 @@ struct IdentifierResolveScope
     /// Node hash to mask id map
     std::shared_ptr<std::map<IQueryTreeNode::Hash, size_t>> projection_mask_map;
 
-    struct ResolvedFunctionsCache
-    {
-        FunctionOverloadResolverPtr resolver;
-        FunctionBasePtr function_base;
-    };
-
-    std::map<IQueryTreeNode::Hash, ResolvedFunctionsCache> functions_cache;
-
     [[maybe_unused]] const IdentifierResolveScope * getNearestQueryScope() const;
 
     IdentifierResolveScope * getNearestQueryScope();
diff --git a/src/Analyzer/Resolve/IdentifierResolver.cpp b/src/Analyzer/Resolve/IdentifierResolver.cpp
index 5580ea0f8df7..216d5a90bf24 100644
--- a/src/Analyzer/Resolve/IdentifierResolver.cpp
+++ b/src/Analyzer/Resolve/IdentifierResolver.cpp
@@ -356,26 +356,25 @@ bool IdentifierResolver::tryBindIdentifierToJoinUsingColumn(const IdentifierLook
   */
 QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromTableColumns(const IdentifierLookup & identifier_lookup, IdentifierResolveScope & scope)
 {
-    if (scope.column_name_to_column_node.empty() || !identifier_lookup.isExpressionLookup())
+    if (!scope.table_expression_data_for_alias_resolution || !identifier_lookup.isExpressionLookup())
         return {};
 
     const auto & identifier = identifier_lookup.identifier;
-    auto it = scope.column_name_to_column_node.find(identifier.getFullName());
-    bool full_column_name_match = it != scope.column_name_to_column_node.end();
+    auto identifier_full_name = identifier.getFullName();
+    auto it = scope.table_expression_data_for_alias_resolution->column_name_to_column_node.find(identifier_full_name);
+    if (it != scope.table_expression_data_for_alias_resolution->column_name_to_column_node.end())
+        return it->second;
 
-    if (!full_column_name_match)
+    /// Check if it's a subcolumn
+    if (auto subcolumn_info = scope.table_expression_data_for_alias_resolution->tryGetSubcolumnInfo(identifier_full_name))
     {
-        it = scope.column_name_to_column_node.find(identifier_lookup.identifier[0]);
-        if (it == scope.column_name_to_column_node.end())
-            return {};
-    }
-
-    QueryTreeNodePtr result = it->second;
+        if (scope.table_expression_data_for_alias_resolution->supports_subcolumns)
+            return std::make_shared<ColumnNode>(NameAndTypePair{identifier_full_name, subcolumn_info->subcolumn_type}, subcolumn_info->column_node->getColumnSource());
 
-    if (!full_column_name_match && identifier.isCompound())
-        return tryResolveIdentifierFromCompoundExpression(identifier_lookup.identifier, 1 /*identifier_bind_size*/, it->second, {}, scope);
+        return wrapExpressionNodeInSubcolumn(subcolumn_info->column_node, String(subcolumn_info->subcolumn_name), scope.context);
+    }
 
-    return result;
+    return {};
 }
 
 bool IdentifierResolver::tryBindIdentifierToTableExpression(const IdentifierLookup & identifier_lookup,
@@ -496,65 +495,31 @@ IdentifierResolveResult IdentifierResolver::tryResolveIdentifierFromStorage(
         */
 
     QueryTreeNodePtr result_expression;
-    bool match_full_identifier = false;
 
     const auto & identifier_full_name = identifier_without_column_qualifier.getFullName();
 
-    ColumnNodePtr result_column_node;
-    bool can_resolve_directly_from_storage = false;
     if (auto it = table_expression_data.column_name_to_column_node.find(identifier_full_name); it != table_expression_data.column_name_to_column_node.end())
     {
-        can_resolve_directly_from_storage = true;
-        result_column_node = it->second;
+        result_expression = it->second;
     }
-    /// Check if it's a dynamic subcolumn
-    else if (table_expression_data.supports_subcolumns)
+    /// Check if it's a subcolumn
+    else
     {
-        auto [column_name, dynamic_subcolumn_name] = Nested::splitName(identifier_full_name);
-        auto jt = table_expression_data.column_name_to_column_node.find(column_name);
-        if (jt != table_expression_data.column_name_to_column_node.end() && jt->second->getColumnType()->hasDynamicSubcolumns())
+        if (auto subcolumn_info = table_expression_data.tryGetSubcolumnInfo(identifier_full_name))
         {
-            if (auto dynamic_subcolumn_type = jt->second->getColumnType()->tryGetSubcolumnType(dynamic_subcolumn_name))
-            {
-                result_column_node = std::make_shared<ColumnNode>(NameAndTypePair{identifier_full_name, dynamic_subcolumn_type}, jt->second->getColumnSource());
-                can_resolve_directly_from_storage = true;
-            }
+            if (table_expression_data.supports_subcolumns)
+                result_expression = std::make_shared<ColumnNode>(NameAndTypePair{identifier_full_name, subcolumn_info->subcolumn_type}, subcolumn_info->column_node->getColumnSource());
+            else
+                result_expression = wrapExpressionNodeInSubcolumn(subcolumn_info->column_node, String(subcolumn_info->subcolumn_name), scope.context);
         }
     }
 
-
-    if (can_resolve_directly_from_storage)
-    {
-        match_full_identifier = true;
-        result_expression = result_column_node;
-    }
-    else
-    {
-        auto it = table_expression_data.column_name_to_column_node.find(identifier_without_column_qualifier.at(0));
-        if (it != table_expression_data.column_name_to_column_node.end())
-            result_expression = it->second;
-    }
-
     bool clone_is_needed = true;
 
     String table_expression_source = table_expression_data.table_expression_description;
     if (!table_expression_data.table_expression_name.empty())
         table_expression_source += " with name " + table_expression_data.table_expression_name;
 
-    if (result_expression && !match_full_identifier && identifier_without_column_qualifier.isCompound())
-    {
-        size_t identifier_bind_size = identifier_column_qualifier_parts + 1;
-        result_expression = tryResolveIdentifierFromCompoundExpression(identifier,
-            identifier_bind_size,
-            result_expression,
-            table_expression_source,
-            scope,
-            can_be_not_found);
-        if (can_be_not_found && !result_expression)
-            return {};
-        clone_is_needed = false;
-    }
-
     if (!result_expression)
     {
         /// Here we try to create Nested from Array columns with the `identifier` prefix.
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index b77a40e02f84..26d34be495f3 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -216,11 +216,7 @@ void QueryAnalyzer::resolve(QueryTreeNodePtr & node, const QueryTreeNodePtr & ta
             }
 
             if (node_type == QueryTreeNodeType::LIST)
-            {
-                QueryExpressionsAliasVisitor visitor(scope.aliases);
-                visitor.visit(node);
                 resolveExpressionNodeList(node, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
-            }
             else
                 resolveExpressionNode(node, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
 
@@ -248,6 +244,7 @@ void QueryAnalyzer::resolve(QueryTreeNodePtr & node, const QueryTreeNodePtr & ta
 void QueryAnalyzer::resolveConstantExpression(QueryTreeNodePtr & node, const QueryTreeNodePtr & table_expression, ContextPtr context)
 {
     IdentifierResolveScope & scope = createIdentifierResolveScope(node, /*parent_scope=*/ nullptr);
+
     if (!scope.context)
         scope.context = context;
 
@@ -737,7 +734,7 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
             }
 
             std::optional<PullingAsyncPipelineExecutor> executor;
-            Block block;
+            Chunk chunk;
 
             if (!skip_execution_for_exists)
             {
@@ -746,12 +743,12 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
                 io.pipeline.setConcurrencyControl(context->getSettingsRef()[Setting::use_concurrency_control]);
 
                 executor.emplace(io.pipeline);
-                while (block.rows() == 0 && executor->pull(block))
+                while (chunk.getNumRows() == 0 && executor->pull(chunk))
                 {
                 }
             }
 
-            if (block.rows() == 0)
+            if (chunk.getNumRows() == 0)
             {
                 DataTypePtr type;
                 if (execute_for_exists)
@@ -784,15 +781,15 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
             }
             else
             {
-                if (block.rows() != 1)
+                if (chunk.getNumRows() != 1)
                     throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY, "Scalar subquery returned more than one row");
 
-                Block tmp_block;
-                while (tmp_block.rows() == 0 && executor->pull(tmp_block))
+                Chunk tmp_chunk;
+                while (tmp_chunk.getNumRows() == 0 && executor->pull(tmp_chunk))
                 {
                 }
 
-                if (tmp_block.rows() != 0)
+                if (tmp_chunk.getNumRows() != 0)
                     throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY, "Scalar subquery returned more than one row");
 
                 if (execute_for_exists)
@@ -804,6 +801,7 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
                 }
                 else
                 {
+                    auto block = executor->getHeader().cloneWithColumns(chunk.getColumns());
                     wrap_with_nullable_or_tuple(block);
                     scalar_block = std::move(block);
                 }
@@ -3513,19 +3511,26 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
     FunctionOverloadResolverPtr function = UserDefinedExecutableFunctionFactory::instance().tryGet(function_name, scope.context, parameters); /// NOLINT(readability-static-accessed-through-instance)
     bool is_executable_udf = true;
 
-    IdentifierResolveScope::ResolvedFunctionsCache * function_cache = nullptr;
+    ResolvedFunctionsCache * function_cache = nullptr;
 
     if (!function)
     {
         /// This is a hack to allow a query like `select randConstant(), randConstant(), randConstant()`.
         /// Function randConstant() would return the same value for the same arguments (in scope).
+        /// But we need to exclude getSetting() function because SETTINGS can change its result for every scope.
 
-        auto hash = function_node_ptr->getTreeHash();
-        function_cache = &scope.functions_cache[hash];
-        if (!function_cache->resolver)
-            function_cache->resolver = FunctionFactory::instance().tryGet(function_name, scope.context);
+        if (function_name != "getSetting" && function_name != "rowNumberInAllBlocks")
+        {
+            auto hash = function_node_ptr->getTreeHash();
+
+            function_cache = &functions_cache[hash];
+            if (!function_cache->resolver)
+                function_cache->resolver = FunctionFactory::instance().tryGet(function_name, scope.context);
 
-        function = function_cache->resolver;
+            function = function_cache->resolver;
+        }
+        else
+            function = FunctionFactory::instance().tryGet(function_name, scope.context);
 
         is_executable_udf = false;
     }
@@ -4805,6 +4810,7 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
             }
         }
 
+        table_expression_data.column_name_to_column_node = std::move(column_name_to_column_node);
         for (auto & [alias_column_to_resolve_name, alias_column_to_resolve] : alias_columns_to_resolve)
         {
             /** Alias column could be potentially resolved during resolve of other ALIAS column.
@@ -4812,10 +4818,10 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
               *
               * During resolve of alias_value_1, alias_value_2 column will be resolved.
               */
-            alias_column_to_resolve = column_name_to_column_node[alias_column_to_resolve_name];
+            alias_column_to_resolve = table_expression_data.column_name_to_column_node[alias_column_to_resolve_name];
 
             IdentifierResolveScope & alias_column_resolve_scope = createIdentifierResolveScope(alias_column_to_resolve, &scope /*parent_scope*/);
-            alias_column_resolve_scope.column_name_to_column_node = std::move(column_name_to_column_node);
+            alias_column_resolve_scope.table_expression_data_for_alias_resolution = &table_expression_data;
             alias_column_resolve_scope.context = scope.context;
 
             /// Initialize aliases in alias column scope
@@ -4829,11 +4835,8 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
             auto & resolved_expression = alias_column_to_resolve->getExpression();
             if (!resolved_expression->getResultType()->equals(*alias_column_to_resolve->getResultType()))
                 resolved_expression = buildCastFunction(resolved_expression, alias_column_to_resolve->getResultType(), scope.context, true);
-            column_name_to_column_node = std::move(alias_column_resolve_scope.column_name_to_column_node);
-            column_name_to_column_node[alias_column_to_resolve_name] = alias_column_to_resolve;
+            table_expression_data.column_name_to_column_node[alias_column_to_resolve_name] = alias_column_to_resolve;
         }
-
-        table_expression_data.column_name_to_column_node = std::move(column_name_to_column_node);
     }
     else if (query_node || union_node)
     {
@@ -5062,6 +5065,14 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
 
         if (auto * expression_list = table_function_argument->as<ListNode>())
         {
+            if (expression_list->getNodes().empty())
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Table function {} argument at position {} resolved to an empty expression list (parsed as: {})",
+                    table_function_name,
+                    table_function_argument_index + 1,
+                    table_function_argument->formatASTForErrorMessage());
+
             for (auto & expression_list_node : expression_list->getNodes())
                 result_table_function_arguments.push_back(expression_list_node);
         }
@@ -6094,6 +6105,7 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
 
     expandGroupByAll(query_node_typed);
 
+    validateFromClause(query_node);
     validateFilters(query_node);
     validateAggregates(query_node, {.group_by_use_nulls = scope.group_by_use_nulls});
 
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.h b/src/Analyzer/Resolve/QueryAnalyzer.h
index 61d5f380a2b2..e214fda505f7 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.h
+++ b/src/Analyzer/Resolve/QueryAnalyzer.h
@@ -12,6 +12,7 @@
 #include <Core/NamesAndTypes.h>
 
 #include <Parsers/NullsAction.h>
+#include <Functions/IFunction.h>
 
 namespace DB
 {
@@ -296,6 +297,14 @@ class QueryAnalyzer
 
     std::unordered_map<QueryTreeNodePtr, IdentifierResolveScope> node_to_scope_map;
 
+    struct ResolvedFunctionsCache
+    {
+        FunctionOverloadResolverPtr resolver;
+        FunctionBasePtr function_base;
+    };
+
+    std::map<IQueryTreeNode::Hash, ResolvedFunctionsCache> functions_cache;
+
     const bool only_analyze;
 };
 
diff --git a/src/Analyzer/Resolve/TableExpressionData.h b/src/Analyzer/Resolve/TableExpressionData.h
index bbedad69cfe4..4d8c89ac3f47 100644
--- a/src/Analyzer/Resolve/TableExpressionData.h
+++ b/src/Analyzer/Resolve/TableExpressionData.h
@@ -2,6 +2,7 @@
 
 #include <IO/Operators.h>
 #include <Analyzer/ColumnNode.h>
+#include <DataTypes/NestedUtils.h>
 
 namespace DB
 {
@@ -49,7 +50,8 @@ struct AnalysisTableExpressionData
 
     bool canBindIdentifier(IdentifierView identifier_view) const
     {
-        return column_identifier_first_parts.contains(identifier_view.at(0));
+        return column_identifier_first_parts.contains(identifier_view.at(0)) || column_name_to_column_node.contains(identifier_view.at(0))
+            || tryGetSubcolumnInfo(identifier_view.getFullName());
     }
 
     [[maybe_unused]] void dump(WriteBuffer & buffer) const
@@ -78,6 +80,28 @@ struct AnalysisTableExpressionData
 
         return buffer.str();
     }
+
+    struct SubcolumnInfo
+    {
+        ColumnNodePtr column_node;
+        std::string_view subcolumn_name;
+        DataTypePtr subcolumn_type;
+    };
+
+    std::optional<SubcolumnInfo> tryGetSubcolumnInfo(std::string_view full_identifier_name) const
+    {
+        for (auto [column_name, subcolumn_name] : Nested::getAllColumnAndSubcolumnPairs(full_identifier_name))
+        {
+            auto it = column_name_to_column_node.find(column_name);
+            if (it != column_name_to_column_node.end())
+            {
+                if (auto subcolumn_type = it->second->getResultType()->tryGetSubcolumnType(subcolumn_name))
+                    return SubcolumnInfo{it->second, subcolumn_name, subcolumn_type};
+            }
+        }
+
+        return std::nullopt;
+    }
 };
 
 }
diff --git a/src/Analyzer/Resolve/TableFunctionsWithClusterAlternativesVisitor.h b/src/Analyzer/Resolve/TableFunctionsWithClusterAlternativesVisitor.h
index ab4dfbce57c1..c889ae414cc8 100644
--- a/src/Analyzer/Resolve/TableFunctionsWithClusterAlternativesVisitor.h
+++ b/src/Analyzer/Resolve/TableFunctionsWithClusterAlternativesVisitor.h
@@ -26,7 +26,7 @@ class TableFunctionsWithClusterAlternativesVisitor : public InDepthQueryTreeVisi
     bool needChildVisit(const QueryTreeNodePtr &, const QueryTreeNodePtr &) { return true; }
     bool shouldReplaceWithClusterAlternatives() const
     {
-        return !has_subquery && !has_join && (table_count + table_function_count) == 1;
+        return !has_subquery && !has_join && ((table_count + table_function_count) == 1 || (table_function_count == 0));
     }
 
 private:
diff --git a/src/Analyzer/SetUtils.cpp b/src/Analyzer/SetUtils.cpp
index 82554ccf256e..1f1e6e649297 100644
--- a/src/Analyzer/SetUtils.cpp
+++ b/src/Analyzer/SetUtils.cpp
@@ -42,16 +42,13 @@ size_t getCompoundTypeDepth(const IDataType & type)
         else if (which_type.isTuple())
         {
             const auto & tuple_elements = assert_cast<const DataTypeTuple &>(*current_type).getElements();
+            ++result;
             if (!tuple_elements.empty())
                 current_type = tuple_elements.at(0).get();
             else
             {
-                /// Special case: tuple with no element - tuple(). In this case, what's the compound type depth?
-                /// I'm not certain about the theoretical answer, but from experiment, 1 is the most reasonable choice.
-                return 1;
+                break;
             }
-
-            ++result;
         }
         else
         {
@@ -162,7 +159,8 @@ ColumnsWithTypeAndName getSetElementsForConstantValue(const DataTypePtr & expres
     DataTypes set_element_types = {expression_type};
     const auto * lhs_tuple_type = typeid_cast<const DataTypeTuple *>(expression_type.get());
 
-    if (lhs_tuple_type && lhs_tuple_type->getElements().size() != 1)
+    /// Do not unpack if empty tuple or single element tuple
+    if (lhs_tuple_type && lhs_tuple_type->getElements().size() > 1)
         set_element_types = lhs_tuple_type->getElements();
 
     for (auto & set_element_type : set_element_types)
diff --git a/src/Analyzer/UnionNode.cpp b/src/Analyzer/UnionNode.cpp
index 34a4b2b69749..4fb43b120eef 100644
--- a/src/Analyzer/UnionNode.cpp
+++ b/src/Analyzer/UnionNode.cpp
@@ -122,6 +122,35 @@ void UnionNode::removeUnusedProjectionColumns(const std::unordered_set<size_t> &
     if (recursive_cte_table)
         return;
 
+    /// We can't remove unused projections in the case of EXCEPT and INTERSECT
+    /// because it can lead to incorrect query results. Example:
+    ///
+    /// SELECT count()
+    /// FROM
+    /// (
+    ///     SELECT
+    ///         1 AS a,
+    ///         2 AS b
+    ///     INTERSECT ALL
+    ///     SELECT
+    ///         1,
+    ///         1
+    /// )
+    ///
+    /// Will be transformed into the following query with output 1 instead of 0:
+    ///
+    /// SELECT count()
+    /// FROM
+    /// (
+    ///     SELECT
+    ///         1 AS a, -- we must keep at least 1 column
+    ///     INTERSECT ALL
+    ///     SELECT
+    ///         1
+    /// );
+    if (union_mode > SelectUnionMode::UNION_DISTINCT)
+        return;
+
     auto & query_nodes = getQueries().getNodes();
     for (auto & query_node : query_nodes)
     {
diff --git a/src/Analyzer/ValidationUtils.cpp b/src/Analyzer/ValidationUtils.cpp
index 017653a7036a..a6adb863a7b8 100644
--- a/src/Analyzer/ValidationUtils.cpp
+++ b/src/Analyzer/ValidationUtils.cpp
@@ -1,27 +1,32 @@
 #include <Analyzer/ValidationUtils.h>
 
 #include <Analyzer/AggregationUtils.h>
+#include <Analyzer/ArrayJoinNode.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/JoinNode.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/WindowFunctionsUtils.h>
 #include <Storages/IStorage.h>
 
+#include <memory>
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int NOT_AN_AGGREGATE;
-    extern const int NOT_IMPLEMENTED;
     extern const int BAD_ARGUMENTS;
-    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
     extern const int ILLEGAL_PREWHERE;
-    extern const int UNSUPPORTED_METHOD;
+    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_AN_AGGREGATE;
+    extern const int NOT_IMPLEMENTED;
     extern const int UNEXPECTED_EXPRESSION;
+    extern const int UNSUPPORTED_METHOD;
 }
 
 namespace
@@ -541,4 +546,76 @@ void validateCorrelatedSubqueries(const QueryTreeNodePtr & node)
     }
 }
 
+void validateFromClause(const QueryTreeNodePtr & node)
+{
+    const auto & root_query_node = node->as<QueryNode &>();
+    auto correlated_columns_set = root_query_node.getCorrelatedColumnsSet();
+
+    std::vector<QueryTreeNodePtr> nodes_to_process = { root_query_node.getJoinTree() };
+
+    while (!nodes_to_process.empty())
+    {
+        auto node_to_process = std::move(nodes_to_process.back());
+        nodes_to_process.pop_back();
+
+        auto node_type = node_to_process->getNodeType();
+
+        switch (node_type)
+        {
+            case QueryTreeNodeType::TABLE:
+                [[fallthrough]];
+            case QueryTreeNodeType::TABLE_FUNCTION:
+                break;
+            case QueryTreeNodeType::QUERY:
+            {
+                auto & query_node = node_to_process->as<QueryNode &>();
+                const auto & correlated_columns = query_node.getCorrelatedColumns();
+                for (const auto & column : correlated_columns)
+                {
+                    if (!correlated_columns_set.contains(std::static_pointer_cast<ColumnNode>(column)))
+                        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                            "Lateral joins are not supported. Correlated column '{}' is found in the FROM clause. In query {}",
+                            column->formatASTForErrorMessage(),
+                            node->formatASTForErrorMessage());
+                }
+                break;
+            }
+            case QueryTreeNodeType::UNION:
+            {
+                for (const auto & union_node : node_to_process->as<UnionNode>()->getQueries().getNodes())
+                    nodes_to_process.push_back(union_node);
+                break;
+            }
+            case QueryTreeNodeType::ARRAY_JOIN:
+            {
+                auto & array_join_node = node_to_process->as<ArrayJoinNode &>();
+                nodes_to_process.push_back(array_join_node.getTableExpression());
+                break;
+            }
+            case QueryTreeNodeType::CROSS_JOIN:
+            {
+                auto & join_node = node_to_process->as<CrossJoinNode &>();
+                for (const auto & expr : std::ranges::reverse_view(join_node.getTableExpressions()))
+                    nodes_to_process.push_back(expr);
+                break;
+            }
+            case QueryTreeNodeType::JOIN:
+            {
+                auto & join_node = node_to_process->as<JoinNode &>();
+                nodes_to_process.push_back(join_node.getRightTableExpression());
+                nodes_to_process.push_back(join_node.getLeftTableExpression());
+                break;
+            }
+            default:
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Unexpected node type for table expression. "
+                                "Expected table, table function, query, union, join or array join. Actual {}",
+                                node_to_process->getNodeTypeName());
+            }
+        }
+    }
+
+}
+
 }
diff --git a/src/Analyzer/ValidationUtils.h b/src/Analyzer/ValidationUtils.h
index 6be599b35194..5203460d83be 100644
--- a/src/Analyzer/ValidationUtils.h
+++ b/src/Analyzer/ValidationUtils.h
@@ -41,8 +41,16 @@ void validateTreeSize(const QueryTreeNodePtr & node,
     size_t max_size,
     std::unordered_map<QueryTreeNodePtr, size_t> & node_to_tree_size);
 
+/**
+  * Validate that correlated subqueries do not present in the context of distributed query.
+  */
 void validateCorrelatedSubqueries(const QueryTreeNodePtr & node);
 
+/**
+  * Validate that if correlated subquery appears in the FROM clause then it uses columns from outer query.
+  */
+void validateFromClause(const QueryTreeNodePtr & node);
+
 /** Compare node with group by key node.
   * Such comparison does not take into account aliases, but checks types and column sources.
   */
diff --git a/src/Analyzer/traverseQueryTree.h b/src/Analyzer/traverseQueryTree.h
new file mode 100644
index 000000000000..da2d3f1a5f95
--- /dev/null
+++ b/src/Analyzer/traverseQueryTree.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <Analyzer/IQueryTreeNode.h>
+#include <Analyzer/TableFunctionNode.h>
+
+namespace DB
+{
+
+/// Traverse query tree in depth-first manner, applying `func` to each node.
+/// `should_visit_predicate` is called for each child node to determine whether to visit it or not.
+/// If the node is a TableFunctionNode, its arguments that are not resolved are skipped during traversal.
+///
+/// Note: This function implements non-recursive traversal to avoid stack overflow on deep trees.
+/// If you need recursive traversal or you need to use query context, consider using InDepthQueryTreeVisitorWithContext.
+/// This function is suitable for simple use cases where you just need to apply a function to each node.
+///
+/// @param node The root node of the query tree to traverse.
+/// @param should_visit_predicate A callable that takes (parent_node, child_node) and returns a bool indicating whether to visit the child node.
+/// @param func A callable that takes (current_node) to be applied to each visited node.
+template <typename ShouldVisitPredicate, typename Func>
+void traverseQueryTree(const QueryTreeNodePtr & node, ShouldVisitPredicate should_visit_predicate, Func func)
+{
+    QueryTreeNodes nodes_to_process = { node };
+
+    while (!nodes_to_process.empty())
+    {
+        auto current_node = nodes_to_process.back();
+        nodes_to_process.pop_back();
+
+        func(current_node);
+
+        if (auto * table_function_node = current_node->as<TableFunctionNode>())
+        {
+            for (const auto & child : current_node->getChildren())
+            {
+                if (!child)
+                    continue;
+
+                if (child == table_function_node->getArgumentsNode())
+                {
+                    const auto & unresolved_indexes = table_function_node->getUnresolvedArgumentIndexes();
+                    const auto & arguments_nodes = table_function_node->getArguments().getNodes();
+
+                    for (size_t index = 0; index < arguments_nodes.size(); ++index)
+                    {
+                        const auto & argument_node = arguments_nodes[index];
+                        if (std::find(unresolved_indexes.begin(), unresolved_indexes.end(), index) == unresolved_indexes.end())
+                        {
+                            nodes_to_process.push_back(argument_node);
+                        }
+                    }
+                }
+                else
+                {
+                    if (should_visit_predicate(current_node, child))
+                        nodes_to_process.push_back(child);
+                }
+            }
+        }
+        else
+        {
+            for (const auto & child : current_node->getChildren())
+            {
+                if (!child)
+                    continue;
+
+                if (should_visit_predicate(current_node, child))
+                    nodes_to_process.push_back(child);
+            }
+        }
+    }
+}
+
+}
diff --git a/src/Backups/BackupCoordinationStageSync.cpp b/src/Backups/BackupCoordinationStageSync.cpp
index 60b06be31226..b86c4309e104 100644
--- a/src/Backups/BackupCoordinationStageSync.cpp
+++ b/src/Backups/BackupCoordinationStageSync.cpp
@@ -115,7 +115,8 @@ BackupCoordinationStageSync::BackupCoordinationStageSync(
     , failure_after_host_disconnected_for_seconds(with_retries.getKeeperSettings().failure_after_host_disconnected_for_seconds)
     , finish_timeout_after_error(with_retries.getKeeperSettings().finish_timeout_after_error)
     , sync_period_ms(with_retries.getKeeperSettings().sync_period_ms)
-    , max_attempts_after_bad_version(with_retries.getKeeperSettings().max_attempts_after_bad_version)
+    // all_hosts.size() is added to max_attempts_after_bad_version since each host change the num_hosts node once, and it's a valid case
+    , max_attempts_after_bad_version(with_retries.getKeeperSettings().max_attempts_after_bad_version + all_hosts.size())
     , zookeeper_path(zookeeper_path_)
     , root_zookeeper_path(zookeeper_path.parent_path().parent_path())
     , operation_zookeeper_path(zookeeper_path.parent_path())
diff --git a/src/Backups/BackupEntriesCollector.cpp b/src/Backups/BackupEntriesCollector.cpp
index 4ce7a5f99edc..cf73f97e80ed 100644
--- a/src/Backups/BackupEntriesCollector.cpp
+++ b/src/Backups/BackupEntriesCollector.cpp
@@ -397,7 +397,7 @@ void BackupEntriesCollector::gatherDatabasesMetadata()
 
             case ASTBackupQuery::ElementType::ALL:
             {
-                for (const auto & [database_name, database] : DatabaseCatalog::instance().getDatabases())
+                for (const auto & [database_name, database] : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true}))
                 {
                     if (!element.except_databases.contains(database_name))
                     {
diff --git a/src/Backups/BackupIO_AzureBlobStorage.cpp b/src/Backups/BackupIO_AzureBlobStorage.cpp
index cdc6b194f84a..7d95ba062740 100644
--- a/src/Backups/BackupIO_AzureBlobStorage.cpp
+++ b/src/Backups/BackupIO_AzureBlobStorage.cpp
@@ -22,70 +22,12 @@ namespace fs = std::filesystem;
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
 }
 
-/// This function compares the authorization methods used to access AzureBlobStorage
-/// It takes 2 variables of variant type as input and checks if they are the same type and value
-static bool compareAuthMethod (AzureBlobStorage::AuthMethod auth_method_a, AzureBlobStorage::AuthMethod auth_method_b)
-{
-    const auto * conn_string_a = std::get_if<AzureBlobStorage::ConnectionString>(&auth_method_a);
-    const auto * conn_string_b = std::get_if<AzureBlobStorage::ConnectionString>(&auth_method_b);
-
-    if (conn_string_a && conn_string_b)
-    {
-        return *conn_string_a == *conn_string_b;
-    }
-
-    const auto * shared_key_a = std::get_if<std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>>(&auth_method_a);
-    const auto * shared_key_b = std::get_if<std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>>(&auth_method_b);
-
-    if (shared_key_a && shared_key_b)
-    {
-        return (shared_key_a->get()->AccountName == shared_key_b->get()->AccountName);
-    }
-
-    try
-    {
-        const auto * workload_identity_a = std::get_if<std::shared_ptr<Azure::Identity::WorkloadIdentityCredential>>(&auth_method_a);
-        const auto * workload_identity_b = std::get_if<std::shared_ptr<Azure::Identity::WorkloadIdentityCredential>>(&auth_method_b);
-
-        if (workload_identity_a && workload_identity_b)
-        {
-            Azure::Core::Credentials::TokenRequestContext tokenRequestContext;
-            return workload_identity_a->get()->GetToken(tokenRequestContext, {}).Token == workload_identity_b->get()->GetToken(tokenRequestContext, {}).Token;
-        }
-
-        const auto * managed_identity_a = std::get_if<std::shared_ptr<Azure::Identity::ManagedIdentityCredential>>(&auth_method_a);
-        const auto * managed_identity_b = std::get_if<std::shared_ptr<Azure::Identity::ManagedIdentityCredential>>(&auth_method_b);
-
-        if (managed_identity_a && managed_identity_b)
-        {
-            Azure::Core::Credentials::TokenRequestContext tokenRequestContext;
-            return managed_identity_a->get()->GetToken(tokenRequestContext, {}).Token == managed_identity_b->get()->GetToken(tokenRequestContext, {}).Token;
-        }
-
-        const auto * static_credential_a = std::get_if<std::shared_ptr<AzureBlobStorage::StaticCredential>>(&auth_method_a);
-        const auto * static_credential_b = std::get_if<std::shared_ptr<AzureBlobStorage::StaticCredential>>(&auth_method_b);
-
-        if (static_credential_a && static_credential_b)
-        {
-            Azure::Core::Credentials::TokenRequestContext tokenRequestContext;
-            auto az_context = Azure::Core::Context();
-            return static_credential_a->get()->GetToken(tokenRequestContext, az_context).Token == static_credential_b->get()->GetToken(tokenRequestContext, az_context).Token;
-        }
-    }
-    catch (const Azure::Core::Credentials::AuthenticationException & e)
-    {
-        /// This is added to catch exception from GetToken. We want to log & fail silently i.e return false so that we can fallback to read & copy (i.e not native copy)
-        LOG_DEBUG(getLogger("compareAuthMethod"), "Exception caught while comparing credentials, error = {}", e.what());
-        return false;
-    }
-    return false;
-}
-
 BackupReaderAzureBlobStorage::BackupReaderAzureBlobStorage(
     const AzureBlobStorage::ConnectionParams & connection_params_,
     const String & blob_path_,
@@ -166,7 +108,7 @@ void BackupReaderAzureBlobStorage::copyFileToDisk(const String & path_in_backup,
                 /* dest_path */ dst_blob_path[0],
                 settings,
                 read_settings,
-                compareAuthMethod(connection_params.auth_method, destination_disk->getObjectStorage()->getAzureBlobStorageAuthMethod()),
+                std::optional<ObjectAttributes>(),
                 threadPoolCallbackRunnerUnsafe<void>(getBackupsIOThreadPool().get(), "BackupRDAzure"));
 
             return file_size;
@@ -233,7 +175,7 @@ void BackupWriterAzureBlobStorage::copyFileFromDisk(
         /// In this case we can't use the native copy.
         if (auto src_blob_path = src_disk->getBlobPath(src_path); src_blob_path.size() == 2)
         {
-            LOG_TRACE(log, "Copying file {} from disk {} to AzureBlobStorag", src_path, src_disk->getName());
+            LOG_TRACE(log, "Copying file {} from disk {} to AzureBlobStorage", src_path, src_disk->getName());
             copyAzureBlobStorageFile(
                 src_disk->getObjectStorage()->getAzureBlobStorageClient(),
                 client,
@@ -245,7 +187,7 @@ void BackupWriterAzureBlobStorage::copyFileFromDisk(
                 fs::path(blob_path) / path_in_backup,
                 settings,
                 read_settings,
-                compareAuthMethod(src_disk->getObjectStorage()->getAzureBlobStorageAuthMethod(), connection_params.auth_method),
+                std::optional<ObjectAttributes>(),
                 threadPoolCallbackRunnerUnsafe<void>(getBackupsIOThreadPool().get(), "BackupWRAzure"));
             return; /// copied!
         }
@@ -269,7 +211,7 @@ void BackupWriterAzureBlobStorage::copyFile(const String & destination, const St
        /* dest_path */ destination,
        settings,
        read_settings,
-       true,
+       std::optional<ObjectAttributes>(),
        threadPoolCallbackRunnerUnsafe<void>(getBackupsIOThreadPool().get(), "BackupWRAzure"));
 }
 
diff --git a/src/Backups/BackupIO_S3.cpp b/src/Backups/BackupIO_S3.cpp
index 709ff74fda24..51cf22a12eee 100644
--- a/src/Backups/BackupIO_S3.cpp
+++ b/src/Backups/BackupIO_S3.cpp
@@ -76,6 +76,36 @@ namespace ErrorCodes
 
 namespace
 {
+class S3BackupClientCreator
+{
+public:
+    explicit S3BackupClientCreator(const ContextPtr & context)
+    {
+        const Settings & local_settings = context->getSettingsRef();
+        retry_strategy = S3::PocoHTTPClientConfiguration::RetryStrategy{
+            .max_retries = static_cast<unsigned>(local_settings[Setting::backup_restore_s3_retry_attempts]),
+            .initial_delay_ms = static_cast<unsigned>(local_settings[Setting::backup_restore_s3_retry_initial_backoff_ms]),
+            .max_delay_ms = static_cast<unsigned>(local_settings[Setting::backup_restore_s3_retry_max_backoff_ms]),
+            .jitter_factor = local_settings[Setting::backup_restore_s3_retry_jitter_factor]};
+        slow_all_threads_after_retryable_error = local_settings[Setting::backup_slow_all_threads_after_retryable_s3_error];
+    }
+
+    S3BackupDiskClientFactory::Entry operator()(DiskPtr disk) const
+    {
+        auto disk_client = disk->getS3StorageClient();
+
+        auto config = disk_client->getClientConfiguration();
+        config.retry_strategy = retry_strategy;
+        config.s3_slow_all_threads_after_retryable_error = slow_all_threads_after_retryable_error;
+
+        return {disk_client->cloneWithConfigurationOverride(config), disk_client};
+    }
+
+private:
+    S3::PocoHTTPClientConfiguration::RetryStrategy retry_strategy;
+    bool slow_all_threads_after_retryable_error = false;
+};
+
     std::shared_ptr<S3::Client> makeS3Client(
         const S3::URI & s3_uri,
         const String & access_key_id,
@@ -117,6 +147,7 @@ namespace
             local_settings[Setting::backup_slow_all_threads_after_retryable_s3_error],
             local_settings[Setting::enable_s3_requests_logging],
             /* for_disk_s3 = */ false,
+            /* opt_disk_name = */ {},
             request_settings.get_request_throttler,
             request_settings.put_request_throttler,
             s3_uri.uri.getScheme());
@@ -179,6 +210,31 @@ namespace
 }
 
 
+S3BackupDiskClientFactory::S3BackupDiskClientFactory(const S3BackupDiskClientFactory::CreateFn & create_fn_)
+    : create_fn(create_fn_)
+{
+}
+
+std::shared_ptr<S3::Client> S3BackupDiskClientFactory::getOrCreate(DiskPtr disk)
+{
+    std::lock_guard lock(clients_mutex);
+
+    auto [it, inserted] = clients.try_emplace(disk->getName(), Entry{});
+    auto log = getLogger("S3BackupDiskClientFactory");
+    auto & entry = it->second;
+    if (inserted)
+        LOG_TRACE(log, "Creating S3 client for copy from disk '{}' to backup bucket", disk->getName());
+    else if (const_pointer_cast<const S3::Client>(entry.disk_reported_client.lock()) != disk->getS3StorageClient())
+        LOG_INFO(
+            log, "Updating S3 client for copy from disk '{}' to the backup bucket because the disk client was updated", disk->getName());
+
+    while (const_pointer_cast<const S3::Client>(entry.disk_reported_client.lock()) != disk->getS3StorageClient())
+        entry = create_fn(disk);
+
+    chassert(entry.backup_client);
+    return entry.backup_client;
+}
+
 BackupReaderS3::BackupReaderS3(
     const S3::URI & s3_uri_,
     const String & access_key_id_,
@@ -277,7 +333,6 @@ void BackupReaderS3::copyFileToDisk(const String & path_in_backup, size_t file_s
     BackupReaderDefault::copyFileToDisk(path_in_backup, file_size, encrypted_in_backup, destination_disk, destination_path, write_mode);
 }
 
-
 BackupWriterS3::BackupWriterS3(
     const S3::URI & s3_uri_,
     const String & access_key_id_,
@@ -294,6 +349,7 @@ BackupWriterS3::BackupWriterS3(
     , s3_uri(s3_uri_)
     , data_source_description{DataSourceType::ObjectStorage, ObjectStorageType::S3, MetadataStorageType::None, s3_uri.endpoint, false, false, ""}
     , s3_capabilities(getCapabilitiesFromConfig(context_->getConfigRef(), "s3"))
+    , disk_client_factory(S3BackupClientCreator(context_))
 {
     s3_settings.loadFromConfig(context_->getConfigRef(), "s3", context_->getSettingsRef());
 
@@ -330,8 +386,9 @@ void BackupWriterS3::copyFileFromDisk(const String & path_in_backup, DiskPtr src
         if (auto blob_path = src_disk->getBlobPath(src_path); blob_path.size() == 2)
         {
             LOG_TRACE(log, "Copying file {} from disk {} to S3", src_path, src_disk->getName());
+            /// Use storage client with overridden retry strategy settings.
             copyS3File(
-                src_disk->getS3StorageClient(),
+                /* src_s3_client */ disk_client_factory.getOrCreate(src_disk),
                 /* src_bucket */ blob_path[1],
                 /* src_key= */ blob_path[0],
                 start_pos,
diff --git a/src/Backups/BackupIO_S3.h b/src/Backups/BackupIO_S3.h
index 6cedf04a67af..c8a3575243e7 100644
--- a/src/Backups/BackupIO_S3.h
+++ b/src/Backups/BackupIO_S3.h
@@ -6,15 +6,39 @@
 #include <Backups/BackupIO_Default.h>
 #include <Common/Logger.h>
 #include <Disks/DiskType.h>
+#include <Disks/IDisk.h>
 #include <IO/S3Common.h>
 #include <IO/S3Settings.h>
 #include <Interpreters/Context_fwd.h>
 #include <IO/S3/BlobStorageLogWriter.h>
 #include <IO/S3/S3Capabilities.h>
 
+#include <functional>
+
+
 namespace DB
 {
 
+class S3BackupDiskClientFactory
+{
+public:
+    struct Entry
+    {
+        std::shared_ptr<S3::Client> backup_client;
+        std::weak_ptr<const S3::Client> disk_reported_client;
+    };
+    using CreateFn = std::function<Entry(DiskPtr)>;
+    explicit S3BackupDiskClientFactory(const CreateFn & create_fn_);
+    std::shared_ptr<S3::Client> getOrCreate(DiskPtr disk);
+
+private:
+    const CreateFn create_fn;
+
+    mutable std::mutex clients_mutex;
+    /// Disk name to client entry;
+    std::unordered_map<std::string, Entry> clients TSA_GUARDED_BY(clients_mutex);
+};
+
 /// Represents a backup stored to AWS S3.
 class BackupReaderS3 : public BackupReaderDefault
 {
@@ -87,6 +111,7 @@ class BackupWriterS3 : public BackupWriterDefault
     S3Settings s3_settings;
     std::shared_ptr<S3::Client> client;
     S3Capabilities s3_capabilities;
+    S3BackupDiskClientFactory disk_client_factory;
     BlobStorageLogWriterPtr blob_storage_log;
 };
 
diff --git a/src/Backups/BackupImpl.cpp b/src/Backups/BackupImpl.cpp
index b16498294647..8009f0038843 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -764,6 +764,16 @@ BackupImpl::readFileImpl(const String & file_name, const SizeAndChecksum & size_
     if (open_mode == OpenMode::WRITE)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "The backup file should not be opened for writing. Something is wrong internally");
 
+    // Zero-sized files are not inserted into `file_infos` during metadata load,
+    // but they are present in `file_names`. Short-circuit them here and return
+    // an empty buffer without consulting `file_infos`.
+    if (size_and_checksum.first == 0)
+    {
+        std::lock_guard lock{mutex};
+        ++num_read_files;
+        return std::make_unique<ReadBufferFromOutsideMemoryFile>(file_name, std::string_view{});
+    }
+
     BackupFileInfo info;
     {
         std::lock_guard lock{mutex};
@@ -780,14 +790,6 @@ BackupImpl::readFileImpl(const String & file_name, const SizeAndChecksum & size_
         info = it->second;
     }
 
-    if (info.size == 0)
-    {
-        /// Entry's data is empty.
-        std::lock_guard lock{mutex};
-        ++num_read_files;
-        return std::make_unique<ReadBufferFromOutsideMemoryFile>(info.data_file_name, std::string_view{});
-    }
-
     if (info.encrypted_by_disk != read_encrypted)
     {
         throw Exception(
diff --git a/src/Backups/BackupInfo.cpp b/src/Backups/BackupInfo.cpp
index 6e582fb77146..c50351a621ff 100644
--- a/src/Backups/BackupInfo.cpp
+++ b/src/Backups/BackupInfo.cpp
@@ -1,10 +1,16 @@
 #include <Backups/BackupInfo.h>
+
+#include <Access/ContextAccess.h>
+#include <Common/NamedCollections/NamedCollections.h>
+#include <Common/NamedCollections/NamedCollectionsFactory.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/parseQuery.h>
+#include <Storages/NamedCollectionsHelpers.h>
 
 
 namespace DB
@@ -29,6 +35,16 @@ BackupInfo BackupInfo::fromString(const String & str)
 }
 
 
+namespace
+{
+    /// Check if an AST node is a key-value assignment (e.g., url='...' parsed as equals(url, '...'))
+    bool isKeyValueArg(const ASTPtr & ast)
+    {
+        const auto * func = ast->as<const ASTFunction>();
+        return func && func->name == "equals";
+    }
+}
+
 ASTPtr BackupInfo::toAST() const
 {
     auto func = std::make_shared<ASTFunction>();
@@ -39,7 +55,7 @@ ASTPtr BackupInfo::toAST() const
     auto list = std::make_shared<ASTExpressionList>();
     func->arguments = list;
     func->children.push_back(list);
-    list->children.reserve(args.size() + !id_arg.empty());
+    list->children.reserve(args.size() + kv_args.size() + !id_arg.empty());
 
     if (!id_arg.empty())
         list->children.push_back(std::make_shared<ASTIdentifier>(id_arg));
@@ -47,6 +63,9 @@ ASTPtr BackupInfo::toAST() const
     for (const auto & arg : args)
         list->children.push_back(std::make_shared<ASTLiteral>(arg));
 
+    for (const auto & kv_arg : kv_args)
+        list->children.push_back(kv_arg);
+
     if (function_arg)
         list->children.push_back(function_arg);
 
@@ -85,6 +104,14 @@ BackupInfo BackupInfo::fromAST(const IAST & ast)
         for (; index < args_size; ++index)
         {
             const auto & elem = list->children[index];
+
+            /// Check for key-value arguments (e.g., url='...' parsed as equals(url, '...'))
+            if (isKeyValueArg(elem))
+            {
+                res.kv_args.push_back(elem);
+                continue;
+            }
+
             const auto * lit = elem->as<const ASTLiteral>();
             if (!lit)
             {
@@ -127,4 +154,32 @@ void BackupInfo::copyS3CredentialsTo(BackupInfo & dest) const
     dest_args[2] = args[2];
 }
 
+NamedCollectionPtr BackupInfo::getNamedCollection(ContextPtr context) const
+{
+    if (id_arg.empty())
+        return nullptr;
+
+    /// Load named collections (both from config and SQL-defined)
+    NamedCollectionFactory::instance().loadIfNot();
+
+    auto collection = NamedCollectionFactory::instance().tryGet(id_arg);
+    if (!collection)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no named collection `{}`", id_arg);
+
+    /// Check access rights for the named collection
+    context->checkAccess(AccessType::NAMED_COLLECTION, id_arg);
+
+    /// Apply key-value overrides from the query (e.g., url='...', blob_path='...')
+    if (!kv_args.empty())
+    {
+        auto mutable_collection = collection->duplicate();
+        auto params_from_query = getParamsMapFromAST(kv_args, context);
+        for (const auto & [key, value] : params_from_query)
+            mutable_collection->setOrUpdate<String>(key, value.safeGet<String>(), {});
+        collection = std::move(mutable_collection);
+    }
+
+    return collection;
+}
+
 }
diff --git a/src/Backups/BackupInfo.h b/src/Backups/BackupInfo.h
index 08218ece35a5..d3c56655040e 100644
--- a/src/Backups/BackupInfo.h
+++ b/src/Backups/BackupInfo.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include <Common/NamedCollections/NamedCollections_fwd.h>
 #include <Core/Field.h>
 #include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST_fwd.h>
 
 
 namespace DB
@@ -16,6 +18,7 @@ struct BackupInfo
     String id_arg;
     std::vector<Field> args;
     ASTPtr function_arg;
+    ASTs kv_args;
 
     String toString() const;
     static BackupInfo fromString(const String & str);
@@ -26,6 +29,11 @@ struct BackupInfo
     String toStringForLogging() const;
 
     void copyS3CredentialsTo(BackupInfo & dest) const;
+
+    /// Gets the named collection specified by id_arg, checks access rights,
+    /// and applies any key-value overrides from kv_args.
+    /// Returns nullptr if id_arg is empty (i.e., no named collection is used).
+    NamedCollectionPtr getNamedCollection(ContextPtr context) const;
 };
 
 }
diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index 5a7e6e9e62a0..5dd6ce6a39fa 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -60,6 +60,7 @@ namespace DB
 
 namespace Setting
 {
+    extern const SettingsUInt64 readonly;
     extern const SettingsBool s3_disable_checksum;
 }
 
@@ -70,6 +71,7 @@ namespace ServerSetting
 
 namespace ErrorCodes
 {
+    extern const int ACCESS_DENIED;
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int QUERY_WAS_CANCELLED;
@@ -388,6 +390,12 @@ struct BackupsWorker::BackupStarter
         backup_info = BackupInfo::fromAST(*backup_query->backup_name);
         backup_name_for_logging = backup_info.toStringForLogging();
         is_internal_backup = backup_settings.internal;
+
+        /// The "internal" option can only be used by a query that was initiated by another query (e.g., ON CLUSTER query).
+        /// It should not be allowed for an initial query explicitly specified by a user.
+        if (is_internal_backup && (query_context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY))
+            throw Exception(ErrorCodes::ACCESS_DENIED, "Setting 'internal' cannot be set explicitly");
+
         on_cluster = !backup_query->cluster.empty() || is_internal_backup;
 
         if (!backup_settings.backup_uuid)
@@ -452,13 +460,24 @@ struct BackupsWorker::BackupStarter
             cluster = backup_context->getCluster(backup_query->cluster);
             backup_settings.cluster_host_ids = cluster->getHostIDs();
         }
+
+        /// Check access rights before opening the backup destination (e.g., S3).
+        /// This ensures we fail fast with a proper ACCESS_DENIED error instead of trying to connect to external storage first.
+        /// For ON CLUSTER queries, access rights are checked in executeDDLQueryOnCluster() before distributing the query.
+        if (!on_cluster)
+        {
+            backup_query->setCurrentDatabase(backup_context->getCurrentDatabase());
+            auto required_access = BackupUtils::getRequiredAccessToBackup(backup_query->elements);
+            query_context->checkAccess(required_access);
+        }
+
         backup_coordination = backups_worker.makeBackupCoordination(on_cluster, backup_settings, backup_context);
         backup_coordination->startup();
 
         chassert(!backup);
         backup = backups_worker.openBackupForWriting(backup_info, backup_settings, backup_coordination, backup_context);
 
-        backups_worker.doBackup(backup, backup_query, backup_id, backup_settings, backup_coordination, backup_context, query_context,
+        backups_worker.doBackup(backup, backup_query, backup_id, backup_settings, backup_coordination, backup_context,
                                 on_cluster, cluster);
 
         if (!is_internal_backup)
@@ -603,7 +622,6 @@ void BackupsWorker::doBackup(
     const BackupSettings & backup_settings,
     std::shared_ptr<IBackupCoordination> backup_coordination,
     ContextMutablePtr context,
-    const ContextPtr & query_context,
     bool on_cluster,
     const ClusterPtr & cluster)
 {
@@ -618,17 +636,13 @@ void BackupsWorker::doBackup(
 
     bool is_internal_backup = backup_settings.internal;
 
-    /// Checks access rights if this is not ON CLUSTER query.
-    /// (If this is ON CLUSTER query executeDDLQueryOnCluster() will check access rights later.)
-    auto required_access = BackupUtils::getRequiredAccessToBackup(backup_query->elements);
-    if (!on_cluster)
-        query_context->checkAccess(required_access);
-
     maybeSleepForTesting();
 
     /// Write the backup.
     if (on_cluster && !is_internal_backup)
     {
+        auto required_access = BackupUtils::getRequiredAccessToBackup(backup_query->elements);
+
         /// Send the BACKUP query to other hosts.
         backup_settings.copySettingsToQuery(*backup_query);
         sendQueryToOtherHosts(*backup_query, cluster, backup_settings.shard_num, backup_settings.replica_num,
@@ -829,6 +843,19 @@ struct BackupsWorker::RestoreStarter
         backup_info = BackupInfo::fromAST(*restore_query->backup_name);
         backup_name_for_logging = backup_info.toStringForLogging();
         is_internal_restore = restore_settings.internal;
+
+        /// The "internal" option can only be used by a query that was initiated by another query (e.g., ON CLUSTER query).
+        /// It should not be allowed for an initial query explicitly specified by a user.
+        if (is_internal_restore && (query_context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY))
+            throw Exception(ErrorCodes::ACCESS_DENIED, "Setting 'internal' cannot be set explicitly");
+
+        /// RESTORE is a write operation, it should be forbidden in strict readonly mode (readonly=1).
+        /// Note: readonly=2 allows changing settings but still restricts writes - however it's set automatically
+        /// by the HTTP interface for GET requests (to protect against accidental writes), so we only block readonly=1
+        /// which is explicitly set by the user to enforce read-only mode.
+        if (query_context->getSettingsRef()[Setting::readonly] == 1)
+            throw Exception(ErrorCodes::ACCESS_DENIED, "Cannot execute RESTORE in readonly mode");
+
         on_cluster = !restore_query->cluster.empty() || is_internal_restore;
 
         if (!restore_settings.restore_uuid)
diff --git a/src/Backups/BackupsWorker.h b/src/Backups/BackupsWorker.h
index 011f0107eae8..559408c868cf 100644
--- a/src/Backups/BackupsWorker.h
+++ b/src/Backups/BackupsWorker.h
@@ -85,7 +85,6 @@ class BackupsWorker
         const BackupSettings & backup_settings,
         std::shared_ptr<IBackupCoordination> backup_coordination,
         ContextMutablePtr context,
-        const ContextPtr & query_context,
         bool on_cluster,
         const ClusterPtr & cluster);
 
diff --git a/src/Backups/registerBackupEngineAzureBlobStorage.cpp b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
index b7e880c90160..dde3f73af81f 100644
--- a/src/Backups/registerBackupEngineAzureBlobStorage.cpp
+++ b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
@@ -6,14 +6,14 @@
 #if USE_AZURE_BLOB_STORAGE
 
 #include <Backups/BackupIO_AzureBlobStorage.h>
-#include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h>
 #include <Backups/BackupImpl.h>
+#include <Backups/BackupInfo.h>
+#include <Common/NamedCollections/NamedCollections.h>
 #include <IO/Archives/hasRegisteredArchiveFileExtension.h>
 #include <Interpreters/Context.h>
 #include <Storages/ObjectStorage/Azure/Configuration.h>
 
 #include <Poco/URI.h>
-#include <Poco/Util/AbstractConfiguration.h>
 
 #endif
 
@@ -50,28 +50,31 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
     auto creator_fn = []([[maybe_unused]] BackupFactory::CreateParams params) -> std::unique_ptr<IBackup>
     {
 #if USE_AZURE_BLOB_STORAGE
-        const String & id_arg = params.backup_info.id_arg;
         const auto & args = params.backup_info.args;
 
         String blob_path;
         AzureBlobStorage::ConnectionParams connection_params;
-        auto request_settings = AzureBlobStorage::getRequestSettings(params.context->getSettingsRef());
 
-        if (!id_arg.empty())
+        if (auto collection = params.backup_info.getNamedCollection(params.context))
         {
-            const auto & config = params.context->getConfigRef();
-            auto config_prefix = "named_collections." + id_arg;
+            String connection_url = collection->getAnyOrDefault<String>({"connection_string", "storage_account_url"}, "");
+            String container_name = collection->get<String>("container");
+            blob_path = collection->getOrDefault<String>("blob_path", "");
 
-            if (!config.has(config_prefix))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", id_arg);
-
-            connection_params =
+            auto get_optional = [&](const char * key) -> std::optional<String>
             {
-                .endpoint = AzureBlobStorage::processEndpoint(config, config_prefix),
-                .auth_method = AzureBlobStorage::getAuthMethod(config, config_prefix),
-                .client_options = AzureBlobStorage::getClientOptions(params.context, params.context->getSettingsRef(), *request_settings, /*for_disk=*/ true),
+                return collection->has(key) ? std::optional<String>(collection->get<String>(key)) : std::nullopt;
             };
 
+            connection_params = getAzureConnectionParams(
+                connection_url,
+                container_name,
+                get_optional("account_name"),
+                get_optional("account_key"),
+                get_optional("client_id"),
+                get_optional("tenant_id"),
+                params.context);
+
             if (args.size() > 1)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                                 "Backup AzureBlobStorage requires 1 or 2 arguments: named_collection, [filename]");
@@ -87,20 +90,19 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
                 auto container_name = args[1].safeGet<String>();
                 blob_path = args[2].safeGet<String>();
 
-                AzureBlobStorage::processURL(connection_url, container_name, connection_params.endpoint, connection_params.auth_method);
-                connection_params.client_options = AzureBlobStorage::getClientOptions(params.context, params.context->getSettingsRef(), *request_settings, /*for_disk=*/ true);
+                connection_params = getAzureConnectionParams(
+                    connection_url, container_name, std::nullopt, std::nullopt, std::nullopt, std::nullopt, params.context);
             }
             else if (args.size() == 5)
             {
-                connection_params.endpoint.storage_account_url = args[0].safeGet<String>();
-                connection_params.endpoint.container_name = args[1].safeGet<String>();
+                auto connection_url = args[0].safeGet<String>();
+                auto container_name = args[1].safeGet<String>();
                 blob_path = args[2].safeGet<String>();
-
                 auto account_name = args[3].safeGet<String>();
                 auto account_key = args[4].safeGet<String>();
 
-                connection_params.auth_method = std::make_shared<Azure::Storage::StorageSharedKeyCredential>(account_name, account_key);
-                connection_params.client_options = AzureBlobStorage::getClientOptions(params.context, params.context->getSettingsRef(), *request_settings, /*for_disk=*/ true);
+                connection_params = getAzureConnectionParams(
+                    connection_url, container_name, account_name, account_key, std::nullopt, std::nullopt, params.context);
             }
             else
             {
diff --git a/src/Backups/registerBackupEngineS3.cpp b/src/Backups/registerBackupEngineS3.cpp
index 8c0feb17e89a..b0a3b6a668d0 100644
--- a/src/Backups/registerBackupEngineS3.cpp
+++ b/src/Backups/registerBackupEngineS3.cpp
@@ -6,12 +6,12 @@
 #if USE_AWS_S3
 #include <Backups/BackupIO_S3.h>
 #include <Backups/BackupImpl.h>
+#include <Backups/BackupInfo.h>
+#include <Common/NamedCollections/NamedCollections.h>
 #include <IO/Archives/hasRegisteredArchiveFileExtension.h>
 #include <Interpreters/Context.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <filesystem>
-
 #include <Storages/ObjectStorage/S3/Configuration.h>
+#include <filesystem>
 
 namespace DB::S3AuthSetting
 {
@@ -54,7 +54,6 @@ void registerBackupEngineS3(BackupFactory & factory)
     auto creator_fn = []([[maybe_unused]] const BackupFactory::CreateParams & params) -> std::unique_ptr<IBackup>
     {
 #if USE_AWS_S3
-        const String & id_arg = params.backup_info.id_arg;
         const auto & args = params.backup_info.args;
 
         String s3_uri;
@@ -63,22 +62,16 @@ void registerBackupEngineS3(BackupFactory & factory)
         String role_arn;
         String role_session_name;
 
-        if (!id_arg.empty())
+        if (auto collection = params.backup_info.getNamedCollection(params.context))
         {
-            const auto & config = params.context->getConfigRef();
-            auto config_prefix = "named_collections." + id_arg;
-
-            if (!config.has(config_prefix))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", id_arg);
-
-            s3_uri = config.getString(config_prefix + ".url");
-            access_key_id = config.getString(config_prefix + ".access_key_id", "");
-            secret_access_key = config.getString(config_prefix + ".secret_access_key", "");
-            role_arn = config.getString(config_prefix + ".role_arn", "");
-            role_session_name = config.getString(config_prefix + ".role_session_name", "");
-
-            if (config.has(config_prefix + ".filename"))
-                s3_uri = std::filesystem::path(s3_uri) / config.getString(config_prefix + ".filename");
+            s3_uri = collection->get<String>("url");
+            access_key_id = collection->getOrDefault<String>("access_key_id", "");
+            secret_access_key = collection->getOrDefault<String>("secret_access_key", "");
+            role_arn = collection->getOrDefault<String>("role_arn", "");
+            role_session_name = collection->getOrDefault<String>("role_session_name", "");
+
+            if (collection->has("filename"))
+                s3_uri = std::filesystem::path(s3_uri) / collection->get<String>("filename");
 
             if (args.size() > 1)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Backup S3 requires 1 or 2 arguments: named_collection, [filename]");
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2dcf07466941..411942d62a60 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,6 +130,7 @@ add_headers_and_sources(dbms Storages/ObjectStorage/Azure)
 add_headers_and_sources(dbms Storages/ObjectStorage/S3)
 add_headers_and_sources(dbms Storages/ObjectStorage/HDFS)
 add_headers_and_sources(dbms Storages/ObjectStorage/Local)
+add_headers_and_sources(dbms Storages/ObjectStorage/MergeTree)
 add_headers_and_sources(dbms Storages/ObjectStorage/DataLakes)
 add_headers_and_sources(dbms Storages/ObjectStorage/DataLakes/Iceberg)
 add_headers_and_sources(dbms Storages/ObjectStorage/DataLakes/DeltaLake)
diff --git a/src/Client/BuzzHouse/Generator/ServerSettings.cpp b/src/Client/BuzzHouse/Generator/ServerSettings.cpp
index 048e3f315182..2609bc7d27a4 100644
--- a/src/Client/BuzzHouse/Generator/ServerSettings.cpp
+++ b/src/Client/BuzzHouse/Generator/ServerSettings.cpp
@@ -559,6 +559,7 @@ std::unordered_map<String, CHSetting> serverSettings = {
     {"input_format_parquet_case_insensitive_column_matching", trueOrFalseSettingNoOracle},
     {"input_format_parquet_enable_json_parsing", trueOrFalseSettingNoOracle},
     {"input_format_parquet_enable_row_group_prefetch", trueOrFalseSettingNoOracle},
+    {"input_format_parquet_verify_checksums", trueOrFalseSettingNoOracle},
     {"input_format_parquet_filter_push_down", trueOrFalseSetting},
     {"input_format_parquet_preserve_order", trueOrFalseSettingNoOracle},
     {"input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference", trueOrFalseSettingNoOracle},
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 7ef943acdde8..8fe062107fe7 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -339,6 +339,9 @@ class LocalFormatError : public Exception
 {
 public:
     using Exception::Exception;
+
+    LocalFormatError * clone() const override { return new LocalFormatError(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 };
 
 
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 232c19bdc5b3..b52c5b0a2d10 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -88,6 +88,7 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int BAD_ARGUMENTS;
     extern const int EMPTY_DATA_PASSED;
+    extern const int LOGICAL_ERROR;
 }
 
 Connection::~Connection()
@@ -1000,7 +1001,7 @@ void Connection::sendCancel()
 {
     /// If we already disconnected.
     if (!out)
-        return;
+        throw Exception(ErrorCodes::NETWORK_ERROR, "Connection to {} terminated", getDescription());
 
     writeVarUInt(Protocol::Client::Cancel, *out);
     out->finishChunk();
@@ -1297,6 +1298,11 @@ Packet Connection::receivePacket()
 {
     try
     {
+        /// We are trying to send something to already disconnected connection,
+        /// this means that we continue using Connection after exception.
+        if (!in)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Connection to {} is terminated", getDescription());
+
         Packet res;
 
         /// Have we already read packet type?
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index c4c5010df342..3b1a09631dd9 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -232,7 +232,7 @@ void MultiplexedConnections::sendIgnoredPartUUIDs(const std::vector<UUID> & uuid
 void MultiplexedConnections::sendClusterFunctionReadTaskResponse(const ClusterFunctionReadTaskResponse & response)
 {
     std::lock_guard lock(cancel_mutex);
-    if (cancelled)
+    if (cancelled || !current_connection || !current_connection->isConnected())
         return;
     current_connection->sendClusterFunctionReadTaskResponse(response);
 }
@@ -241,7 +241,7 @@ void MultiplexedConnections::sendClusterFunctionReadTaskResponse(const ClusterFu
 void MultiplexedConnections::sendMergeTreeReadTaskResponse(const ParallelReadResponse & response)
 {
     std::lock_guard lock(cancel_mutex);
-    if (cancelled)
+    if (cancelled || !current_connection || !current_connection->isConnected())
         return;
     current_connection->sendMergeTreeReadTaskResponse(response);
 }
@@ -527,9 +527,12 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
 
 void MultiplexedConnections::invalidateReplica(ReplicaState & state)
 {
+    Connection * old_connection = state.connection;
     state.connection = nullptr;
     state.pool_entry = IConnectionPool::Entry();
     --active_connection_count;
+    if (current_connection == old_connection)
+        current_connection = nullptr;
 }
 
 void MultiplexedConnections::setAsyncCallback(AsyncCallback async_callback)
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index 988e45c62d4a..4ce3c923ce9b 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -11,8 +11,10 @@
 #include <IO/WriteBufferFromArena.h>
 #include <IO/WriteBufferFromString.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
+#include <base/defines.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
+#include <Common/FailPoint.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/SipHash.h>
@@ -32,6 +34,12 @@ namespace ErrorCodes
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NOT_IMPLEMENTED;
+    extern const int MEMORY_LIMIT_EXCEEDED;
+}
+
+namespace FailPoints
+{
+    extern const char column_aggregate_function_ensureOwnership_exception[];
 }
 
 
@@ -226,29 +234,44 @@ void ColumnAggregateFunction::ensureOwnership()
         size_t size_of_state = func->sizeOfData();
         size_t align_of_state = func->alignOfData();
 
+        bool inject_memory_limit_exceeded = false;
+        /// Avoid checking failpoint in a loop, since it uses atomic's
+        fiu_do_on(FailPoints::column_aggregate_function_ensureOwnership_exception,
+        {
+            inject_memory_limit_exceeded = true;
+        });
+
+        Container new_data;
+        new_data.resize_exact(size);
+
         size_t rollback_pos = 0;
         try
         {
             for (size_t i = 0; i < size; ++i)
             {
-                ConstAggregateDataPtr old_place = data[i];
-                data[i] = arena.alignedAlloc(size_of_state, align_of_state);
-                func->create(data[i]);
+                new_data[i] = arena.alignedAlloc(size_of_state, align_of_state);
+                func->create(new_data[i]);
                 ++rollback_pos;
-                func->merge(data[i], old_place, &arena);
+
+                if (unlikely(inject_memory_limit_exceeded))
+                    throw Exception(ErrorCodes::MEMORY_LIMIT_EXCEEDED, "Failpoint triggered");
+
+                func->merge(new_data[i], data[i], &arena);
             }
         }
         catch (...)
         {
             /// If we failed to take ownership, destroy all temporary data.
-
             if (!func->hasTrivialDestructor())
+            {
                 for (size_t i = 0; i < rollback_pos; ++i)
-                    func->destroy(data[i]);
-
+                    func->destroy(new_data[i]);
+            }
             throw;
         }
 
+        data = std::move(new_data);
+
         /// Now we own all data.
         src.reset();
     }
@@ -601,7 +624,8 @@ void ColumnAggregateFunction::insertDefault()
     pushBackAndCreateState(data, arena, func.get());
 }
 
-StringRef ColumnAggregateFunction::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin) const
+StringRef ColumnAggregateFunction::serializeValueIntoArena(
+    size_t n, Arena & arena, const char *& begin, const IColumn::SerializationSettings *) const
 {
     WriteBufferFromArena out(arena, begin);
     func->serialize(data[n], out, version);
@@ -609,7 +633,7 @@ StringRef ColumnAggregateFunction::serializeValueIntoArena(size_t n, Arena & are
     return out.complete();
 }
 
-const char * ColumnAggregateFunction::deserializeAndInsertFromArena(const char * src_arena)
+void ColumnAggregateFunction::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings *)
 {
     ensureOwnership();
 
@@ -618,21 +642,10 @@ const char * ColumnAggregateFunction::deserializeAndInsertFromArena(const char *
       */
     Arena & dst_arena = createOrGetArena();
     pushBackAndCreateState(data, dst_arena, func.get());
-
-    /** We will read from src_arena.
-      * There is no limit for reading - it is assumed, that we can read all that we need after src_arena pointer.
-      * Buf ReadBufferFromMemory requires some bound. We will use arbitrary big enough number, that will not overflow pointer.
-      * NOTE Technically, this is not compatible with C++ standard,
-      *  as we cannot legally compare pointers after last element + 1 of some valid memory region.
-      *  Probably this will not work under UBSan.
-      */
-    ReadBufferFromMemory read_buffer(src_arena, std::numeric_limits<char *>::max() - src_arena - 1);
-    func->deserialize(data.back(), read_buffer, version, &dst_arena);
-
-    return read_buffer.position();
+    func->deserialize(data.back(), in, version, &dst_arena);
 }
 
-const char * ColumnAggregateFunction::skipSerializedInArena(const char *) const
+void ColumnAggregateFunction::skipSerializedInArena(ReadBuffer &) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method skipSerializedInArena is not supported for {}", getName());
 }
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index 75f3c2f28f1f..e64ba35f112c 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -171,11 +171,11 @@ class ColumnAggregateFunction final : public COWHelper<IColumnHelper<ColumnAggre
 
     void insertDefault() override;
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
 
-    const char * deserializeAndInsertFromArena(const char * src_arena) override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
 
-    const char * skipSerializedInArena(const char *) const override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 
     void updateHashWithValue(size_t n, SipHash & hash) const override;
 
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 6a15e8f4d4ce..216aa7f4dc17 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -17,6 +17,7 @@
 #include <Common/WeakHash.h>
 #include <Common/HashTable/Hash.h>
 #include <cstring> // memcpy
+#include <IO/ReadHelpers.h>
 
 
 namespace DB
@@ -222,7 +223,8 @@ void ColumnArray::insertData(const char * pos, size_t length)
 }
 
 
-StringRef ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef
+ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
     size_t array_size = sizeAt(n);
     size_t offset = offsetAt(n);
@@ -234,7 +236,7 @@ StringRef ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char con
 
     for (size_t i = 0; i < array_size; ++i)
     {
-        auto value_ref = getData().serializeValueIntoArena(offset + i, arena, begin);
+        auto value_ref = getData().serializeValueIntoArena(offset + i, arena, begin, settings);
         res.data = value_ref.data - res.size;
         res.size += value_ref.size;
     }
@@ -242,8 +244,7 @@ StringRef ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char con
     return res;
 }
 
-
-char * ColumnArray::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnArray::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
     size_t array_size = sizeAt(n);
     size_t offset = offsetAt(n);
@@ -251,32 +252,48 @@ char * ColumnArray::serializeValueIntoMemory(size_t n, char * memory) const
     memcpy(memory, &array_size, sizeof(array_size));
     memory += sizeof(array_size);
     for (size_t i = 0; i < array_size; ++i)
-        memory = getData().serializeValueIntoMemory(offset + i, memory);
+        memory = getData().serializeValueIntoMemory(offset + i, memory, settings);
     return memory;
 }
 
+std::optional<size_t> ColumnArray::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
+{
+    const auto & offsets_data = getOffsets();
+
+    size_t pos = offsets_data[n - 1];
+    size_t end = offsets_data[n];
 
-const char * ColumnArray::deserializeAndInsertFromArena(const char * pos)
+    size_t res = sizeof(offsets_data[0]);
+    for (; pos < end; ++pos)
+    {
+        auto element_size = getData().getSerializedValueSize(pos, settings);
+        if (!element_size)
+            return std::nullopt;
+        res += *element_size;
+    }
+
+    return res;
+}
+
+
+void ColumnArray::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
-    size_t array_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(array_size);
+    size_t array_size;
+    readBinaryLittleEndian<size_t>(array_size, in);
 
     for (size_t i = 0; i < array_size; ++i)
-        pos = getData().deserializeAndInsertFromArena(pos);
+        getData().deserializeAndInsertFromArena(in, settings);
 
     getOffsets().push_back(getOffsets().back() + array_size);
-    return pos;
 }
 
-const char * ColumnArray::skipSerializedInArena(const char * pos) const
+void ColumnArray::skipSerializedInArena(ReadBuffer & in) const
 {
-    size_t array_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(array_size);
+    size_t array_size;
+    readBinaryLittleEndian<size_t>(array_size, in);
 
     for (size_t i = 0; i < array_size; ++i)
-        pos = getData().skipSerializedInArena(pos);
-
-    return pos;
+        getData().skipSerializedInArena(in);
 }
 
 void ColumnArray::updateHashWithValue(size_t n, SipHash & hash) const
@@ -1360,14 +1377,19 @@ size_t ColumnArray::getNumberOfDimensions() const
     return 1 + nested_array->getNumberOfDimensions();   /// Every modern C++ compiler optimizes tail recursion.
 }
 
-void ColumnArray::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnArray::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     Columns nested_source_columns;
     nested_source_columns.reserve(source_columns.size());
     for (const auto & source_column : source_columns)
         nested_source_columns.push_back(assert_cast<const ColumnArray &>(*source_column).getDataPtr());
 
-    data->takeDynamicStructureFromSourceColumns(nested_source_columns);
+    data->takeDynamicStructureFromSourceColumns(nested_source_columns, max_dynamic_subcolumns);
+}
+
+void ColumnArray::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    data->takeDynamicStructureFromColumn(assert_cast<const ColumnArray &>(*source_column).getDataPtr());
 }
 
 }
diff --git a/src/Columns/ColumnArray.h b/src/Columns/ColumnArray.h
index 799d335d5cce..854c4504442e 100644
--- a/src/Columns/ColumnArray.h
+++ b/src/Columns/ColumnArray.h
@@ -78,10 +78,11 @@ class ColumnArray final : public COWHelper<IColumnHelper<ColumnArray>, ColumnArr
     StringRef getDataAt(size_t n) const override;
     bool isDefaultAt(size_t n) const override;
     void insertData(const char * pos, size_t length) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t, char * memory) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t, char * memory, const IColumn::SerializationSettings * settings) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
     void updateHashFast(SipHash & hash) const override;
@@ -209,7 +210,9 @@ class ColumnArray final : public COWHelper<IColumnHelper<ColumnArray>, ColumnArr
     size_t getNumberOfDimensions() const;
 
     bool hasDynamicStructure() const override { return getData().hasDynamicStructure(); }
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override { data->fixDynamicStructure(); }
 
     bool dynamicStructureEquals(const IColumn & rhs) const override
     {
diff --git a/src/Columns/ColumnBLOB.h b/src/Columns/ColumnBLOB.h
index 64356d2376a8..770f45720245 100644
--- a/src/Columns/ColumnBLOB.h
+++ b/src/Columns/ColumnBLOB.h
@@ -161,10 +161,10 @@ class ColumnBLOB : public COWHelper<IColumnHelper<ColumnBLOB>, ColumnBLOB>
     void insertData(const char *, size_t) override { throwInapplicable(); }
     void insertDefault() override { throwInapplicable(); }
     void popBack(size_t) override { throwInapplicable(); }
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwInapplicable(); }
-    char * serializeValueIntoMemory(size_t, char *) const override { throwInapplicable(); }
-    const char * deserializeAndInsertFromArena(const char *) override { throwInapplicable(); }
-    const char * skipSerializedInArena(const char *) const override { throwInapplicable(); }
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const IColumn::SerializationSettings *) const override { throwInapplicable(); }
+    char * serializeValueIntoMemory(size_t, char *, const IColumn::SerializationSettings *) const override { throwInapplicable(); }
+    void deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *) override { throwInapplicable(); }
+    void skipSerializedInArena(ReadBuffer &) const override { throwInapplicable(); }
     void updateHashWithValue(size_t, SipHash &) const override { throwInapplicable(); }
     WeakHash32 getWeakHash32() const override { throwInapplicable(); }
     void updateHashFast(SipHash &) const override { throwInapplicable(); }
@@ -201,7 +201,9 @@ class ColumnBLOB : public COWHelper<IColumnHelper<ColumnBLOB>, ColumnBLOB>
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override { throwInapplicable(); }
 
     bool hasDynamicStructure() const override { throwInapplicable(); }
-    void takeDynamicStructureFromSourceColumns(const Columns &) override { throwInapplicable(); }
+    void takeDynamicStructureFromSourceColumns(const Columns &, std::optional<size_t>) override { throwInapplicable(); }
+    void takeDynamicStructureFromColumn(const ColumnPtr &) override { throwInapplicable(); }
+    void fixDynamicStructure() override { throwInapplicable(); }
 
 private:
     /// Compressed and serialized representation of the wrapped column.
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index 0f07148f143e..3bc0ffb16149 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -97,10 +97,10 @@ class ColumnCompressed : public COWHelper<IColumnHelper<ColumnCompressed>, Colum
     void insertData(const char *, size_t) override { throwMustBeDecompressed(); }
     void insertDefault() override { throwMustBeDecompressed(); }
     void popBack(size_t) override { throwMustBeDecompressed(); }
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwMustBeDecompressed(); }
-    char * serializeValueIntoMemory(size_t, char *) const override { throwMustBeDecompressed(); }
-    const char * deserializeAndInsertFromArena(const char *) override { throwMustBeDecompressed(); }
-    const char * skipSerializedInArena(const char *) const override { throwMustBeDecompressed(); }
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const IColumn::SerializationSettings *) const override { throwMustBeDecompressed(); }
+    char * serializeValueIntoMemory(size_t, char *, const IColumn::SerializationSettings *) const override { throwMustBeDecompressed(); }
+    void deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *) override { throwMustBeDecompressed(); }
+    void skipSerializedInArena(ReadBuffer &) const override { throwMustBeDecompressed(); }
     void updateHashWithValue(size_t, SipHash &) const override { throwMustBeDecompressed(); }
     WeakHash32 getWeakHash32() const override { throwMustBeDecompressed(); }
     void updateHashFast(SipHash &) const override { throwMustBeDecompressed(); }
@@ -135,7 +135,9 @@ class ColumnCompressed : public COWHelper<IColumnHelper<ColumnCompressed>, Colum
     void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override { throwMustBeDecompressed(); }
 
     bool hasDynamicStructure() const override { throwMustBeDecompressed(); }
-    void takeDynamicStructureFromSourceColumns(const Columns &) override { throwMustBeDecompressed(); }
+    void takeDynamicStructureFromSourceColumns(const Columns &, std::optional<size_t>) override { throwMustBeDecompressed(); }
+    void takeDynamicStructureFromColumn(const ColumnPtr &) override { throwMustBeDecompressed(); }
+    void fixDynamicStructure() override { throwMustBeDecompressed(); }
 
 protected:
     size_t rows;
diff --git a/src/Columns/ColumnConst.h b/src/Columns/ColumnConst.h
index bfde9ca7ddff..f8aed534e64c 100644
--- a/src/Columns/ColumnConst.h
+++ b/src/Columns/ColumnConst.h
@@ -174,27 +174,27 @@ class ColumnConst final : public COWHelper<IColumnHelper<ColumnConst>, ColumnCon
         s -= n;
     }
 
-    StringRef serializeValueIntoArena(size_t, Arena & arena, char const *& begin) const override
+    StringRef
+    serializeValueIntoArena(size_t, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override
     {
-        return data->serializeValueIntoArena(0, arena, begin);
+        return data->serializeValueIntoArena(0, arena, begin, settings);
     }
 
-    char * serializeValueIntoMemory(size_t, char * memory) const override
+    char * serializeValueIntoMemory(size_t, char * memory, const IColumn::SerializationSettings * settings) const override
     {
-        return data->serializeValueIntoMemory(0, memory);
+        return data->serializeValueIntoMemory(0, memory, settings);
     }
 
-    const char * deserializeAndInsertFromArena(const char * pos) override
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override
     {
-        const auto * res = data->deserializeAndInsertFromArena(pos);
+        data->deserializeAndInsertFromArena(in, settings);
         data->popBack(1);
         ++s;
-        return res;
     }
 
-    const char * skipSerializedInArena(const char * pos) const override
+    void skipSerializedInArena(ReadBuffer & in) const override
     {
-        return data->skipSerializedInArena(pos);
+        data->skipSerializedInArena(in);
     }
 
     void updateHashWithValue(size_t, SipHash & hash) const override
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index 51b37a381f14..5542e229d0da 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -78,16 +78,17 @@ Float64 ColumnDecimal<T>::getFloat64(size_t n) const
 }
 
 template <is_decimal T>
-const char * ColumnDecimal<T>::deserializeAndInsertFromArena(const char * pos)
+void ColumnDecimal<T>::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings *)
 {
-    data.push_back(unalignedLoad<T>(pos));
-    return pos + sizeof(T);
+    T dec;
+    readBinaryLittleEndian(dec, in);
+    data.push_back(std::move(dec));
 }
 
 template <is_decimal T>
-const char * ColumnDecimal<T>::skipSerializedInArena(const char * pos) const
+void ColumnDecimal<T>::skipSerializedInArena(ReadBuffer & in) const
 {
-    return pos + sizeof(T);
+    in.ignore(sizeof(T));
 }
 
 template <is_decimal T>
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index 482d063fe5dc..0660b4f90681 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -103,8 +103,8 @@ class ColumnDecimal final : public COWHelper<IColumnHelper<ColumnDecimal<T>, Col
 
     Float64 getFloat64(size_t n) const final;
 
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
     void updateHashFast(SipHash & hash) const override;
diff --git a/src/Columns/ColumnDynamic.cpp b/src/Columns/ColumnDynamic.cpp
index eff44e53735a..2f012c37e9fa 100644
--- a/src/Columns/ColumnDynamic.cpp
+++ b/src/Columns/ColumnDynamic.cpp
@@ -14,6 +14,7 @@
 #include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <Formats/FormatSettings.h>
 #include <Interpreters/convertFieldToType.h>
@@ -23,6 +24,7 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
     extern const int LOGICAL_ERROR;
     extern const int PARAMETER_OUT_OF_BOUND;
 }
@@ -725,7 +727,7 @@ void ColumnDynamic::serializeValueIntoSharedVariant(
     shared_variant.getOffsets().push_back(chars.size());
 }
 
-StringRef ColumnDynamic::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin) const
+StringRef ColumnDynamic::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin, const IColumn::SerializationSettings *) const
 {
     /// We cannot use Variant serialization here as it serializes discriminator + value,
     /// but Dynamic doesn't have fixed mapping discriminator <-> variant type
@@ -769,22 +771,25 @@ StringRef ColumnDynamic::serializeValueIntoArena(size_t n, Arena & arena, const
     return res;
 }
 
-const char * ColumnDynamic::deserializeAndInsertFromArena(const char * pos)
+void ColumnDynamic::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings *)
 {
     auto & variant_col = getVariantColumn();
-    UInt8 null_bit = unalignedLoad<UInt8>(pos);
-    pos += sizeof(UInt8);
+    UInt8 null_bit;
+    readBinaryLittleEndian<UInt8>(null_bit, in);
     if (null_bit)
     {
         insertDefault();
-        return pos;
+        return;
     }
 
     /// Read variant type and value in binary format.
-    const size_t type_and_value_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(type_and_value_size);
-    std::string_view type_and_value(pos, type_and_value_size);
-    pos += type_and_value_size;
+    size_t type_and_value_size;
+    readBinaryLittleEndian<size_t>(type_and_value_size, in);
+    if (in.available() < type_and_value_size)
+        throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Attempt to read after eof when deserializing ColumnDynamic");
+
+    std::string_view type_and_value(in.position(), type_and_value_size);
+    in.ignore(type_and_value_size);
 
     ReadBufferFromMemory buf(type_and_value.data(), type_and_value.size());
     auto variant_type = decodeDataType(buf);
@@ -809,21 +814,18 @@ const char * ColumnDynamic::deserializeAndInsertFromArena(const char * pos)
         variant_col.getLocalDiscriminators().push_back(variant_col.localDiscriminatorByGlobal(getSharedVariantDiscriminator()));
         variant_col.getOffsets().push_back(shared_variant.size() - 1);
     }
-
-    return pos;
 }
 
-const char * ColumnDynamic::skipSerializedInArena(const char * pos) const
+void ColumnDynamic::skipSerializedInArena(ReadBuffer & in) const
 {
-    UInt8 null_bit = unalignedLoad<UInt8>(pos);
-    pos += sizeof(UInt8);
+    UInt8 null_bit;
+    readBinaryLittleEndian<UInt8>(null_bit, in);
     if (null_bit)
-        return pos;
+        return;
 
-    const size_t type_and_value_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(type_and_value_size);
-    pos += type_and_value_size;
-    return pos;
+    size_t type_and_value_size;
+    readBinaryLittleEndian<size_t>(type_and_value_size, in);
+    in.ignore(type_and_value_size);
 }
 
 void ColumnDynamic::updateHashWithValue(size_t n, SipHash & hash) const
@@ -1256,7 +1258,7 @@ bool ColumnDynamic::dynamicStructureEquals(const IColumn & rhs) const
     return false;
 }
 
-void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     if (!empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "takeDynamicStructureFromSourceColumns should be called only on empty Dynamic column");
@@ -1329,8 +1331,8 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
 
     DataTypePtr result_variant_type;
     Statistics new_statistics(Statistics::Source::MERGE);
-    /// Reset max_dynamic_types to global_max_dynamic_types.
-    max_dynamic_types = global_max_dynamic_types;
+    /// Reset max_dynamic_types to global_max_dynamic_types or max_dynamic_subcolumns if set.
+    max_dynamic_types = max_dynamic_subcolumns ? std::min(*max_dynamic_subcolumns, global_max_dynamic_types) : global_max_dynamic_types;
     /// Check if the number of all dynamic types exceeds the limit.
     if (!canAddNewVariants(0, all_variants.size()))
     {
@@ -1402,7 +1404,38 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
 
     auto & variant_col = getVariantColumn();
     for (size_t i = 0; i != variant_info.variant_names.size(); ++i)
-        variant_col.getVariantByGlobalDiscriminator(i).takeDynamicStructureFromSourceColumns(variants_source_columns[i]);
+        variant_col.getVariantByGlobalDiscriminator(i).takeDynamicStructureFromSourceColumns(variants_source_columns[i], max_dynamic_subcolumns);
+}
+
+void ColumnDynamic::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    if (!empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "takeDynamicStructureFromColumn should be called only on empty Dynamic column");
+
+    const auto & source_dynamic = assert_cast<const ColumnDynamic &>(*source_column);
+    variant_column = source_dynamic.getVariantColumn().cloneEmpty();
+    variant_column_ptr = assert_cast<ColumnVariant *>(variant_column.get());
+    variant_info = source_dynamic.getVariantInfo();
+    statistics = source_dynamic.getStatistics();
+    /// Reduce max_dynamic_types to the number of selected variants, so there will be no possibility
+    /// to extend selected variants on inserts into this column.
+    /// -1 because we don't count shared variant in the limit.
+    max_dynamic_types = variant_info.variant_names.size() - 1;
+
+    /// Run takeDynamicStructureFromColumn recursively for variants.
+    const auto & source_variant_column = source_dynamic.getVariantColumn();
+    auto & variant_col = getVariantColumn();
+    for (size_t i = 0; i != variant_info.variant_names.size(); ++i)
+        variant_col.getVariantByGlobalDiscriminator(i).takeDynamicStructureFromColumn(source_variant_column.getVariantPtrByGlobalDiscriminator(i));
+}
+
+void ColumnDynamic::fixDynamicStructure()
+{
+    /// Reduce max_dynamic_types to the number of selected variants, so there will be no possibility
+    /// to extend selected variants on inserts into this column.
+    /// -1 because we don't count shared variant in the limit.
+    max_dynamic_types = variant_info.variant_names.size() - 1;
+    getVariantColumn().fixDynamicStructure();
 }
 
 void ColumnDynamic::applyNullMap(const ColumnVector<UInt8>::Container & null_map)
diff --git a/src/Columns/ColumnDynamic.h b/src/Columns/ColumnDynamic.h
index 748c8946c79e..4e1bbe3232f1 100644
--- a/src/Columns/ColumnDynamic.h
+++ b/src/Columns/ColumnDynamic.h
@@ -193,9 +193,10 @@ class ColumnDynamic final : public COWHelper<IColumnHelper<ColumnDynamic>, Colum
         variant_column_ptr->popBack(n);
     }
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
+    std::optional<size_t> getSerializedValueSize(size_t, const IColumn::SerializationSettings *) const override { return std::nullopt; }
 
     void updateHashWithValue(size_t n, SipHash & hash) const override;
 
@@ -281,6 +282,11 @@ class ColumnDynamic final : public COWHelper<IColumnHelper<ColumnDynamic>, Colum
     /// Prepare only variants but not discriminators and offsets.
     void prepareVariantsForSquashing(const Columns & source_columns, size_t factor);
 
+    void shrinkToFit() override
+    {
+        variant_column_ptr->shrinkToFit();
+    }
+
     void ensureOwnership() override
     {
         variant_column_ptr->ensureOwnership();
@@ -384,7 +390,9 @@ class ColumnDynamic final : public COWHelper<IColumnHelper<ColumnDynamic>, Colum
 
     bool hasDynamicStructure() const override { return true; }
     bool dynamicStructureEquals(const IColumn & rhs) const override;
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override;
 
     const StatisticsPtr & getStatistics() const { return statistics; }
     void setStatistics(const StatisticsPtr & statistics_) { statistics = statistics_; }
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index 817d94a0d2f7..68a9d0bb7488 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -119,17 +119,16 @@ void ColumnFixedString::insertData(const char * pos, size_t length)
     memset(chars.data() + old_size + length, 0, n - length);
 }
 
-const char * ColumnFixedString::deserializeAndInsertFromArena(const char * pos)
+void ColumnFixedString::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings *)
 {
     size_t old_size = chars.size();
     chars.resize(old_size + n);
-    memcpy(chars.data() + old_size, pos, n);
-    return pos + n;
+    in.readStrict(reinterpret_cast<char *>(chars.data() + old_size), n);
 }
 
-const char * ColumnFixedString::skipSerializedInArena(const char * pos) const
+void ColumnFixedString::skipSerializedInArena(ReadBuffer & in) const
 {
-    return pos + n;
+    in.ignore(n);
 }
 
 void ColumnFixedString::updateHashWithValue(size_t index, SipHash & hash) const
diff --git a/src/Columns/ColumnFixedString.h b/src/Columns/ColumnFixedString.h
index 7812a2bcd647..eda8171912b4 100644
--- a/src/Columns/ColumnFixedString.h
+++ b/src/Columns/ColumnFixedString.h
@@ -137,9 +137,9 @@ class ColumnFixedString final : public COWHelper<IColumnHelper<ColumnFixedString
         chars.resize_assume_reserved(chars.size() - n * elems);
     }
 
-    const char * deserializeAndInsertFromArena(const char * pos) override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
 
-    const char * skipSerializedInArena(const char * pos) const override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 
     void updateHashWithValue(size_t index, SipHash & hash) const override;
 
diff --git a/src/Columns/ColumnFunction.h b/src/Columns/ColumnFunction.h
index 2a0aeb65f499..0e3335332dee 100644
--- a/src/Columns/ColumnFunction.h
+++ b/src/Columns/ColumnFunction.h
@@ -106,17 +106,17 @@ class ColumnFunction final : public COWHelper<IColumnHelper<ColumnFunction>, Col
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot insert into {}", getName());
     }
 
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const IColumn::SerializationSettings *) const override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot serialize from {}", getName());
     }
 
-    const char * deserializeAndInsertFromArena(const char *) override
+    void deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *) override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot deserialize to {}", getName());
     }
 
-    const char * skipSerializedInArena(const char*) const override
+    void skipSerializedInArena(ReadBuffer &) const override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot skip serialized {}", getName());
     }
diff --git a/src/Columns/ColumnLazy.cpp b/src/Columns/ColumnLazy.cpp
index a9f8c7eafc39..10e6b2270ce7 100644
--- a/src/Columns/ColumnLazy.cpp
+++ b/src/Columns/ColumnLazy.cpp
@@ -152,12 +152,12 @@ void ColumnLazy::popBack(size_t)
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method popBack is not supported for {}", getName());
 }
 
-const char * ColumnLazy::deserializeAndInsertFromArena(const char *)
+void ColumnLazy::deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *)
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method deserializeAndInsertFromArena is not supported for {}", getName());
 }
 
-const char * ColumnLazy::skipSerializedInArena(const char *) const
+void ColumnLazy::skipSerializedInArena(ReadBuffer &) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method skipSerializedInArena is not supported for {}", getName());
 }
diff --git a/src/Columns/ColumnLazy.h b/src/Columns/ColumnLazy.h
index e540af1b0095..b9cf6564b72c 100644
--- a/src/Columns/ColumnLazy.h
+++ b/src/Columns/ColumnLazy.h
@@ -91,8 +91,8 @@ class ColumnLazy final : public COWHelper<IColumn, ColumnLazy>
 
     void insertDefault() override;
     void popBack(size_t n) override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
     void updateHashFast(SipHash & hash) const override;
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index ae8971c96aaa..352e3998c4a2 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -240,6 +240,8 @@ static void checkPositionsAreLimited(const IColumn & positions, UInt64 limit)
 
         const auto & data = column_ptr->getData();
         size_t num_rows = data.size();
+        if (num_rows == 0)
+            return true;
         UInt64 max_position = 0;
         for (size_t i = 0; i < num_rows; ++i)
             max_position = std::max<UInt64>(max_position, data[i]);
@@ -274,17 +276,18 @@ void ColumnLowCardinality::insertData(const char * pos, size_t length)
     idx.insertPosition(getDictionary().uniqueInsertData(pos, length));
 }
 
-StringRef ColumnLowCardinality::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnLowCardinality::serializeValueIntoArena(
+    size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
-    return getDictionary().serializeValueIntoArena(getIndexes().getUInt(n), arena, begin);
+    return getDictionary().serializeValueIntoArena(getIndexes().getUInt(n), arena, begin, settings);
 }
 
-char * ColumnLowCardinality::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnLowCardinality::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
-    return getDictionary().serializeValueIntoMemory(getIndexes().getUInt(n), memory);
+    return getDictionary().serializeValueIntoMemory(getIndexes().getUInt(n), memory, settings);
 }
 
-void ColumnLowCardinality::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+void ColumnLowCardinality::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     /// nullable is handled internally.
     chassert(is_null == nullptr);
@@ -298,23 +301,19 @@ void ColumnLowCardinality::collectSerializedValueSizes(PaddedPODArray<UInt64> &
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of sizes: {} doesn't match rows_num: {}. It is a bug", sizes.size(), rows);
 
     PaddedPODArray<UInt64> dict_sizes;
-    getDictionary().collectSerializedValueSizes(dict_sizes, nullptr);
+    getDictionary().collectSerializedValueSizes(dict_sizes, nullptr, settings);
     idx.collectSerializedValueSizes(sizes, dict_sizes);
 }
 
-const char * ColumnLowCardinality::deserializeAndInsertFromArena(const char * pos)
+void ColumnLowCardinality::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
     compactIfSharedDictionary();
-
-    const char * new_pos;
-    idx.insertPosition(getDictionary().uniqueDeserializeAndInsertFromArena(pos, new_pos));
-
-    return new_pos;
+    idx.insertPosition(getDictionary().uniqueDeserializeAndInsertFromArena(in, settings));
 }
 
-const char * ColumnLowCardinality::skipSerializedInArena(const char * pos) const
+void ColumnLowCardinality::skipSerializedInArena(ReadBuffer & in) const
 {
-    return getDictionary().skipSerializedInArena(pos);
+    getDictionary().skipSerializedInArena(in);
 }
 
 WeakHash32 ColumnLowCardinality::getWeakHash32() const
@@ -335,7 +334,7 @@ MutableColumnPtr ColumnLowCardinality::cloneResized(size_t size) const
     if (size == 0)
         unique_ptr = unique_ptr->cloneEmpty();
 
-    return ColumnLowCardinality::create(IColumn::mutate(std::move(unique_ptr)), getIndexes().cloneResized(size));
+    return ColumnLowCardinality::create(IColumn::mutate(std::move(unique_ptr)), getIndexes().cloneResized(size), /*is_shared=*/false);
 }
 
 MutableColumnPtr ColumnLowCardinality::cloneNullable() const
@@ -569,7 +568,7 @@ std::vector<MutableColumnPtr> ColumnLowCardinality::scatter(ColumnIndex num_colu
     for (auto & column : columns)
     {
         auto unique_ptr = dictionary.getColumnUniquePtr();
-        column = ColumnLowCardinality::create(IColumn::mutate(std::move(unique_ptr)), std::move(column));
+        column = ColumnLowCardinality::create(IColumn::mutate(std::move(unique_ptr)), std::move(column), /*is_shared=*/false);
     }
 
     return columns;
@@ -588,7 +587,7 @@ ColumnLowCardinality::MutablePtr ColumnLowCardinality::cutAndCompact(size_t star
 {
     auto sub_positions = IColumn::mutate(idx.getPositions()->cut(start, length));
     auto new_column_unique = Dictionary::compact(getDictionary(), sub_positions);
-    return ColumnLowCardinality::create(std::move(new_column_unique), std::move(sub_positions));
+    return ColumnLowCardinality::create(std::move(new_column_unique), std::move(sub_positions), /*is_shared=*/false);
 }
 
 void ColumnLowCardinality::compactInplace()
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index 19665e8989d1..8e8ce8840ed6 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -28,7 +28,7 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
 {
     friend class COWHelper<IColumnHelper<ColumnLowCardinality>, ColumnLowCardinality>;
 
-    ColumnLowCardinality(MutableColumnPtr && column_unique, MutableColumnPtr && indexes, bool is_shared = false);
+    ColumnLowCardinality(MutableColumnPtr && column_unique, MutableColumnPtr && indexes, bool is_shared);
     ColumnLowCardinality(const ColumnLowCardinality & other) = default;
 
 public:
@@ -36,12 +36,12 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
       */
     using Base = COWHelper<IColumnHelper<ColumnLowCardinality>, ColumnLowCardinality>;
-    static Ptr create(const ColumnPtr & column_unique_, const ColumnPtr & indexes_, bool is_shared = false)
+    static Ptr create(const ColumnPtr & column_unique_, const ColumnPtr & indexes_, bool is_shared)
     {
         return ColumnLowCardinality::create(column_unique_->assumeMutable(), indexes_->assumeMutable(), is_shared);
     }
 
-    static MutablePtr create(MutableColumnPtr && column_unique, MutableColumnPtr && indexes, bool is_shared = false)
+    static MutablePtr create(MutableColumnPtr && column_unique, MutableColumnPtr && indexes, bool is_shared)
     {
         return Base::create(std::move(column_unique), std::move(indexes), is_shared);
     }
@@ -75,7 +75,7 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
     bool isNullAt(size_t n) const override { return getDictionary().isNullAt(getIndexes().getUInt(n)); }
     ColumnPtr cut(size_t start, size_t length) const override
     {
-        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().cut(start, length));
+        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().cut(start, length), isSharedDictionary());
     }
 
     void insert(const Field & x) override;
@@ -101,14 +101,14 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
 
     void popBack(size_t n) override { idx.popBack(n); }
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
 
-    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
 
-    const char * deserializeAndInsertFromArena(const char * pos) override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
 
-    const char * skipSerializedInArena(const char * pos) const override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 
     void updateHashWithValue(size_t n, SipHash & hash) const override
     {
@@ -121,7 +121,8 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
 
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override
     {
-        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().filter(filt, result_size_hint));
+        return ColumnLowCardinality::create(
+            dictionary.getColumnUniquePtr(), getIndexes().filter(filt, result_size_hint), isSharedDictionary());
     }
 
     void expand(const Filter & mask, bool inverted) override
@@ -131,12 +132,12 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
 
     ColumnPtr permute(const Permutation & perm, size_t limit) const override
     {
-        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().permute(perm, limit));
+        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().permute(perm, limit), isSharedDictionary());
     }
 
     ColumnPtr index(const IColumn & indexes_, size_t limit) const override
     {
-        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().index(indexes_, limit));
+        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().index(indexes_, limit), isSharedDictionary());
     }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -165,7 +166,7 @@ class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardi
 
     ColumnPtr replicate(const Offsets & offsets) const override
     {
-        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().replicate(offsets));
+        return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().replicate(offsets), isSharedDictionary());
     }
 
     std::vector<MutableColumnPtr> scatter(ColumnIndex num_columns, const Selector & selector) const override;
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index 0981b882049e..99f95505c237 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -150,24 +150,29 @@ void ColumnMap::popBack(size_t n)
     nested->popBack(n);
 }
 
-StringRef ColumnMap::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnMap::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
-    return nested->serializeValueIntoArena(n, arena, begin);
+    return nested->serializeValueIntoArena(n, arena, begin, settings);
 }
 
-char * ColumnMap::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnMap::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
-    return nested->serializeValueIntoMemory(n, memory);
+    return nested->serializeValueIntoMemory(n, memory, settings);
 }
 
-const char * ColumnMap::deserializeAndInsertFromArena(const char * pos)
+std::optional<size_t> ColumnMap::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
 {
-    return nested->deserializeAndInsertFromArena(pos);
+    return nested->getSerializedValueSize(n, settings);
 }
 
-const char * ColumnMap::skipSerializedInArena(const char * pos) const
+void ColumnMap::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
-    return nested->skipSerializedInArena(pos);
+    nested->deserializeAndInsertFromArena(in, settings);
+}
+
+void ColumnMap::skipSerializedInArena(ReadBuffer & in) const
+{
+    nested->skipSerializedInArena(in);
 }
 
 void ColumnMap::updateHashWithValue(size_t n, SipHash & hash) const
@@ -427,13 +432,19 @@ ColumnPtr ColumnMap::compress(bool force_compression) const
     });
 }
 
-void ColumnMap::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnMap::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     Columns nested_source_columns;
     nested_source_columns.reserve(source_columns.size());
     for (const auto & source_column : source_columns)
         nested_source_columns.push_back(assert_cast<const ColumnMap &>(*source_column).getNestedColumnPtr());
-    nested->takeDynamicStructureFromSourceColumns(nested_source_columns);
+    nested->takeDynamicStructureFromSourceColumns(nested_source_columns, max_dynamic_subcolumns);
 }
 
+void ColumnMap::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    nested->takeDynamicStructureFromColumn(assert_cast<const ColumnMap &>(*source_column).getNestedColumnPtr());
+}
+
+
 }
diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h
index d016a29db67d..324d62ce6922 100644
--- a/src/Columns/ColumnMap.h
+++ b/src/Columns/ColumnMap.h
@@ -56,10 +56,11 @@ class ColumnMap final : public COWHelper<IColumnHelper<ColumnMap>, ColumnMap>
     bool tryInsert(const Field & x) override;
     void insertDefault() override;
     void popBack(size_t n) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
     void updateHashFast(SipHash & hash) const override;
@@ -123,7 +124,9 @@ class ColumnMap final : public COWHelper<IColumnHelper<ColumnMap>, ColumnMap>
 
     bool hasDynamicStructure() const override { return nested->hasDynamicStructure(); }
     bool dynamicStructureEquals(const IColumn & rhs) const override;
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override { nested->fixDynamicStructure(); }
 };
 
 }
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index 0f43e93c3094..7c1047b29abb 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -166,7 +166,7 @@ void ColumnNullable::insertData(const char * pos, size_t length)
     }
 }
 
-StringRef ColumnNullable::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnNullable::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
     const auto & arr = getNullMapData();
 
@@ -179,13 +179,13 @@ StringRef ColumnNullable::serializeValueIntoArena(size_t n, Arena & arena, char
         return StringRef(pos, 1);
 
     /// Now serialize the nested value. Note that it also uses allocContinue so that the memory range remains contiguous.
-    auto nested_ref = getNestedColumn().serializeValueIntoArena(n, arena, begin);
+    auto nested_ref = getNestedColumn().serializeValueIntoArena(n, arena, begin, settings);
 
     /// serializeValueIntoArena may reallocate memory. Have to use ptr from nested_ref.data and move it back.
     return StringRef(nested_ref.data - 1, nested_ref.size + 1);
 }
 
-char * ColumnNullable::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnNullable::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
     const auto & arr = getNullMapData();
 
@@ -195,33 +195,37 @@ char * ColumnNullable::serializeValueIntoMemory(size_t n, char * memory) const
     if (arr[n])
         return memory;
 
-    return getNestedColumn().serializeValueIntoMemory(n, memory);
+    return getNestedColumn().serializeValueIntoMemory(n, memory, settings);
 }
 
-const char * ColumnNullable::deserializeAndInsertFromArena(const char * pos)
+std::optional<size_t> ColumnNullable::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
 {
-    UInt8 val = unalignedLoad<UInt8>(pos);
-    pos += sizeof(val);
+    auto nested_size = getNestedColumn().getSerializedValueSize(n, settings);
+    if (!nested_size)
+        return std::nullopt;
+    return 1 + *nested_size; /// +1 for null mask byte.
+}
+
+void ColumnNullable::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
+{
+    UInt8 val;
+    readBinaryLittleEndian<UInt8>(val, in);
 
     getNullMapData().push_back(val);
 
     if (val == 0)
-        pos = getNestedColumn().deserializeAndInsertFromArena(pos);
+        getNestedColumn().deserializeAndInsertFromArena(in, settings);
     else
         getNestedColumn().insertDefault();
-
-    return pos;
 }
 
-const char * ColumnNullable::skipSerializedInArena(const char * pos) const
+void ColumnNullable::skipSerializedInArena(ReadBuffer & in) const
 {
-    UInt8 val = unalignedLoad<UInt8>(pos);
-    pos += sizeof(val);
+    UInt8 val;
+    readBinaryLittleEndian<UInt8>(val, in);
 
     if (val == 0)
-        return getNestedColumn().skipSerializedInArena(pos);
-
-    return pos;
+        getNestedColumn().skipSerializedInArena(in);
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -961,13 +965,24 @@ ColumnPtr ColumnNullable::getNestedColumnWithDefaultOnNull() const
     return res;
 }
 
-void ColumnNullable::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnNullable::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     Columns nested_source_columns;
     nested_source_columns.reserve(source_columns.size());
     for (const auto & source_column : source_columns)
         nested_source_columns.push_back(assert_cast<const ColumnNullable &>(*source_column).getNestedColumnPtr());
-    nested_column->takeDynamicStructureFromSourceColumns(nested_source_columns);
+    nested_column->takeDynamicStructureFromSourceColumns(nested_source_columns, max_dynamic_subcolumns);
+}
+
+void ColumnNullable::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    nested_column->takeDynamicStructureFromColumn(assert_cast<const ColumnNullable &>(*source_column).getNestedColumnPtr());
+}
+
+bool ColumnNullable::dynamicStructureEquals(const IColumn & rhs) const
+{
+    const auto & rhs_nested_column = assert_cast<const ColumnNullable &>(rhs).getNestedColumn();
+    return nested_column->dynamicStructureEquals(rhs_nested_column);
 }
 
 ColumnPtr makeNullable(const ColumnPtr & column)
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index 5a4a8c0cd8ff..e9c114f63ac3 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -66,10 +66,11 @@ class ColumnNullable final : public COWHelper<IColumnHelper<ColumnNullable>, Col
     StringRef getDataAt(size_t) const override;
     /// Will insert null value if pos=nullptr
     void insertData(const char * pos, size_t length) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 #else
@@ -228,7 +229,10 @@ class ColumnNullable final : public COWHelper<IColumnHelper<ColumnNullable>, Col
     void checkConsistency() const;
 
     bool hasDynamicStructure() const override { return nested_column->hasDynamicStructure(); }
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override { nested_column->fixDynamicStructure(); }
+    bool dynamicStructureEquals(const IColumn & rhs) const override;
 
 private:
     WrappedPtr nested_column;
diff --git a/src/Columns/ColumnObject.cpp b/src/Columns/ColumnObject.cpp
index 75a3a60d3770..7ca7701a1e83 100644
--- a/src/Columns/ColumnObject.cpp
+++ b/src/Columns/ColumnObject.cpp
@@ -8,12 +8,14 @@
 #include <IO/ReadBufferFromString.h>
 #include <Common/Arena.h>
 #include <Common/SipHash.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
     extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
 }
@@ -726,8 +728,15 @@ void ColumnObject::insertFromSharedDataAndFillRemainingDynamicPaths(const DB::Co
             if (auto it = dynamic_paths_ptrs.find(path); it != dynamic_paths_ptrs.end())
             {
                 /// Deserialize binary value into dynamic column from shared data.
+                if (it->second->size() != current_size)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected size of dynamic path {}: {} != {}", path, it->second->size(), current_size);
+
                 deserializeValueFromSharedData(src_shared_data_values, i, *it->second);
             }
+            else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
+            {
+                deserializeValueFromSharedData(src_shared_data_values, i, *dynamic_path_column);
+            }
             else
             {
                 /// Before inserting this path into shared data check if we need to
@@ -885,18 +894,24 @@ void ColumnObject::rollback(const ColumnCheckpoint & checkpoint)
     shared_data->rollback(*object_checkpoint.shared_data);
 }
 
-StringRef ColumnObject::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin) const
+StringRef ColumnObject::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin, const IColumn::SerializationSettings * settings) const
 {
     StringRef res(begin, 0);
     /// First serialize values from typed paths in sorted order. They are the same for all instances of this column.
     for (auto path : sorted_typed_paths)
     {
-        auto data_ref = typed_paths.find(path)->second->serializeValueIntoArena(n, arena, begin);
+        auto data_ref = typed_paths.find(path)->second->serializeValueIntoArena(n, arena, begin, settings);
         res.data = data_ref.data - res.size;
         res.size += data_ref.size;
     }
 
-    /// Second, serialize paths and values in bunary format from dynamic paths and shared data in sorted by path order.
+    /// Second, serialize paths and values in binary format from dynamic paths and shared data in sorted by path order.
+    serializeDynamicPathsAndSharedDataIntoArena(n, arena, begin, res);
+    return res;
+}
+
+void ColumnObject::serializeDynamicPathsAndSharedDataIntoArena(size_t n, Arena & arena, const char *& begin, StringRef & res) const
+{
     /// Calculate total number of paths to serialize and write it.
     const auto & shared_data_offsets = getSharedDataOffsets();
     size_t offset = shared_data_offsets[static_cast<ssize_t>(n) - 1];
@@ -943,8 +958,6 @@ StringRef ColumnObject::serializeValueIntoArena(size_t n, Arena & arena, const c
             serializePathAndValueIntoArena(arena, begin, StringRef(*dynamic_paths_it), buf.str(), res);
         }
     }
-
-    return res;
 }
 
 void ColumnObject::serializePathAndValueIntoArena(DB::Arena & arena, const char *& begin, StringRef path, StringRef value, StringRef & res) const
@@ -960,44 +973,63 @@ void ColumnObject::serializePathAndValueIntoArena(DB::Arena & arena, const char
     res.size += sizeof(size_t) + path_size + sizeof(size_t) + value_size;
 }
 
-const char * ColumnObject::deserializeAndInsertFromArena(const char * pos)
+void ColumnObject::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
-    size_t current_size = size();
     /// First deserialize typed paths. They come first.
     for (auto path : sorted_typed_paths)
-        pos = typed_paths.find(path)->second->deserializeAndInsertFromArena(pos);
+        typed_paths.find(path)->second->deserializeAndInsertFromArena(in, settings);
 
     /// Second deserialize all other paths and values and insert them into dynamic paths or shared data.
-    auto num_paths = unalignedLoad<size_t>(pos);
-    pos += sizeof(size_t);
+    deserializeDynamicPathsAndSharedDataFromArena(in);
+}
+
+void ColumnObject::deserializeDynamicPathsAndSharedDataFromArena(ReadBuffer & in)
+{
+    size_t current_size = size();
+    size_t num_paths;
+    readBinaryLittleEndian<size_t>(num_paths, in);
+
     const auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
     for (size_t i = 0; i != num_paths; ++i)
     {
-        auto path_size = unalignedLoad<size_t>(pos);
-        pos += sizeof(size_t);
-        std::string_view path(pos, path_size);
-        pos += path_size;
+        size_t path_size;
+        readBinaryLittleEndian<size_t>(path_size, in);
+
+        if (in.available() < path_size)
+            throw Exception(
+                ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF,
+                "Attempt to read {} bytes for the path size, but only {} bytes are available",
+                path_size,
+                in.available());
+        std::string_view path(in.position(), path_size);
+        in.ignore(path_size);
+
         /// Deserialize binary value and try to insert it to dynamic paths or shared data.
-        auto value_size = unalignedLoad<size_t>(pos);
-        pos += sizeof(size_t);
-        std::string_view value(pos, value_size);
-        pos += value_size;
+        size_t value_size;
+        readBinaryLittleEndian<size_t>(value_size, in);
+
         /// Check if we have this path in dynamic paths.
         if (auto dynamic_it = dynamic_paths.find(path); dynamic_it != dynamic_paths.end())
         {
-            ReadBufferFromMemory buf(value.data(), value.size());
-            getDynamicSerialization()->deserializeBinary(*dynamic_it->second, buf, getFormatSettings());
+            getDynamicSerialization()->deserializeBinary(*dynamic_it->second, in, getFormatSettings());
         }
         /// Try to add a new dynamic path.
         else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
         {
-            ReadBufferFromMemory buf(value.data(), value.size());
-            getDynamicSerialization()->deserializeBinary(*dynamic_path_column, buf, getFormatSettings());
+            getDynamicSerialization()->deserializeBinary(*dynamic_path_column, in, getFormatSettings());
         }
         /// Limit on dynamic paths is reached, add this path to shared data.
         /// Serialized paths are sorted, so we can insert right away.
         else
         {
+            if (in.available() < value_size)
+                throw Exception(
+                    ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF,
+                    "Attempt to read {} bytes for the value size, but only {} bytes are available",
+                    value_size,
+                    in.available());
+            std::string_view value(in.position(), value_size);
+            in.ignore(value_size);
             shared_data_paths->insertData(path.data(), path.size());
             shared_data_values->insertData(value.data(), value.size());
         }
@@ -1011,30 +1043,28 @@ const char * ColumnObject::deserializeAndInsertFromArena(const char * pos)
         if (column->size() == current_size)
             column->insertDefault();
     }
-
-    return pos;
 }
 
-const char * ColumnObject::skipSerializedInArena(const char * pos) const
+void ColumnObject::skipSerializedInArena(ReadBuffer & in) const
 {
     /// First, skip all values of typed paths;
     for (auto path : sorted_typed_paths)
-        pos = typed_paths.find(path)->second->skipSerializedInArena(pos);
+        typed_paths.find(path)->second->skipSerializedInArena(in);
 
     /// Second, skip all other paths and values.
-    auto num_paths = unalignedLoad<size_t>(pos);
-    pos += sizeof(size_t);
+    size_t num_paths;
+    readBinaryLittleEndian<size_t>(num_paths, in);
+
     for (size_t i = 0; i != num_paths; ++i)
     {
-        auto path_size = unalignedLoad<size_t>(pos);
-        pos += sizeof(size_t);
-        std::string_view path(pos, path_size);
-        pos += path_size;
-        auto value_size = unalignedLoad<size_t>(pos);
-        pos += sizeof(size_t) + value_size;
-    }
+        size_t path_size;
+        readBinaryLittleEndian<size_t>(path_size, in);
+        in.ignore(path_size);
 
-    return pos;
+        size_t value_size;
+        readBinaryLittleEndian<size_t>(value_size, in);
+        in.ignore(value_size);
+    }
 }
 
 void ColumnObject::updateHashWithValue(size_t n, SipHash & hash) const
@@ -1271,6 +1301,15 @@ size_t ColumnObject::capacity() const
     return shared_data->capacity();
 }
 
+void ColumnObject::shrinkToFit()
+{
+    for (auto & [_, column] : typed_paths)
+        column->shrinkToFit();
+    for (auto & [_, column] : dynamic_paths_ptrs)
+        column->shrinkToFit();
+    shared_data->shrinkToFit();
+}
+
 void ColumnObject::ensureOwnership()
 {
     for (auto & [_, column] : typed_paths)
@@ -1621,7 +1660,7 @@ bool ColumnObject::dynamicStructureEquals(const IColumn & rhs) const
     return true;
 }
 
-void ColumnObject::takeDynamicStructureFromSourceColumns(const DB::Columns & source_columns)
+void ColumnObject::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     if (!empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "takeDynamicStructureFromSourceColumns should be called only on empty Object column");
@@ -1679,7 +1718,8 @@ void ColumnObject::takeDynamicStructureFromSourceColumns(const DB::Columns & sou
     dynamic_paths.clear();
     dynamic_paths_ptrs.clear();
     sorted_dynamic_paths.clear();
-    max_dynamic_paths = global_max_dynamic_paths;
+    /// If max_dynamic_subcolumns is set, use it as max number of paths.
+    max_dynamic_paths = max_dynamic_subcolumns ? std::min(*max_dynamic_subcolumns, global_max_dynamic_paths) : global_max_dynamic_paths;
     Statistics new_statistics(Statistics::Source::MERGE);
 
     /// Check if the number of all dynamic paths exceeds the limit.
@@ -1743,7 +1783,7 @@ void ColumnObject::takeDynamicStructureFromSourceColumns(const DB::Columns & sou
             if (it != source_object.dynamic_paths.end())
                 dynamic_path_source_columns.push_back(it->second);
         }
-        column->takeDynamicStructureFromSourceColumns(dynamic_path_source_columns);
+        column->takeDynamicStructureFromSourceColumns(dynamic_path_source_columns, max_dynamic_subcolumns);
     }
 
     /// Typed paths also can contain types with dynamic structure.
@@ -1753,10 +1793,45 @@ void ColumnObject::takeDynamicStructureFromSourceColumns(const DB::Columns & sou
         typed_path_source_columns.reserve(source_columns.size());
         for (const auto & source_column : source_columns)
             typed_path_source_columns.push_back(assert_cast<const ColumnObject &>(*source_column).typed_paths.at(path));
-        column->takeDynamicStructureFromSourceColumns(typed_path_source_columns);
+        column->takeDynamicStructureFromSourceColumns(typed_path_source_columns, max_dynamic_subcolumns);
     }
 }
 
+void ColumnObject::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    if (!empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "takeDynamicStructureFromColumn should be called only on empty Object column");
+
+    const auto & source_object = assert_cast<const ColumnObject &>(*source_column);
+
+    for (auto & [path, column] : typed_paths)
+        column->takeDynamicStructureFromColumn(source_object.typed_paths.at(path));
+
+    dynamic_paths.clear();
+    dynamic_paths_ptrs.clear();
+    sorted_dynamic_paths.clear();
+    for (const auto & [path, column] : source_object.getDynamicPaths())
+    {
+        auto it = dynamic_paths.emplace(path, ColumnDynamic::create(max_dynamic_types)).first;
+        it->second->takeDynamicStructureFromColumn(column);
+        dynamic_paths_ptrs.emplace(path, assert_cast<ColumnDynamic *>(it->second.get()));
+        sorted_dynamic_paths.insert(it->first);
+    }
+
+    /// Set max_dynamic_paths to the number of dynamic paths.
+    /// It's needed to avoid adding new unexpected dynamic paths during later inserts into this column.
+    max_dynamic_paths = dynamic_paths.size();
+
+    statistics = source_object.getStatistics();
+}
+
+void ColumnObject::fixDynamicStructure()
+{
+    /// Set max_dynamic_paths to the number of dynamic paths.
+    /// It's needed to avoid adding new unexpected dynamic paths during later inserts into this column.
+    max_dynamic_paths = dynamic_paths.size();
+}
+
 size_t ColumnObject::findPathLowerBoundInSharedData(StringRef path, const ColumnString & shared_data_paths, size_t start, size_t end)
 {
     /// Simple random access iterator over values in ColumnString in specified range.
@@ -1995,4 +2070,132 @@ int ColumnObject::doCompareAt(size_t n, size_t m, const IColumn & rhs, int nan_d
     return 1;
 }
 
+void ColumnObject::repairDuplicatesInDynamicPathsAndSharedData(size_t offset)
+{
+    if (dynamic_paths.empty())
+        return;
+
+    /// First, check if all dynamic paths have correct sizes, just in case.
+    size_t expected_size = shared_data->size();
+    for (const auto & [path, column] : dynamic_paths)
+    {
+        if (column->size() != expected_size)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected size of dynamic path {}: {} != {}", path, column->size(), expected_size);
+    }
+
+    /// Second, iterate over paths in shared data and check if we have any path that is also present in dynamic paths.
+    const auto & shared_data_offsets = getSharedDataOffsets();
+    const auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
+    /// Remember the first row with duplicates if any. We will start repair from this row.
+    std::optional<size_t> first_row_with_duplicates = std::nullopt;
+    size_t size = shared_data_offsets.size();
+    for (size_t i = offset; i < size; ++i)
+    {
+        size_t shared_data_start = shared_data_offsets[i - 1];
+        size_t shared_data_end = shared_data_offsets[i];
+        for (size_t j = shared_data_start; j < shared_data_end; ++j)
+        {
+            if (dynamic_paths.contains(shared_data_paths->getDataAt(j)))
+            {
+                /// Duplicate is found, no need to iterate further, we need to start repair.
+                first_row_with_duplicates = i;
+                break;
+            }
+        }
+
+        if (first_row_with_duplicates)
+            break;
+    }
+
+    if (!first_row_with_duplicates)
+        return;
+
+    LOG_TRACE(getLogger("ColumnObject"), "Repair duplicates in Object column starting from row {}", *first_row_with_duplicates);
+
+    /// During repair we create new shared data without duplicated dynamic paths
+    /// update corresponding dynamic paths with values from shared data.
+    auto new_shared_data = shared_data->cloneResized(*first_row_with_duplicates);
+    const auto [new_shared_data_paths, new_shared_data_values, new_shared_data_offsets] = getSharedDataPathsValuesAndOffsets(*new_shared_data);
+    new_shared_data_offsets->reserve(size);
+    PathToColumnMap new_dynamic_paths;
+    for (size_t i = *first_row_with_duplicates; i < size; ++i)
+    {
+        size_t shared_data_start = shared_data_offsets[i - 1];
+        size_t shared_data_end = shared_data_offsets[i];
+        for (size_t j = shared_data_start; j < shared_data_end; ++j)
+        {
+            auto path = shared_data_paths->getDataAt(j).toView();
+            auto it = dynamic_paths.find(path);
+            if (it == dynamic_paths.end())
+            {
+                new_shared_data_paths->insertFrom(*shared_data_paths, j);
+                new_shared_data_values->insertFrom(*shared_data_values, j);
+            }
+            /// We update dynamic path with value from shared data only if dynamic path has NULL at this row.
+            else if (it->second->isNullAt(i))
+            {
+                auto new_it = new_dynamic_paths.find(path);
+                if (new_it == new_dynamic_paths.end())
+                {
+                    new_it = new_dynamic_paths.emplace(path, it->second->cloneResized(i)).first;
+                    new_it->second->reserve(size);
+                }
+
+                deserializeValueFromSharedData(shared_data_values, j, *new_it->second);
+            }
+            /// Situation when both values in dynamic path and shared data are non-NULL should not be possible
+            /// and we cannot repair it anyhow. Throw logical error exception in this case.
+            else
+            {
+                auto value = shared_data_values->getDataAt(j).toView();
+                ReadBufferFromMemory buf(value.data(), value.size());
+                auto type_from_shared_data = decodeDataType(buf);
+                if (!isNothing(type_from_shared_data))
+                {
+                    auto type_from_dynamic_path = dynamic_paths_ptrs.find(path)->second->getTypeAt(i);
+                    throw Exception(
+                        ErrorCodes::LOGICAL_ERROR,
+                        "Path {} is present both in dynamic paths and shared data and has two non-null values at the row {}."
+                        "Value type in dynamic paths: {}. Value type in shared data: {}",
+                        path,
+                        i,
+                        type_from_dynamic_path->getName(),
+                        type_from_shared_data->getName());
+                }
+            }
+        }
+
+        new_shared_data_offsets->push_back(new_shared_data_paths->size());
+        /// Update new dynamic paths that were not updated with value from shared data in this row.
+        for (auto & [path, column] : new_dynamic_paths)
+        {
+            if (column->size() == i)
+                column->insertFrom(*dynamic_paths.at(path), i);
+        }
+    }
+
+    for (auto & [path, column] : new_dynamic_paths)
+    {
+        if (column->size() != size)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected size of new dynamic path {}: {} != {}", path, column->size(), size);
+        dynamic_paths_ptrs[path] = assert_cast<ColumnDynamic *>(column.get());
+        dynamic_paths[path] = std::move(column);
+    }
+
+    if (new_shared_data->size() != size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected size of new shared data: {} != {}", new_shared_data->size(), size);
+    shared_data = std::move(new_shared_data);
+}
+
+void ColumnObject::validateDynamicPathsSizes() const
+{
+    size_t expected_size = shared_data->size();
+    for (const auto & [path, column] : dynamic_paths)
+    {
+        if (column->size() != expected_size)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected size of dynamic path {}: {} != {}", path, column->size(), expected_size);
+    }
+
+}
+
 }
diff --git a/src/Columns/ColumnObject.h b/src/Columns/ColumnObject.h
index 3cac587f56ae..2421cf7934b8 100644
--- a/src/Columns/ColumnObject.h
+++ b/src/Columns/ColumnObject.h
@@ -143,9 +143,10 @@ class ColumnObject final : public COWHelper<IColumnHelper<ColumnObject>, ColumnO
 
     void popBack(size_t n) override;
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
+    std::optional<size_t> getSerializedValueSize(size_t, const IColumn::SerializationSettings *) const override { return std::nullopt; }
 
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
@@ -173,6 +174,7 @@ class ColumnObject final : public COWHelper<IColumnHelper<ColumnObject>, ColumnO
     void reserve(size_t n) override;
     size_t capacity() const override;
     void prepareForSquashing(const std::vector<ColumnPtr> & source_columns, size_t factor) override;
+    void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -200,7 +202,9 @@ class ColumnObject final : public COWHelper<IColumnHelper<ColumnObject>, ColumnO
 
     bool hasDynamicStructure() const override { return true; }
     bool dynamicStructureEquals(const IColumn & rhs) const override;
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override;
 
     const PathToColumnMap & getTypedPaths() const { return typed_paths; }
     PathToColumnMap & getTypedPaths() { return typed_paths; }
@@ -278,11 +282,22 @@ class ColumnObject final : public COWHelper<IColumnHelper<ColumnObject>, ColumnO
     /// Insert all the data from shared data with specified path to dynamic column.
     static void fillPathColumnFromSharedData(IColumn & path_column, StringRef path, const ColumnPtr & shared_data_column, size_t start, size_t end);
 
+    /// Due to previous bugs we can have an invalid state where we have some path
+    /// both in shared data and in dynamic paths and only one value is not NULL.
+    /// This methods repairs the column and removes this duplicate by removing path
+    /// and value from shared data and keeping only dynamic path containing non-Null value.
+    /// offset argument - is the offset from which we should check for duplicates.
+    void repairDuplicatesInDynamicPathsAndSharedData(size_t offset = 0);
+
+    void validateDynamicPathsSizes() const;
+
 private:
     class SortedPathsIterator;
 
     void insertFromSharedDataAndFillRemainingDynamicPaths(const ColumnObject & src_object_column, std::vector<std::string_view> && src_dynamic_paths_for_shared_data, size_t start, size_t length);
     void serializePathAndValueIntoArena(Arena & arena, const char *& begin, StringRef path, StringRef value, StringRef & res) const;
+    void serializeDynamicPathsAndSharedDataIntoArena(size_t n, Arena & arena, const char *& begin, StringRef & res) const;
+    void deserializeDynamicPathsAndSharedDataFromArena(ReadBuffer & in);
 
     /// Map path -> column for paths with explicitly specified types.
     /// This set of paths is constant and cannot be changed.
diff --git a/src/Columns/ColumnObjectDeprecated.h b/src/Columns/ColumnObjectDeprecated.h
index 3401d03f6fde..d0d3bee34739 100644
--- a/src/Columns/ColumnObjectDeprecated.h
+++ b/src/Columns/ColumnObjectDeprecated.h
@@ -250,10 +250,10 @@ class ColumnObjectDeprecated final : public COWHelper<IColumnHelper<ColumnObject
     StringRef getDataAt(size_t) const override { throwMustBeConcrete(); }
     bool isDefaultAt(size_t) const override { throwMustBeConcrete(); }
     void insertData(const char *, size_t) override { throwMustBeConcrete(); }
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwMustBeConcrete(); }
-    char * serializeValueIntoMemory(size_t, char *) const override { throwMustBeConcrete(); }
-    const char * deserializeAndInsertFromArena(const char *) override { throwMustBeConcrete(); }
-    const char * skipSerializedInArena(const char *) const override { throwMustBeConcrete(); }
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const IColumn::SerializationSettings *) const override { throwMustBeConcrete(); }
+    char * serializeValueIntoMemory(size_t, char *, const IColumn::SerializationSettings *) const override { throwMustBeConcrete(); }
+    void deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *) override { throwMustBeConcrete(); }
+    void skipSerializedInArena(ReadBuffer &) const override { throwMustBeConcrete(); }
     void updateHashWithValue(size_t, SipHash &) const override { throwMustBeConcrete(); }
     WeakHash32 getWeakHash32() const override { throwMustBeConcrete(); }
     void updateHashFast(SipHash &) const override;
diff --git a/src/Columns/ColumnSparse.cpp b/src/Columns/ColumnSparse.cpp
index adb707ca2ad6..4ecdd94f5070 100644
--- a/src/Columns/ColumnSparse.cpp
+++ b/src/Columns/ColumnSparse.cpp
@@ -158,26 +158,29 @@ void ColumnSparse::insertData(const char * pos, size_t length)
     insertSingleValue([&](IColumn & column) { column.insertData(pos, length); });
 }
 
-StringRef ColumnSparse::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnSparse::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
-    return values->serializeValueIntoArena(getValueIndex(n), arena, begin);
+    return values->serializeValueIntoArena(getValueIndex(n), arena, begin, settings);
 }
 
-char * ColumnSparse::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnSparse::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
-    return values->serializeValueIntoMemory(getValueIndex(n), memory);
+    return values->serializeValueIntoMemory(getValueIndex(n), memory, settings);
 }
 
-const char * ColumnSparse::deserializeAndInsertFromArena(const char * pos)
+std::optional<size_t> ColumnSparse::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
 {
-    const char * res = nullptr;
-    insertSingleValue([&](IColumn & column) { res = column.deserializeAndInsertFromArena(pos); });
-    return res;
+    return values->getSerializedValueSize(getValueIndex(n), settings);
+}
+
+void ColumnSparse::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
+{
+    insertSingleValue([&](IColumn & column) { column.deserializeAndInsertFromArena(in, settings); });
 }
 
-const char * ColumnSparse::skipSerializedInArena(const char * pos) const
+void ColumnSparse::skipSerializedInArena(ReadBuffer & in) const
 {
-    return values->skipSerializedInArena(pos);
+    values->skipSerializedInArena(in);
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -873,13 +876,18 @@ ColumnSparse::Iterator ColumnSparse::getIterator(size_t n) const
     return Iterator(offsets_data, _size, current_offset, n);
 }
 
-void ColumnSparse::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnSparse::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     Columns values_source_columns;
     values_source_columns.reserve(source_columns.size());
     for (const auto & source_column : source_columns)
         values_source_columns.push_back(assert_cast<const ColumnSparse &>(*source_column).getValuesPtr());
-    values->takeDynamicStructureFromSourceColumns(values_source_columns);
+    values->takeDynamicStructureFromSourceColumns(values_source_columns, max_dynamic_subcolumns);
+}
+
+void ColumnSparse::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    values->takeDynamicStructureFromColumn(assert_cast<const ColumnSparse &>(*source_column).getValuesPtr());
 }
 
 ColumnPtr recursiveRemoveSparse(const ColumnPtr & column)
diff --git a/src/Columns/ColumnSparse.h b/src/Columns/ColumnSparse.h
index 02163649ad3d..8a1ab670998e 100644
--- a/src/Columns/ColumnSparse.h
+++ b/src/Columns/ColumnSparse.h
@@ -78,10 +78,11 @@ class ColumnSparse final : public COWHelper<IColumnHelper<ColumnSparse>, ColumnS
 
     /// Will insert null value if pos=nullptr
     void insertData(const char * pos, size_t length) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 #else
@@ -168,7 +169,9 @@ class ColumnSparse final : public COWHelper<IColumnHelper<ColumnSparse>, ColumnS
     bool isCollationSupported() const override { return values->isCollationSupported(); }
 
     bool hasDynamicStructure() const override { return values->hasDynamicStructure(); }
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override { values->fixDynamicStructure(); }
 
     size_t getNumberOfTrailingDefaults() const
     {
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index 4ee8b067cc6f..77da8370f685 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -226,7 +226,7 @@ void ColumnString::rollback(const ColumnCheckpoint & checkpoint)
     chars.resize_assume_reserved(assert_cast<const ColumnCheckpointWithNested &>(checkpoint).nested->size);
 }
 
-void ColumnString::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+void ColumnString::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     if (empty())
         return;
@@ -237,11 +237,12 @@ void ColumnString::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, c
     else if (sizes.size() != rows)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of sizes: {} doesn't match rows_num: {}. It is a bug", sizes.size(), rows);
 
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
     if (is_null)
     {
         for (size_t i = 0; i < rows; ++i)
         {
-            size_t string_size = sizeAt(i);
+            size_t string_size = sizeAt(i) + serialize_string_with_zero_byte;
             sizes[i] += 1 + !is_null[i] * (sizeof(string_size) + string_size);
         }
     }
@@ -249,73 +250,89 @@ void ColumnString::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, c
     {
         for (size_t i = 0; i < rows; ++i)
         {
-            size_t string_size = sizeAt(i);
+            size_t string_size = sizeAt(i) + serialize_string_with_zero_byte;
             sizes[i] += sizeof(string_size) + string_size;
         }
     }
 }
 
+std::optional<size_t> ColumnString::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
+{
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
+    return byteSizeAt(n) + serialize_string_with_zero_byte;
+}
 
-StringRef ColumnString::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnString::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
-    size_t string_size = sizeAt(n);
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
+
+    size_t string_size = sizeAt(n) + serialize_string_with_zero_byte;
     size_t offset = offsetAt(n);
 
     StringRef res;
     res.size = sizeof(string_size) + string_size;
     char * pos = arena.allocContinue(res.size, begin);
     memcpy(pos, &string_size, sizeof(string_size));
-    memcpy(pos + sizeof(string_size), &chars[offset], string_size);
+    memcpy(pos + sizeof(string_size), &chars[offset], string_size - serialize_string_with_zero_byte);
+    if (serialize_string_with_zero_byte)
+        *(pos + sizeof(string_size) + string_size - 1) = 0;
     res.data = pos;
 
     return res;
 }
 
-ALWAYS_INLINE char * ColumnString::serializeValueIntoMemory(size_t n, char * memory) const
+ALWAYS_INLINE char * ColumnString::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
-    size_t string_size = sizeAt(n);
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
+    size_t string_size = sizeAt(n) + serialize_string_with_zero_byte;
     size_t offset = offsetAt(n);
 
     memcpy(memory, &string_size, sizeof(string_size));
     memory += sizeof(string_size);
-    memcpy(memory, &chars[offset], string_size);
+    memcpy(memory, &chars[offset], string_size - serialize_string_with_zero_byte);
+    if (serialize_string_with_zero_byte)
+        *(memory + string_size - 1) = 0;
     return memory + string_size;
 }
 
-void ColumnString::batchSerializeValueIntoMemory(std::vector<char *> & memories) const
+void ColumnString::batchSerializeValueIntoMemory(std::vector<char *> & memories, const IColumn::SerializationSettings * settings) const
 {
     chassert(memories.size() == size());
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
     for (size_t i = 0; i < memories.size(); ++i)
     {
-        size_t string_size = sizeAt(i);
+        size_t string_size = sizeAt(i) + serialize_string_with_zero_byte;
         size_t offset = offsetAt(i);
 
         memcpy(memories[i], &string_size, sizeof(string_size));
         memories[i] += sizeof(string_size);
-        memcpy(memories[i], &chars[offset], string_size);
+        memcpy(memories[i], &chars[offset], string_size - serialize_string_with_zero_byte);
+        if (serialize_string_with_zero_byte)
+            *(memories[i] + string_size - 1) = 0;
         memories[i] += string_size;
     }
 }
 
-const char * ColumnString::deserializeAndInsertFromArena(const char * pos)
+void ColumnString::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
-    const size_t string_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(string_size);
+    size_t string_size;
+    readBinaryLittleEndian<size_t>(string_size, in);
 
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
     const size_t old_size = chars.size();
-    const size_t new_size = old_size + string_size;
+    const size_t new_size = old_size + string_size - serialize_string_with_zero_byte;
     chars.resize(new_size);
-    memcpy(chars.data() + old_size, pos, string_size);
+    in.readStrict(reinterpret_cast<char *>(chars.data() + old_size), string_size - serialize_string_with_zero_byte);
+    in.ignore(serialize_string_with_zero_byte);
 
     offsets.push_back(new_size);
-    return pos + string_size;
 }
 
-const char * ColumnString::skipSerializedInArena(const char * pos) const
+void ColumnString::skipSerializedInArena(ReadBuffer & in) const
 {
-    const size_t string_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(string_size);
-    return pos + string_size;
+    size_t string_size;
+    readBinaryLittleEndian<size_t>(string_size, in);
+    in.ignore(string_size);
 }
 
 ColumnPtr ColumnString::index(const IColumn & indexes, size_t limit) const
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index 0084af184c35..bcd27b3c1359 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -204,16 +204,18 @@ class ColumnString final : public COWHelper<IColumnHelper<ColumnString>, ColumnS
     void updateCheckpoint(ColumnCheckpoint & checkpoint) const override;
     void rollback(const ColumnCheckpoint & checkpoint) override;
 
-    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    ALWAYS_INLINE char * serializeValueIntoMemory(size_t n, char * memory) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
 
-    void batchSerializeValueIntoMemory(std::vector<char *> & memories) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    ALWAYS_INLINE char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
 
-    const char * deserializeAndInsertFromArena(const char * pos) override;
+    void batchSerializeValueIntoMemory(std::vector<char *> & memories, const IColumn::SerializationSettings * settings) const override;
 
-    const char * skipSerializedInArena(const char * pos) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+
+    void skipSerializedInArena(ReadBuffer & in) const override;
 
     void updateHashWithValue(size_t n, SipHash & hash) const override;
 
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index ae5ec507759e..84696add5cd4 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -308,7 +308,7 @@ void ColumnTuple::rollback(const ColumnCheckpoint & checkpoint)
         columns[i]->rollback(*checkpoints[i]);
 }
 
-StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
     if (columns.empty())
     {
@@ -321,7 +321,7 @@ StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char con
     StringRef res(begin, 0);
     for (const auto & column : columns)
     {
-        auto value_ref = column->serializeValueIntoArena(n, arena, begin);
+        auto value_ref = column->serializeValueIntoArena(n, arena, begin, settings);
         res.data = value_ref.data - res.size;
         res.size += value_ref.size;
     }
@@ -329,33 +329,62 @@ StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char con
     return res;
 }
 
-char * ColumnTuple::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnTuple::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
+    if (columns.empty())
+    {
+        *memory = 0;
+        return memory + 1;
+    }
+
     for (const auto & column : columns)
-        memory = column->serializeValueIntoMemory(n, memory);
+        memory = column->serializeValueIntoMemory(n, memory, settings);
 
     return memory;
 }
 
-const char * ColumnTuple::deserializeAndInsertFromArena(const char * pos)
+std::optional<size_t> ColumnTuple::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
+{
+    if (columns.empty())
+        return 1;
+
+    size_t res = 0;
+    for (const auto & column : columns)
+    {
+        auto element_size = column->getSerializedValueSize(n, settings);
+        if (!element_size)
+            return std::nullopt;
+        res += *element_size;
+    }
+
+    return res;
+}
+
+
+void ColumnTuple::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
     ++column_length;
 
     if (columns.empty())
-        return pos + 1;
+    {
+        in.ignore(1);
+        return;
+    }
 
     for (auto & column : columns)
-        pos = column->deserializeAndInsertFromArena(pos);
-
-    return pos;
+        column->deserializeAndInsertFromArena(in, settings);
 }
 
-const char * ColumnTuple::skipSerializedInArena(const char * pos) const
+void ColumnTuple::skipSerializedInArena(ReadBuffer & in) const
 {
-    for (const auto & column : columns)
-        pos = column->skipSerializedInArena(pos);
+    if (columns.empty())
+    {
+        in.ignore(1);
+        return;
+    }
 
-    return pos;
+    for (const auto & column : columns)
+        column->skipSerializedInArena(in);
 }
 
 void ColumnTuple::updateHashWithValue(size_t n, SipHash & hash) const
@@ -816,7 +845,7 @@ bool ColumnTuple::dynamicStructureEquals(const IColumn & rhs) const
     }
 }
 
-void ColumnTuple::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnTuple::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     std::vector<Columns> nested_source_columns;
     nested_source_columns.resize(columns.size());
@@ -831,9 +860,21 @@ void ColumnTuple::takeDynamicStructureFromSourceColumns(const Columns & source_c
     }
 
     for (size_t i = 0; i != columns.size(); ++i)
-        columns[i]->takeDynamicStructureFromSourceColumns(nested_source_columns[i]);
+        columns[i]->takeDynamicStructureFromSourceColumns(nested_source_columns[i], max_dynamic_subcolumns);
+}
+
+void ColumnTuple::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    const auto & source_elements = assert_cast<const ColumnTuple &>(*source_column).getColumns();
+    for (size_t i = 0; i != columns.size(); ++i)
+        columns[i]->takeDynamicStructureFromColumn(source_elements[i]);
 }
 
+void ColumnTuple::fixDynamicStructure()
+{
+    for (auto & column : columns)
+        column->fixDynamicStructure();
+}
 
 ColumnPtr ColumnTuple::compress(bool force_compression) const
 {
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index e53e7abc2d2c..70bb00fbd6a0 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -77,10 +77,11 @@ class ColumnTuple final : public COWHelper<IColumnHelper<ColumnTuple>, ColumnTup
 
     void insertDefault() override;
     void popBack(size_t n) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
     void updateHashFast(SipHash & hash) const override;
@@ -145,7 +146,9 @@ class ColumnTuple final : public COWHelper<IColumnHelper<ColumnTuple>, ColumnTup
 
     bool hasDynamicStructure() const override;
     bool dynamicStructureEquals(const IColumn & rhs) const override;
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override;
 
     /// Empty tuple needs a public method to manage its size.
     void addSize(size_t delta) { column_length += delta; }
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index bca5d913bdb0..85cceba778f3 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -27,6 +27,7 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
     extern const int LOGICAL_ERROR;
     extern const int ILLEGAL_COLUMN;
     extern const int NOT_IMPLEMENTED;
@@ -65,7 +66,8 @@ class ColumnUnique final : public COWHelper<IColumnUnique, ColumnUnique<ColumnTy
     IColumnUnique::IndexesWithOverflow uniqueInsertRangeWithOverflow(const IColumn & src, size_t start, size_t length,
                                                                      size_t max_dictionary_size) override;
     size_t uniqueInsertData(const char * pos, size_t length) override;
-    size_t uniqueDeserializeAndInsertFromArena(const char * pos, const char *& new_pos) override;
+    size_t uniqueDeserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    size_t uniqueDeserializeAndInsertAggregationStateValueFromArena(ReadBuffer & in) override;
 
     size_t getDefaultValueIndex() const override { return 0; }
     size_t getNullValueIndex() const override;
@@ -87,10 +89,10 @@ class ColumnUnique final : public COWHelper<IColumnUnique, ColumnUnique<ColumnTy
     Float32 getFloat32(size_t n) const override { return getNestedColumn()->getFloat32(n); }
     bool getBool(size_t n) const override { return getNestedColumn()->getBool(n); }
     bool isNullAt(size_t n) const override { return is_nullable && n == getNullValueIndex(); }
-    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
-    const char * skipSerializedInArena(const char * pos) const override;
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
     void updateHashWithValue(size_t n, SipHash & hash_func) const override;
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -441,7 +443,7 @@ size_t ColumnUnique<ColumnType>::uniqueInsertData(const char * pos, size_t lengt
 }
 
 template <typename ColumnType>
-void ColumnUnique<ColumnType>::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+void ColumnUnique<ColumnType>::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     /// nullable is handled internally.
     chassert(is_null == nullptr);
@@ -449,13 +451,14 @@ void ColumnUnique<ColumnType>::collectSerializedValueSizes(PaddedPODArray<UInt64
         return;
 
     if (is_nullable)
-        column_holder->collectSerializedValueSizes(sizes, assert_cast<const ColumnUInt8 &>(*nested_null_mask).getData().data());
+        column_holder->collectSerializedValueSizes(sizes, assert_cast<const ColumnUInt8 &>(*nested_null_mask).getData().data(), settings);
     else
-        column_holder->collectSerializedValueSizes(sizes, nullptr);
+        column_holder->collectSerializedValueSizes(sizes, nullptr, settings);
 }
 
 template <typename ColumnType>
-StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(
+    size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
     if (is_nullable)
     {
@@ -468,18 +471,18 @@ StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(size_t n, Arena & ar
         if (n == getNullValueIndex())
             return StringRef(pos, s);
 
-        auto nested_ref = column_holder->serializeValueIntoArena(n, arena, begin);
+        auto nested_ref = column_holder->serializeValueIntoArena(n, arena, begin, settings);
 
         /// serializeValueIntoArena may reallocate memory. Have to use ptr from nested_ref.data and move it back.
         return StringRef(nested_ref.data - s, nested_ref.size + s);
     }
 
 
-    return column_holder->serializeValueIntoArena(n, arena, begin);
+    return column_holder->serializeValueIntoArena(n, arena, begin, settings);
 }
 
 template <typename ColumnType>
-char * ColumnUnique<ColumnType>::serializeValueIntoMemory(size_t n, char * memory) const
+char * ColumnUnique<ColumnType>::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
     if (is_nullable)
     {
@@ -491,41 +494,84 @@ char * ColumnUnique<ColumnType>::serializeValueIntoMemory(size_t n, char * memor
             return memory;
     }
 
-    return column_holder->serializeValueIntoMemory(n, memory);
+    return column_holder->serializeValueIntoMemory(n, memory, settings);
 }
 
 template <typename ColumnType>
-size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertFromArena(const char * pos, const char *& new_pos)
+size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
     if (is_nullable)
     {
-        UInt8 val = unalignedLoad<UInt8>(pos);
-        pos += sizeof(val);
+        UInt8 val;
+        readBinaryLittleEndian<UInt8>(val, in);
 
         if (val)
-        {
-            new_pos = pos;
             return getNullValueIndex();
-        }
     }
 
     /// Numbers, FixedString
     if (size_of_value_if_fixed)
     {
-        new_pos = pos + size_of_value_if_fixed;
-        return uniqueInsertData(pos, size_of_value_if_fixed);
+        if (in.available() < size_of_value_if_fixed)
+            throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Not enough data to deserialize fixed size value in ColumnUnique.");
+
+        size_t ret = uniqueInsertData(in.position(), size_of_value_if_fixed);
+        in.ignore(size_of_value_if_fixed);
+        return ret;
+    }
+
+    /// String
+    bool serialize_string_with_zero_byte = settings && settings->serialize_string_with_zero_byte;
+    size_t string_size;
+    readBinaryLittleEndian<size_t>(string_size, in);
+    if (in.available() < string_size)
+        throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Not enough data to deserialize string value in ColumnUnique.");
+
+    size_t ret = uniqueInsertData(in.position(), string_size - serialize_string_with_zero_byte);
+    in.ignore(string_size);
+    return ret;
+}
+
+template <typename ColumnType>
+size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertAggregationStateValueFromArena(ReadBuffer & in)
+{
+    if (is_nullable)
+    {
+        UInt8 val;
+        readBinaryLittleEndian<UInt8>(val, in);
+
+        if (val)
+            return getNullValueIndex();
+
+    }
+
+    /// Numbers, FixedString
+    if (size_of_value_if_fixed)
+    {
+        if (in.available() < size_of_value_if_fixed)
+            throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Not enough data to deserialize fixed size value in ColumnUnique.");
+
+        size_t ret = uniqueInsertData(in.position(), size_of_value_if_fixed);
+        in.ignore(size_of_value_if_fixed);
+        return ret;
+
     }
 
     /// String
-    const size_t string_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(string_size);
-    new_pos = pos + string_size;
+    /// For compatibility, serialized string value contains zero byte at the end, we just ignore this byte.
+    size_t string_size_with_zero_byte;
+    readBinaryLittleEndian<size_t>(string_size_with_zero_byte, in);
+    if (in.available() < string_size_with_zero_byte)
+        throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Not enough data to deserialize string value in ColumnUnique.");
+
+    size_t ret = uniqueInsertData(in.position(), string_size_with_zero_byte - 1);
+    in.ignore(string_size_with_zero_byte);
 
-    return uniqueInsertData(pos, string_size);
+    return ret;
 }
 
 template <typename ColumnType>
-const char * ColumnUnique<ColumnType>::skipSerializedInArena(const char *) const
+void ColumnUnique<ColumnType>::skipSerializedInArena(ReadBuffer &) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method skipSerializedInArena is not supported for {}", this->getName());
 }
diff --git a/src/Columns/ColumnVariant.cpp b/src/Columns/ColumnVariant.cpp
index 6ab917878905..fc3f00915eb8 100644
--- a/src/Columns/ColumnVariant.cpp
+++ b/src/Columns/ColumnVariant.cpp
@@ -786,7 +786,7 @@ void ColumnVariant::rollback(const ColumnCheckpoint & checkpoint)
         variants[i]->rollback(*checkpoints[i]);
 }
 
-StringRef ColumnVariant::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef ColumnVariant::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
     /// During any serialization/deserialization we should always use global discriminators.
     Discriminator global_discr = globalDiscriminatorAt(n);
@@ -797,46 +797,65 @@ StringRef ColumnVariant::serializeValueIntoArena(size_t n, Arena & arena, char c
     if (global_discr == NULL_DISCRIMINATOR)
         return res;
 
-    auto value_ref = variants[localDiscriminatorByGlobal(global_discr)]->serializeValueIntoArena(offsetAt(n), arena, begin);
+    auto value_ref = variants[localDiscriminatorByGlobal(global_discr)]->serializeValueIntoArena(offsetAt(n), arena, begin, settings);
     res.data = value_ref.data - res.size;
     res.size += value_ref.size;
 
     return res;
 }
 
-const char * ColumnVariant::deserializeAndInsertFromArena(const char * pos)
+void ColumnVariant::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
 {
     /// During any serialization/deserialization we should always use global discriminators.
-    Discriminator global_discr = unalignedLoad<Discriminator>(pos);
-    pos += sizeof(global_discr);
+    Discriminator global_discr;
+    readBinaryLittleEndian<Discriminator>(global_discr, in);
+
     Discriminator local_discr = localDiscriminatorByGlobal(global_discr);
     getLocalDiscriminators().push_back(local_discr);
     if (local_discr == NULL_DISCRIMINATOR)
     {
         getOffsets().emplace_back();
-        return pos;
+        return;
     }
 
     getOffsets().push_back(variants[local_discr]->size());
-    return variants[local_discr]->deserializeAndInsertFromArena(pos);
+    variants[local_discr]->deserializeAndInsertFromArena(in, settings);
 }
 
-const char * ColumnVariant::deserializeVariantAndInsertFromArena(DB::ColumnVariant::Discriminator global_discr, const char * pos)
+void ColumnVariant::skipSerializedInArena(ReadBuffer & in) const
 {
-    Discriminator local_discr = localDiscriminatorByGlobal(global_discr);
-    getLocalDiscriminators().push_back(local_discr);
-    getOffsets().push_back(variants[local_discr]->size());
-    return variants[local_discr]->deserializeAndInsertFromArena(pos);
+    Discriminator global_discr;
+    readBinaryLittleEndian<Discriminator>(global_discr, in);
+
+    if (global_discr == NULL_DISCRIMINATOR)
+        return;
+
+    variants[localDiscriminatorByGlobal(global_discr)]->skipSerializedInArena(in);
+}
+
+char * ColumnVariant::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
+{
+    Discriminator global_discr = globalDiscriminatorAt(n);
+    memcpy(memory, &global_discr, sizeof(global_discr));
+    memory += sizeof(global_discr);
+    if (global_discr == NULL_DISCRIMINATOR)
+        return memory;
+
+    return variants[localDiscriminatorByGlobal(global_discr)]->serializeValueIntoMemory(offsetAt(n), memory, settings);
 }
 
-const char * ColumnVariant::skipSerializedInArena(const char * pos) const
+std::optional<size_t> ColumnVariant::getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const
 {
-    Discriminator global_discr = unalignedLoad<Discriminator>(pos);
-    pos += sizeof(global_discr);
+    size_t res = sizeof(Discriminator);
+    Discriminator global_discr = globalDiscriminatorAt(n);
     if (global_discr == NULL_DISCRIMINATOR)
-        return pos;
+        return res;
+
+    auto variant_size = variants[localDiscriminatorByGlobal(global_discr)]->getSerializedValueSize(offsetAt(n), settings);
+    if (!variant_size)
+        return std::nullopt;
 
-    return variants[localDiscriminatorByGlobal(global_discr)]->skipSerializedInArena(pos);
+    return res + *variant_size;
 }
 
 void ColumnVariant::updateHashWithValue(size_t n, SipHash & hash) const
@@ -1337,8 +1356,19 @@ size_t ColumnVariant::capacity() const
     return local_discriminators->capacity();
 }
 
+void ColumnVariant::shrinkToFit()
+{
+    offsets->shrinkToFit();
+    local_discriminators->shrinkToFit();
+    const size_t num_variants = variants.size();
+    for (size_t i = 0; i < num_variants; ++i)
+        getVariantByLocalDiscriminator(i).shrinkToFit();
+}
+
 void ColumnVariant::ensureOwnership()
 {
+    offsets->ensureOwnership();
+    local_discriminators->ensureOwnership();
     const size_t num_variants = variants.size();
     for (size_t i = 0; i < num_variants; ++i)
         getVariantByLocalDiscriminator(i).ensureOwnership();
@@ -1696,7 +1726,7 @@ bool ColumnVariant::hasDynamicStructure() const
     return false;
 }
 
-void ColumnVariant::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
+void ColumnVariant::takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns)
 {
     /// List of source columns for each variant. In global order.
     std::vector<Columns> variants_source_columns;
@@ -1713,7 +1743,21 @@ void ColumnVariant::takeDynamicStructureFromSourceColumns(const Columns & source
     }
 
     for (size_t i = 0; i != num_variants; ++i)
-        getVariantByGlobalDiscriminator(i).takeDynamicStructureFromSourceColumns(variants_source_columns[i]);
+        getVariantByGlobalDiscriminator(i).takeDynamicStructureFromSourceColumns(variants_source_columns[i], max_dynamic_subcolumns);
+}
+
+void ColumnVariant::takeDynamicStructureFromColumn(const ColumnPtr & source_column)
+{
+    const auto & source_variant = assert_cast<const ColumnVariant &>(*source_column);
+    for (size_t i = 0; i != variants.size(); ++i)
+        getVariantByGlobalDiscriminator(i).takeDynamicStructureFromColumn(source_variant.getVariantPtrByGlobalDiscriminator(i));
+}
+
+void ColumnVariant::fixDynamicStructure()
+{
+    for (auto & variant : variants)
+        variant->fixDynamicStructure();
 }
 
+
 }
diff --git a/src/Columns/ColumnVariant.h b/src/Columns/ColumnVariant.h
index 5c94c8edd856..a1bdbe7d4039 100644
--- a/src/Columns/ColumnVariant.h
+++ b/src/Columns/ColumnVariant.h
@@ -213,10 +213,12 @@ class ColumnVariant final : public COWHelper<IColumnHelper<ColumnVariant>, Colum
     void insertManyDefaults(size_t length) override;
 
     void popBack(size_t n) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
-    const char * deserializeAndInsertFromArena(const char * pos) override;
-    const char * deserializeVariantAndInsertFromArena(Discriminator global_discr, const char * pos);
-    const char * skipSerializedInArena(const char * pos) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    std::optional<size_t> getSerializedValueSize(size_t n, const IColumn::SerializationSettings * settings) const override;
+
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     WeakHash32 getWeakHash32() const override;
     void updateHashFast(SipHash & hash) const override;
@@ -244,6 +246,7 @@ class ColumnVariant final : public COWHelper<IColumnHelper<ColumnVariant>, Colum
     void reserve(size_t n) override;
     size_t capacity() const override;
     void prepareForSquashing(const Columns & source_columns, size_t factor) override;
+    void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -340,7 +343,9 @@ class ColumnVariant final : public COWHelper<IColumnHelper<ColumnVariant>, Colum
 
     bool hasDynamicStructure() const override;
     bool dynamicStructureEquals(const IColumn & rhs) const override;
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
+    void takeDynamicStructureFromSourceColumns(const Columns & source_columns, std::optional<size_t> max_dynamic_subcolumns) override;
+    void takeDynamicStructureFromColumn(const ColumnPtr & source_column) override;
+    void fixDynamicStructure() override;
 
 private:
     void insertFromImpl(const IColumn & src_, size_t n, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping);
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 3fdf75fed79e..2e0f5b7f1452 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -24,6 +24,8 @@
 #include <Common/findExtreme.h>
 #include <Common/iota.h>
 #include <DataTypes/FieldToDataType.h>
+#include <IO/Operators.h>
+#include <IO/ReadHelpers.h>
 
 #include <bit>
 #include <cstring>
@@ -56,16 +58,17 @@ namespace ErrorCodes
 }
 
 template <typename T>
-const char * ColumnVector<T>::deserializeAndInsertFromArena(const char * pos)
+void ColumnVector<T>::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings *)
 {
-    data.emplace_back(unalignedLoad<T>(pos));
-    return pos + sizeof(T);
+    T element;
+    readBinaryLittleEndian<T>(element, in);
+    data.emplace_back(std::move(element));
 }
 
 template <typename T>
-const char * ColumnVector<T>::skipSerializedInArena(const char * pos) const
+void ColumnVector<T>::skipSerializedInArena(ReadBuffer & in) const
 {
-    return pos + sizeof(T);
+    in.ignore(sizeof(T));
 }
 
 template <typename T>
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 06fe60c7b174..81601c7e1fae 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -106,9 +106,9 @@ class ColumnVector final : public COWHelper<IColumnHelper<ColumnVector<T>, Colum
         data.resize_assume_reserved(data.size() - n);
     }
 
-    const char * deserializeAndInsertFromArena(const char * pos) override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
 
-    const char * skipSerializedInArena(const char * pos) const override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 
     void updateHashWithValue(size_t n, SipHash & hash) const override;
 
diff --git a/src/Columns/IColumn.cpp b/src/Columns/IColumn.cpp
index a5af99e9b6ca..937f15da89b3 100644
--- a/src/Columns/IColumn.cpp
+++ b/src/Columns/IColumn.cpp
@@ -136,38 +136,44 @@ bool IColumn::getBool(size_t /*n*/) const
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getBool is not supported for {}", getName());
 }
 
-StringRef IColumn::serializeValueIntoArena(size_t /* n */, Arena & /* arena */, char const *& /* begin */) const
+StringRef IColumn::serializeValueIntoArena(size_t /* n */, Arena & /* arena */, char const *& /* begin */, const IColumn::SerializationSettings * /* settings */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoArena is not supported for {}", getName());
 }
 
-char * IColumn::serializeValueIntoMemory(size_t /* n */, char * /* memory */) const
+char * IColumn::serializeValueIntoMemory(size_t /* n */, char * /* memory */, const IColumn::SerializationSettings * /* settings */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoMemory is not supported for {}", getName());
 }
 
-void IColumn::batchSerializeValueIntoMemory(std::vector<char *> & /* memories */) const
+void IColumn::batchSerializeValueIntoMemory(std::vector<char *> & /* memories */, const IColumn::SerializationSettings * /* settings */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method batchSerializeValueIntoMemory is not supported for {}", getName());
 }
 
-StringRef
-IColumn::serializeValueIntoArenaWithNull(size_t /* n */, Arena & /* arena */, char const *& /* begin */, const UInt8 * /* is_null */) const
+StringRef IColumn::serializeValueIntoArenaWithNull(
+    size_t /* n */,
+    Arena & /* arena */,
+    char const *& /* begin */,
+    const UInt8 * /* is_null */,
+    const IColumn::SerializationSettings * /* settings */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoArenaWithNull is not supported for {}", getName());
 }
 
-char * IColumn::serializeValueIntoMemoryWithNull(size_t /* n */, char * /* memory */, const UInt8 * /* is_null */) const
+char * IColumn::serializeValueIntoMemoryWithNull(
+    size_t /* n */, char * /* memory */, const UInt8 * /* is_null */, const IColumn::SerializationSettings * /* settings */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoMemoryWithNull is not supported for {}", getName());
 }
 
-void IColumn::batchSerializeValueIntoMemoryWithNull(std::vector<char *> & /* memories */, const UInt8 * /* is_null */) const
+void IColumn::batchSerializeValueIntoMemoryWithNull(
+    std::vector<char *> & /* memories */, const UInt8 * /* is_null */, const IColumn::SerializationSettings * /* settings */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method batchSerializeValueIntoMemoryWithNull is not supported for {}", getName());
 }
 
-void IColumn::collectSerializedValueSizes(PaddedPODArray<UInt64> & /* sizes */, const UInt8 * /* is_null */) const
+void IColumn::collectSerializedValueSizes(PaddedPODArray<UInt64> & /* sizes */, const UInt8 * /* is_null */, const SerializationSettings * /*settings*/) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method collectSerializedValueSizes is not supported for {}", getName());
 }
@@ -547,8 +553,7 @@ void IColumnHelper<Derived, Parent>::fillFromBlocksAndRowNumbers(const DataTypeP
 }
 
 template <typename Derived, typename Parent>
-StringRef
-IColumnHelper<Derived, Parent>::serializeValueIntoArenaWithNull(size_t n, Arena & arena, char const *& begin, const UInt8 * is_null) const
+StringRef IColumnHelper<Derived, Parent>::serializeValueIntoArenaWithNull(size_t n, Arena & arena, char const *& begin, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     const auto & self = static_cast<const Derived &>(*this);
     if (is_null)
@@ -561,31 +566,41 @@ IColumnHelper<Derived, Parent>::serializeValueIntoArenaWithNull(size_t n, Arena
             return {memory, 1};
         }
 
-        size_t sz = self.byteSizeAt(n) + 1 /* null map byte */;
-        memory = arena.allocContinue(sz, begin);
+        auto serialized_value_size = self.getSerializedValueSize(n, settings);
+        if (serialized_value_size)
+        {
+            size_t total_size = *serialized_value_size + 1 /* null map byte */;
+            memory = arena.allocContinue(total_size, begin);
+            *memory = 0;
+            self.serializeValueIntoMemory(n, memory + 1, settings);
+            return {memory, total_size};
+        }
+
+        memory = arena.allocContinue(1, begin);
         *memory = 0;
-        self.serializeValueIntoMemory(n, memory + 1);
-        return {memory, sz};
+        auto res = self.serializeValueIntoArena(n, arena, begin, settings);
+        return StringRef(res.data - 1, res.size + 1);
     }
 
-    return self.serializeValueIntoArena(n, arena, begin);
+    return self.serializeValueIntoArena(n, arena, begin, settings);
 }
 
 template <typename Derived, typename Parent>
-StringRef IColumnHelper<Derived, Parent>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+StringRef IColumnHelper<Derived, Parent>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
 {
     if constexpr (!std::is_base_of_v<ColumnFixedSizeHelper, Derived>)
-        return IColumn::serializeValueIntoArena(n, arena, begin);
+        return IColumn::serializeValueIntoArena(n, arena, begin, settings);
 
     const auto & self = static_cast<const Derived &>(*this);
     size_t sz = self.byteSizeAt(n);
     char * memory = arena.allocContinue(sz, begin);
-    self.serializeValueIntoMemory(n, memory);
+    self.serializeValueIntoMemory(n, memory, settings);
     return {memory, sz};
 }
 
 template <typename Derived, typename Parent>
-ALWAYS_INLINE char * IColumnHelper<Derived, Parent>::serializeValueIntoMemoryWithNull(size_t n, char * memory, const UInt8 * is_null) const
+ALWAYS_INLINE char * IColumnHelper<Derived, Parent>::serializeValueIntoMemoryWithNull(
+    size_t n, char * memory, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     const auto & self = static_cast<const Derived &>(*this);
     if (is_null)
@@ -596,18 +611,19 @@ ALWAYS_INLINE char * IColumnHelper<Derived, Parent>::serializeValueIntoMemoryWit
             return memory;
     }
 
-    return self.serializeValueIntoMemory(n, memory);
+    return self.serializeValueIntoMemory(n, memory, settings);
 }
 
 template <typename Derived, typename Parent>
-void IColumnHelper<Derived, Parent>::batchSerializeValueIntoMemoryWithNull(std::vector<char *> & memories, const UInt8 * is_null) const
+void IColumnHelper<Derived, Parent>::batchSerializeValueIntoMemoryWithNull(
+    std::vector<char *> & memories, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     const auto & self = static_cast<const Derived &>(*this);
     chassert(memories.size() == self.size());
 
     if (!is_null)
     {
-        self.batchSerializeValueIntoMemory(memories);
+        self.batchSerializeValueIntoMemory(memories, settings);
         return;
     }
 
@@ -617,15 +633,15 @@ void IColumnHelper<Derived, Parent>::batchSerializeValueIntoMemoryWithNull(std::
         *memories[i] = is_null[i];
         ++memories[i];
         if (!is_null[i])
-            memories[i] = self.serializeValueIntoMemory(i, memories[i]);
+            memories[i] = self.serializeValueIntoMemory(i, memories[i], settings);
     }
 }
 
 template <typename Derived, typename Parent>
-ALWAYS_INLINE char * IColumnHelper<Derived, Parent>::serializeValueIntoMemory(size_t n, char * memory) const
+ALWAYS_INLINE char * IColumnHelper<Derived, Parent>::serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const
 {
     if constexpr (!std::is_base_of_v<ColumnFixedSizeHelper, Derived>)
-        return IColumn::serializeValueIntoMemory(n, memory);
+        return IColumn::serializeValueIntoMemory(n, memory, settings);
 
     const auto & self = static_cast<const Derived &>(*this);
     auto raw_data = self.getDataAt(n);
@@ -634,19 +650,19 @@ ALWAYS_INLINE char * IColumnHelper<Derived, Parent>::serializeValueIntoMemory(si
 }
 
 template <typename Derived, typename Parent>
-void IColumnHelper<Derived, Parent>::batchSerializeValueIntoMemory(std::vector<char *> & memories) const
+void IColumnHelper<Derived, Parent>::batchSerializeValueIntoMemory(std::vector<char *> & memories, const IColumn::SerializationSettings * settings) const
 {
     const auto & self = static_cast<const Derived &>(*this);
     chassert(memories.size() == self.size());
     for (size_t i = 0; i < self.size(); ++i)
-        memories[i] = self.serializeValueIntoMemory(i, memories[i]);
+        memories[i] = self.serializeValueIntoMemory(i, memories[i], settings);
 }
 
 template <typename Derived, typename Parent>
-void IColumnHelper<Derived, Parent>::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+void IColumnHelper<Derived, Parent>::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const
 {
     if constexpr (!std::is_base_of_v<ColumnFixedSizeHelper, Derived>)
-        return IColumn::collectSerializedValueSizes(sizes, is_null);
+        return IColumn::collectSerializedValueSizes(sizes, is_null, settings);
 
     const auto & self = static_cast<const Derived &>(*this);
     size_t rows = self.size();
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index 4e6fef9a47cb..ce5d349ecdbf 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -32,6 +32,8 @@ class WeakHash32;
 class ColumnConst;
 class IDataType;
 class Block;
+class ReadBuffer;
+struct ColumnsInfo;
 using DataTypePtr = std::shared_ptr<const IDataType>;
 using IColumnPermutation = PaddedPODArray<size_t>;
 using IColumnFilter = PaddedPODArray<UInt8>;
@@ -264,41 +266,61 @@ class IColumn : public COW<IColumn>
       */
     virtual void popBack(size_t n) = 0;
 
+    struct SerializationSettings
+    {
+        bool serialize_string_with_zero_byte = false;
+
+        static SerializationSettings createForAggregationState()
+        {
+            /// Same aggregation state can be serialized/deserialized by servers with different versions.
+            /// Add zero byte to the end of the string in aggregation state to keep it compatible with old versions.
+            return SerializationSettings{.serialize_string_with_zero_byte = true};
+        }
+    };
+
     /** Serializes n-th element. Serialized element should be placed continuously inside Arena's memory.
       * Serialized value can be deserialized to reconstruct original object. Is used in aggregation.
       * The method is similar to getDataAt(), but can work when element's value cannot be mapped to existing continuous memory chunk,
       *  For example, to obtain unambiguous representation of Array of strings, strings data should be interleaved with their sizes.
       * Parameter begin should be used with Arena::allocContinue.
       */
-    virtual StringRef serializeValueIntoArena(size_t /* n */, Arena & /* arena */, char const *& /* begin */) const;
+    virtual StringRef serializeValueIntoArena(size_t /* n */, Arena & /* arena */, char const *& /* begin */, const SerializationSettings * settings) const;
 
     /// Same as above but serialize into already allocated continuous memory.
     /// Return pointer to the end of the serialization data.
-    virtual char * serializeValueIntoMemory(size_t /* n */, char * /* memory */) const;
+    virtual char * serializeValueIntoMemory(size_t /* n */, char * /* memory */, const SerializationSettings * settings) const;
+
+    /// Returns size in bytes required to serialize value into memory using the previous method.
+    /// If size cannot be calculated in advance, return nullopt. In this case serializeValueIntoMemory
+    /// cannot be used and serializeValueIntoArena should be used instead,
+    virtual std::optional<size_t> getSerializedValueSize(size_t n, const SerializationSettings *) const { return byteSizeAt(n); }
 
-    virtual void batchSerializeValueIntoMemory(std::vector<char *> & /* memories */) const;
+    virtual void batchSerializeValueIntoMemory(std::vector<char *> & /* memories */, const SerializationSettings * settings) const;
 
     /// Nullable variant to avoid calling virtualized method inside ColumnNullable.
-    virtual StringRef
-    serializeValueIntoArenaWithNull(size_t /* n */, Arena & /* arena */, char const *& /* begin */, const UInt8 * /* is_null */) const;
+    virtual StringRef serializeValueIntoArenaWithNull(
+        size_t /* n */,
+        Arena & /* arena */,
+        char const *& /* begin */,
+        const UInt8 * /* is_null */,
+        const SerializationSettings * settings) const;
 
-    virtual char * serializeValueIntoMemoryWithNull(size_t /* n */, char * /* memory */, const UInt8 * /* is_null */) const;
+    virtual char * serializeValueIntoMemoryWithNull(size_t /* n */, char * /* memory */, const UInt8 * /* is_null */, const SerializationSettings * settings) const;
 
-    virtual void batchSerializeValueIntoMemoryWithNull(std::vector<char *> & /* memories */, const UInt8 * /* is_null */) const;
+    virtual void batchSerializeValueIntoMemoryWithNull(std::vector<char *> & /* memories */, const UInt8 * /* is_null */, const SerializationSettings * settings) const;
 
     /// Calculate all the sizes of serialized data (as in the methods above) in the column and add to `sizes`.
     /// If `is_null` is not nullptr, also take null byte into account.
     /// This is currently used to facilitate the allocation of memory for an entire continuous row
     /// in a single step. For more details, refer to the HashMethodSerialized implementation.
-    virtual void collectSerializedValueSizes(PaddedPODArray<UInt64> & /* sizes */, const UInt8 * /* is_null */) const;
+    virtual void collectSerializedValueSizes(PaddedPODArray<UInt64> & /* sizes */, const UInt8 * /* is_null */, const SerializationSettings * settings) const;
 
     /// Deserializes a value that was serialized using IColumn::serializeValueIntoArena method.
-    /// Returns pointer to the position after the read data.
-    [[nodiscard]] virtual const char * deserializeAndInsertFromArena(const char * pos) = 0;
+    /// Note that it needs to deal with user input
+    virtual void deserializeAndInsertFromArena(ReadBuffer & in, const SerializationSettings * settings) = 0;
 
     /// Skip previously serialized value that was serialized using IColumn::serializeValueIntoArena method.
-    /// Returns a pointer to the position after the deserialized data.
-    [[nodiscard]] virtual const char * skipSerializedInArena(const char *) const = 0;
+    virtual void skipSerializedInArena(ReadBuffer & in) const = 0;
 
     /// Update state of hash function with value of n-th element.
     /// On subsequent calls of this method for sequence of column values of arbitrary types,
@@ -645,7 +667,11 @@ class IColumn : public COW<IColumn>
     [[nodiscard]] virtual bool dynamicStructureEquals(const IColumn & rhs) const { return structureEquals(rhs); }
     /// For columns with dynamic subcolumns this method takes dynamic structure from source columns
     /// and creates proper resulting dynamic structure in advance for merge of these source columns.
-    virtual void takeDynamicStructureFromSourceColumns(const std::vector<Ptr> & /*source_columns*/) {}
+    virtual void takeDynamicStructureFromSourceColumns(const std::vector<Ptr> & /*source_columns*/, std::optional<size_t> /*max_dynamic_subcolumns*/) {}
+    /// For columns with dynamic subcolumns this method takes the exact dynamic structure from provided column.
+    virtual void takeDynamicStructureFromColumn(const ColumnPtr & /*source_column*/) {}
+    /// For columns with dynamic subcolumns fix current dynamic structure so later inserts into this column won't change it.
+    virtual void fixDynamicStructure() {}
 
     /** Some columns can contain another columns inside.
       * So, we have a tree of columns. But not all combinations are possible.
@@ -858,7 +884,7 @@ class IColumnHelper : public Parent
     void getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t from, size_t limit) const override;
 
     /// Devirtualize byteSizeAt.
-    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
 
     /// Devirtualize insertFrom.
     ColumnPtr updateFrom(const IColumn::Patch & patch) const override;
@@ -875,14 +901,14 @@ class IColumnHelper : public Parent
     void fillFromBlocksAndRowNumbers(const DataTypePtr & type, size_t source_column_index_in_block, const std::vector<const Columns *> & columns, const std::vector<UInt32> & row_nums) override;
 
     /// Move common implementations into the same translation unit to ensure they are properly inlined.
-    char * serializeValueIntoMemoryWithNull(size_t n, char * memory, const UInt8 * is_null) const override;
-    void batchSerializeValueIntoMemoryWithNull(std::vector<char *> & memories, const UInt8 * is_null) const override;
+    char * serializeValueIntoMemoryWithNull(size_t n, char * memory, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
+    void batchSerializeValueIntoMemoryWithNull(std::vector<char *> & memories, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
 
-    char * serializeValueIntoMemory(size_t n, char * memory) const override;
-    void batchSerializeValueIntoMemory(std::vector<char *> & memories) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory, const IColumn::SerializationSettings * settings) const override;
+    void batchSerializeValueIntoMemory(std::vector<char *> & memories, const IColumn::SerializationSettings * settings) const override;
 
-    StringRef serializeValueIntoArenaWithNull(size_t n, Arena & arena, char const *& begin, const UInt8 * is_null) const override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    StringRef serializeValueIntoArenaWithNull(size_t n, Arena & arena, char const *& begin, const UInt8 * is_null, const IColumn::SerializationSettings * settings) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
 };
 
 }
diff --git a/src/Columns/IColumnDummy.cpp b/src/Columns/IColumnDummy.cpp
index 1d1d9f53cec4..de58c50c0f4e 100644
--- a/src/Columns/IColumnDummy.cpp
+++ b/src/Columns/IColumnDummy.cpp
@@ -3,6 +3,7 @@
 #include <Core/Field.h>
 #include <Common/Arena.h>
 #include <Common/iota.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
@@ -40,7 +41,7 @@ bool IColumnDummy::isDefaultAt(size_t) const
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "isDefaultAt is not implemented for {}", getName());
 }
 
-StringRef IColumnDummy::serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin) const
+StringRef IColumnDummy::serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin, const IColumn::SerializationSettings *) const
 {
     /// Has to put one useless byte into Arena, because serialization into zero number of bytes is ambiguous.
     char * res = arena.allocContinue(1, begin);
@@ -48,15 +49,15 @@ StringRef IColumnDummy::serializeValueIntoArena(size_t /*n*/, Arena & arena, cha
     return { res, 1 };
 }
 
-const char * IColumnDummy::deserializeAndInsertFromArena(const char * pos)
+void IColumnDummy::deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings *)
 {
     ++s;
-    return pos + 1;
+    in.ignore(1);
 }
 
-const char * IColumnDummy::skipSerializedInArena(const char * pos) const
+void IColumnDummy::skipSerializedInArena(ReadBuffer & in) const
 {
-    return pos;
+    in.ignore(1);
 }
 
 ColumnPtr IColumnDummy::filter(const Filter & filt, ssize_t /*result_size_hint*/) const
diff --git a/src/Columns/IColumnDummy.h b/src/Columns/IColumnDummy.h
index f5e0cf779d37..ad7244e74768 100644
--- a/src/Columns/IColumnDummy.h
+++ b/src/Columns/IColumnDummy.h
@@ -55,11 +55,11 @@ class IColumnDummy : public IColumnHelper<IColumnDummy>
         ++s;
     }
 
-    StringRef serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin) const override;
+    StringRef serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const override;
 
-    const char * deserializeAndInsertFromArena(const char * pos) override;
+    void deserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) override;
 
-    const char * skipSerializedInArena(const char * pos) const override;
+    void skipSerializedInArena(ReadBuffer & in) const override;
 
     void updateHashWithValue(size_t /*n*/, SipHash & /*hash*/) const override
     {
diff --git a/src/Columns/IColumnUnique.h b/src/Columns/IColumnUnique.h
index 8801f3e91ff4..7e30c3c9d882 100644
--- a/src/Columns/IColumnUnique.h
+++ b/src/Columns/IColumnUnique.h
@@ -68,7 +68,8 @@ class IColumnUnique : public IColumn
     virtual size_t getNestedTypeDefaultValueIndex() const = 0;  /// removeNullable()->getDefault() value index
     virtual bool canContainNulls() const = 0;
 
-    virtual size_t uniqueDeserializeAndInsertFromArena(const char * pos, const char *& new_pos) = 0;
+    virtual size_t uniqueDeserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings) = 0;
+    virtual size_t uniqueDeserializeAndInsertAggregationStateValueFromArena(ReadBuffer & in) = 0;
 
     /// Returns dictionary hash which is SipHash is applied to each row of nested column.
     virtual UInt128 getHash() const = 0;
@@ -115,7 +116,7 @@ class IColumnUnique : public IColumn
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method gather is not supported for ColumnUnique.");
     }
 
-    const char * deserializeAndInsertFromArena(const char *) override
+    void deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *) override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method deserializeAndInsertFromArena is not supported for ColumnUnique.");
     }
diff --git a/src/Columns/tests/gtest_column_aggregate_function.cpp b/src/Columns/tests/gtest_column_aggregate_function.cpp
new file mode 100644
index 000000000000..e1c5a57cb9fe
--- /dev/null
+++ b/src/Columns/tests/gtest_column_aggregate_function.cpp
@@ -0,0 +1,70 @@
+#include <base/types.h>
+#include <AggregateFunctions/DDSketch.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromVector.h>
+#include <Common/Arena.h>
+#include <Common/Base64.h>
+#include <Common/FailPoint.h>
+#include <Common/tests/gtest_global_register.h>
+
+#include <gtest/gtest.h>
+
+namespace DB::FailPoints
+{
+    extern const char column_aggregate_function_ensureOwnership_exception[];
+}
+
+TEST(ColumnAggregateFunction, EnsureOwnershipExceptionLeavesCorruptedState)
+{
+    tryRegisterAggregateFunctions();
+
+    using namespace DB;
+
+    // Create the aggregate function quantileDD with relative accuracy 0.01
+    AggregateFunctionFactory & factory = AggregateFunctionFactory::instance();
+    DataTypes argument_types = {std::make_shared<DataTypeFloat64>()};
+    Array params = {Field(0.01), Field(0.5)};
+    AggregateFunctionProperties properties;
+    auto aggregate_function = factory.get("quantileDD", NullsAction::EMPTY, argument_types, params, properties);
+
+    // Create a source column with some data
+    auto src_column = ColumnAggregateFunction::create(aggregate_function);
+    Arena arena_src;
+    auto data_column = ColumnFloat64::create();
+    data_column->insert(Field(1.0));
+    data_column->insert(Field(2.0));
+    data_column->insert(Field(3.0));
+    const IColumn * columns[1] = {data_column.get()};
+
+    for (size_t i = 0; i < 3; ++i)
+    {
+        src_column->insertDefault();
+        aggregate_function->add(src_column->getData()[i], columns, i, &arena_src);
+    }
+
+    // Create a view column from the source - this sets src pointer
+    auto view_column = src_column->cloneEmpty();
+    view_column->insertRangeFrom(*src_column, 0, 3);
+
+    // Enable failpoint that will trigger an exception during ensureOwnership
+    // This will happen after at least one state is created and destroyed
+    FailPointInjection::enableFailPoint(FailPoints::column_aggregate_function_ensureOwnership_exception);
+
+    // Try to insert - this will call ensureOwnership() which will throw
+    // After the exception, previously, data[] points to destroyed memory where mapping == nullptr
+    ASSERT_THROW({
+        view_column->insertDefault();
+    }, Exception);
+
+    // Disable failpoint
+    FailPointInjection::disableFailPoint(FailPoints::column_aggregate_function_ensureOwnership_exception);
+
+    /// Previously leads to a crash
+    view_column->insertDefault();
+}
diff --git a/src/Columns/tests/gtest_column_dynamic.cpp b/src/Columns/tests/gtest_column_dynamic.cpp
index 539926d03635..5ceeb978a070 100644
--- a/src/Columns/tests/gtest_column_dynamic.cpp
+++ b/src/Columns/tests/gtest_column_dynamic.cpp
@@ -1,7 +1,8 @@
 #include <Columns/ColumnDynamic.h>
 #include <Columns/ColumnString.h>
-#include <Common/Arena.h>
+#include <IO/ReadBufferFromString.h>
 #include <gtest/gtest.h>
+#include <Common/Arena.h>
 
 using namespace DB;
 
@@ -751,14 +752,16 @@ TEST(ColumnDynamic, SerializeDeserializeFromArena1)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = column->serializeValueIntoArena(0, arena, pos);
-    column->serializeValueIntoArena(1, arena, pos);
-    column->serializeValueIntoArena(2, arena, pos);
-    column->serializeValueIntoArena(3, arena, pos);
-    pos = column->deserializeAndInsertFromArena(ref1.data);
-    pos = column->deserializeAndInsertFromArena(pos);
-    pos = column->deserializeAndInsertFromArena(pos);
-    column->deserializeAndInsertFromArena(pos);
+    auto ref1 = column->serializeValueIntoArena(0, arena, pos, nullptr);
+    column->serializeValueIntoArena(1, arena, pos, nullptr);
+    column->serializeValueIntoArena(2, arena, pos, nullptr);
+    column->serializeValueIntoArena(3, arena, pos, nullptr);
+
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    column->deserializeAndInsertFromArena(in, nullptr);
+    column->deserializeAndInsertFromArena(in, nullptr);
+    column->deserializeAndInsertFromArena(in, nullptr);
+    column->deserializeAndInsertFromArena(in, nullptr);
 
     ASSERT_EQ((*column)[column->size() - 4], 42);
     ASSERT_EQ((*column)[column->size() - 3], 42.42);
@@ -776,24 +779,17 @@ TEST(ColumnDynamic, SerializeDeserializeFromArena2)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos);
-    column_from->serializeValueIntoArena(1, arena, pos);
-    column_from->serializeValueIntoArena(2, arena, pos);
-    column_from->serializeValueIntoArena(3, arena, pos);
+    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(1, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(2, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(3, arena, pos, nullptr);
 
     auto column_to = ColumnDynamic::create(254);
-    pos = column_to->deserializeAndInsertFromArena(ref1.data);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    column_to->deserializeAndInsertFromArena(pos);
-
-    ASSERT_EQ((*column_to)[column_to->size() - 4], 42);
-    ASSERT_EQ((*column_to)[column_to->size() - 3], 42.42);
-    ASSERT_EQ((*column_to)[column_to->size() - 2], "str");
-    ASSERT_EQ((*column_to)[column_to->size() - 1], Null());
-    ASSERT_EQ(column_to->getVariantInfo().variant_type->getName(), "Variant(Float64, Int8, SharedVariant, String)");
-    std::vector<String> expected_names = {"Float64", "Int8", "SharedVariant", "String"};
-    ASSERT_EQ(column_to->getVariantInfo().variant_names, expected_names);
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
     std::unordered_map<String, UInt8> expected_variant_name_to_discriminator = {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}};
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator == expected_variant_name_to_discriminator);
 }
@@ -808,16 +804,17 @@ TEST(ColumnDynamic, SerializeDeserializeFromArenaOverflow1)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos);
-    column_from->serializeValueIntoArena(1, arena, pos);
-    column_from->serializeValueIntoArena(2, arena, pos);
-    column_from->serializeValueIntoArena(3, arena, pos);
+    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(1, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(2, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(3, arena, pos, nullptr);
 
     auto column_to = getDynamicWithManyVariants(253);
-    pos = column_to->deserializeAndInsertFromArena(ref1.data);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    column_to->deserializeAndInsertFromArena(pos);
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
 
     ASSERT_EQ((*column_to)[column_to->size() - 4], 42);
     ASSERT_EQ((*column_to)[column_to->size() - 3], 42.42);
@@ -840,19 +837,20 @@ TEST(ColumnDynamic, SerializeDeserializeFromArenaOverflow2)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos);
-    column_from->serializeValueIntoArena(1, arena, pos);
-    column_from->serializeValueIntoArena(2, arena, pos);
-    column_from->serializeValueIntoArena(3, arena, pos);
-    column_from->serializeValueIntoArena(4, arena, pos);
+    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(1, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(2, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(3, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(4, arena, pos, nullptr);
 
     auto column_to = ColumnDynamic::create(2);
     column_to->insert(Field(42.42));
-    pos = column_to->deserializeAndInsertFromArena(ref1.data);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    column_to->deserializeAndInsertFromArena(pos);
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
+    column_to->deserializeAndInsertFromArena(in, nullptr);
 
     ASSERT_EQ((*column_to)[column_to->size() - 5], 42);
     ASSERT_EQ((*column_to)[column_to->size() - 4], 42.42);
@@ -876,19 +874,19 @@ TEST(ColumnDynamic, skipSerializedInArena)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos);
-    column_from->serializeValueIntoArena(1, arena, pos);
-    column_from->serializeValueIntoArena(2, arena, pos);
-    auto ref4 = column_from->serializeValueIntoArena(3, arena, pos);
+    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(1, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(2, arena, pos, nullptr);
+    column_from->serializeValueIntoArena(3, arena, pos, nullptr);
 
-    const char * end = ref4.data + ref4.size;
     auto column_to = ColumnDynamic::create(254);
-    pos = column_to->skipSerializedInArena(ref1.data);
-    pos = column_to->skipSerializedInArena(pos);
-    pos = column_to->skipSerializedInArena(pos);
-    pos = column_to->skipSerializedInArena(pos);
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    column_to->skipSerializedInArena(in);
+    column_to->skipSerializedInArena(in);
+    column_to->skipSerializedInArena(in);
+    column_to->skipSerializedInArena(in);
 
-    ASSERT_EQ(pos, end);
+    ASSERT_TRUE(in.eof());
     ASSERT_EQ(column_to->getVariantInfo().variant_name_to_discriminator.at("SharedVariant"), 0);
     ASSERT_EQ(column_to->getVariantInfo().variant_names, Names{"SharedVariant"});
 }
diff --git a/src/Columns/tests/gtest_column_object.cpp b/src/Columns/tests/gtest_column_object.cpp
index 408c76cd58d8..4a0ca225617d 100644
--- a/src/Columns/tests/gtest_column_object.cpp
+++ b/src/Columns/tests/gtest_column_object.cpp
@@ -1,7 +1,8 @@
-#include <Columns/ColumnString.h>
 #include <Columns/ColumnObject.h>
+#include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromString.h>
 
 #include <Common/Arena.h>
 #include <Core/Field.h>
@@ -312,15 +313,17 @@ TEST(ColumnObject, SerializeDeserializerFromArena)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = col_object.serializeValueIntoArena(0, arena, pos);
-    col_object.serializeValueIntoArena(1, arena, pos);
-    col_object.serializeValueIntoArena(2, arena, pos);
+    auto ref1 = col_object.serializeValueIntoArena(0, arena, pos, nullptr);
+    col_object.serializeValueIntoArena(1, arena, pos, nullptr);
+    col_object.serializeValueIntoArena(2, arena, pos, nullptr);
 
     auto col2 = type->createColumn();
     auto & col_object2 = assert_cast<ColumnObject &>(*col);
-    pos = col_object2.deserializeAndInsertFromArena(ref1.data);
-    pos = col_object2.deserializeAndInsertFromArena(pos);
-    col_object2.deserializeAndInsertFromArena(pos);
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    col_object2.deserializeAndInsertFromArena(in, nullptr);
+    col_object2.deserializeAndInsertFromArena(in, nullptr);
+    col_object2.deserializeAndInsertFromArena(in, nullptr);
+    ASSERT_TRUE(in.eof());
 
     ASSERT_EQ(col_object2[0], (Object{{"b.d", Field(42u)}, {"a.b", Array{"Str1", "Str2"}}, {"a.a", Tuple{"Str3", 441u}}, {"a.c", Field("Str4")}, {"a.d", Array{Field(45), Field(46)}}, {"a.e", Field(47)}}));
     ASSERT_EQ(col_object2[1], (Object{{"b.d", Field{0u}}, {"a.b", Array{}}, {"b.a", Field(48)}, {"b.b", Array{Field(49), Field(50)}}}));
@@ -338,16 +341,16 @@ TEST(ColumnObject, SkipSerializedInArena)
 
     Arena arena;
     const char * pos = nullptr;
-    auto ref1 = col_object.serializeValueIntoArena(0, arena, pos);
-    col_object.serializeValueIntoArena(1, arena, pos);
-    auto ref3 = col_object.serializeValueIntoArena(2, arena, pos);
+    auto ref1 = col_object.serializeValueIntoArena(0, arena, pos, nullptr);
+    col_object.serializeValueIntoArena(1, arena, pos, nullptr);
+    col_object.serializeValueIntoArena(2, arena, pos, nullptr);
 
-    const char * end = ref3.data + ref3.size;
     auto col2 = type->createColumn();
-    pos = col2->skipSerializedInArena(ref1.data);
-    pos = col2->skipSerializedInArena(pos);
-    pos = col2->skipSerializedInArena(pos);
-    ASSERT_EQ(pos, end);
+    ReadBufferFromString in({ref1.data, arena.usedBytes()});
+    col2->skipSerializedInArena(in);
+    col2->skipSerializedInArena(in);
+    col2->skipSerializedInArena(in);
+    ASSERT_TRUE(in.eof());
 }
 
 TEST(ColumnObject, rollback)
@@ -411,3 +414,33 @@ TEST(ColumnObject, rollback)
     ASSERT_EQ((*typed_paths.at("a.a"))[0], Field{1u});
     ASSERT_EQ((*dynamic_paths.at("a.c"))[1], Field{"ccc"});
 }
+
+TEST(ColumnObject, RepairDuplicatesInDynamicPathsAndSharedData)
+{
+    auto type_with_dynamic_paths = DataTypeFactory::instance().get("JSON");
+    auto column_with_dynamic_paths = type_with_dynamic_paths->createColumn();
+    auto & column_object_with_dynamic_paths = assert_cast<ColumnObject &>(*column_with_dynamic_paths);
+    column_object_with_dynamic_paths.insert(Object{{"a", Field{1u}}});
+    column_object_with_dynamic_paths.insert(Object{{"b", Field{1u}}});
+    column_object_with_dynamic_paths.insert(Object{{"c", Field{1u}}});
+    column_object_with_dynamic_paths.insert(Object{{"d", Field{1u}}});
+
+    auto type_with_shared_data_paths = DataTypeFactory::instance().get("JSON(max_dynamic_paths=0)");
+    auto column_with_shared_data_paths = type_with_shared_data_paths->createColumn();
+    auto & column_object_with_shared_data_paths = assert_cast<ColumnObject &>(*column_with_shared_data_paths);
+    column_object_with_shared_data_paths.insert(Object{});
+    column_object_with_shared_data_paths.insert(Object{{"a", Field{1u}}, {"c", Field{1u}}});
+    column_object_with_shared_data_paths.insert(Object{{"d", Field{1u}}, {"b", Field{1u}}});
+    column_object_with_shared_data_paths.insert(Object{});
+
+    std::unordered_map<String, MutableColumnPtr> dynamic_paths;
+    for (const auto & [path, column] : column_object_with_dynamic_paths.getDynamicPaths())
+        dynamic_paths[path] = IColumn::mutate(column);
+
+    auto column_object = ColumnObject::create({}, std::move(dynamic_paths), IColumn::mutate(column_object_with_shared_data_paths.getSharedDataPtr()), 4, 4, 16);
+    column_object->repairDuplicatesInDynamicPathsAndSharedData(0);
+    ASSERT_EQ((*column_object)[0], (Object{{"a", Field(1u)}}));
+    ASSERT_EQ((*column_object)[1], (Object{{"a", Field(1u)}, {"b", Field(1u)}, {"c", Field(1u)}}));
+    ASSERT_EQ((*column_object)[2], (Object{{"b", Field(1u)}, {"c", Field(1u)}, {"d", Field(1u)}}));
+    ASSERT_EQ((*column_object)[3], (Object{{"d", Field(1u)}}));
+}
diff --git a/src/Columns/tests/gtest_column_unique.cpp b/src/Columns/tests/gtest_column_unique.cpp
index 15208da70fb2..6a165adb286c 100644
--- a/src/Columns/tests/gtest_column_unique.cpp
+++ b/src/Columns/tests/gtest_column_unique.cpp
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <IO/ReadBufferFromString.h>
 
 #include <gtest/gtest.h>
 
@@ -117,10 +118,10 @@ void column_unique_unique_deserialize_from_arena_impl(ColumnType & column, const
         const char * pos = nullptr;
         for (size_t i = 0; i < num_values; ++i)
         {
-            auto ref = column_unique_pattern->serializeValueIntoArena(idx->getUInt(i), arena, pos);
-            const char * new_pos;
-            column_unique->uniqueDeserializeAndInsertFromArena(ref.data, new_pos);
-            ASSERT_EQ(new_pos - ref.data, ref.size) << "Deserialized data has different sizes at position " << i;
+            auto ref = column_unique_pattern->serializeValueIntoArena(idx->getUInt(i), arena, pos, nullptr);
+            ReadBufferFromString in({ref.data, ref.size});
+            column_unique->uniqueDeserializeAndInsertFromArena(in, nullptr);
+            ASSERT_TRUE(in.eof()) << "Deserialized data has different sizes at position " << i;
 
             ASSERT_EQ(column_unique_pattern->getNestedNotNullableColumn()->getDataAt(idx->getUInt(i)),
                       column_unique->getNestedNotNullableColumn()->getDataAt(idx->getUInt(i)))
@@ -140,8 +141,8 @@ void column_unique_unique_deserialize_from_arena_impl(ColumnType & column, const
         const char * pos_lc = nullptr;
         for (size_t i = 0; i < num_values; ++i)
         {
-            auto ref_string = column.serializeValueIntoArena(i, arena_string, pos_string);
-            auto ref_lc = column_unique->serializeValueIntoArena(idx->getUInt(i), arena_lc, pos_lc);
+            auto ref_string = column.serializeValueIntoArena(i, arena_string, pos_string, nullptr);
+            auto ref_lc = column_unique->serializeValueIntoArena(idx->getUInt(i), arena_lc, pos_lc, nullptr);
             ASSERT_EQ(ref_string, ref_lc) << "Serialized data is different from pattern at position " << i;
         }
     }
diff --git a/src/Columns/tests/gtest_low_cardinality.cpp b/src/Columns/tests/gtest_low_cardinality.cpp
index 301fa2a60904..c8ae39013fe0 100644
--- a/src/Columns/tests/gtest_low_cardinality.cpp
+++ b/src/Columns/tests/gtest_low_cardinality.cpp
@@ -62,3 +62,25 @@ TEST(ColumnLowCardinality, Clone)
     ASSERT_TRUE(assert_cast<const ColumnLowCardinality &>(*nullable_column).nestedIsNullable());
     ASSERT_FALSE(assert_cast<const ColumnLowCardinality &>(*column).nestedIsNullable());
 }
+
+TEST(ColumnLowCardinality, EmptyDictionaryEmptyIndexes)
+{
+    /// Test edge case: empty dictionary (size=0) with empty indexes (num_rows=0)
+    /// This should not throw an error, as empty indexes are always valid
+    /// Regression test for bug where check was: if (max_position >= limit)
+    /// When num_rows=0, max_position stays 0, and with limit=0, this incorrectly threw
+    
+    auto data_type = std::make_shared<DataTypeUInt32>();
+    auto low_cardinality_type = std::make_shared<DataTypeLowCardinality>(data_type);
+    auto column = low_cardinality_type->createColumn();
+    auto & lc_column = assert_cast<ColumnLowCardinality &>(*column);
+    
+    // Create empty keys and indexes columns
+    auto empty_keys = ColumnUInt32::create();
+    auto empty_indexes = ColumnUInt8::create();
+    
+    // This should NOT throw an exception
+    ASSERT_NO_THROW(lc_column.insertRangeFromDictionaryEncodedColumn(*empty_keys, *empty_indexes));
+    
+    ASSERT_EQ(column->size(), 0);
+}
diff --git a/src/Common/AllocatorWithMemoryTracking.h b/src/Common/AllocatorWithMemoryTracking.h
index ff83e925822c..7e60e3504650 100644
--- a/src/Common/AllocatorWithMemoryTracking.h
+++ b/src/Common/AllocatorWithMemoryTracking.h
@@ -2,6 +2,7 @@
 
 #include <cstddef>
 #include <cstdlib>
+#include <type_traits>
 
 #include <Common/AllocationInterceptors.h>
 #include <Common/CurrentMemoryTracker.h>
@@ -18,6 +19,14 @@ template <typename T>
 struct AllocatorWithMemoryTracking
 {
     using value_type = T;
+    /// Allocator is stateless and thus always equal to another allocator.
+    using is_always_equal = std::true_type;
+    /// When propagate_on_container_move_assignment::value is:
+    /// true: The container will move the allocator from the source to the destination during move assignment
+    /// false (default): The container keeps its original allocator
+    /// For a stateless allocator like this one, this option doesn't make a lot of sense and needed only
+    /// to workaround a compilation error in our version of boost::container::devector.
+    using propagate_on_container_move_assignment = std::true_type;
 
     AllocatorWithMemoryTracking() = default;
 
@@ -54,13 +63,13 @@ struct AllocatorWithMemoryTracking
 };
 
 template <typename T, typename U>
-bool operator==(const AllocatorWithMemoryTracking <T> &, const AllocatorWithMemoryTracking <U> &)
+constexpr bool operator==(const AllocatorWithMemoryTracking <T> &, const AllocatorWithMemoryTracking <U> &)
 {
     return true;
 }
 
 template <typename T, typename U>
-bool operator!=(const AllocatorWithMemoryTracking <T> &, const AllocatorWithMemoryTracking <U> &)
+constexpr bool operator!=(const AllocatorWithMemoryTracking <T> &, const AllocatorWithMemoryTracking <U> &)
 {
     return false;
 }
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index 463c6403cc27..dca81c4162ec 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -19,6 +19,7 @@
 #include <Core/Defines.h>
 #include <memory>
 #include <cassert>
+#include <Common/HashTable/Hash.h>
 
 namespace DB
 {
@@ -331,6 +332,15 @@ struct HashMethodSingleLowCardinalityColumn : public SingleColumnMethod
     }
 };
 
+class HashMethodSerializedContext : public HashMethodContext
+{
+public:
+    explicit HashMethodSerializedContext(const HashMethodContextSettings & settings_)
+        : settings(settings_)
+    {}
+
+    HashMethodContextSettings settings;
+};
 
 /** Hash by concatenating serialized key values.
   * The serialized value differs in that it uniquely allows to deserialize it, having only the position with which it starts.
@@ -344,6 +354,11 @@ struct HashMethodSerialized
     using Self = HashMethodSerialized<Value, Mapped, nullable, prealloc>;
     using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, false>;
 
+    static HashMethodContextPtr createContext(const HashMethodContextSettings & settings)
+    {
+        return std::make_shared<HashMethodSerializedContext>(settings);
+    }
+
     static constexpr bool has_cheap_key_calculation = false;
 
     ColumnRawPtrs key_columns;
@@ -353,12 +368,22 @@ struct HashMethodSerialized
     /// Only used if prealloc is true.
     PaddedPODArray<UInt64> row_sizes;
     size_t total_size = 0;
+    IColumn::SerializationSettings serialization_settings;
     PODArray<char> serialized_buffer;
     std::vector<StringRef> serialized_keys;
 
-    HashMethodSerialized(const ColumnRawPtrs & key_columns_, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
+    HashMethodSerialized(const ColumnRawPtrs & key_columns_, const Sizes & /*key_sizes*/, const HashMethodContextPtr & context)
         : key_columns(key_columns_), keys_size(key_columns_.size())
     {
+        const auto * hash_serialized_context = typeid_cast<const HashMethodSerializedContext *>(context.get());
+        if (!hash_serialized_context)
+        {
+            const auto & cached_val = *context;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid type for HashMethodSerialized context: {}",
+                            demangle(typeid(cached_val).name()));
+        }
+
+        serialization_settings.serialize_string_with_zero_byte = hash_serialized_context->settings.serialize_string_with_zero_byte;
         if constexpr (nullable)
         {
             null_maps.resize(keys_size, nullptr);
@@ -378,7 +403,7 @@ struct HashMethodSerialized
 
             /// Calculate serialized value size for each key column in each row.
             for (size_t i = 0; i < keys_size; ++i)
-                key_columns[i]->collectSerializedValueSizes(row_sizes, null_maps[i]);
+                key_columns[i]->collectSerializedValueSizes(row_sizes, null_maps[i], &serialization_settings);
 
             for (auto row_size : row_sizes)
                 total_size += row_size;
@@ -401,9 +426,9 @@ struct HashMethodSerialized
             for (size_t i = 0; i < keys_size; ++i)
             {
                 if constexpr (nullable)
-                    key_columns[i]->batchSerializeValueIntoMemoryWithNull(memories, null_maps[i]);
+                    key_columns[i]->batchSerializeValueIntoMemoryWithNull(memories, null_maps[i], &serialization_settings);
                 else
-                    key_columns[i]->batchSerializeValueIntoMemory(memories);
+                    key_columns[i]->batchSerializeValueIntoMemory(memories, &serialization_settings);
             }
         }
     }
@@ -425,13 +450,13 @@ struct HashMethodSerialized
 
             size_t sum_size = 0;
             for (size_t j = 0; j < keys_size; ++j)
-                sum_size += key_columns[j]->serializeValueIntoArenaWithNull(row, pool, begin, null_maps[j]).size;
+                sum_size += key_columns[j]->serializeValueIntoArenaWithNull(row, pool, begin, null_maps[j], &serialization_settings).size;
 
             return SerializedKeyHolder{{begin, sum_size}, pool};
         }
 
         return SerializedKeyHolder{
-            serializeKeysToPoolContiguous(row, keys_size, key_columns, pool),
+            serializeKeysToPoolContiguous(row, keys_size, key_columns, pool, &serialization_settings),
             pool};
     }
 };
diff --git a/src/Common/ColumnsHashingImpl.h b/src/Common/ColumnsHashingImpl.h
index 287faed01064..253249d86eb8 100644
--- a/src/Common/ColumnsHashingImpl.h
+++ b/src/Common/ColumnsHashingImpl.h
@@ -19,6 +19,7 @@ namespace ColumnsHashing
 struct HashMethodContextSettings
 {
     size_t max_threads;
+    bool serialize_string_with_zero_byte = false;
 };
 
 /// Generic context for HashMethod. Context is shared between multiple threads, all methods must be thread-safe.
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index 41b16996ba74..da72fd5f4653 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -10,6 +10,7 @@
     M(Merge, "Number of executing background merges") \
     M(MergeParts, "Number of source parts participating in current background merges") \
     M(Move, "Number of currently executing moves") \
+    M(Export, "Number of currently executing exports") \
     M(PartMutation, "Number of mutations (ALTER DELETE/UPDATE)") \
     M(ReplicatedFetch, "Number of data parts being fetched from replica") \
     M(ReplicatedSend, "Number of data parts being sent to replicas") \
@@ -299,6 +300,7 @@
     M(FilesystemCacheDelayedCleanupElements, "Filesystem cache elements in background cleanup queue") \
     M(FilesystemCacheHoldFileSegments, "Filesystem cache file segment which are currently hold as unreleasable") \
     M(FilesystemCacheKeys, "Number of keys in filesystem cache") \
+    M(FilesystemCacheReserveThreads, "Threads number trying to reserve space in cache") \
     M(AsyncInsertCacheSize, "Number of async insert hash id in cache") \
     M(IcebergMetadataFilesCacheBytes, "Size of the iceberg metadata cache in bytes") \
     M(IcebergMetadataFilesCacheFiles, "Number of cached files in the iceberg metadata cache") \
@@ -431,6 +433,7 @@
     M(StartupScriptsExecutionState, "State of startup scripts execution: 0 = not finished, 1 = success, 2 = failure.") \
     \
     M(IsServerShuttingDown, "Indicates if the server is shutting down: 0 = no, 1 = yes") \
+    M(IsSwarmModeEnabled, "Indicates if the swarm mode enabled or not: 0 = disabled, 1 = enabled") \
     \
     M(StatelessWorkerThreads, "Number of threads in the stateless worker thread pool.") \
     M(StatelessWorkerThreadsActive, "Number of threads in the stateless worker thread pool running a task.") \
diff --git a/src/Common/DateLUT.cpp b/src/Common/DateLUT.cpp
index ba7dd6602e48..39e8044f36d6 100644
--- a/src/Common/DateLUT.cpp
+++ b/src/Common/DateLUT.cpp
@@ -209,6 +209,11 @@ ExtendedDayNum makeDayNum(const DateLUTImpl & date_lut, Int16 year, UInt8 month,
     return date_lut.makeDayNum(year, month, day_of_month, default_error_day_num);
 }
 
+std::optional<ExtendedDayNum> tryToMakeDayNum(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month)
+{
+    return date_lut.tryToMakeDayNum(year, month, day_of_month);
+}
+
 Int64 makeDate(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month)
 {
     static_assert(std::same_as<Int64, DateLUTImpl::Time>);
@@ -221,6 +226,12 @@ Int64 makeDateTime(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8
     return date_lut.makeDateTime(year, month, day_of_month, hour, minute, second);
 }
 
+std::optional<Int64> tryToMakeDateTime(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second)
+{
+    static_assert(std::same_as<Int64, DateLUTImpl::Time>);
+    return date_lut.tryToMakeDateTime(year, month, day_of_month, hour, minute, second);
+}
+
 const std::string & getDateLUTTimeZone(const DateLUTImpl & date_lut)
 {
     return date_lut.getTimeZone();
diff --git a/src/Common/DateLUT.h b/src/Common/DateLUT.h
index 72992e3c70d2..ff025fd8036b 100644
--- a/src/Common/DateLUT.h
+++ b/src/Common/DateLUT.h
@@ -87,9 +87,11 @@ inline UInt64 timeInNanoseconds(std::chrono::time_point<std::chrono::system_cloc
 /// A few helper functions to avoid having to include DateLUTImpl.h in some heavy headers
 
 ExtendedDayNum makeDayNum(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month, Int32 default_error_day_num = 0);
+std::optional<ExtendedDayNum> tryToMakeDayNum(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month);
 
 Int64 makeDate(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month);
 Int64 makeDateTime(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second);
+std::optional<Int64> tryToMakeDateTime(const DateLUTImpl & date_lut, Int16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second);
 
 const std::string & getDateLUTTimeZone(const DateLUTImpl & date_lut);
 UInt32 getDayNumOffsetEpoch();
diff --git a/src/Common/DateLUTImpl.h b/src/Common/DateLUTImpl.h
index 5c08916f8095..b9c058b60a85 100644
--- a/src/Common/DateLUTImpl.h
+++ b/src/Common/DateLUTImpl.h
@@ -1177,6 +1177,20 @@ class DateLUTImpl
         return LUTIndex{std::min(index, static_cast<UInt32>(DATE_LUT_SIZE - 1))};
     }
 
+    std::optional<LUTIndex> tryToMakeLUTIndex(Int16 year, UInt8 month, UInt8 day_of_month) const
+    {
+        if (unlikely(year < DATE_LUT_MIN_YEAR || year > DATE_LUT_MAX_YEAR || month < 1 || month > 12 || day_of_month < 1 || day_of_month > 31))
+            return std::nullopt;
+
+        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;
+
+        if (index >= DATE_LUT_SIZE)
+            return std::nullopt;
+
+        return LUTIndex(index);
+    }
+
     /// Create DayNum from year, month, day of month.
     ExtendedDayNum makeDayNum(Int16 year, UInt8 month, UInt8 day_of_month, Int32 default_error_day_num = 0) const
     {
@@ -1186,6 +1200,18 @@ class DateLUTImpl
         return toDayNum(makeLUTIndex(year, month, day_of_month));
     }
 
+    std::optional<ExtendedDayNum> tryToMakeDayNum(Int16 year, UInt8 month, UInt8 day_of_month) const
+    {
+        if (unlikely(year < DATE_LUT_MIN_YEAR || month < 1 || month > 12 || day_of_month < 1 || day_of_month > 31))
+            return std::nullopt;
+
+        auto index = tryToMakeLUTIndex(year, month, day_of_month);
+        if (!index)
+            return std::nullopt;
+
+        return toDayNum(*index);
+    }
+
     Time makeDate(Int16 year, UInt8 month, UInt8 day_of_month) const
     {
         return lut[makeLUTIndex(year, month, day_of_month)].date;
@@ -1204,6 +1230,20 @@ class DateLUTImpl
         return lut[index].date + time_offset;
     }
 
+    std::optional<Time> tryToMakeDateTime(Int16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second) const
+    {
+        auto index = tryToMakeLUTIndex(year, month, day_of_month);
+        if (!index)
+            return std::nullopt;
+
+        Time time_offset = hour * 3600 + minute * 60 + second;
+
+        if (time_offset >= lut[*index].time_at_offset_change())
+            time_offset -= lut[*index].amount_of_offset_change();
+
+        return lut[*index].date + time_offset;
+    }
+
     Time makeTime(int64_t hour, UInt8 minute, UInt8 second) const
     {
         Time time_offset = hour * 3600 + minute * 60 + second;
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index eb5b64f2f328..e1e4d26a3e11 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -648,6 +648,7 @@
     M(1002, UNKNOWN_EXCEPTION) \
     M(1003, SSH_EXCEPTION) \
     M(1004, STARTUP_SCRIPTS_ERROR) \
+    M(1005, PENDING_MUTATIONS_NOT_ALLOWED) \
     /* See END */
 
 #ifdef APPLY_FOR_EXTERNAL_ERROR_CODES
@@ -664,7 +665,7 @@ namespace ErrorCodes
     APPLY_FOR_ERROR_CODES(M)
 #undef M
 
-    constexpr ErrorCode END = 1004;
+    constexpr ErrorCode END = 1005;
     ErrorPairHolder values[END + 1]{};
 
     struct ErrorCodesNames
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index fbba3e83cc42..43f769c78d52 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -779,4 +779,27 @@ ExecutionStatus ExecutionStatus::fromText(const std::string & data)
     return status;
 }
 
+std::exception_ptr copyMutableException(std::exception_ptr ptr)
+{
+    try
+    {
+        std::rethrow_exception(ptr);
+    }
+    catch (Poco::Exception & e)
+    {
+        try
+        {
+            e.rethrow();
+        }
+        catch (...)
+        {
+            return std::current_exception();
+        }
+    }
+    catch (...)
+    {
+        return std::current_exception();
+    }
+}
+
 }
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index 151e78cbaf7a..f21eb3084c2a 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -376,4 +376,8 @@ T current_exception_cast()
     }
 }
 
+/// Return copy of a current exception if it is a Poco::Exception (DB::Exception), since this exception is mutable, and returning reference is unsafe.
+/// And a reference otherwise.
+std::exception_ptr copyMutableException(std::exception_ptr ptr);
+
 }
diff --git a/src/Common/FailPoint.cpp b/src/Common/FailPoint.cpp
index b9cb8e5b3cd8..476738471079 100644
--- a/src/Common/FailPoint.cpp
+++ b/src/Common/FailPoint.cpp
@@ -64,6 +64,7 @@ static struct InitFiu
     ONCE(rmt_merge_task_sleep_in_prepare) \
     ONCE(s3_read_buffer_throw_expired_token) \
     ONCE(distributed_cache_fail_request_in_the_middle_of_request) \
+    ONCE(object_storage_queue_fail_commit_once) \
     REGULAR(distributed_cache_fail_connect_non_retriable) \
     REGULAR(distributed_cache_fail_connect_retriable) \
     REGULAR(object_storage_queue_fail_commit) \
@@ -87,6 +88,7 @@ static struct InitFiu
     ONCE(execute_query_calling_empty_set_result_func_on_exception) \
     ONCE(receive_timeout_on_table_status_response) \
     ONCE(delta_kernel_fail_literal_visitor) \
+    ONCE(column_aggregate_function_ensureOwnership_exception) \
     REGULAR(keepermap_fail_drop_data) \
     REGULAR(lazy_pipe_fds_fail_close) \
     PAUSEABLE(infinite_sleep) \
@@ -113,9 +115,23 @@ static struct InitFiu
     REGULAR(output_format_sleep_on_progress) \
     REGULAR(slowdown_parallel_replicas_local_plan_read) \
     ONCE(iceberg_writes_cleanup) \
+    REGULAR(sleep_in_logs_flush) \
+    ONCE(database_replicated_drop_before_removing_keeper_failed) \
+    ONCE(database_replicated_drop_after_removing_keeper_failed) \
+    PAUSEABLE_ONCE(mt_mutate_task_pause_in_prepare) \
+    PAUSEABLE(rmt_mutate_task_pause_in_prepare) \
+    PAUSEABLE(rmt_merge_selecting_task_pause_when_scheduled) \
+    PAUSEABLE_ONCE(smt_mutate_task_pause_in_prepare) \
+    PAUSEABLE_ONCE(smt_merge_selecting_task_pause_when_scheduled) \
+    ONCE(shared_set_full_update_fails_when_initializing) \
+    PAUSEABLE(after_kill_part_pause) \
+    ONCE(parallel_replicas_reading_response_timeout) \
+    ONCE(database_iceberg_gcs) \
+    REGULAR(rmt_delay_execute_drop_range) \
+    REGULAR(rmt_delay_commit_part) \
     ONCE(smt_commit_exception_before_op) \
     ONCE(backup_add_empty_memory_table) \
-    REGULAR(refresh_task_delay_update_coordination_state_running)
+    REGULAR(refresh_task_stop_racing_for_running_refresh)
 
 
 namespace FailPoints
diff --git a/src/Common/HTTPHeaderFilter.cpp b/src/Common/HTTPHeaderFilter.cpp
index fd02fe1ecef6..4c7e0b8a4058 100644
--- a/src/Common/HTTPHeaderFilter.cpp
+++ b/src/Common/HTTPHeaderFilter.cpp
@@ -2,6 +2,8 @@
 #include <Common/StringUtils.h>
 #include <Common/Exception.h>
 #include <Common/re2.h>
+#include <algorithm>
+#include <cctype>
 
 namespace DB
 {
@@ -11,21 +13,29 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-void HTTPHeaderFilter::checkHeaders(const HTTPHeaderEntries & entries) const
+void HTTPHeaderFilter::checkAndNormalizeHeaders(HTTPHeaderEntries & entries) const
 {
     std::lock_guard guard(mutex);
 
-    for (const auto & entry : entries)
+    for (auto & entry : entries)
     {
         if (entry.name.contains('\n') || entry.value.contains('\n'))
-           throw Exception(ErrorCodes::BAD_ARGUMENTS, "HTTP header \"{}\" has invalid character", entry.name);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "HTTP header \"{}\" has invalid character", entry.name);
+        /// Strip whitespace and control characters from header name for validation
+        std::string & normalized_name = entry.name;
+        normalized_name.erase(
+            std::remove_if(
+                normalized_name.begin(),
+                normalized_name.end(),
+                [](char c) { return std::iscntrl(static_cast<unsigned char>(c)) || std::isspace(static_cast<unsigned char>(c)); }),
+            normalized_name.end());
 
-        if (forbidden_headers.contains(entry.name))
+        if (forbidden_headers.contains(normalized_name))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "HTTP header \"{}\" is forbidden in configuration file, "
                                                     "see <http_forbid_headers>", entry.name);
 
         for (const auto & header_regex : forbidden_headers_regexp)
-            if (re2::RE2::FullMatch(entry.name, header_regex))
+            if (re2::RE2::FullMatch(normalized_name, header_regex))
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "HTTP header \"{}\" is forbidden in configuration file, "
                                                         "see <http_forbid_headers>", entry.name);
     }
diff --git a/src/Common/HTTPHeaderFilter.h b/src/Common/HTTPHeaderFilter.h
index 6dfb01d903b2..09975d77e736 100644
--- a/src/Common/HTTPHeaderFilter.h
+++ b/src/Common/HTTPHeaderFilter.h
@@ -15,7 +15,7 @@ class HTTPHeaderFilter
 public:
 
     void setValuesFromConfig(const Poco::Util::AbstractConfiguration & config);
-    void checkHeaders(const HTTPHeaderEntries & entries) const;
+    void checkAndNormalizeHeaders(HTTPHeaderEntries & entries) const;
 
 private:
     std::unordered_set<std::string> forbidden_headers;
diff --git a/src/Common/ISlotControl.h b/src/Common/ISlotControl.h
index d36639f44375..20c4c81e782c 100644
--- a/src/Common/ISlotControl.h
+++ b/src/Common/ISlotControl.h
@@ -62,7 +62,7 @@ class ISlotLease : public IAcquiredSlot
 
     /// This method is for CPU consumption only.
     /// It should be called from a thread that started using the slot.
-    /// Required for obtainting CPU time for the thread, because ctor is called in another thread.
+    /// Required for obtaining CPU time for the thread, because ctor is called in another thread.
     virtual void startConsumption() = 0;
 
     /// Renew the slot. This method should be called periodically.
@@ -81,6 +81,9 @@ class ISlotAllocation : public std::enable_shared_from_this<ISlotAllocation>, bo
 public:
     virtual ~ISlotAllocation() = default;
 
+    /// Free the allocated slots, cancel slot requests and wake up preempted threads.
+    virtual void free() {}
+
     /// Take one already granted slot if available.
     [[nodiscard]] virtual AcquiredSlotPtr tryAcquire() = 0;
 
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 62de007b9875..cacc2dd43273 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -252,8 +252,9 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
         if (level == VariableContext::Global)
         {
             /// For global memory tracker always update memory usage.
-            amount.fetch_add(size, std::memory_order_relaxed);
+            Int64 will_be = amount.fetch_add(size, std::memory_order_relaxed);
             rss.fetch_add(size, std::memory_order_relaxed);
+            updatePeak(will_be, /*log_memory_usage=*/ false);
 
             auto metric_loaded = metric.load(std::memory_order_relaxed);
             if (metric_loaded != CurrentMetrics::end())
diff --git a/src/Common/MemoryTrackerDebugBlockerInThread.h b/src/Common/MemoryTrackerDebugBlockerInThread.h
index ac1998ad0458..7eeaeed182fc 100644
--- a/src/Common/MemoryTrackerDebugBlockerInThread.h
+++ b/src/Common/MemoryTrackerDebugBlockerInThread.h
@@ -2,6 +2,7 @@
 
 #include <base/defines.h> /// DEBUG_OR_SANITIZER_BUILD
 
+/// Use it if you need to suppress MemoryAllocatedWithoutCheck for known big allocations.
 #ifdef DEBUG_OR_SANITIZER_BUILD
 struct MemoryTrackerDebugBlockerInThread
 {
diff --git a/src/Common/MemoryTrackerUtils.cpp b/src/Common/MemoryTrackerUtils.cpp
index d590e6703aa7..96ce9022341c 100644
--- a/src/Common/MemoryTrackerUtils.cpp
+++ b/src/Common/MemoryTrackerUtils.cpp
@@ -50,8 +50,13 @@ std::optional<UInt64> getCurrentQueryHardLimit()
 Int64 getCurrentQueryMemoryUsage()
 {
     /// Use query-level memory tracker
-    if (auto * memory_tracker_child = DB::CurrentThread::getMemoryTracker())
-        if (auto * memory_tracker = memory_tracker_child->getParent())
-            return memory_tracker->get();
-    return 0;
+    auto * thread_memory_tracker = DB::CurrentThread::getMemoryTracker();
+    if (!thread_memory_tracker || thread_memory_tracker->level != VariableContext::Thread)
+        return 0;
+
+    auto * query_process_memory_tracker = thread_memory_tracker->getParent();
+    if (!query_process_memory_tracker || query_process_memory_tracker->level != VariableContext::Process)
+        return 0;
+
+    return query_process_memory_tracker->get();
 }
diff --git a/src/Common/MemoryWorker.cpp b/src/Common/MemoryWorker.cpp
index f19508b6a331..241d6d218515 100644
--- a/src/Common/MemoryWorker.cpp
+++ b/src/Common/MemoryWorker.cpp
@@ -32,7 +32,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int FILE_DOESNT_EXIST;
-    extern const int LOGICAL_ERROR;
 }
 
 #if defined(OS_LINUX)
@@ -223,13 +222,21 @@ std::string_view sourceToString(MemoryWorker::MemoryUsageSource source)
 /// - reading from cgroups' pseudo-files (fastest and most accurate)
 /// - reading jemalloc's resident stat (doesn't take into account allocations that didn't use jemalloc)
 /// Also, different tick rates are used because not all options are equally fast
-MemoryWorker::MemoryWorker(uint64_t period_ms_, bool correct_tracker_, bool use_cgroup, std::shared_ptr<PageCache> page_cache_)
+MemoryWorker::MemoryWorker(
+    MemoryWorkerConfig config,
+    std::shared_ptr<PageCache> page_cache_)
     : log(getLogger("MemoryWorker"))
-    , period_ms(period_ms_)
-    , correct_tracker(correct_tracker_)
+    , rss_update_period_ms(config.rss_update_period_ms)
+    , correct_tracker(config.correct_tracker)
+    , purge_total_memory_threshold_ratio(config.purge_total_memory_threshold_ratio)
+    , purge_dirty_pages_threshold_ratio(config.purge_dirty_pages_threshold_ratio)
     , page_cache(page_cache_)
 {
-    if (use_cgroup)
+#if USE_JEMALLOC
+    page_size = pagesize_mib.getValue();
+#endif
+
+    if (config.use_cgroup)
     {
 #if defined(OS_LINUX)
         try
@@ -245,8 +252,8 @@ MemoryWorker::MemoryWorker(uint64_t period_ms_, bool correct_tracker_, bool use_
 
             cgroups_reader = ICgroupsReader::createCgroupsReader(version, cgroup_path);
             source = MemoryUsageSource::Cgroups;
-            if (period_ms == 0)
-                period_ms = cgroups_memory_usage_tick_ms;
+            if (rss_update_period_ms == 0)
+                rss_update_period_ms = cgroups_memory_usage_tick_ms;
 
             return;
         }
@@ -261,8 +268,8 @@ MemoryWorker::MemoryWorker(uint64_t period_ms_, bool correct_tracker_, bool use_
     static constexpr uint64_t jemalloc_memory_usage_tick_ms{100};
 
     source = MemoryUsageSource::Jemalloc;
-    if (period_ms == 0)
-        period_ms = jemalloc_memory_usage_tick_ms;
+    if (rss_update_period_ms == 0)
+        rss_update_period_ms = jemalloc_memory_usage_tick_ms;
 #endif
 }
 
@@ -276,79 +283,114 @@ void MemoryWorker::start()
     if (source == MemoryUsageSource::None)
         return;
 
+    const std::string purge_dirty_pages_info = purge_dirty_pages_threshold_ratio > 0 || purge_total_memory_threshold_ratio > 0
+        ? fmt::format(
+              "enabled (total memory threshold ratio: {}, dirty pages threshold ratio: {}, page size: {})",
+              purge_total_memory_threshold_ratio,
+              purge_dirty_pages_threshold_ratio,
+              page_size)
+        : "disabled";
+
     LOG_INFO(
-        getLogger("MemoryWorker"),
-        "Starting background memory thread with period of {}ms, using {} as source",
-        period_ms,
-        sourceToString(source));
-    background_thread = ThreadFromGlobalPool([this] { backgroundThread(); });
+        log,
+        "Starting background memory thread with period of {}ms, using {} as source, purging dirty pages {}",
+        rss_update_period_ms,
+        sourceToString(source),
+        purge_dirty_pages_info);
+
+    update_resident_memory_thread = ThreadFromGlobalPool([this] { updateResidentMemoryThread(); });
+
+#if USE_JEMALLOC
+    purge_dirty_pages_thread = ThreadFromGlobalPool([this] { purgeDirtyPagesThread(); });
+#endif
 }
 
 MemoryWorker::~MemoryWorker()
 {
     {
-        std::unique_lock lock(mutex);
+        std::scoped_lock lock(rss_update_mutex, purge_dirty_pages_mutex);
         shutdown = true;
     }
-    cv.notify_all();
 
-    if (background_thread.joinable())
-        background_thread.join();
+    rss_update_cv.notify_all();
+    purge_dirty_pages_cv.notify_all();
+
+    if (update_resident_memory_thread.joinable())
+        update_resident_memory_thread.join();
+
+#if USE_JEMALLOC
+    if (purge_dirty_pages_thread.joinable())
+        purge_dirty_pages_thread.join();
+#endif
 }
 
-uint64_t MemoryWorker::getMemoryUsage()
+uint64_t MemoryWorker::getMemoryUsage(bool log_error)
 {
     switch (source)
     {
         case MemoryUsageSource::Cgroups:
-            return cgroups_reader != nullptr ? cgroups_reader->readMemoryUsage() : 0;
+        {
+            if (cgroups_reader != nullptr)
+                return cgroups_reader->readMemoryUsage();
+            [[fallthrough]];
+        }
         case MemoryUsageSource::Jemalloc:
 #if USE_JEMALLOC
             epoch_mib.setValue(0);
             return resident_mib.getValue();
 #else
-            return 0;
+            [[fallthrough]];
 #endif
         case MemoryUsageSource::None:
-            throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Trying to fetch memory usage while no memory source can be used");
+        {
+            if (log_error)
+                LOG_ERROR(getLogger("MemoryWorker"), "Trying to fetch memory usage while no memory source can be used");
+            return 0;
+        }
     }
 }
 
-void MemoryWorker::backgroundThread()
+void MemoryWorker::updateResidentMemoryThread()
 {
     setThreadName("MemoryWorker");
 
-    std::chrono::milliseconds chrono_period_ms{period_ms};
+    std::chrono::milliseconds chrono_period_ms{rss_update_period_ms};
     [[maybe_unused]] bool first_run = true;
-    std::unique_lock lock(mutex);
+    std::unique_lock rss_update_lock(rss_update_mutex);
+
     while (true)
     {
-        cv.wait_for(lock, chrono_period_ms, [this] { return shutdown; });
+        rss_update_cv.wait_for(rss_update_lock, chrono_period_ms, [this] { return shutdown; });
         if (shutdown)
             return;
 
         Stopwatch total_watch;
 
-        Int64 resident = getMemoryUsage();
+        Int64 resident = getMemoryUsage(first_run);
         MemoryTracker::updateRSS(resident);
 
         if (page_cache)
             page_cache->autoResize(std::max(resident, total_memory_tracker.get()), total_memory_tracker.getHardLimit());
 
 #if USE_JEMALLOC
-        if (resident > total_memory_tracker.getHardLimit())
+        const auto memory_tracker_limit = total_memory_tracker.getHardLimit();
+
+        const bool needs_purge
+            = (purge_total_memory_threshold_ratio > 0 && resident > memory_tracker_limit * purge_total_memory_threshold_ratio)
+            || (purge_dirty_pages_threshold_ratio > 0
+                && pdirty_mib.getValue() * page_size > memory_tracker_limit * purge_dirty_pages_threshold_ratio);
+
+        bool is_purge_enabled = false;
+        if (needs_purge && purge_dirty_pages.compare_exchange_strong(is_purge_enabled, true, std::memory_order_relaxed))
         {
-            Stopwatch purge_watch;
-            purge_mib.run();
-            ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
-            ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, purge_watch.elapsedMicroseconds());
+            purge_dirty_pages_cv.notify_all();
         }
 
         /// update MemoryTracker with `allocated` information from jemalloc when:
         ///  - it's a first run of MemoryWorker (MemoryTracker could've missed some allocation before its initialization)
         ///  - MemoryTracker stores a negative value
         ///  - `correct_tracker` is set to true
-        if (unlikely(first_run || total_memory_tracker.get() < 0))
+        if (first_run || total_memory_tracker.get() < 0) [[unlikely]]
             MemoryTracker::updateAllocated(resident, /*log_change=*/true);
         else if (correct_tracker)
             MemoryTracker::updateAllocated(resident, /*log_change=*/false);
@@ -358,7 +400,7 @@ void MemoryWorker::backgroundThread()
         /// resident memory can be much larger than the actual allocated memory
         /// so we rather ignore the potential difference caused by allocated memory
         /// before MemoryTracker initialization
-        if (unlikely(total_memory_tracker.get() < 0) || correct_tracker)
+        if (total_memory_tracker.get() < 0 || correct_tracker) [[unlikely]]
             MemoryTracker::updateAllocated(resident, /*log_change=*/false);
 #endif
 
@@ -368,4 +410,34 @@ void MemoryWorker::backgroundThread()
     }
 }
 
+void MemoryWorker::purgeDirtyPagesThread()
+{
+#if USE_JEMALLOC
+    /// Instead of having completely separate logic for purging dirty pages,
+    /// we rely on the main thread to notify us when we need to purge dirty pages.
+    /// We do it to avoid reading RSS value in both threads. Even though they are fairly
+    /// fast, they are still not free.
+    /// So we keep the work of reading current RSS in one thread which allows us to keep the low period time for it.
+    setThreadName("MemoryWorker");
+
+    std::unique_lock purge_dirty_pages_lock(purge_dirty_pages_mutex);
+
+    while (true)
+    {
+        purge_dirty_pages_cv.wait(purge_dirty_pages_lock, [this] { return shutdown || purge_dirty_pages.load(std::memory_order_relaxed); });
+        if (shutdown)
+            return;
+
+        bool is_purge_enabled = true;
+        if (!purge_dirty_pages.compare_exchange_strong(is_purge_enabled, false, std::memory_order_relaxed))
+            continue;
+
+        Stopwatch purge_watch;
+        purge_mib.run();
+        ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
+        ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, purge_watch.elapsedMicroseconds());
+    }
+#endif
+}
+
 }
diff --git a/src/Common/MemoryWorker.h b/src/Common/MemoryWorker.h
index 8eac77c3c908..28f6455f852a 100644
--- a/src/Common/MemoryWorker.h
+++ b/src/Common/MemoryWorker.h
@@ -30,6 +30,14 @@ struct ICgroupsReader
     virtual std::string dumpAllStats() = 0;
 };
 
+struct MemoryWorkerConfig
+{
+    uint64_t rss_update_period_ms = 0;
+    double purge_dirty_pages_threshold_ratio = 0.0;
+    double purge_total_memory_threshold_ratio = 0.0;
+    bool correct_tracker = false;
+    bool use_cgroup = true;
+};
 
 /// Correct MemoryTracker based on external information (e.g. Cgroups or stats.resident from jemalloc)
 /// The worker spawns a background thread which periodically reads current resident memory from the source,
@@ -38,7 +46,7 @@ struct ICgroupsReader
 class MemoryWorker
 {
 public:
-    MemoryWorker(uint64_t period_ms_, bool correct_tracker_, bool use_cgroup, std::shared_ptr<PageCache> page_cache_);
+    MemoryWorker(MemoryWorkerConfig config, std::shared_ptr<PageCache> page_cache_);
 
     enum class MemoryUsageSource : uint8_t
     {
@@ -53,21 +61,31 @@ class MemoryWorker
 
     ~MemoryWorker();
 private:
-    uint64_t getMemoryUsage();
+    uint64_t getMemoryUsage(bool log_error);
 
-    void backgroundThread();
+    void updateResidentMemoryThread();
+    [[maybe_unused]] void purgeDirtyPagesThread();
 
-    ThreadFromGlobalPool background_thread;
+    ThreadFromGlobalPool update_resident_memory_thread;
+    ThreadFromGlobalPool purge_dirty_pages_thread;
 
-    std::mutex mutex;
-    std::condition_variable cv;
+    std::mutex rss_update_mutex;
+    std::condition_variable rss_update_cv;
+    std::mutex purge_dirty_pages_mutex;
+    std::condition_variable purge_dirty_pages_cv;
     bool shutdown = false;
 
     LoggerPtr log;
 
-    uint64_t period_ms;
+    uint64_t rss_update_period_ms;
+
     bool correct_tracker = false;
 
+    std::atomic<bool> purge_dirty_pages = false;
+    double purge_total_memory_threshold_ratio;
+    double purge_dirty_pages_threshold_ratio;
+    uint64_t page_size = 0;
+
     MemoryUsageSource source{MemoryUsageSource::None};
 
     std::shared_ptr<ICgroupsReader> cgroups_reader;
@@ -77,9 +95,11 @@ class MemoryWorker
 #if USE_JEMALLOC
     JemallocMibCache<uint64_t> epoch_mib{"epoch"};
     JemallocMibCache<size_t> resident_mib{"stats.resident"};
+    JemallocMibCache<size_t> pagesize_mib{"arenas.page"};
 
 #define STRINGIFY_HELPER(x) #x
 #define STRINGIFY(x) STRINGIFY_HELPER(x)
+    JemallocMibCache<size_t> pdirty_mib{"stats.arenas." STRINGIFY(MALLCTL_ARENAS_ALL) ".pdirty"};
     JemallocMibCache<size_t> purge_mib{"arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge"};
 #undef STRINGIFY
 #undef STRINGIFY_HELPER
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 39c01296cf0e..d31e3eec9c36 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -28,6 +28,10 @@
     M(AsyncInsertBytes, "Data size in bytes of asynchronous INSERT queries.", ValueType::Bytes) \
     M(AsyncInsertRows, "Number of rows inserted by asynchronous INSERT queries.", ValueType::Number) \
     M(AsyncInsertCacheHits, "Number of times a duplicate hash id has been found in asynchronous INSERT hash id cache.", ValueType::Number) \
+    M(PartsExports, "Number of successful part exports.", ValueType::Number) \
+    M(PartsExportFailures, "Number of failed part exports.", ValueType::Number) \
+    M(PartsExportDuplicated, "Number of part exports that failed because target already exists.", ValueType::Number) \
+    M(PartsExportTotalMilliseconds, "Total time spent on part export operations.", ValueType::Milliseconds) \
     M(FailedQuery, "Number of failed queries.", ValueType::Number) \
     M(FailedSelectQuery, "Same as FailedQuery, but only for SELECT queries.", ValueType::Number) \
     M(FailedInsertQuery, "Same as FailedQuery, but only for INSERT queries.", ValueType::Number) \
@@ -87,6 +91,10 @@
     M(IcebergMetadataFilesCacheHits, "Number of times iceberg metadata files have been found in the cache.", ValueType::Number) \
     M(IcebergMetadataFilesCacheMisses, "Number of times iceberg metadata files have not been found in the iceberg metadata cache and had to be read from (remote) disk.", ValueType::Number) \
     M(IcebergMetadataFilesCacheWeightLost, "Approximate number of bytes evicted from the iceberg metadata cache.", ValueType::Number) \
+    M(IcebergMetadataReadWaitTimeMicroseconds, "Total time data readers spend waiting for iceberg metadata files to be read and parsed, summed across all reader threads.", ValueType::Microseconds) \
+    M(IcebergIteratorInitializationMicroseconds, "Total time spent on synchronous initialization of iceberg data iterators.", ValueType::Microseconds) \
+    M(IcebergMetadataUpdateMicroseconds, "Total time spent on synchronous initialization of iceberg data iterators.", ValueType::Microseconds) \
+    M(IcebergMetadataReturnedObjectInfos, "Total number of returned object infos from iceberg iterator.", ValueType::Number) \
     M(VectorSimilarityIndexCacheHits, "Number of times an index granule has been found in the vector index cache.", ValueType::Number) \
     M(VectorSimilarityIndexCacheMisses, "Number of times an index granule has not been found in the vector index cache and had to be read from disk.", ValueType::Number) \
     M(VectorSimilarityIndexCacheWeightLost, "Approximate number of bytes evicted from the vector index cache.", ValueType::Number) \
@@ -171,6 +179,8 @@
     M(MergesThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_merges_bandwidth_for_server' throttling.", ValueType::Microseconds) \
     M(MutationsThrottlerBytes, "Bytes passed through 'max_mutations_bandwidth_for_server' throttler.", ValueType::Bytes) \
     M(MutationsThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_mutations_bandwidth_for_server' throttling.", ValueType::Microseconds) \
+    M(ExportsThrottlerBytes, "Bytes passed through 'max_exports_bandwidth_for_server' throttler.", ValueType::Bytes) \
+    M(ExportsThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_exports_bandwidth_for_server' throttling.", ValueType::Microseconds) \
     M(QueryRemoteReadThrottlerBytes, "Bytes passed through 'max_remote_read_network_bandwidth' throttler.", ValueType::Bytes) \
     M(QueryRemoteReadThrottlerSleepMicroseconds, "Total time a query was sleeping to conform 'max_remote_read_network_bandwidth' throttling.", ValueType::Microseconds) \
     M(QueryRemoteWriteThrottlerBytes, "Bytes passed through 'max_remote_write_network_bandwidth' throttler.", ValueType::Bytes) \
@@ -293,6 +303,12 @@
     M(IcebergTrivialCountOptimizationApplied, "Trivial count optimization applied while reading from Iceberg", ValueType::Number) \
     M(IcebergVersionHintUsed, "Number of times version-hint.text has been used.", ValueType::Number) \
     M(IcebergMinMaxIndexPrunedFiles, "Number of skipped files by using MinMax index in Iceberg", ValueType::Number) \
+    M(IcebergAvroFileParsing, "Number of times avro metadata files have been parsed.", ValueType::Number) \
+    M(IcebergAvroFileParsingMicroseconds, "Time spent for parsing avro metadata files for Iceberg tables.", ValueType::Microseconds) \
+    M(IcebergJsonFileParsing, "Number of times json metadata files have been parsed.", ValueType::Number) \
+    M(IcebergJsonFileParsingMicroseconds, "Time spent for parsing json metadata files for Iceberg tables.", ValueType::Microseconds) \
+    M(IcebergIteratorNextMicroseconds, "Time spent for getting next objects in Iceberg iterator.", ValueType::Microseconds) \
+    \
     M(JoinBuildTableRowCount, "Total number of rows in the build table for a JOIN operation.", ValueType::Number) \
     M(JoinProbeTableRowCount, "Total number of rows in the probe table for a JOIN operation.", ValueType::Number) \
     M(JoinResultRowCount, "Total number of rows in the result of a JOIN operation.", ValueType::Number) \
@@ -375,6 +391,27 @@
     M(MergeTreeDataWriterBlocks, "Number of blocks INSERTed to MergeTree tables. Each block forms a data part of level zero.", ValueType::Number) \
     M(MergeTreeDataWriterBlocksAlreadySorted, "Number of blocks INSERTed to MergeTree tables that appeared to be already sorted.", ValueType::Number) \
     \
+    /* Per-executor background executor task timings */ \
+    M(MergeMutateBackgroundExecutorTaskExecuteStepMicroseconds, "Time spent in executeStep() for MergeMutate executor tasks.", ValueType::Microseconds) \
+    M(MergeMutateBackgroundExecutorTaskCancelMicroseconds, "Time spent in cancel() for MergeMutate executor tasks.", ValueType::Microseconds) \
+    M(MergeMutateBackgroundExecutorTaskResetMicroseconds, "Time spent resetting task for MergeMutate executor.", ValueType::Microseconds) \
+    M(MergeMutateBackgroundExecutorWaitMicroseconds, "Time spent waiting for completion in MergeMutate executor.", ValueType::Microseconds) \
+    \
+    M(MoveBackgroundExecutorTaskExecuteStepMicroseconds, "Time spent in executeStep() for Move executor tasks.", ValueType::Microseconds) \
+    M(MoveBackgroundExecutorTaskCancelMicroseconds, "Time spent in cancel() for Move executor tasks.", ValueType::Microseconds) \
+    M(MoveBackgroundExecutorTaskResetMicroseconds, "Time spent resetting task for Move executor.", ValueType::Microseconds) \
+    M(MoveBackgroundExecutorWaitMicroseconds, "Time spent waiting for completion in Move executor.", ValueType::Microseconds) \
+    \
+    M(FetchBackgroundExecutorTaskExecuteStepMicroseconds, "Time spent in executeStep() for Fetch executor tasks.", ValueType::Microseconds) \
+    M(FetchBackgroundExecutorTaskCancelMicroseconds, "Time spent in cancel() for Fetch executor tasks.", ValueType::Microseconds) \
+    M(FetchBackgroundExecutorTaskResetMicroseconds, "Time spent resetting task for Fetch executor.", ValueType::Microseconds) \
+    M(FetchBackgroundExecutorWaitMicroseconds, "Time spent waiting for completion in Fetch executor.", ValueType::Microseconds) \
+    \
+    M(CommonBackgroundExecutorTaskExecuteStepMicroseconds, "Time spent in executeStep() for Common executor tasks.", ValueType::Microseconds) \
+    M(CommonBackgroundExecutorTaskCancelMicroseconds, "Time spent in cancel() for Common executor tasks.", ValueType::Microseconds) \
+    M(CommonBackgroundExecutorTaskResetMicroseconds, "Time spent resetting task for Common executor.", ValueType::Microseconds) \
+    M(CommonBackgroundExecutorWaitMicroseconds, "Time spent waiting for completion in Common executor.", ValueType::Microseconds) \
+    \
     M(MergeTreeDataWriterSkipIndicesCalculationMicroseconds, "Time spent calculating skip indices", ValueType::Microseconds) \
     M(MergeTreeDataWriterStatisticsCalculationMicroseconds, "Time spent calculating statistics", ValueType::Microseconds) \
     M(MergeTreeDataWriterSortingBlocksMicroseconds, "Time spent sorting blocks", ValueType::Microseconds) \
@@ -560,17 +597,23 @@ The server successfully detected this situation and will download merged part fr
     M(DiskS3ReadRequestsErrors, "Number of non-throttling errors in GET and HEAD requests to DiskS3 storage.", ValueType::Number) \
     M(DiskS3ReadRequestsThrottling, "Number of 429 and 503 errors in GET and HEAD requests to DiskS3 storage.", ValueType::Number) \
     M(DiskS3ReadRequestsRedirects, "Number of redirects in GET and HEAD requests to DiskS3 storage.", ValueType::Number) \
+    M(DiskS3ReadRequestAttempts, "Number of attempts for GET and HEAD requests to DiskS3 storage, including the initial try and any retries, but excluding retries performed internally by the S3 retry strategy", ValueType::Number) \
+    M(DiskS3ReadRequestRetryableErrors, "Number of retryable errors for GET and HEAD requests to DiskS3 storage, excluding retries performed internally by the S3 retry strategy", ValueType::Number) \
     \
     M(DiskS3WriteMicroseconds, "Time of POST, DELETE, PUT and PATCH requests to DiskS3 storage.", ValueType::Microseconds) \
     M(DiskS3WriteRequestsCount, "Number of POST, DELETE, PUT and PATCH requests to DiskS3 storage.", ValueType::Number) \
     M(DiskS3WriteRequestsErrors, "Number of non-throttling errors in POST, DELETE, PUT and PATCH requests to DiskS3 storage.", ValueType::Number) \
     M(DiskS3WriteRequestsThrottling, "Number of 429 and 503 errors in POST, DELETE, PUT and PATCH requests to DiskS3 storage.", ValueType::Number) \
     M(DiskS3WriteRequestsRedirects, "Number of redirects in POST, DELETE, PUT and PATCH requests to DiskS3 storage.", ValueType::Number) \
+    M(DiskS3WriteRequestAttempts, "Number of attempts for POST, DELETE, PUT and PATCH requests to DiskS3 storage, including the initial try and any retries, but excluding retries performed internally by the retry strategy", ValueType::Number) \
+    M(DiskS3WriteRequestRetryableErrors, "Number of retryable errors for POST, DELETE, PUT and PATCH requests to DiskS3 storage, excluding retries performed internally by the retry strategy", ValueType::Number) \
     \
     M(S3DeleteObjects, "Number of S3 API DeleteObject(s) calls.", ValueType::Number) \
     M(S3CopyObject, "Number of S3 API CopyObject calls.", ValueType::Number) \
     M(S3ListObjects, "Number of S3 API ListObjects calls.", ValueType::Number) \
+    M(S3ListObjectsMicroseconds, "Time of S3 API ListObjects execution.", ValueType::Microseconds) \
     M(S3HeadObject,  "Number of S3 API HeadObject calls.", ValueType::Number) \
+    M(S3HeadObjectMicroseconds,  "Time of S3 API HeadObject execution.", ValueType::Microseconds) \
     M(S3GetObjectAttributes, "Number of S3 API GetObjectAttributes calls.", ValueType::Number) \
     M(S3CreateMultipartUpload, "Number of S3 API CreateMultipartUpload calls.", ValueType::Number) \
     M(S3UploadPartCopy, "Number of S3 API UploadPartCopy calls.", ValueType::Number) \
@@ -624,6 +667,7 @@ The server successfully detected this situation and will download merged part fr
     M(AzureCopyObject, "Number of Azure blob storage API CopyObject calls", ValueType::Number) \
     M(AzureDeleteObjects, "Number of Azure blob storage API DeleteObject(s) calls.", ValueType::Number) \
     M(AzureListObjects, "Number of Azure blob storage API ListObjects calls.", ValueType::Number) \
+    M(AzureListObjectsMicroseconds, "Time of Azure blob storage API ListObjects execution.", ValueType::Microseconds) \
     M(AzureGetProperties, "Number of Azure blob storage API GetProperties calls.", ValueType::Number) \
     M(AzureCreateContainer, "Number of Azure blob storage API CreateContainer calls.", ValueType::Number) \
     \
@@ -664,13 +708,17 @@ The server successfully detected this situation and will download merged part fr
     M(FilesystemCacheEvictionSkippedFileSegments, "Number of file segments skipped for eviction because of being in unreleasable state", ValueType::Number) \
     M(FilesystemCacheEvictionSkippedEvictingFileSegments, "Number of file segments skipped for eviction because of being in evicting state", ValueType::Number) \
     M(FilesystemCacheEvictionTries, "Number of filesystem cache eviction attempts", ValueType::Number) \
+    M(FilesystemCacheEvictionReusedIterator, "Number of filesystem cache iterator reusing", ValueType::Number) \
     M(FilesystemCacheLockKeyMicroseconds, "Lock cache key time", ValueType::Microseconds) \
     M(FilesystemCacheLockMetadataMicroseconds, "Lock filesystem cache metadata time", ValueType::Microseconds) \
     M(FilesystemCacheLockCacheMicroseconds, "Lock filesystem cache time", ValueType::Microseconds) \
     M(FilesystemCacheReserveMicroseconds, "Filesystem cache space reservation time", ValueType::Microseconds) \
+    M(FilesystemCacheReserveAttempts, "Filesystem cache space reservation attempt", ValueType::Number) \
     M(FilesystemCacheEvictMicroseconds, "Filesystem cache eviction time", ValueType::Microseconds) \
     M(FilesystemCacheGetOrSetMicroseconds, "Filesystem cache getOrSet() time", ValueType::Microseconds) \
     M(FilesystemCacheGetMicroseconds, "Filesystem cache get() time", ValueType::Microseconds) \
+    M(FilesystemCacheBackgroundEvictedFileSegments, "Number of file segments evicted by background thread", ValueType::Number) \
+    M(FilesystemCacheBackgroundEvictedBytes, "Number of bytes evicted by background thread", ValueType::Number) \
     M(FileSegmentWaitMicroseconds, "Wait on DOWNLOADING state", ValueType::Microseconds) \
     M(FileSegmentCompleteMicroseconds, "Duration of FileSegment::complete() in filesystem cache", ValueType::Microseconds) \
     M(FileSegmentLockMicroseconds, "Lock file segment time", ValueType::Microseconds) \
@@ -1100,7 +1148,7 @@ The server successfully detected this situation and will download merged part fr
     M(MemoryWorkerRun, "Number of runs done by MemoryWorker in background", ValueType::Number) \
     M(MemoryWorkerRunElapsedMicroseconds, "Total time spent by MemoryWorker for background work", ValueType::Microseconds) \
     \
-    M(ParquetFetchWaitTimeMicroseconds, "Time of waiting fetching parquet data", ValueType::Microseconds) \
+    M(ParquetFetchWaitTimeMicroseconds, "Time of waiting for parquet file reads from decoding threads (not prefetching threads)", ValueType::Microseconds) \
     M(ParquetReadRowGroups, "The total number of row groups read from parquet data", ValueType::Number) \
     M(ParquetPrunedRowGroups, "The total number of row groups pruned from parquet data", ValueType::Number) \
     M(ParquetDecodingTasks, "Tasks issued by parquet reader", ValueType::Number) \
@@ -1131,7 +1179,17 @@ The server successfully detected this situation and will download merged part fr
     M(AsyncLoggingErrorFileLogDroppedMessages, "How many messages have been dropped from error file log due to the async log queue being full", ValueType::Number) \
     M(AsyncLoggingSyslogDroppedMessages, "How many messages have been dropped from the syslog due to the async log queue being full", ValueType::Number) \
     M(AsyncLoggingTextLogDroppedMessages, "How many messages have been dropped from text_log due to the async log queue being full", ValueType::Number) \
-
+    M(ObjectStorageListObjectsCacheHits, "Number of times object storage list objects operation hit the cache.", ValueType::Number) \
+    M(ObjectStorageListObjectsCacheMisses, "Number of times object storage list objects operation miss the cache.", ValueType::Number)                                                                                                                                                                                                                                  \
+    M(ObjectStorageListObjectsCacheExactMatchHits, "Number of times object storage list objects operation hit the cache with an exact match.", ValueType::Number) \
+    M(ObjectStorageListObjectsCachePrefixMatchHits, "Number of times object storage list objects operation miss the cache using prefix matching.", ValueType::Number) \
+    M(ParquetMetaDataCacheHits, "Number of times the read from filesystem cache hit the cache.", ValueType::Number) \
+    M(ParquetMetaDataCacheMisses, "Number of times the read from filesystem cache miss the cache.", ValueType::Number) \
+    \
+    M(ObjectStorageClusterSentToMatchedReplica, "Number of tasks in ObjectStorageCluster request sent to matched replica.", ValueType::Number) \
+    M(ObjectStorageClusterSentToNonMatchedReplica, "Number of tasks in ObjectStorageCluster request sent to non-matched replica.", ValueType::Number) \
+    M(ObjectStorageClusterProcessedTasks, "Number of processed tasks in ObjectStorageCluster request.", ValueType::Number) \
+    M(ObjectStorageClusterWaitingMicroseconds, "Time of waiting for tasks in ObjectStorageCluster request.", ValueType::Microseconds) \
 
 #ifdef APPLY_FOR_EXTERNAL_EVENTS
     #define APPLY_FOR_EVENTS(M) APPLY_FOR_BUILTIN_EVENTS(M) APPLY_FOR_EXTERNAL_EVENTS(M)
diff --git a/src/Common/SSHWrapper.cpp b/src/Common/SSHWrapper.cpp
index a7933f260327..36457d28ac8f 100644
--- a/src/Common/SSHWrapper.cpp
+++ b/src/Common/SSHWrapper.cpp
@@ -21,36 +21,14 @@ namespace ErrorCodes
 
 namespace
 {
-
-class SSHString
+struct SSHStringDeleter
 {
-public:
-    explicit SSHString(std::string_view input)
-    {
-        if (string = ssh_string_new(input.size()); string == nullptr)
-            throw Exception(ErrorCodes::LIBSSH_ERROR, "Can't create SSHString");
-        if (int rc = ssh_string_fill(string, input.data(), input.size()); rc != SSH_OK)
-            throw Exception(ErrorCodes::LIBSSH_ERROR, "Can't create SSHString");
-    }
-
-    explicit SSHString(ssh_string other) { string = other; }
-
-    ssh_string get() { return string; }
-
-    String toString()
-    {
-        return {ssh_string_get_char(string), ssh_string_len(string)};
-    }
-
-    ~SSHString()
-    {
-        ssh_string_free(string);
-    }
-
-private:
-    ssh_string string;
+    void operator()(char * ptr) const { ssh_string_free_char(ptr); }
+};
+struct CStringDeleter
+{
+    void operator()(char * ptr) const { std::free(ptr); }
 };
-
 }
 
 SSHKey SSHKeyFactory::makePrivateKeyFromFile(String filename, String passphrase)
@@ -119,20 +97,31 @@ bool SSHKey::isEqual(const SSHKey & other) const
 
 String SSHKey::signString(std::string_view input) const
 {
-    SSHString input_str(input);
-    ssh_string output = nullptr;
-    if (int rc = pki_sign_string(key, input_str.get(), &output); rc != SSH_OK)
-        throw Exception(ErrorCodes::LIBSSH_ERROR, "Error singing with ssh key");
-    SSHString output_str(output);
-    return output_str.toString();
+    char * signature = nullptr;
+    if (int rc = sshsig_sign(input.data(), input.size(), key, nullptr, "clickhouse", SSHSIG_DIGEST_SHA2_256, &signature); rc != SSH_OK)
+        throw Exception(ErrorCodes::LIBSSH_ERROR, "Error signing with ssh key");
+    std::unique_ptr<char, SSHStringDeleter> sig_ptr(signature);
+    return String(sig_ptr.get());
 }
 
 bool SSHKey::verifySignature(std::string_view signature, std::string_view original) const
 {
-    SSHString sig(signature);
-    SSHString orig(original);
-    int rc = pki_verify_string(key, sig.get(), orig.get());
-    return rc == SSH_OK;
+    ssh_key verify_key = nullptr;
+    String sig_str(signature);
+    int rc = sshsig_verify(original.data(), original.size(), sig_str.c_str(), "clickhouse", &verify_key);
+    if (rc != SSH_OK)
+    {
+        if (verify_key != nullptr)
+            ssh_key_free(verify_key);
+        return false;
+    }
+    bool keys_match = false;
+    if (verify_key != nullptr)
+    {
+        keys_match = (ssh_key_cmp(key, verify_key, SSH_KEY_CMP_PUBLIC) == 0);
+        ssh_key_free(verify_key);
+    }
+    return keys_match;
 }
 
 bool SSHKey::isPrivate() const
@@ -145,14 +134,6 @@ bool SSHKey::isPublic() const
     return ssh_key_is_public(key);
 }
 
-namespace
-{
-    struct CStringDeleter
-    {
-        void operator()(char * ptr) const { std::free(ptr); }
-    };
-}
-
 String SSHKey::getBase64() const
 {
     char * buf = nullptr;
diff --git a/src/Common/Scheduler/CPULeaseAllocation.cpp b/src/Common/Scheduler/CPULeaseAllocation.cpp
index e122f1b84c25..4fab4be028b8 100644
--- a/src/Common/Scheduler/CPULeaseAllocation.cpp
+++ b/src/Common/Scheduler/CPULeaseAllocation.cpp
@@ -207,11 +207,29 @@ CPULeaseAllocation::CPULeaseAllocation(SlotCount max_threads_, ResourceLink mast
 }
 
 CPULeaseAllocation::~CPULeaseAllocation()
+{
+    free();
+}
+
+void CPULeaseAllocation::free()
 {
     std::unique_lock lock{mutex};
+
+    if (shutdown)
+        return;
+
     shutdown = true;
     acquirable.store(false, std::memory_order_relaxed);
 
+    // Wake up all preempted threads
+    while (true)
+    {
+        if (size_t thread_num = threads.preempted.find_first(); thread_num != boost::dynamic_bitset<>::npos)
+            resetPreempted(thread_num);
+        else
+            break; // No preempted threads, we are done
+    }
+
     // Properly cancel pending resource request (if any)
     requests.cancel(lock);
 
@@ -433,6 +451,7 @@ bool CPULeaseAllocation::renew(Lease & lease)
     }
 
     std::unique_lock lock{mutex};
+
     if (exception)
         throw Exception(ErrorCodes::RESOURCE_ACCESS_DENIED, "CPU Resource request failed: {}", getExceptionMessage(exception, /* with_stacktrace = */ false));
 
@@ -440,6 +459,13 @@ bool CPULeaseAllocation::renew(Lease & lease)
 
     report_span.reset();
 
+    if (shutdown) // Allocation is being destroyed, worker thread should stop
+    {
+        downscale(lease.slot_id);
+        lease.reset();
+        return false;
+    }
+
     // Check if we need to decrease number of running threads (i.e. `acquired`).
     // We want number of `acquired` slots to be less than number of `allocated` slots.
     // Difference `allocated - acquired` equals `granted`. But we allow `granted == -1` for two reasons:
@@ -477,14 +503,17 @@ bool CPULeaseAllocation::renew(Lease & lease)
             CurrentMetrics::Increment preempted_increment(CurrentMetrics::ConcurrencyControlPreempted);
             acquired_increment.sub(1);
 
-            if (!waitForGrant(lock, thread_num))
+            if (!waitForGrant(lock, thread_num) || shutdown)
             {
-                // Timeout - worker thread should stop, but query continues
+                // Timeout or exception or shutdown - worker thread should stop
                 downscale(thread_num);
                 lease.reset();
                 return false;
             }
 
+            if (settings.on_resume)
+                settings.on_resume(thread_num);
+
             if (exception) // Stop the query
                 throw Exception(ErrorCodes::RESOURCE_ACCESS_DENIED, "CPU Resource request failed: {}", getExceptionMessage(exception, /* with_stacktrace = */ false));
 
@@ -503,9 +532,26 @@ bool CPULeaseAllocation::waitForGrant(std::unique_lock<std::mutex> & lock, size_
 
     auto predicate = [this, thread_num]
     {
-        return !threads.preempted[thread_num] || exception;
+        return !threads.preempted[thread_num] || exception || shutdown;
     };
 
+    // It is important to call on_preempt w/o lock to avoid deadlock due to recursive locking:
+    // renew() -> ExecutorTasks::preempt() -> ExecutorTasks::finish() -> free()
+    if (settings.on_preempt)
+    {
+        lock.unlock();
+        try
+        {
+            settings.on_preempt(thread_num);
+        }
+        catch (...)
+        {
+            lock.lock();
+            throw;
+        }
+        lock.lock();
+    }
+
     if (timeout == std::chrono::milliseconds::max())
     {
         threads.wake[thread_num].wait(lock, predicate);
diff --git a/src/Common/Scheduler/CPULeaseAllocation.h b/src/Common/Scheduler/CPULeaseAllocation.h
index 5402cbab89ad..687b5709f724 100644
--- a/src/Common/Scheduler/CPULeaseAllocation.h
+++ b/src/Common/Scheduler/CPULeaseAllocation.h
@@ -15,6 +15,7 @@
 #include <condition_variable>
 #include <mutex>
 #include <chrono>
+#include <functional>
 
 namespace DB
 {
@@ -34,6 +35,12 @@ struct CPULeaseSettings
     /// Timeout after which preempted thread should exit
     std::chrono::milliseconds preemption_timeout = default_preemption_timeout;
 
+    /// Callback to be invoked when a thread is preempted
+    std::function<void(size_t slot_id)> on_preempt;
+
+    /// Callback to be invoked when a thread is resumed
+    std::function<void(size_t slot_id)> on_resume;
+
     /// For debugging purposes, not used in production
     String workload;
 
@@ -149,6 +156,9 @@ class CPULeaseAllocation final : public ISlotAllocation
         CPULeaseSettings settings = {});
     ~CPULeaseAllocation() override;
 
+    /// Free all resources held by this allocation.
+    void free() override;
+
     /// Take one already granted slot if available. Never blocks or waits for slots.
     /// Should be used before spawning worker threads for a query.
     [[nodiscard]] AcquiredSlotPtr tryAcquire() override;
diff --git a/src/Common/Scheduler/IResourceManager.h b/src/Common/Scheduler/IResourceManager.h
index 5cca911cdbb6..4b5537f73f00 100644
--- a/src/Common/Scheduler/IResourceManager.h
+++ b/src/Common/Scheduler/IResourceManager.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Common/Scheduler/ResourceLink.h>
+#include <Common/Scheduler/WorkloadSettings.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -37,6 +38,8 @@ class IClassifier : private boost::noncopyable
     /// Returns ResourceLink that should be used to access resource.
     /// Returned link is valid until classifier destruction.
     virtual ResourceLink get(const String & resource_name) = 0;
+    /// Returns settings that should be used to limit workload on given resource.
+    virtual WorkloadSettings getWorkloadSettings(const String & resource_name) const = 0;
 };
 
 using ClassifierPtr = std::shared_ptr<IClassifier>;
diff --git a/src/Common/Scheduler/Nodes/CustomResourceManager.cpp b/src/Common/Scheduler/Nodes/CustomResourceManager.cpp
index 244a83374f8b..33f5d43de9e6 100644
--- a/src/Common/Scheduler/Nodes/CustomResourceManager.cpp
+++ b/src/Common/Scheduler/Nodes/CustomResourceManager.cpp
@@ -177,6 +177,12 @@ ResourceLink CustomResourceManager::Classifier::get(const String & resource_name
         return ResourceLink{}; // unlimited access
 }
 
+WorkloadSettings CustomResourceManager::Classifier::getWorkloadSettings(const String & resource_name) const
+{
+    UNUSED(resource_name);
+    return {};
+}
+
 CustomResourceManager::CustomResourceManager()
     : state(new State())
 {
diff --git a/src/Common/Scheduler/Nodes/CustomResourceManager.h b/src/Common/Scheduler/Nodes/CustomResourceManager.h
index e7559aaa77f5..a232aa32c60d 100644
--- a/src/Common/Scheduler/Nodes/CustomResourceManager.h
+++ b/src/Common/Scheduler/Nodes/CustomResourceManager.h
@@ -84,6 +84,7 @@ class CustomResourceManager : public IResourceManager
         Classifier(const ClassifierSettings & settings_, const StatePtr & state_, const String & classifier_name);
         bool has(const String & resource_name) override;
         ResourceLink get(const String & resource_name) override;
+        WorkloadSettings getWorkloadSettings(const String & resource_name) const override;
     private:
         const ClassifierSettings settings;
         std::unordered_map<String, ResourceLink> resources; // accessible resources by names
diff --git a/src/Common/Scheduler/Nodes/WorkloadResourceManager.cpp b/src/Common/Scheduler/Nodes/WorkloadResourceManager.cpp
index 986125503ef8..43aa4bb8720f 100644
--- a/src/Common/Scheduler/Nodes/WorkloadResourceManager.cpp
+++ b/src/Common/Scheduler/Nodes/WorkloadResourceManager.cpp
@@ -423,11 +423,32 @@ ResourceLink WorkloadResourceManager::Classifier::get(const String & resource_na
     }
 }
 
-void WorkloadResourceManager::Classifier::attach(const ResourcePtr & resource, const VersionPtr & version, ResourceLink link)
+WorkloadSettings WorkloadResourceManager::Classifier::getWorkloadSettings(const String & resource_name) const
+{
+    std::unique_lock lock{mutex};
+    auto iter = attachments.find(resource_name);
+    if (iter != attachments.end())
+    {
+        // Extract settings from the attached resource
+        return iter->second.settings;
+    }
+    return {};
+}
+
+void WorkloadResourceManager::Classifier::attach(const ResourcePtr & resource, const VersionPtr & version, UnifiedSchedulerNode * node)
 {
     std::unique_lock lock{mutex};
     chassert(!attachments.contains(resource->getName()));
-    attachments[resource->getName()] = Attachment{.resource = resource, .version = version, .link = link};
+    ResourceLink link;
+    WorkloadSettings wl_settings{};
+    if (node)
+    {
+        auto queue = node->getQueue();
+        if (queue)
+            link = ResourceLink{.queue = queue.get()};
+        wl_settings = node->getSettings();
+    }
+    attachments[resource->getName()] = Attachment{.resource = resource, .version = version, .link = link, .settings = wl_settings};
 }
 
 void WorkloadResourceManager::Resource::updateResource(const ASTPtr & new_resource_entity)
@@ -447,11 +468,12 @@ std::future<void> WorkloadResourceManager::Resource::attachClassifier(Classifier
         {
             if (auto iter = node_for_workload.find(workload_name); iter != node_for_workload.end())
             {
+                auto nodePtr = iter->second;
                 auto queue = iter->second->getQueue();
                 if (!queue)
                     throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Unable to use workload '{}' that have children for resource '{}'",
                         workload_name, resource_name);
-                classifier.attach(shared_from_this(), current_version, ResourceLink{.queue = queue.get()});
+                classifier.attach(shared_from_this(), current_version, nodePtr.get());
             }
             else
             {
diff --git a/src/Common/Scheduler/Nodes/WorkloadResourceManager.h b/src/Common/Scheduler/Nodes/WorkloadResourceManager.h
index def320eb37af..aea9d435c896 100644
--- a/src/Common/Scheduler/Nodes/WorkloadResourceManager.h
+++ b/src/Common/Scheduler/Nodes/WorkloadResourceManager.h
@@ -241,21 +241,23 @@ class WorkloadResourceManager : public IResourceManager
         /// NOTE: It is called from query threads (possibly multiple)
         bool has(const String & resource_name) override;
         ResourceLink get(const String & resource_name) override;
+        WorkloadSettings getWorkloadSettings(const String & resource_name) const override;
 
         /// Attaches/detaches a specific resource
         /// NOTE: It is called from scheduler threads (possibly multiple)
-        void attach(const ResourcePtr & resource, const VersionPtr & version, ResourceLink link);
+        void attach(const ResourcePtr & resource, const VersionPtr & version, UnifiedSchedulerNode * node);
         void detach(const ResourcePtr & resource);
 
     private:
         const ClassifierSettings settings;
         WorkloadResourceManager * resource_manager;
-        std::mutex mutex;
+        mutable std::mutex mutex;
         struct Attachment
         {
             ResourcePtr resource;
             VersionPtr version;
             ResourceLink link;
+            WorkloadSettings settings;
         };
         std::unordered_map<String, Attachment> attachments; // TSA_GUARDED_BY(mutex);
     };
diff --git a/src/Common/Scheduler/Nodes/tests/gtest_workload_resource_manager.cpp b/src/Common/Scheduler/Nodes/tests/gtest_workload_resource_manager.cpp
index e4d6164d34d5..3b3969340fe6 100644
--- a/src/Common/Scheduler/Nodes/tests/gtest_workload_resource_manager.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_workload_resource_manager.cpp
@@ -18,6 +18,7 @@
 #include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 #include <Common/Scheduler/Workload/WorkloadEntityStorageBase.h>
 #include <Common/Scheduler/Nodes/WorkloadResourceManager.h>
+#include <Common/getNumberOfCPUCoresToUse.h>
 
 #include <base/scope_guard.h>
 
@@ -1268,6 +1269,23 @@ TEST(SchedulerWorkloadResourceManager, CPUSchedulingIndependentPools)
     t.wait();
 }
 
+TEST(SchedulerWorkloadResourceManager, MaxCPUsDerivedFromShare)
+{
+    ResourceTest t;
+
+    t.query("CREATE RESOURCE cpu (MASTER THREAD, WORKER THREAD)");
+    // Only max_cpu_share is set, max_cpus is unset
+    t.query("CREATE WORKLOAD all SETTINGS max_cpu_share = 0.5");
+    ClassifierPtr c = t.manager->acquire("all");
+
+    // The expected hard cap is max_cpu_share * getNumberOfCPUCoresToUse()
+    WorkloadSettings settings = c->getWorkloadSettings("cpu");
+    double expected_cap = 0.5 * getNumberOfCPUCoresToUse();
+    double actual_cap = settings.max_cpus;
+
+    EXPECT_DOUBLE_EQ(actual_cap, expected_cap);
+}
+
 auto getAcquired()
 {
     return CurrentMetrics::get(CurrentMetrics::ConcurrencyControlAcquired);
diff --git a/src/Common/Scheduler/SchedulerRoot.h b/src/Common/Scheduler/SchedulerRoot.h
index 7650780dc597..93b7e1a5082c 100644
--- a/src/Common/Scheduler/SchedulerRoot.h
+++ b/src/Common/Scheduler/SchedulerRoot.h
@@ -250,9 +250,11 @@ class SchedulerRoot final : public ISchedulerNode
     }
 
     Resource * current = nullptr; // round-robin pointer
-    std::unordered_map<ISchedulerNode *, Resource> children; // resources by pointer
     std::atomic<bool> stop_flag = false;
     EventQueue events;
+    /// Resources by pointer. Must be destroyed before the "events",
+    /// because the descructor of ISchedulerNode might access the mutex in that queue.
+    std::unordered_map<ISchedulerNode *, Resource> children;
     ThreadFromGlobalPool scheduler;
 };
 
diff --git a/src/Common/Scheduler/WorkloadSettings.cpp b/src/Common/Scheduler/WorkloadSettings.cpp
index f5b9d98786d6..bba7975f078c 100644
--- a/src/Common/Scheduler/WorkloadSettings.cpp
+++ b/src/Common/Scheduler/WorkloadSettings.cpp
@@ -232,7 +232,7 @@ void WorkloadSettings::initFromChanges(CostUnit unit_, const ASTCreateWorkloadQu
         if (share_limit > 0)
         {
             Float64 value = share_limit * getNumberOfCPUCoresToUse();
-            if (value > 0 && value < limit)
+            if (value > 0 && (limit == 0 || value < limit))
                 limit = value;
         }
         max_cpus = limit;
diff --git a/src/Common/Scheduler/createResourceManager.cpp b/src/Common/Scheduler/createResourceManager.cpp
index c5a430024b6d..500aed901f80 100644
--- a/src/Common/Scheduler/createResourceManager.cpp
+++ b/src/Common/Scheduler/createResourceManager.cpp
@@ -55,6 +55,16 @@ class ResourceManagerDispatcher : public IResourceManager
                 return ResourceLink{};
         }
 
+        WorkloadSettings getWorkloadSettings(const String & resource_name) const override
+        {
+            for (const auto & classifier : classifiers)
+            {
+                if (classifier->has(resource_name))
+                    return classifier->getWorkloadSettings(resource_name);
+            }
+            return {};
+        }
+
     private:
         const ClassifierSettings settings;
         std::vector<ClassifierPtr> classifiers; // should be constant after initialization to avoid races
diff --git a/src/Common/SensitiveDataMasker.cpp b/src/Common/SensitiveDataMasker.cpp
index 66bb556076ea..aa3c8eb6537a 100644
--- a/src/Common/SensitiveDataMasker.cpp
+++ b/src/Common/SensitiveDataMasker.cpp
@@ -216,12 +216,13 @@ size_t SensitiveDataMasker::rulesCount() const
 }
 
 
-std::string wipeSensitiveDataAndCutToLength(std::string str, size_t max_length)
+std::string wipeSensitiveDataAndCutToLength(std::string str, size_t max_length, bool wipe_sensitive)
 {
     std::string res = std::move(str);
 
-    if (auto masker = SensitiveDataMasker::getInstance())
-        masker->wipeSensitiveData(res);
+    if (wipe_sensitive)
+        if (auto masker = SensitiveDataMasker::getInstance())
+            masker->wipeSensitiveData(res);
 
     size_t length = res.length();
     if (max_length && (length > max_length))
diff --git a/src/Common/SensitiveDataMasker.h b/src/Common/SensitiveDataMasker.h
index 79b4940e48d2..707dbf7fa835 100644
--- a/src/Common/SensitiveDataMasker.h
+++ b/src/Common/SensitiveDataMasker.h
@@ -77,6 +77,6 @@ class SensitiveDataMasker
 
 /// Wipes sensitive data and cuts to a specified maximum length in one function call.
 /// If the maximum length is zero then the function doesn't cut to the maximum length.
-std::string wipeSensitiveDataAndCutToLength(std::string str, size_t max_length);
+std::string wipeSensitiveDataAndCutToLength(std::string str, size_t max_length, bool wipe_sensitive);
 
 }
diff --git a/src/Common/SignalHandlers.cpp b/src/Common/SignalHandlers.cpp
index 66e1b20465b5..6daad010010c 100644
--- a/src/Common/SignalHandlers.cpp
+++ b/src/Common/SignalHandlers.cpp
@@ -525,16 +525,16 @@ try
     }
 
     /// Advice the user to send it manually.
-    if (std::string_view(VERSION_OFFICIAL).contains("official build"))
+    if (std::string_view(VERSION_OFFICIAL).contains("altinity build"))
     {
         /// Approximate support period, upper bound.
         if (time(nullptr) - makeDate(DateLUT::instance(), 2000 + VERSION_MAJOR, VERSION_MINOR, 1) < (365 + 30) * 86400)
         {
-            LOG_FATAL(log, "Report this error to https://github.com/ClickHouse/ClickHouse/issues");
+            LOG_FATAL(log, "Report this error to https://github.com/Altinity/ClickHouse/issues");
         }
         else
         {
-            LOG_FATAL(log, "ClickHouse version {} is old and should be upgraded to the latest version.", VERSION_STRING);
+            // LOG_FATAL(log, "ClickHouse version {} is old and should be upgraded to the latest version.", VERSION_STRING);
         }
     }
 
diff --git a/src/Common/SystemLogBase.cpp b/src/Common/SystemLogBase.cpp
index dd66f399f62f..610451ad01c7 100644
--- a/src/Common/SystemLogBase.cpp
+++ b/src/Common/SystemLogBase.cpp
@@ -14,6 +14,7 @@
 #include <Interpreters/TraceLog.h>
 #include <Interpreters/FilesystemCacheLog.h>
 #include <Interpreters/ObjectStorageQueueLog.h>
+#include <Interpreters/IcebergMetadataLog.h>
 #if CLICKHOUSE_CLOUD
 #include <Interpreters/DistributedCacheLog.h>
 #include <Interpreters/DistributedCacheServerLog.h>
@@ -29,6 +30,7 @@
 #include <Interpreters/DeadLetterQueue.h>
 #include <IO/S3/BlobStorageLogWriter.h>
 
+#include <Common/MemoryTrackerDebugBlockerInThread.h>
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/SystemLogBase.h>
 #include <Common/ThreadPool.h>
@@ -64,7 +66,7 @@ SystemLogQueue<LogElement>::SystemLogQueue(const SystemLogQueueSettings & settin
 static thread_local bool recursive_push_call = false;
 
 template <typename LogElement>
-void SystemLogQueue<LogElement>::push(LogElement&& element)
+void SystemLogQueue<LogElement>::push(LogElement && element)
 {
     /// It is possible that the method will be called recursively.
     /// Better to drop these events to avoid complications.
@@ -73,10 +75,11 @@ void SystemLogQueue<LogElement>::push(LogElement&& element)
     recursive_push_call = true;
     SCOPE_EXIT({ recursive_push_call = false; });
 
-    /// Memory can be allocated while resizing on queue.push_back.
-    /// The size of allocation can be in order of a few megabytes.
-    /// But this should not be accounted for query memory usage.
-    /// Otherwise the tests like 01017_uniqCombined_memory_usage.sql will be flaky.
+
+    /// Queue resize can allocate memory
+    /// - MemoryTrackerDebugBlockerInThread here due to the allocation can hit the limit for MemoryAllocatedWithoutCheck, let's suppress it.
+    /// - MemoryTrackerBlockerInThread here because this allocation should not be take into account in the query scope (since it will be freed outside of it)
+    [[maybe_unused]] MemoryTrackerDebugBlockerInThread blocker;
     MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
 
     /// Should not log messages under mutex.
@@ -125,7 +128,7 @@ void SystemLogQueue<LogElement>::handleCrash()
 {
     if (settings.notify_flush_on_crash)
     {
-        notifyFlush(getLastLogIndex(), /* should_prepare_tables_anyway */ true);
+        waitFlush(getLastLogIndex(),  /* should_prepare_tables_anyway */ true);
     }
 }
 
@@ -307,6 +310,8 @@ void SystemLogBase<LogElement>::stopFlushThread()
 template <typename LogElement>
 void SystemLogBase<LogElement>::add(LogElement element)
 {
+    /// This allocation should not be take into account in the query scope (since it will be freed outside of it)
+    MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
     queue->push(std::move(element));
 }
 
diff --git a/src/Common/SystemLogBase.h b/src/Common/SystemLogBase.h
index 977f9308b3fb..abe0e8c242ab 100644
--- a/src/Common/SystemLogBase.h
+++ b/src/Common/SystemLogBase.h
@@ -34,6 +34,7 @@
     M(QueryMetricLogElement) \
     M(DeadLetterQueueElement) \
     M(ZooKeeperConnectionLogElement) \
+    M(IcebergMetadataLogElement) \
 
 #define SYSTEM_LOG_ELEMENTS_CLOUD(M) \
     M(DistributedCacheLogElement) \
diff --git a/src/Common/TTLCachePolicy.h b/src/Common/TTLCachePolicy.h
index 79e34dc2ebd5..140dcc59f1b8 100644
--- a/src/Common/TTLCachePolicy.h
+++ b/src/Common/TTLCachePolicy.h
@@ -271,10 +271,10 @@ class TTLCachePolicy : public ICachePolicy<Key, Mapped, HashFunction, WeightFunc
         return res;
     }
 
-private:
+protected:
     using Cache = std::unordered_map<Key, MappedPtr, HashFunction>;
     Cache cache;
-
+private:
     /// TODO To speed up removal of stale entries, we could also add another container sorted on expiry times which maps keys to iterators
     /// into the cache. To insert an entry, add it to the cache + add the iterator to the sorted container. To remove stale entries, do a
     /// binary search on the sorted container and erase all left of the found key.
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 9807f8c6ad07..66162ecd536e 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -117,16 +117,18 @@ class ThreadGroup
     /// When new query starts, new thread group is created for it, current thread becomes master thread of the query
     static ThreadGroupPtr createForQuery(ContextPtr query_context_, FatalErrorCallback fatal_error_callback_ = {});
 
-    static ThreadGroupPtr createForBackgroundProcess(ContextPtr storage_context);
+    /// NOTE: The caller should call background_memory_tracker.adjustOnBackgroundTaskEnd() at the end (see existing callers),
+    /// and make sure that you are the only user of this shared_ptr (usually it is managed via ThreadGroupSwitcher)
+    static ThreadGroupPtr createForMergeMutate(ContextPtr storage_context);
 
-    static ThreadGroupPtr createForMaterializedView();
+    static ThreadGroupPtr createForMaterializedView(ContextPtr context);
 
     std::vector<UInt64> getInvolvedThreadIds() const;
     size_t getPeakThreadsUsage() const;
-    UInt64 getThreadsTotalElapsedMs() const;
+    UInt64 getGroupElapsedMs() const;
 
     void linkThread(UInt64 thread_id);
-    void unlinkThread(UInt64 elapsed_thread_counter_ms);
+    void unlinkThread();
 
 private:
     mutable std::mutex mutex;
@@ -143,7 +145,10 @@ class ThreadGroup
     /// Peak threads count in the group
     size_t peak_threads_usage TSA_GUARDED_BY(mutex) = 0;
 
-    UInt64 elapsed_total_threads_counter_ms TSA_GUARDED_BY(mutex) = 0;
+    Stopwatch effective_group_stopwatch TSA_GUARDED_BY(mutex) = Stopwatch(STOPWATCH_DEFAULT_CLOCK, 0, /* is running */ false);
+    UInt64 elapsed_group_ms TSA_GUARDED_BY(mutex) = 0;
+
+    static ThreadGroupPtr create(ContextPtr context);
 };
 
 /**
diff --git a/src/Common/ZooKeeper/Types.h b/src/Common/ZooKeeper/Types.h
index c17a39ed672b..2f833d076a86 100644
--- a/src/Common/ZooKeeper/Types.h
+++ b/src/Common/ZooKeeper/Types.h
@@ -30,7 +30,6 @@ using AsyncResponses = std::vector<std::pair<std::string, std::future<R>>>;
 
 Coordination::RequestPtr makeCreateRequest(const std::string & path, const std::string & data, int create_mode, bool ignore_if_exists = false);
 Coordination::RequestPtr makeRemoveRequest(const std::string & path, int version);
-Coordination::RequestPtr makeRemoveRecursiveRequest(const std::string & path, uint32_t remove_nodes_limit);
 Coordination::RequestPtr makeSetRequest(const std::string & path, const std::string & data, int version);
 Coordination::RequestPtr makeCheckRequest(const std::string & path, int version);
 Coordination::RequestPtr makeGetRequest(const std::string & path, Coordination::WatchCallbackPtr watch = nullptr);
@@ -38,4 +37,7 @@ Coordination::RequestPtr makeListRequest(const std::string & path, Coordination:
 Coordination::RequestPtr makeSimpleListRequest(const std::string & path, Coordination::WatchCallbackPtr watch = nullptr);
 Coordination::RequestPtr makeExistsRequest(const std::string & path, Coordination::WatchCallbackPtr watch = nullptr);
 
+template <class Client>
+Coordination::RequestPtr makeRemoveRecursiveRequest(const Client & client, const std::string & path, uint32_t remove_nodes_limit);
+
 }
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index 99c798f919cc..9f3e0ac66850 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -1727,14 +1727,21 @@ Coordination::RequestPtr makeRemoveRequest(const std::string & path, int version
     return request;
 }
 
-Coordination::RequestPtr makeRemoveRecursiveRequest(const std::string & path, uint32_t remove_nodes_limit)
+template <class Client>
+Coordination::RequestPtr makeRemoveRecursiveRequest(const Client & client, const std::string & path, uint32_t remove_nodes_limit)
 {
+    if (!client.isFeatureEnabled(DB::KeeperFeatureFlag::REMOVE_RECURSIVE))
+        throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Trying to use RemoveRecursive request while Keeper doesn't support it or feature flag is disabled");
+
     auto request = std::make_shared<Coordination::ZooKeeperRemoveRecursiveRequest>();
     request->path = path;
     request->remove_nodes_limit = remove_nodes_limit;
     return request;
 }
 
+template Coordination::RequestPtr makeRemoveRecursiveRequest<zkutil::ZooKeeper>(const zkutil::ZooKeeper & client, const std::string & path, uint32_t remove_nodes_limit);
+template Coordination::RequestPtr makeRemoveRecursiveRequest<DB::ZooKeeperWithFaultInjection>(const DB::ZooKeeperWithFaultInjection & client, const std::string & path, uint32_t remove_nodes_limit);
+
 Coordination::RequestPtr makeSetRequest(const std::string & path, const std::string & data, int version)
 {
     auto request = std::make_shared<Coordination::ZooKeeperSetRequest>();
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index d7dd7013d86e..55501ea1d568 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -351,7 +351,7 @@ void ZooKeeper::flushWriteBuffer()
 void ZooKeeper::cancelWriteBuffer() noexcept
 {
     if (compressed_out)
-         compressed_out->cancel();
+        compressed_out->cancel();
     if (out)
         out->cancel();
 }
@@ -585,7 +585,6 @@ void ZooKeeper::connect(
                     throw;
                 }
 
-                connected = true;
                 if (use_compression)
                 {
                     compressed_in.emplace(*in);
@@ -593,6 +592,8 @@ void ZooKeeper::connect(
                 }
 
                 original_index.store(node.original_index);
+
+                connected = true;
                 break;
             }
             catch (...)
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index c68ad12f804a..08ed3e10f1a0 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -218,9 +218,18 @@ String getFilesystemName([[maybe_unused]] const String & mount_point)
 
 bool pathStartsWith(const std::filesystem::path & path, const std::filesystem::path & prefix_path)
 {
-    String absolute_path = std::filesystem::weakly_canonical(path);
-    String absolute_prefix_path = std::filesystem::weakly_canonical(prefix_path);
-    return absolute_path.starts_with(absolute_prefix_path);
+    auto rel = fs::relative(path, prefix_path);
+    if (rel.empty() || rel == "..")
+        return false;
+
+    while (rel.has_relative_path())
+    {
+        rel = rel.parent_path();
+        if (rel == "..")
+            return false;
+    }
+
+    return true;
 }
 
 static bool fileOrSymlinkPathStartsWith(const std::filesystem::path & path, const std::filesystem::path & prefix_path)
@@ -230,11 +239,19 @@ static bool fileOrSymlinkPathStartsWith(const std::filesystem::path & path, cons
     /// `.` and `..` and extra `/`. Path is not canonized because otherwise path will
     /// not be a path of a symlink itself.
 
-    String absolute_path = std::filesystem::absolute(path);
-    absolute_path = fs::path(absolute_path).lexically_normal(); /// Normalize path.
-    String absolute_prefix_path = std::filesystem::absolute(prefix_path);
-    absolute_prefix_path = fs::path(absolute_prefix_path).lexically_normal(); /// Normalize path.
-    return absolute_path.starts_with(absolute_prefix_path);
+    auto rel = fs::absolute(path).lexically_normal().lexically_relative(fs::absolute(prefix_path).lexically_normal());
+
+    if (rel.empty() || rel == "..")
+        return false;
+
+    while (rel.has_relative_path())
+    {
+        rel = rel.parent_path();
+        if (rel == "..")
+            return false;
+    }
+
+    return true;
 }
 
 bool pathStartsWith(const String & path, const String & prefix_path)
diff --git a/src/Common/futex.h b/src/Common/futex.h
index f86cfacdc3d3..9ee0ae95d956 100644
--- a/src/Common/futex.h
+++ b/src/Common/futex.h
@@ -19,6 +19,16 @@ inline Int64 futexWait(void * address, UInt32 value)
     return syscall(SYS_futex, address, FUTEX_WAIT_PRIVATE, value, nullptr, nullptr, 0);
 }
 
+inline Int64 futexTimedWait(void * address, UInt32 value, UInt64 nanos)
+{
+    const UInt64 nanos_per_sec = 1'000'000'000;
+    UInt64 sec = nanos / nanos_per_sec;
+    struct timespec timeout;
+    timeout.tv_sec = time_t(std::min(sec, UInt64(std::numeric_limits<time_t>::max())));
+    timeout.tv_nsec = int64_t(nanos % nanos_per_sec);
+    return syscall(SYS_futex, address, FUTEX_WAIT_PRIVATE, value, &timeout, nullptr, 0);
+}
+
 inline Int64 futexWake(void * address, int count)
 {
     return syscall(SYS_futex, address, FUTEX_WAKE_PRIVATE, count, nullptr, nullptr, 0);
@@ -37,7 +47,7 @@ inline void futexWakeOne(std::atomic<UInt32> & address)
 
 inline void futexWakeAll(std::atomic<UInt32> & address)
 {
-     futexWake(&address, INT_MAX);
+    futexWake(&address, INT_MAX);
 }
 
 constexpr UInt32 lowerHalf(UInt64 value)
diff --git a/src/Common/logger_useful.h b/src/Common/logger_useful.h
index 3efc0d544149..c0746f8d1c5f 100644
--- a/src/Common/logger_useful.h
+++ b/src/Common/logger_useful.h
@@ -9,6 +9,7 @@
 #include <Common/AtomicLogger.h>
 #include <Common/CurrentThreadHelpers.h>
 #include <Common/Logger.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/LoggingFormatStringHelpers.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Stopwatch.h>
@@ -73,6 +74,7 @@ constexpr bool constexprContains(std::string_view haystack, std::string_view nee
 {                                                                                                                   \
     static_assert(!constexprContains(#__VA_ARGS__, "formatWithSecretsOneLine"), "Think twice!");                    \
     static_assert(!constexprContains(#__VA_ARGS__, "formatWithSecretsMultiLine"), "Think twice!");                  \
+                                                                                                                    \
     auto _logger = ::impl::getLoggerHelper(logger);                                                                 \
     const bool _is_clients_log = DB::currentThreadHasGroup() && DB::currentThreadLogsLevel() >= (priority);         \
     if (!_is_clients_log && !_logger->is((PRIORITY)))                                                               \
@@ -87,6 +89,11 @@ constexpr bool constexprContains(std::string_view haystack, std::string_view nee
     constexpr size_t _nargs = CH_VA_ARGS_NARGS(__VA_ARGS__);                                                        \
     using LogTypeInfo = FormatStringTypeInfo<std::decay_t<decltype(LOG_IMPL_FIRST_ARG(__VA_ARGS__))>>;              \
                                                                                                                     \
+    /* Note, we need to block memory tracking to avoid taking into account this memory in the query context */      \
+    /* Since this memory will be freed either in OwnAsyncSplitChannel::runChannel() (in case of async logging) */   \
+    /* Or in a system thread for flushing system.text_log (in case of sync logging) */                              \
+    MemoryTrackerBlockerInThread block_memory_tracker(VariableContext::Global);                                     \
+                                                                                                                    \
     std::string_view _format_string;                                                                                \
     std::string _formatted_message;                                                                                 \
     std::vector<std::string> _format_string_args;                                                                   \
diff --git a/src/Common/mysqlxx/mysqlxx/Exception.h b/src/Common/mysqlxx/mysqlxx/Exception.h
index 54153a7f1506..700f2b3afe02 100644
--- a/src/Common/mysqlxx/mysqlxx/Exception.h
+++ b/src/Common/mysqlxx/mysqlxx/Exception.h
@@ -14,6 +14,9 @@ struct Exception : public Poco::Exception
     int errnum() const { return code(); }
     const char * name() const noexcept override { return "mysqlxx::Exception"; }
     const char * className() const noexcept override { return "mysqlxx::Exception"; }
+
+    Exception * clone() const override { return new Exception(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 };
 
 
@@ -23,6 +26,9 @@ struct ConnectionFailed : public Exception
     explicit ConnectionFailed(const std::string & msg, int code = 0) : Exception(msg, code) {}
     const char * name() const noexcept override { return "mysqlxx::ConnectionFailed"; }
     const char * className() const noexcept override { return "mysqlxx::ConnectionFailed"; }
+
+    ConnectionFailed * clone() const override { return new ConnectionFailed(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 };
 
 
@@ -32,6 +38,9 @@ struct ConnectionLost : public Exception
     explicit ConnectionLost(const std::string & msg, int code = 0) : Exception(msg, code) {}
     const char * name() const noexcept override { return "mysqlxx::ConnectionLost"; }
     const char * className() const noexcept override { return "mysqlxx::ConnectionLost"; }
+
+    ConnectionLost * clone() const override { return new ConnectionLost(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 };
 
 
@@ -41,6 +50,9 @@ struct BadQuery : public Exception
     explicit BadQuery(const std::string & msg, int code = 0) : Exception(msg, code) {}
     const char * name() const noexcept override { return "mysqlxx::BadQuery"; }
     const char * className() const noexcept override { return "mysqlxx::BadQuery"; }
+
+    BadQuery * clone() const override { return new BadQuery(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 };
 
 
@@ -50,6 +62,9 @@ struct CannotParseValue : public Exception
     explicit CannotParseValue(const std::string & msg, int code = 0) : Exception(msg, code) {}
     const char * name() const noexcept override { return "mysqlxx::CannotParseValue"; }
     const char * className() const noexcept override { return "mysqlxx::CannotParseValue"; }
+
+    CannotParseValue * clone() const override { return new CannotParseValue(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 };
 
 
diff --git a/src/Common/tests/gtest_http_chunked_stream.cpp b/src/Common/tests/gtest_http_chunked_stream.cpp
new file mode 100644
index 000000000000..c737f4794105
--- /dev/null
+++ b/src/Common/tests/gtest_http_chunked_stream.cpp
@@ -0,0 +1,16 @@
+#include <gtest/gtest.h>
+
+#include <Poco/Net/HTTPChunkedStream.h>
+#include <Poco/Net/HTTPClientSession.h>
+
+
+TEST(HTTPChunkedStreamBuf, IsCompleteHandlesInvalidSocketException)
+{
+    Poco::Net::HTTPClientSession session;
+    Poco::Net::HTTPChunkedStreamBuf buf(session, std::ios::in);
+
+    /// Default-initialized socket throws InvalidSocketException in SocketImpl::receiveBytes,
+    /// which HTTPChunkedStreamBuf::isComplete should swallow and return false.
+    bool complete = buf.isComplete(true);
+    ASSERT_FALSE(complete);
+}
diff --git a/src/Common/threadPoolCallbackRunner.cpp b/src/Common/threadPoolCallbackRunner.cpp
index d33349cbaedb..a97566c42daf 100644
--- a/src/Common/threadPoolCallbackRunner.cpp
+++ b/src/Common/threadPoolCallbackRunner.cpp
@@ -20,14 +20,6 @@ void ThreadPoolCallbackRunnerFast::initThreadPool(ThreadPool & pool_, size_t max
     max_threads = max_threads_;
     thread_name = thread_name_;
     thread_group = thread_group_;
-
-    /// We could dynamically add and remove threads based on load, but it's not clear whether it's
-    /// worth the added complexity.
-    for (size_t i = 0; i < max_threads; ++i)
-    {
-        pool->scheduleOrThrowOnError([this] { threadFunction(); });
-        ++threads; // only if scheduleOrThrowOnError didn't throw
-    }
 }
 
 ThreadPoolCallbackRunnerFast::ThreadPoolCallbackRunnerFast(Mode mode_) : mode(mode_)
@@ -58,19 +50,31 @@ void ThreadPoolCallbackRunnerFast::shutdown()
         chassert(active_tasks.load() == queue.size());
 }
 
+void ThreadPoolCallbackRunnerFast::startMoreThreadsIfNeeded(size_t active_tasks_, std::unique_lock<std::mutex> &)
+{
+    while (threads < max_threads && threads < active_tasks_ && !shutdown_requested)
+    {
+        pool->scheduleOrThrow([this] { threadFunction(); });
+        ++threads; // only if scheduleOrThrow didn't throw
+    }
+}
+
 void ThreadPoolCallbackRunnerFast::operator()(std::function<void()> f)
 {
     if (mode == Mode::Disabled)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Thread pool runner is not initialized");
 
+    size_t active_tasks_ = 1 + active_tasks.fetch_add(1, std::memory_order_relaxed);
+
     {
         std::unique_lock lock(mutex);
         queue.push_back(std::move(f));
+
+        startMoreThreadsIfNeeded(active_tasks_, lock);
     }
 
     if (mode == Mode::ThreadPool)
     {
-        active_tasks.fetch_add(1, std::memory_order_relaxed);
 #ifdef OS_LINUX
         UInt32 prev_size = queue_size.fetch_add(1, std::memory_order_release);
         if (prev_size < max_threads)
@@ -89,21 +93,35 @@ void ThreadPoolCallbackRunnerFast::bulkSchedule(std::vector<std::function<void()
     if (mode == Mode::Disabled)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Thread pool runner is not initialized");
 
+    size_t n = fs.size();
+    size_t active_tasks_ = n + active_tasks.fetch_add(n, std::memory_order_relaxed);
+
     {
         std::unique_lock lock(mutex);
         queue.insert(queue.end(), std::move_iterator(fs.begin()), std::move_iterator(fs.end()));
+
+        try
+        {
+            startMoreThreadsIfNeeded(active_tasks_, lock);
+        }
+        catch (...)
+        {
+            /// Keep `queue` consistent with `queue_size`.
+            queue.erase(queue.end() - n, queue.end());
+            active_tasks.fetch_sub(n, std::memory_order_relaxed);
+            throw;
+        }
     }
 
     if (mode == Mode::ThreadPool)
     {
-        active_tasks.fetch_add(fs.size(), std::memory_order_relaxed);
 #ifdef OS_LINUX
-        UInt32 prev_size = queue_size.fetch_add(fs.size(), std::memory_order_release);
+        UInt32 prev_size = queue_size.fetch_add(n, std::memory_order_release);
         if (prev_size < max_threads)
-            futexWake(&queue_size, fs.size());
+            futexWake(&queue_size, n);
 #else
-        if (fs.size() < 4)
-            for (size_t i = 0; i < fs.size(); ++i)
+        if (n < 4)
+            for (size_t i = 0; i < n; ++i)
                 queue_cv.notify_one();
         else
             queue_cv.notify_all();
@@ -127,68 +145,94 @@ bool ThreadPoolCallbackRunnerFast::runTaskInline()
 
 void ThreadPoolCallbackRunnerFast::threadFunction()
 {
+    std::optional<ThreadGroupSwitcher> switcher;
+    switcher.emplace(thread_group, thread_name.c_str());
+
+    while (true)
     {
-        ThreadGroupSwitcher switcher(thread_group, thread_name.c_str());
+        bool timed_out = false;
 
+#ifdef OS_LINUX
+        UInt32 x = queue_size.load(std::memory_order_relaxed);
         while (true)
         {
-    #ifdef OS_LINUX
-            UInt32 x = queue_size.load(std::memory_order_relaxed);
-            while (true)
+            if (x == 0)
             {
-                if (x == 0)
+                Int64 waited = futexTimedWait(&queue_size, 0, THREAD_IDLE_TIMEOUT_NS);
+                x = queue_size.load(std::memory_order_relaxed);
+
+                if (waited < 0 && errno == ETIMEDOUT && x == 0)
                 {
-                    futexWait(&queue_size, 0);
-                    x = queue_size.load(std::memory_order_relaxed);
-                }
-                else if (queue_size.compare_exchange_weak(
-                            x, x - 1, std::memory_order_acquire, std::memory_order_relaxed))
+                    timed_out = true;
                     break;
+                }
             }
-    #endif
+            else if (queue_size.compare_exchange_weak(
+                        x, x - 1, std::memory_order_acquire, std::memory_order_relaxed))
+                break;
+        }
+#endif
 
-            std::function<void()> f;
-            {
-                std::unique_lock lock(mutex);
+        std::function<void()> f;
+        {
+            std::unique_lock lock(mutex);
 
-    #ifndef OS_LINUX
-                queue_cv.wait(lock, [&] { return shutdown_requested || !queue.empty(); });
-    #endif
+#ifdef OS_LINUX
+            /// Important to never stop the last thread if queue is not empty (checked under the
+            /// same `lock` as decrementing `threads`). Otherwise we'll deadlock like this:
+            ///  0. `threads` == 1, queue is empty.
+            ///  1. The worker thread times out; it didn't lock mutex or decrement `threads` yet.
+            ///  2. A manager thread enqueues a task. It sees active_tasks == 1 and `threads` == 1,
+            ///     so it doesn't start another thread.
+            ///  3. The worker thread exits.
+            ///  4. There are no threads, but the queue is not empty, oops.
+            if (timed_out && !queue.empty() && !shutdown_requested)
+                /// We can't just proceed to `queue.pop_front()` here because we haven't
+                /// decremented queue_size.
+                continue;
+#else
+            timed_out = !queue_cv.wait_for(
+                lock, std::chrono::nanoseconds(THREAD_IDLE_TIMEOUT_NS),
+                [&] { return shutdown_requested || !queue.empty(); });
+#endif
 
-                if (shutdown_requested)
-                    break;
+            if (shutdown_requested || timed_out)
+            {
+                /// Important that we destroy the `ThreadGroupSwitcher` before decrementing `threads`.
+                /// Otherwise ~ThreadGroupSwitcher may access global Context after the query is
+                /// finished, which may race with mutating Context (specifically, Settings) at the
+                /// start of next query.
+                switcher.reset();
 
-                chassert(!queue.empty());
+                threads -= 1;
+                if (threads == 0)
+                    shutdown_cv.notify_all();
 
-                f = std::move(queue.front());
-                queue.pop_front();
+                return;
             }
 
-            try
-            {
-                f();
+            chassert(!queue.empty());
 
-                CurrentThread::updatePerformanceCountersIfNeeded();
-            }
-            catch (...)
-            {
-                tryLogCurrentException("FastThreadPool");
-                chassert(false);
-            }
+            f = std::move(queue.front());
+            queue.pop_front();
+        }
 
-            active_tasks.fetch_sub(1, std::memory_order_relaxed);
+        try
+        {
+            f();
+
+            CurrentThread::updatePerformanceCountersIfNeeded();
+        }
+        catch (...)
+        {
+            tryLogCurrentException("FastThreadPool");
+            chassert(false);
         }
-    }
 
-    /// Important that we destroy the `ThreadGroupSwitcher` before decrementing `threads`.
-    /// Otherwise ~ThreadGroupSwitcher may access global Context after the query is finished, which
-    /// may race with mutating Context (specifically, Settings) at the start of next query.
-    {
-        std::unique_lock lock(mutex);
-        threads -= 1;
-        if (threads == 0)
-            shutdown_cv.notify_all();
+        active_tasks.fetch_sub(1, std::memory_order_relaxed);
     }
+
+    chassert(false);
 }
 
 bool ShutdownHelper::try_lock_shared()
diff --git a/src/Common/threadPoolCallbackRunner.h b/src/Common/threadPoolCallbackRunner.h
index 415c2907800f..443e07c0584f 100644
--- a/src/Common/threadPoolCallbackRunner.h
+++ b/src/Common/threadPoolCallbackRunner.h
@@ -249,8 +249,6 @@ class ThreadPoolCallbackRunnerFast
         Disabled,
     };
 
-    /// TODO [parquet]: Add metrics for queue size and active threads, and maybe event for tasks executed.
-
     ThreadPoolCallbackRunnerFast();
 
     void initManual()
@@ -282,6 +280,9 @@ class ThreadPoolCallbackRunnerFast
     bool isIdle() const { return active_tasks.load(std::memory_order_relaxed) == 0; }
 
 private:
+    /// Stop thread if it had nothing to do for this long.
+    static constexpr UInt64 THREAD_IDLE_TIMEOUT_NS = 3'000'000; // 3 ms
+
     Mode mode = Mode::Disabled;
     ThreadPool * pool = nullptr;
     size_t max_threads = 0;
@@ -309,6 +310,25 @@ class ThreadPoolCallbackRunnerFast
     std::condition_variable queue_cv;
 #endif
 
+    /// We dynamically start more threads when queue grows and stop idle threads after a timeout.
+    ///
+    /// Interestingly, this is required for correctness, not just performance.
+    /// If we kept max_threads threads at all times, we may deadlock because the "threads" that we
+    /// schedule on ThreadPool are not necessarily running, they may be sitting in ThreadPool's
+    /// queue, blocking other "threads" from running. E.g. this may happen:
+    ///  1. Iceberg reader creates many parquet readers, and their ThreadPoolCallbackRunnerFast(s)
+    ///     occupy all slots in the shared ThreadPool (getFormatParsingThreadPool()).
+    ///  2. Iceberg reader creates some more parquet readers for positional deletes, using separate
+    ///     ThreadPoolCallbackRunnerFast-s (because the ones from above are mildly inconvenient to
+    ///     propagate to that code site). Those ThreadPoolCallbackRunnerFast-s make
+    ///     pool->scheduleOrThrowOnError calls, but ThreadPool just adds them to queue, no actual
+    ///     ThreadPoolCallbackRunnerFast::threadFunction()-s are started.
+    ///  3. The readers from step 2 are stuck because their ThreadPoolCallbackRunnerFast-s have no
+    ///     threads. The readers from step 1 are idle but not destroyed (keep occupying threads)
+    ///     because the iceberg reader is waiting for positional deletes to be read (by readers
+    ///     from step 2). We're stuck.
+    void startMoreThreadsIfNeeded(size_t active_tasks_, std::unique_lock<std::mutex> &);
+
     void threadFunction();
 };
 
@@ -329,7 +349,9 @@ class ThreadPoolCallbackRunnerFast
 ///
 ///     void someBackgroundTask(std::shared_ptr<ShutdownHelper> shutdown_)
 ///     {
-///         std::shared_lock shutdown_lock(*shutdown, std::try_to_lock);
+///         // Using a copy of the shared_ptr, can't use this->shutdown here as `this` might already
+///         // be destroyed.
+///         std::shared_lock shutdown_lock(*shutdown_, std::try_to_lock);
 ///         if (!shutdown_lock.owns_lock())
 ///             return; // shutdown was requested, `this` may be destroyed
 ///
diff --git a/src/Compression/CompressionCodecDeflateQpl.cpp b/src/Compression/CompressionCodecDeflateQpl.cpp
index 6a45b4420d2c..c025b41315aa 100644
--- a/src/Compression/CompressionCodecDeflateQpl.cpp
+++ b/src/Compression/CompressionCodecDeflateQpl.cpp
@@ -435,7 +435,7 @@ inline void touchBufferWithZeroFilling(char * buffer, UInt32 buffer_size)
     }
 }
 
-void CompressionCodecDeflateQpl::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecDeflateQpl::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
 /// QPL library is using AVX-512 with some shuffle operations.
 /// Memory sanitizer don't understand if there was uninitialized memory in SIMD register but it was not used in the result of shuffle.
@@ -457,7 +457,7 @@ void CompressionCodecDeflateQpl::doDecompressData(const char * source, UInt32 so
             }
             else
                 sw_codec->doDecompressData(source, source_size, dest, uncompressed_size);
-            return;
+            return uncompressed_size;
         }
         case CodecMode::Asynchronous:
         {
@@ -466,11 +466,11 @@ void CompressionCodecDeflateQpl::doDecompressData(const char * source, UInt32 so
                 res = hw_codec->doDecompressDataAsynchronous(source, source_size, dest, uncompressed_size);
             if (res == HardwareCodecDeflateQpl::RET_ERROR)
                 sw_codec->doDecompressData(source, source_size, dest, uncompressed_size);
-            return;
+            return uncompressed_size;
         }
         case CodecMode::SoftwareFallback:
             sw_codec->doDecompressData(source, source_size, dest, uncompressed_size);
-            return;
+            return uncompressed_size;
     }
 }
 
diff --git a/src/Compression/CompressionCodecDeflateQpl.h b/src/Compression/CompressionCodecDeflateQpl.h
index b85c52521725..3ecfbb49eaf1 100644
--- a/src/Compression/CompressionCodecDeflateQpl.h
+++ b/src/Compression/CompressionCodecDeflateQpl.h
@@ -117,7 +117,7 @@ class CompressionCodecDeflateQpl final : public ICompressionCodec
 
 
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     /// Flush result for previous asynchronous decompression requests on asynchronous mode.
     void flushAsynchronousDecompressRequests() override;
diff --git a/src/Compression/CompressionCodecDelta.cpp b/src/Compression/CompressionCodecDelta.cpp
index 79d7b76f3e28..89fdbfd4d4d2 100644
--- a/src/Compression/CompressionCodecDelta.cpp
+++ b/src/Compression/CompressionCodecDelta.cpp
@@ -21,7 +21,7 @@ class CompressionCodecDelta : public ICompressionCodec
 
 protected:
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override { return uncompressed_size + 2; }
 
@@ -47,6 +47,7 @@ namespace ErrorCodes
     extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
     extern const int ILLEGAL_CODEC_PARAMETER;
     extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
 }
 
 CompressionCodecDelta::CompressionCodecDelta(UInt8 delta_bytes_size_)
@@ -88,8 +89,9 @@ void compressDataForType(const char * source, UInt32 source_size, char * dest)
 }
 
 template <typename T>
-void decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
+UInt32 decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
 {
+    const char * const original_dest = dest;
     const char * const output_end = dest + output_size;
 
     if (source_size % sizeof(T) != 0)
@@ -107,6 +109,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         source += sizeof(T);
         dest += sizeof(T);
     }
+
+    return dest - original_dest;
 }
 
 }
@@ -118,7 +122,7 @@ UInt32 CompressionCodecDelta::doCompressData(const char * source, UInt32 source_
     dest[1] = bytes_to_skip; /// unused (backward compatibility)
     memcpy(&dest[2], source, bytes_to_skip);
     size_t start_pos = 2 + bytes_to_skip;
-    switch (delta_bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (delta_bytes_size)
     {
     case 1:
         compressDataForType<UInt8>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos]);
@@ -132,17 +136,19 @@ UInt32 CompressionCodecDelta::doCompressData(const char * source, UInt32 source_
     case 8:
         compressDataForType<UInt64>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos]);
         break;
+    default:
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot compress to delta-encoded data. Invalid byte size {}", UInt32{delta_bytes_size});
     }
     return 1 + 1 + source_size;
 }
 
-void CompressionCodecDelta::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecDelta::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     if (source_size < 2)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress delta-encoded data. File has wrong header");
 
     if (uncompressed_size == 0)
-        return;
+        return 0;
 
     UInt8 bytes_size = source[0];
 
@@ -157,20 +163,19 @@ void CompressionCodecDelta::doDecompressData(const char * source, UInt32 source_
 
     memcpy(dest, &source[2], bytes_to_skip);
     UInt32 source_size_no_header = source_size - bytes_to_skip - 2;
-    switch (bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (bytes_size)
     {
     case 1:
-        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 2:
-        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 4:
-        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 8:
-        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
+    default:
+        /// This should be unreachable due to the check above
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot decompress delta-encoded data. File has unknown byte size {}", UInt32{bytes_size});
     }
 }
 
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index e765ee43badd..667cfc216e48 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -131,7 +131,7 @@ class CompressionCodecDoubleDelta : public ICompressionCodec
 
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
 
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
 
@@ -365,16 +365,17 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 }
 
 template <typename ValueType>
-void decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
+UInt32 decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
 {
     static_assert(is_unsigned_v<ValueType>, "ValueType must be unsigned.");
     using UnsignedDeltaType = ValueType;
 
     const char * source_end = source + source_size;
     const char * output_end = dest + output_size;
+    const char * const original_dest = dest;
 
     if (source + sizeof(UInt32) > source_end)
-        return;
+        return 0;
 
     const UInt32 items_count = unalignedLoadLittleEndian<UInt32>(source);
     source += sizeof(items_count);
@@ -384,7 +385,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
 
     // decoding first item
     if (source + sizeof(ValueType) > source_end || items_count < 1)
-        return;
+        return 0;
 
     prev_value = unalignedLoadLittleEndian<ValueType>(source);
     if (dest + sizeof(prev_value) > output_end)
@@ -396,7 +397,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
 
     // decoding second item
     if (source + sizeof(UnsignedDeltaType) > source_end || items_count < 2)
-        return;
+        return dest - original_dest;
 
     prev_delta = unalignedLoadLittleEndian<UnsignedDeltaType>(source);
     prev_value = prev_value + static_cast<ValueType>(prev_delta);
@@ -441,6 +442,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         prev_delta = curr_value - prev_value;
         prev_value = curr_value;
     }
+
+    return dest - original_dest;
 }
 
 UInt8 getDataBytesSize(const IDataType * column_type)
@@ -498,7 +501,7 @@ UInt32 CompressionCodecDoubleDelta::doCompressData(const char * source, UInt32 s
     size_t start_pos = 2 + bytes_to_skip;
     UInt32 compressed_size = 0;
 
-    switch (data_bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (data_bytes_size)
     {
     case 1:
         compressed_size = compressDataForType<UInt8>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos]);
@@ -512,19 +515,21 @@ UInt32 CompressionCodecDoubleDelta::doCompressData(const char * source, UInt32 s
     case 8:
         compressed_size = compressDataForType<UInt64>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos]);
         break;
+    default:
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot compress to double delta-encoded data. Invalid byte size {}", UInt32{data_bytes_size});
     }
 
     return 1 + 1 + compressed_size + UInt32(bytes_to_skip);
 }
 
-void CompressionCodecDoubleDelta::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecDoubleDelta::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     if (source_size < 2)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress double-delta encoded data. File has wrong header");
 
     UInt8 bytes_size = source[0];
 
-    if (bytes_size == 0)
+    if (bytes_size != 1 && bytes_size != 2 && bytes_size != 4 && bytes_size != 8)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress double-delta encoded data. File has wrong header");
 
     UInt8 bytes_to_skip = uncompressed_size % bytes_size;
@@ -535,20 +540,20 @@ void CompressionCodecDoubleDelta::doDecompressData(const char * source, UInt32 s
 
     memcpy(dest, &source[2], bytes_to_skip);
     UInt32 source_size_no_header = source_size - bytes_to_skip - 2;
-    switch (bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (bytes_size)
     {
     case 1:
-        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 2:
-        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 4:
-        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 8:
-        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
+    default:
+        /// This should be unreachable due to the check above
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR, "Cannot decompress with codec 'double-delta'. File has incorrect width ({})", UInt32{bytes_size});
     }
 }
 
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index 39522a3b811b..b663f9894945 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -537,7 +537,7 @@ UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 sou
     return safe_cast<UInt32>(out_size);
 }
 
-void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     /// The key is needed for decrypting. That's why it is read at the beginning of process.
     UInt64 key_id;
@@ -566,6 +566,8 @@ void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 sou
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Can't decrypt data, out length after decryption {} is wrong, expected {}",
                         out_len, ciphertext_size - tag_size);
+
+    return out_len;
 }
 
 }
diff --git a/src/Compression/CompressionCodecEncrypted.h b/src/Compression/CompressionCodecEncrypted.h
index 229eccf032b9..c3d19436c1ec 100644
--- a/src/Compression/CompressionCodecEncrypted.h
+++ b/src/Compression/CompressionCodecEncrypted.h
@@ -121,7 +121,7 @@ class CompressionCodecEncrypted final : public ICompressionCodec
 
     /// Decrypt data with chosen method
     /// Throws exception if decryption is impossible or size of decrypted text is incorrect
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 private:
     EncryptionMethod encryption_method;
 };
diff --git a/src/Compression/CompressionCodecFPC.cpp b/src/Compression/CompressionCodecFPC.cpp
index 1b35a0612681..dd4df9be6dcc 100644
--- a/src/Compression/CompressionCodecFPC.cpp
+++ b/src/Compression/CompressionCodecFPC.cpp
@@ -33,7 +33,7 @@ class CompressionCodecFPC : public ICompressionCodec
 protected:
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
 
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
 
@@ -243,7 +243,7 @@ class FPCOperation
 
 public:
     FPCOperation(std::span<std::byte> destination, UInt8 compression_level)
-        : dfcm_predictor(1u << compression_level), fcm_predictor(1u << compression_level), chunk{}, result{destination}
+        : dfcm_predictor(1u << compression_level), fcm_predictor(1u << compression_level), chunk{}, result{destination}, result_initial_pointer{result.data()}
     {
     }
 
@@ -261,7 +261,7 @@ class FPCOperation
         return initial_size - result.size();
     }
 
-    void decode(std::span<const std::byte> values, size_t decoded_size) &&
+    UInt32 decode(std::span<const std::byte> values, size_t decoded_size) &&
     {
         size_t read_bytes = 0;
 
@@ -273,6 +273,8 @@ class FPCOperation
             read_bytes += decodeChunk(values.subspan(read_bytes), chunk_view);
             exportChunk(chunk_view);
         }
+
+        return result.data() - result_initial_pointer;
     }
 
 private:
@@ -455,6 +457,8 @@ class FPCOperation
     std::array<TUInt, CHUNK_SIZE> chunk{};
 
     std::span<std::byte> result{};
+    /// Pointer to the start of the result buffer (used to calculate the final size)
+    std::span<std::byte>::const_pointer result_initial_pointer{};
 };
 
 }
@@ -479,7 +483,7 @@ UInt32 CompressionCodecFPC::doCompressData(const char * source, UInt32 source_si
     throw Exception(ErrorCodes::CANNOT_COMPRESS, "Cannot compress with codec 'FPC'. File has incorrect float width");
 }
 
-void CompressionCodecFPC::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecFPC::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     if (source_size < HEADER_SIZE)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress FPC-encoded data. File has wrong header");
@@ -495,11 +499,9 @@ void CompressionCodecFPC::doDecompressData(const char * source, UInt32 source_si
     switch (compressed_float_width)
     {
         case sizeof(Float64):
-            FPCOperation<UInt64>(destination, compressed_level).decode(src, uncompressed_size);
-            break;
+            return FPCOperation<UInt64>(destination, compressed_level).decode(src, uncompressed_size);
         case sizeof(Float32):
-            FPCOperation<UInt32>(destination, compressed_level).decode(src, uncompressed_size);
-            break;
+            return FPCOperation<UInt32>(destination, compressed_level).decode(src, uncompressed_size);
         default:
             throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress FPC-encoded data. File has incorrect float width");
     }
diff --git a/src/Compression/CompressionCodecGCD.cpp b/src/Compression/CompressionCodecGCD.cpp
index 34065da4d741..e93be2be8407 100644
--- a/src/Compression/CompressionCodecGCD.cpp
+++ b/src/Compression/CompressionCodecGCD.cpp
@@ -26,7 +26,7 @@ class CompressionCodecGCD : public ICompressionCodec
 protected:
     /// 1 byte (`gcd_bytes_size` value) + 1 byte (`bytes_to_skip` value) + `bytes_to_skip` bytes (trash) + `gcd_bytes_size` bytes (gcd value) + (`source_size` - `bytes_to_skip`) bytes (data)
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
 
     bool isCompression() const override { return false; }
@@ -47,6 +47,7 @@ namespace ErrorCodes
     extern const int CANNOT_DECOMPRESS;
     extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
     extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
 }
 
 CompressionCodecGCD::CompressionCodecGCD(UInt8 gcd_bytes_size_)
@@ -131,8 +132,9 @@ void compressDataForType(const char * source, UInt32 source_size, char * dest)
 }
 
 template <typename T>
-void decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
+UInt32 decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
 {
+    const char * original_dest = dest;
     if (source_size % sizeof(T) != 0)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress GCD-encoded data, data size {} is not aligned to {}", source_size, sizeof(T));
 
@@ -153,7 +155,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
             throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress GCD-encoded data");
 
         memcpy(dest, source, source_size - sizeof(T));
-        return;
+        return source_size - sizeof(T);
     }
 
     while (source < source_end)
@@ -166,6 +168,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         dest += sizeof(T);
     }
     chassert(source == source_end);
+    return dest - original_dest;
 }
 
 }
@@ -177,7 +180,7 @@ UInt32 CompressionCodecGCD::doCompressData(const char * source, UInt32 source_si
     dest[1] = bytes_to_skip; /// unused (backward compatibility)
     memcpy(&dest[2], source, bytes_to_skip);
     size_t start_pos = 2 + bytes_to_skip;
-    switch (gcd_bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (gcd_bytes_size)
     {
     case 1:
         compressDataForType<UInt8>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos]);
@@ -197,17 +200,19 @@ UInt32 CompressionCodecGCD::doCompressData(const char * source, UInt32 source_si
     case 32:
         compressDataForType<UInt256>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos]);
         break;
+    default:
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot compress to GCD-encoded data. Invalid byte size {}", UInt32{gcd_bytes_size});
     }
     return 2 + gcd_bytes_size + source_size;
 }
 
-void CompressionCodecGCD::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecGCD::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     if (source_size < 2)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress GCD-encoded data. File has wrong header");
 
     if (uncompressed_size == 0)
-        return;
+        return 0;
 
     UInt8 bytes_size = source[0];
 
@@ -226,26 +231,23 @@ void CompressionCodecGCD::doDecompressData(const char * source, UInt32 source_si
 
     memcpy(dest, &source[2], bytes_to_skip);
     UInt32 source_size_no_header = source_size - bytes_to_skip - 2;
-    switch (bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (bytes_size)
     {
     case 1:
-        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 2:
-        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 4:
-        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 8:
-        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 16:
-        decompressDataForType<UInt128>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt128>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
     case 32:
-        decompressDataForType<UInt256>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt256>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
+    default:
+        /// This should be unreachable due to the check above
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot decompress GCD-encoded data. File has unknown byte size {}", UInt32{bytes_size});
     }
 }
 
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 5693d2205d44..acad0f69f9e9 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -116,7 +116,7 @@ class CompressionCodecGorilla : public ICompressionCodec
 
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
 
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
 
@@ -141,6 +141,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
     extern const int ILLEGAL_CODEC_PARAMETER;
+    extern const int LOGICAL_ERROR;
 }
 
 namespace
@@ -270,12 +271,13 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 }
 
 template <typename T>
-void decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 dest_size)
+UInt32 decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 dest_size)
 {
+    const char * const original_dest = dest;
     const char * const source_end = source + source_size;
 
     if (source + sizeof(UInt32) > source_end)
-        return;
+        return 0;
 
     const UInt32 items_count = unalignedLoadLittleEndian<UInt32>(source);
     source += sizeof(items_count);
@@ -284,7 +286,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
 
     // decoding first item
     if (source + sizeof(T) > source_end || items_count < 1)
-        return;
+        return 0;
 
     if (static_cast<UInt64>(items_count) * sizeof(T) > dest_size)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress Gorilla-encoded data: corrupted input data.");
@@ -341,6 +343,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         prev_xored_info = curr_xored_info;
         prev_value = curr_value;
     }
+
+    return dest - original_dest;
 }
 
 UInt8 getDataBytesSize(const IDataType * column_type)
@@ -398,7 +402,7 @@ UInt32 CompressionCodecGorilla::doCompressData(const char * source, UInt32 sourc
     UInt32 result_size = 0;
 
     const UInt32 compressed_size = getMaxCompressedDataSize(source_size);
-    switch (data_bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (data_bytes_size)
     {
     case 1:
         result_size = compressDataForType<UInt8>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos], compressed_size);
@@ -412,12 +416,14 @@ UInt32 CompressionCodecGorilla::doCompressData(const char * source, UInt32 sourc
     case 8:
         result_size = compressDataForType<UInt64>(&source[bytes_to_skip], source_size - bytes_to_skip, &dest[start_pos], compressed_size);
         break;
+    default:
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot compress to Gorilla-encoded data. Invalid byte size {}", UInt32{data_bytes_size});
     }
 
     return 2 + bytes_to_skip + result_size;
 }
 
-void CompressionCodecGorilla::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecGorilla::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     if (source_size < 2)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress Gorilla-encoded data. File has wrong header");
@@ -438,20 +444,16 @@ void CompressionCodecGorilla::doDecompressData(const char * source, UInt32 sourc
     memcpy(dest, &source[2], bytes_to_skip);
     UInt32 source_size_no_header = source_size - bytes_to_skip - 2;
     UInt32 uncompressed_size_left = uncompressed_size - bytes_to_skip;
-    switch (bytes_size) // NOLINT(bugprone-switch-missing-default-case)
+    switch (bytes_size)
     {
     case 1:
-        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
     case 2:
-        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
     case 4:
-        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
     case 8:
-        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
-        break;
+        return bytes_to_skip + decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], uncompressed_size_left);
     default:
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress Gorilla-encoded data. File has wrong header");
     }
diff --git a/src/Compression/CompressionCodecLZ4.cpp b/src/Compression/CompressionCodecLZ4.cpp
index 4cb424b318cc..2b91e1070587 100644
--- a/src/Compression/CompressionCodecLZ4.cpp
+++ b/src/Compression/CompressionCodecLZ4.cpp
@@ -38,7 +38,7 @@ class CompressionCodecLZ4 : public ICompressionCodec
     String getDescription() const override { return "Extremely fast; good compression; balanced speed and efficiency."; }
 
 private:
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
 
@@ -97,12 +97,15 @@ UInt32 CompressionCodecLZ4::doCompressData(const char * source, UInt32 source_si
     return LZ4_compress_default(source, dest, source_size, LZ4_COMPRESSBOUND(source_size));
 }
 
-void CompressionCodecLZ4::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecLZ4::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     bool success = LZ4::decompress(source, dest, source_size, uncompressed_size, lz4_stat);
 
     if (!success)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress LZ4-encoded data");
+
+    /// LZ4::decompress only returns true when the dest buffer has been fully written (uncompressed_size)
+    return uncompressed_size;
 }
 
 void registerCodecLZ4(CompressionCodecFactory & factory)
diff --git a/src/Compression/CompressionCodecMultiple.cpp b/src/Compression/CompressionCodecMultiple.cpp
index aae52a2d0512..d44482b64948 100644
--- a/src/Compression/CompressionCodecMultiple.cpp
+++ b/src/Compression/CompressionCodecMultiple.cpp
@@ -65,7 +65,7 @@ UInt32 CompressionCodecMultiple::doCompressData(const char * source, UInt32 sour
     return static_cast<UInt32>(1 + codecs.size() + source_size);
 }
 
-void CompressionCodecMultiple::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 decompressed_size) const
+UInt32 CompressionCodecMultiple::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 decompressed_size) const
 {
     if (source_size < 1 || !source[0])
         throw Exception(decompression_error_code, "Wrong compression methods list");
@@ -113,10 +113,12 @@ void CompressionCodecMultiple::doDecompressData(const char * source, UInt32 sour
 
         codec->decompress(compressed_buf.data(), source_size, uncompressed_buf.data());
         uncompressed_buf.swap(compressed_buf);
+        /// The call to decompress will validate uncompressed_size (same readDecompressedBlockSize call as here)
         source_size = uncompressed_size;
     }
 
     memcpy(dest, compressed_buf.data(), decompressed_size);
+    return decompressed_size;
 }
 
 std::vector<uint8_t> CompressionCodecMultiple::getCodecsBytesFromData(const char * source)
diff --git a/src/Compression/CompressionCodecMultiple.h b/src/Compression/CompressionCodecMultiple.h
index 2c2573bacf54..3459958d94f2 100644
--- a/src/Compression/CompressionCodecMultiple.h
+++ b/src/Compression/CompressionCodecMultiple.h
@@ -23,7 +23,7 @@ class CompressionCodecMultiple final : public ICompressionCodec
 
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
 
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 decompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 decompressed_size) const override;
 
     bool isCompression() const override;
     bool isGenericCompression() const override { return false; }
diff --git a/src/Compression/CompressionCodecNone.cpp b/src/Compression/CompressionCodecNone.cpp
index e52a601700e2..d09ab0b8179e 100644
--- a/src/Compression/CompressionCodecNone.cpp
+++ b/src/Compression/CompressionCodecNone.cpp
@@ -27,13 +27,14 @@ UInt32 CompressionCodecNone::doCompressData(const char * source, UInt32 source_s
     return source_size;
 }
 
-void CompressionCodecNone::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecNone::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     if (source_size != uncompressed_size)
         throw Exception(decompression_error_code, "Wrong data for compression codec NONE: source_size ({}) != uncompressed_size ({})",
             source_size, uncompressed_size);
 
     memcpy(dest, source, uncompressed_size);
+    return uncompressed_size;
 }
 
 void registerCodecNone(CompressionCodecFactory & factory)
diff --git a/src/Compression/CompressionCodecNone.h b/src/Compression/CompressionCodecNone.h
index 89cf12bbe826..00d92586a7be 100644
--- a/src/Compression/CompressionCodecNone.h
+++ b/src/Compression/CompressionCodecNone.h
@@ -19,7 +19,7 @@ class CompressionCodecNone final : public ICompressionCodec
 
 protected:
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     bool isCompression() const override { return false; }
     bool isGenericCompression() const override { return false; }
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index b724e8510b7d..5d2276e85914 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -43,7 +43,7 @@ class CompressionCodecT64 : public ICompressionCodec
 
 protected:
     UInt32 doCompressData(const char * src, UInt32 src_size, char * dst) const override;
-    void doDecompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncompressed_size) const override;
 
     UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override
     {
@@ -549,12 +549,14 @@ UInt32 compressData(const char * src, UInt32 bytes_size, char * dst)
 }
 
 template <typename T, bool full>
-void decompressData(const char * src, UInt32 bytes_size, char * dst, UInt32 uncompressed_size)
+UInt32 decompressData(const char * src, UInt32 bytes_size, char * dst, UInt32 uncompressed_size)
 {
     using MinMaxType = std::conditional_t<is_signed_v<T>, Int64, UInt64>;
 
     static constexpr const UInt32 matrix_size = 64;
     static constexpr const UInt32 header_size = 2 * sizeof(UInt64);
+  
+    const char * const original_dst = dst;
 
     if (bytes_size < header_size)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress T64-encoded data, data size ({}) is less than the size of T64 header",
@@ -583,7 +585,7 @@ void decompressData(const char * src, UInt32 bytes_size, char * dst, UInt32 unco
         T min_value = static_cast<T>(min);
         for (UInt32 i = 0; i < num_elements; ++i, dst += sizeof(T))
             unalignedStore<T>(dst, min_value);
-        return;
+        return dst - original_dst;
     }
 
     UInt32 src_shift = sizeof(UInt64) * num_bits;
@@ -634,7 +636,10 @@ void decompressData(const char * src, UInt32 bytes_size, char * dst, UInt32 unco
         reverseTranspose<T, full>(src, buf, num_bits, tail);
         restoreUpperBits(buf, upper_min, upper_max, sign_bit, tail);
         store<T>(buf, dst, tail);
+        dst += tail * sizeof(T);
     }
+
+    return dst - original_dst;
 }
 
 template <typename T>
@@ -646,12 +651,12 @@ UInt32 compressData(const char * src, UInt32 src_size, char * dst, Variant varia
 }
 
 template <typename T>
-void decompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncompressed_size, Variant variant)
+UInt32 decompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncompressed_size, Variant variant)
 {
     if (variant == Variant::Bit)
-        decompressData<T, true>(src, src_size, dst, uncompressed_size);
+        return decompressData<T, true>(src, src_size, dst, uncompressed_size);
     else
-        decompressData<T, false>(src, src_size, dst, uncompressed_size);
+        return decompressData<T, false>(src, src_size, dst, uncompressed_size);
 }
 
 }
@@ -688,7 +693,7 @@ UInt32 CompressionCodecT64::doCompressData(const char * src, UInt32 src_size, ch
     throw Exception(ErrorCodes::CANNOT_COMPRESS, "Cannot compress with T64 codec");
 }
 
-void CompressionCodecT64::doDecompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncompressed_size) const
+UInt32 CompressionCodecT64::doDecompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncompressed_size) const
 {
     if (!src_size)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress T64-encoded data");
@@ -703,34 +708,24 @@ void CompressionCodecT64::doDecompressData(const char * src, UInt32 src_size, ch
     switch (baseType(saved_type_id))
     {
         case TypeIndex::Int8:
-            decompressData<Int8>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<Int8>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::Int16:
-            decompressData<Int16>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<Int16>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::Int32:
-            decompressData<Int32>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<Int32>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::Int64:
-            decompressData<Int64>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<Int64>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::UInt8:
-            decompressData<UInt8>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<UInt8>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::UInt16:
-            decompressData<UInt16>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<UInt16>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::UInt32:
-            decompressData<UInt32>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<UInt32>(src, src_size, dst, uncompressed_size, saved_variant);
         case TypeIndex::UInt64:
-            decompressData<UInt64>(src, src_size, dst, uncompressed_size, saved_variant);
-            return;
+            return decompressData<UInt64>(src, src_size, dst, uncompressed_size, saved_variant);
         default:
-            break;
+            throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress T64-encoded data");
     }
-
-    throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress T64-encoded data");
 }
 
 uint8_t CompressionCodecT64::getMethodByte() const
diff --git a/src/Compression/CompressionCodecZSTD.cpp b/src/Compression/CompressionCodecZSTD.cpp
index 7aecb652efc5..fb3eaaa54b63 100644
--- a/src/Compression/CompressionCodecZSTD.cpp
+++ b/src/Compression/CompressionCodecZSTD.cpp
@@ -57,12 +57,13 @@ UInt32 CompressionCodecZSTD::doCompressData(const char * source, UInt32 source_s
 }
 
 
-void CompressionCodecZSTD::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+UInt32 CompressionCodecZSTD::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
     size_t res = ZSTD_decompress(dest, uncompressed_size, source, source_size);
 
     if (ZSTD_isError(res))
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress ZSTD-encoded data: {}", std::string(ZSTD_getErrorName(res)));
+    return res;
 }
 
 CompressionCodecZSTD::CompressionCodecZSTD(int level_, int window_log_)
diff --git a/src/Compression/CompressionCodecZSTD.h b/src/Compression/CompressionCodecZSTD.h
index f363f1af69e1..eeaabca94130 100644
--- a/src/Compression/CompressionCodecZSTD.h
+++ b/src/Compression/CompressionCodecZSTD.h
@@ -24,7 +24,7 @@ class CompressionCodecZSTD : public ICompressionCodec
 
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
 
-    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+    UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     bool isCompression() const override { return true; }
     bool isGenericCompression() const override { return true; }
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index aac0d66dd474..da5f74f320d3 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -116,9 +116,16 @@ UInt32 ICompressionCodec::decompress(const char * source, UInt32 source_size, ch
         throw Exception(decompression_error_code, "Can't decompress data with codec byte {} using codec with byte {}", method, our_method);
 
     UInt32 decompressed_size = readDecompressedBlockSize(source);
-    doDecompressData(&source[header_size], source_size - header_size, dest, decompressed_size);
-
-    return decompressed_size;
+    UInt32 final_decompressed_size = doDecompressData(&source[header_size], source_size - header_size, dest, decompressed_size);
+    if (decompressed_size != final_decompressed_size)
+        throw Exception(
+            decompression_error_code,
+            "Can't decompress data: The size after decompression ({}) is different than the expected size ({}) for codec '{}'",
+            final_decompressed_size,
+            decompressed_size,
+            getCodecDesc()->formatForErrorMessage());
+
+    return final_decompressed_size;
 }
 
 UInt32 ICompressionCodec::readCompressedBlockSize(const char * source) const
diff --git a/src/Compression/ICompressionCodec.h b/src/Compression/ICompressionCodec.h
index 551f6db55191..46e6565dd461 100644
--- a/src/Compression/ICompressionCodec.h
+++ b/src/Compression/ICompressionCodec.h
@@ -141,7 +141,7 @@ class ICompressionCodec : private boost::noncopyable
     virtual UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const = 0;
 
     /// Actually decompress data without header
-    virtual void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const = 0;
+    virtual UInt32 doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const = 0;
 
     /// Construct and set codec description from codec name and arguments. Must be called in codec constructor.
     void setCodecDescription(const String & name, const ASTs & arguments = {});
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 6b2393c4e457..5dc8503127ba 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -1881,7 +1881,17 @@ try
             }
 
             ChangelogReader reader(changelog_description_ptr);
-            last_log_read_result = reader.readChangelog(entry_storage, start_to_read_from, log);
+            auto log_read_result = reader.readChangelog(entry_storage, start_to_read_from, log);
+
+            /// We didn't find the first required log in this changelog so we move to the next changelog
+            /// This can happen in case we failed to rename changelog to a name with correct first and last log index
+            if (log_read_result.first_read_index == 0)
+            {
+                LOG_TRACE(log, "Changelog contains only logs before {}", start_to_read_from);
+                continue;
+            }
+
+            last_log_read_result = std::move(log_read_result);
 
             if (last_log_read_result->last_read_index != 0)
                 last_read_index = last_log_read_result->last_read_index;
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index 7eb50ea7ac8b..172844e8ea5b 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -69,7 +69,8 @@ namespace ErrorCodes
     DECLARE(UInt64, log_slow_total_threshold_ms, 5000, "Requests for which the total latency is larger than this settings will be logged", 0) \
     DECLARE(UInt64, log_slow_cpu_threshold_ms, 100, "Requests for which the CPU (preprocessing and processing) latency is larger than this settings will be logged", 0) \
     DECLARE(UInt64, log_slow_connection_operation_threshold_ms, 1000, "Log message if a certain operation took too long inside a single connection", 0) \
-    DECLARE(Bool, use_xid_64, false, "Enable 64-bit XID. It is disabled by default because of backward compatibility", 0)
+    DECLARE(Bool, use_xid_64, false, "Enable 64-bit XID. It is disabled by default because of backward compatibility", 0) \
+    DECLARE(Bool, check_node_acl_on_remove, false, "When trying to remove a node, check ACLs from both the node itself and the parent node. If disabled, default behaviour will be used where only ACL from the parent node is checked", 0) \
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 IMPLEMENT_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
@@ -277,6 +278,11 @@ void KeeperConfigurationAndSettings::dump(WriteBufferFromOwnString & buf) const
     write_int(coordination_settings[CoordinationSetting::log_slow_cpu_threshold_ms]);
     writeText("log_slow_connection_operation_threshold_ms=", buf);
     write_int(coordination_settings[CoordinationSetting::log_slow_connection_operation_threshold_ms]);
+
+    writeText("use_xid_64=", buf);
+    write_bool(coordination_settings[CoordinationSetting::use_xid_64]);
+    writeText("check_node_acl_on_remove=", buf);
+    write_bool(coordination_settings[CoordinationSetting::check_node_acl_on_remove]);
 }
 
 KeeperConfigurationAndSettingsPtr
diff --git a/src/Coordination/KeeperConstants.cpp b/src/Coordination/KeeperConstants.cpp
index 438026c32909..d15c142df6f0 100644
--- a/src/Coordination/KeeperConstants.cpp
+++ b/src/Coordination/KeeperConstants.cpp
@@ -300,6 +300,8 @@
     M(KeeperLogsEntryReadFromCommitCache) \
     M(KeeperLogsEntryReadFromFile) \
     M(KeeperLogsPrefetchedEntries) \
+\
+    M(KeeperRequestRejectedDueToSoftMemoryLimitCount) \
 
 namespace ProfileEvents
 {
diff --git a/src/Coordination/KeeperSnapshotManagerS3.cpp b/src/Coordination/KeeperSnapshotManagerS3.cpp
index 05d4d381a24d..0973fdc045c9 100644
--- a/src/Coordination/KeeperSnapshotManagerS3.cpp
+++ b/src/Coordination/KeeperSnapshotManagerS3.cpp
@@ -123,6 +123,7 @@ void KeeperSnapshotManagerS3::updateS3Configuration(const Poco::Util::AbstractCo
             s3_slow_all_threads_after_retryable_error,
             enable_s3_requests_logging,
             /* for_disk_s3 = */ false,
+            /* opt_disk_name = */ {},
             /* get_request_throttler = */ {},
             /* put_request_throttler = */ {},
             new_uri.uri.getScheme());
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 2cab070706b1..cdac684740aa 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -52,6 +52,7 @@ namespace DB
 namespace CoordinationSetting
 {
     extern const CoordinationSettingsUInt64 log_slow_cpu_threshold_ms;
+    extern const CoordinationSettingsBool check_node_acl_on_remove;
 }
 
 namespace ErrorCodes
@@ -1828,6 +1829,12 @@ processLocal(const Coordination::ZooKeeperGetRequest & zk_request, Storage & sto
 template <typename Storage>
 bool checkAuth(const Coordination::ZooKeeperRemoveRequest & zk_request, Storage & storage, int64_t session_id, bool is_local)
 {
+    if (auto check_node_acl = storage.keeper_context->getCoordinationSettings()[CoordinationSetting::check_node_acl_on_remove];
+        check_node_acl && !storage.checkACL(zk_request.getPath(), Coordination::ACL::Delete, session_id, is_local))
+    {
+        return false;
+    }
+
     return storage.checkACL(Coordination::parentNodePath(zk_request.getPath()), Coordination::ACL::Delete, session_id, is_local);
 }
 
@@ -1957,9 +1964,23 @@ class ToDeleteTreeCollector
     uint32_t nodes_observed = 1;  /// root node
 
     std::list<KeeperStorageBase::Delta> deltas;
-    using UncommittedChildren
+    using ProcessedUncommittedChildren
         = std::unordered_set<std::string_view, StringHashForHeterogeneousLookup, StringHashForHeterogeneousLookup::transparent_key_equal>;
 
+    struct PathCmp
+    {
+        auto operator()(const std::string_view a,
+                        const std::string_view b) const
+        {
+            size_t level_a = std::count(a.begin(), a.end(), '/');
+            size_t level_b = std::count(b.begin(), b.end(), '/');
+            return level_a < level_b || (level_a == level_b && a < b);
+        }
+
+        using is_transparent = void; // required to make find() work with different type than key_type
+    };
+
+    std::map<std::string_view, typename Storage::UncommittedState::UncommittedNode *, PathCmp> uncommitted_children;
 public:
     enum class CollectStatus
     {
@@ -1983,6 +2004,16 @@ class ToDeleteTreeCollector
         if (checkLimits(root_node))
             return CollectStatus::LimitExceeded;
 
+        /// Collect uncommitted children of root node in a specialized structure so we avoid iterating all uncommitted
+        /// nodes for each child node.
+        auto & nodes = storage.uncommitted_state.nodes;
+        auto root_path_view = root_path.toView();
+        for (auto & [node_path, uncommitted_node] : nodes)
+        {
+            if (Coordination::matchPath(node_path, root_path_view) == Coordination::PathMatchResult::IS_CHILD)
+                uncommitted_children[node_path] = &uncommitted_node;
+        }
+
         addDelta(root_path, root_node.stats, storage.uncommitted_state.getACLs(root_path), std::string{root_node.getData()});
 
         for (auto current_delta_it = deltas.rbegin(); current_delta_it != deltas.rend(); ++current_delta_it)
@@ -1993,18 +2024,18 @@ class ToDeleteTreeCollector
             if (!storage.checkACL(current_path, Coordination::ACL::Delete, session_id, /*is_local=*/false))
                 return CollectStatus::NoAuth;
 
-            UncommittedChildren uncommitted_children;
-            if (auto status = visitUncommitted(current_path, uncommitted_children); status != CollectStatus::Ok)
+            ProcessedUncommittedChildren processed_uncommitted_children;
+            if (auto status = visitUncommitted(current_path, processed_uncommitted_children); status != CollectStatus::Ok)
                 return status;
 
             if constexpr (Storage::use_rocksdb)
             {
-                if (auto status = visitRocksDBNode(current_path, uncommitted_children); status != CollectStatus::Ok)
+                if (auto status = visitRocksDBNode(current_path, processed_uncommitted_children); status != CollectStatus::Ok)
                     return status;
             }
             else
             {
-                if (auto status = visitMemNode(current_path, uncommitted_children); status != CollectStatus::Ok)
+                if (auto status = visitMemNode(current_path, processed_uncommitted_children); status != CollectStatus::Ok)
                     return status;
             }
         }
@@ -2018,7 +2049,7 @@ class ToDeleteTreeCollector
     }
 
 private:
-    CollectStatus visitRocksDBNode(StringRef current_path, const UncommittedChildren & uncommitted_children) requires Storage::use_rocksdb
+    CollectStatus visitRocksDBNode(StringRef current_path, const ProcessedUncommittedChildren & processed_uncommitted_children) requires Storage::use_rocksdb
     {
         std::filesystem::path current_path_fs(current_path.toString());
 
@@ -2032,7 +2063,7 @@ class ToDeleteTreeCollector
         {
             auto child_path = (current_path_fs / child_name).generic_string();
 
-            if (uncommitted_children.contains(child_path))
+            if (processed_uncommitted_children.contains(child_path))
                 continue;
 
             if (checkLimits(child_node))
@@ -2044,7 +2075,7 @@ class ToDeleteTreeCollector
         return CollectStatus::Ok;
     }
 
-    CollectStatus visitMemNode(StringRef current_path, const UncommittedChildren & uncommitted_children) requires (!Storage::use_rocksdb)
+    CollectStatus visitMemNode(StringRef current_path, const ProcessedUncommittedChildren & processed_uncommitted_children) requires (!Storage::use_rocksdb)
     {
         std::lock_guard lock(storage.storage_mutex);
         auto node_it = storage.container.find(current_path);
@@ -2058,7 +2089,7 @@ class ToDeleteTreeCollector
         {
             auto child_path = (current_path_fs / child_name.toView()).generic_string();
 
-            if (uncommitted_children.contains(child_path))
+            if (processed_uncommitted_children.contains(child_path))
                 continue;
 
             auto child_it = storage.container.find(child_path);
@@ -2074,18 +2105,17 @@ class ToDeleteTreeCollector
         return CollectStatus::Ok;
     }
 
-    CollectStatus visitUncommitted(const std::string & path, UncommittedChildren & uncommitted_children)
+    CollectStatus visitUncommitted(const std::string & path, ProcessedUncommittedChildren & processed_uncommitted_children)
     {
-        auto & nodes = storage.uncommitted_state.nodes;
-
-        for (auto & [node_path, uncommitted_node] : nodes)
+        for (auto nodes_it = uncommitted_children.upper_bound(path + "/");
+             nodes_it != uncommitted_children.end() && Coordination::parentNodePath(StringRef{nodes_it->first}) == path;
+             ++nodes_it)
         {
-            if (Coordination::parentNodePath(node_path) != path)
-                continue;
+            const auto & [node_path, uncommitted_node] = *nodes_it;
 
-            uncommitted_children.insert(node_path);
+            processed_uncommitted_children.insert(node_path);
 
-            const auto node_ptr = uncommitted_node.node;
+            const auto node_ptr = uncommitted_node->node;
 
             if (node_ptr == nullptr) /// node was deleted in previous step of multi transaction
                 continue;
@@ -2093,8 +2123,8 @@ class ToDeleteTreeCollector
             if (checkLimits(*node_ptr))
                 return CollectStatus::LimitExceeded;
 
-            uncommitted_node.materializeACL(storage.acl_map);
-            addDelta(node_path, node_ptr->stats, *uncommitted_node.acls, std::string{node_ptr->getData()});
+            uncommitted_node->materializeACL(storage.acl_map);
+            addDelta(std::string{node_path}, node_ptr->stats, *uncommitted_node->acls, std::string{node_ptr->getData()});
         }
 
         return CollectStatus::Ok;
diff --git a/src/Coordination/tests/gtest_coordination_changelog.cpp b/src/Coordination/tests/gtest_coordination_changelog.cpp
index 79057308ad3a..b0889f103691 100644
--- a/src/Coordination/tests/gtest_coordination_changelog.cpp
+++ b/src/Coordination/tests/gtest_coordination_changelog.cpp
@@ -1149,7 +1149,6 @@ TYPED_TEST(CoordinationChangelogTest, TestRotateIntervalChanges)
 
 TYPED_TEST(CoordinationChangelogTest, ChangelogTestMaxLogSize)
 {
-
     ChangelogDirTest test("./logs");
     this->setLogDirectory("./logs");
 
@@ -1524,4 +1523,59 @@ TYPED_TEST(CoordinationChangelogTest, ChangelogTestBrokenWriteAt)
     }
 }
 
+TYPED_TEST(CoordinationChangelogTest, ChangelogLoadingFromInvalidName)
+{
+    if (this->enable_compression)
+        return;
+
+    ChangelogDirTest test("./logs");
+    this->setLogDirectory("./logs");
+
+    {
+        DB::KeeperLogStore changelog(
+            DB::LogFileSettings{
+                .force_sync = true, .compress_logs = this->enable_compression, .rotate_interval = 100'000, .max_size = 500},
+            DB::FlushSettings(),
+            this->keeper_context);
+        changelog.init(1, 0);
+
+        EXPECT_TRUE(fs::exists("./logs/changelog_1_100000.bin"));
+        for (size_t i = 0; i < 500; ++i)
+        {
+            auto entry = getLogEntry(std::to_string(i) + "_hello_world", 1);
+            changelog.append(entry);
+        }
+        changelog.end_of_append_batch(0, 0);
+
+        waitDurableLogs(changelog);
+    }
+
+    // Find file starting with "changelog_1_" (renamed because of file size limit)
+    fs::path new_changelog_path;
+    for (const auto & entry : fs::directory_iterator("./logs"))
+    {
+        if (entry.is_regular_file())
+        {
+            const auto filename = entry.path().filename().string();
+            if (filename.starts_with("changelog_1_"))
+                new_changelog_path = entry.path();
+        }
+    }
+
+    ASSERT_NE(new_changelog_path, fs::path{});
+
+    fs::rename(new_changelog_path, "./logs/changelog_1_100000.bin");
+
+    std::cout << new_changelog_path << std::endl;
+
+    DB::KeeperLogStore changelog(
+        DB::LogFileSettings{
+            .force_sync = true, .compress_logs = this->enable_compression, .rotate_interval = 100'000, .max_size = 500},
+        DB::FlushSettings(),
+        this->keeper_context);
+    changelog.init(15, 0);
+
+    ASSERT_EQ(changelog.next_slot(), 501);
+}
+
 #endif
diff --git a/src/Coordination/tests/gtest_coordination_storage.cpp b/src/Coordination/tests/gtest_coordination_storage.cpp
index 81bcc7b98764..f8d668569dd8 100644
--- a/src/Coordination/tests/gtest_coordination_storage.cpp
+++ b/src/Coordination/tests/gtest_coordination_storage.cpp
@@ -367,6 +367,17 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveRequest)
     }
 }
 
+namespace
+{
+Coordination::RequestPtr makeRemoveRecursiveRequest(const std::string & path, uint32_t remove_nodes_limit)
+{
+    auto request = std::make_shared<Coordination::ZooKeeperRemoveRecursiveRequest>();
+    request->path = path;
+    request->remove_nodes_limit = remove_nodes_limit;
+    return request;
+}
+}
+
 TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
 {
     using namespace DB;
@@ -436,7 +447,7 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
         int new_zxid = ++zxid;
         auto ops = prepare_create_tree();
 
-        ops.push_back(zkutil::makeRemoveRecursiveRequest("/A", 4));
+        ops.push_back(makeRemoveRecursiveRequest("/A", 4));
         const auto request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
 
         storage.preprocessRequest(request, 1, 0, new_zxid);
@@ -457,7 +468,7 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
         auto ops = prepare_create_tree();
 
         ops.push_back(zkutil::makeRemoveRequest("/A/C", -1));
-        ops.push_back(zkutil::makeRemoveRecursiveRequest("/A", 3));
+        ops.push_back(makeRemoveRecursiveRequest("/A", 3));
         const auto request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
 
         storage.preprocessRequest(request, 1, 0, new_zxid);
@@ -497,7 +508,7 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
         int remove_zxid = ++zxid;
         ops = {
             zkutil::makeRemoveRequest("/A/C", -1),
-            zkutil::makeRemoveRecursiveRequest("/A", 3),
+            makeRemoveRecursiveRequest("/A", 3),
         };
         const auto remove_request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
 
@@ -528,7 +539,7 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
         int remove_zxid = ++zxid;
         ops = {
             zkutil::makeSetRequest("/A/B", "", -1),
-            zkutil::makeRemoveRecursiveRequest("/A", 3),
+            makeRemoveRecursiveRequest("/A", 3),
         };
         auto remove_request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
         storage.preprocessRequest(remove_request, 1, 0, remove_zxid);
@@ -539,7 +550,7 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
 
         /// Big limit
         remove_zxid = ++zxid;
-        ops[1] = zkutil::makeRemoveRecursiveRequest("/A", 4);
+        ops[1] = makeRemoveRecursiveRequest("/A", 4);
         remove_request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
         storage.preprocessRequest(remove_request, 1, 0, remove_zxid);
         remove_responses = storage.processRequest(remove_request, 1, remove_zxid);
@@ -562,7 +573,7 @@ TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
             zkutil::makeCreateRequest("/A", "", zkutil::CreateMode::Persistent),
             zkutil::makeCreateRequest("/A/B", "", zkutil::CreateMode::Persistent),
             zkutil::makeCreateRequest("/A/CCCCCCCCCCCC", "", zkutil::CreateMode::Persistent),
-            zkutil::makeRemoveRecursiveRequest("/A", 3),
+            makeRemoveRecursiveRequest("/A", 3),
         };
         auto remove_request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
         storage.preprocessRequest(remove_request, 1, 0, new_zxid);
diff --git a/src/Core/BackgroundSchedulePool.cpp b/src/Core/BackgroundSchedulePool.cpp
index 08c2f22864f7..eb34e5e69e35 100644
--- a/src/Core/BackgroundSchedulePool.cpp
+++ b/src/Core/BackgroundSchedulePool.cpp
@@ -266,8 +266,14 @@ void BackgroundSchedulePool::join()
         shutdown = true;
 
         /// Unlock threads
-        tasks_cond_var.notify_all();
-        delayed_tasks_cond_var.notify_all();
+        {
+            std::lock_guard tasks_lock(tasks_mutex);
+            tasks_cond_var.notify_all();
+        }
+        {
+            std::lock_guard tasks_lock(delayed_tasks_mutex);
+            delayed_tasks_cond_var.notify_all();
+        }
 
         /// Join all worker threads to avoid any recursive calls to schedule()/scheduleAfter() from the task callbacks
         {
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index 623d2f5cd882..9b740b2df509 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -318,20 +318,19 @@ const ColumnWithTypeAndName * Block::findByName(const std::string & name, bool c
 
 std::optional<ColumnWithTypeAndName> Block::findSubcolumnByName(const std::string & name) const
 {
-    auto [name_in_storage, subcolumn_name] = Nested::splitName(name);
-    if (subcolumn_name.empty())
-        return std::nullopt;
-
-    const auto * column = findByName(name_in_storage, false);
-    if (!column)
-        return std::nullopt;
+    for (auto [column_name, subcolumn_name] : Nested::getAllColumnAndSubcolumnPairs(name))
+    {
+        const auto * column = findByName(column_name, false);
+        if (!column)
+            continue;
 
-    auto subcolumn_type = column->type->tryGetSubcolumnType(subcolumn_name);
-    auto subcolumn = column->type->tryGetSubcolumn(subcolumn_name, column->column);
-    if (!subcolumn_type || !subcolumn)
-        return std::nullopt;
+        auto subcolumn_type = column->type->tryGetSubcolumnType(subcolumn_name);
+        auto subcolumn = column->type->tryGetSubcolumn(subcolumn_name, column->column);
+        if (subcolumn_type && subcolumn)
+            return ColumnWithTypeAndName(subcolumn, subcolumn_type, name);
+    }
 
-    return ColumnWithTypeAndName(subcolumn, subcolumn_type, name);
+    return std::nullopt;
 }
 
 std::optional<ColumnWithTypeAndName> Block::findColumnOrSubcolumnByName(const std::string & name) const
diff --git a/src/Core/FormatFactorySettings.h b/src/Core/FormatFactorySettings.h
index 825dd0671472..f662617b2519 100644
--- a/src/Core/FormatFactorySettings.h
+++ b/src/Core/FormatFactorySettings.h
@@ -168,7 +168,7 @@ Ignore case when matching ORC columns with CH columns.
 Ignore case when matching Parquet columns with CH columns.
 )", 0) \
     DECLARE(Bool, input_format_parquet_preserve_order, false, R"(
-Avoid reordering rows when reading from Parquet files. Usually makes it much slower. Not recommended as row ordering is generally not guaranteed, and other parts of query pipeline may break it.
+Avoid reordering rows when reading from Parquet files. Not recommended as row ordering is generally not guaranteed, and other parts of query pipeline may break it. Use `ORDER BY _row_number` instead.
 )", 0) \
     DECLARE(Bool, input_format_parquet_filter_push_down, true, R"(
 When reading Parquet files, skip whole row groups based on the WHERE/PREWHERE expressions and min/max statistics in the Parquet metadata.
@@ -182,8 +182,8 @@ When reading Parquet files, parse JSON columns as ClickHouse JSON Column.
     DECLARE(Bool, input_format_parquet_use_native_reader, false, R"(
 Use native parquet reader v1. It's relatively fast but unfinished. Deprecated.
 )", 0) \
-    DECLARE(Bool, input_format_parquet_use_native_reader_v3, false, R"(
-Use Parquet reader v3. Experimental.
+    DECLARE(Bool, input_format_parquet_use_native_reader_v3, true, R"(
+Use Parquet reader v3.
 )", 0) \
     DECLARE(UInt64, input_format_parquet_memory_low_watermark, 2ul << 20, R"(
 Schedule prefetches more aggressively if memory usage is below than threshold. Potentially useful e.g. if there are many small bloom filters to read over network.
@@ -196,6 +196,9 @@ Skip pages using min/max values from column index.
 )", 0) \
     DECLARE(Bool, input_format_parquet_use_offset_index, true, R"(
 Minor tweak to how pages are read from parquet file when no page filtering is used.
+)", 0) \
+    DECLARE(Bool, input_format_parquet_verify_checksums, true, R"(
+Verify page checksums when reading parquet files.
 )", 0) \
     DECLARE(Bool, input_format_allow_seeks, true, R"(
 Allow seeks while reading in ORC/Parquet/Arrow input formats.
@@ -1127,6 +1130,9 @@ If dictionary size grows bigger than this many bytes, switch to encoding without
 )", 0) \
     DECLARE(Bool, output_format_parquet_enum_as_byte_array, true, R"(
 Write enum using parquet physical type: BYTE_ARRAY and logical type: ENUM
+)", 0) \
+    DECLARE(Bool, output_format_parquet_write_checksums, true, R"(
+Put crc32 checksums in parquet page headers.
 )", 0) \
     DECLARE(String, output_format_avro_codec, "", R"(
 Compression codec used for output. Possible values: 'null', 'deflate', 'snappy', 'zstd'.
@@ -1458,8 +1464,7 @@ Use geo column parser to convert Array(UInt8) into Point/Linestring/Polygon/Mult
     DECLARE(Bool, output_format_parquet_geometadata, true, R"(
 Allow to write information about geo columns in parquet metadata and encode columns in WKB format.
 )", 0) \
-
-
+    DECLARE(Bool, input_format_parquet_use_metadata_cache, true, R"(Enable parquet file metadata caching)", 0) \
 // End of FORMAT_FACTORY_SETTINGS
 
 #define OBSOLETE_FORMAT_SETTINGS(M, ALIAS) \
diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h
index 1db06e0f916d..9db589f4ca34 100644
--- a/src/Core/Protocol.h
+++ b/src/Core/Protocol.h
@@ -96,8 +96,10 @@ namespace Protocol
             MergeTreeReadTaskRequest = 16,  /// Request from a MergeTree replica to a coordinator
             TimezoneUpdate = 17,            /// Receive server's (session-wide) default timezone
             SSHChallenge = 18,              /// Return challenge for SSH signature signing
+
             MAX = SSHChallenge,
 
+            ConnectionLost = 255,           /// Exception that occurred on the client side.
         };
 
         /// NOTE: If the type of packet argument would be Enum, the comparison packet >= 0 && packet < 10
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
index 5ed5ab179b19..b8bbf2c9e945 100644
--- a/src/Core/ProtocolDefines.h
+++ b/src/Core/ProtocolDefines.h
@@ -35,7 +35,10 @@ static constexpr auto DBMS_MIN_REVISION_WITH_AGGREGATE_FUNCTIONS_VERSIONING = 54
 
 static constexpr auto DBMS_CLUSTER_INITIAL_PROCESSING_PROTOCOL_VERSION = 1;
 static constexpr auto DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_DATA_LAKE_METADATA = 2;
-static constexpr auto DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION = 2;
+static constexpr auto DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_ICEBERG_METADATA = 3;
+static constexpr auto DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_FILE_BUCKETS_INFO = 4;
+static constexpr auto DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_DATA_LAKE_COLUMNS_METADATA = 5;
+static constexpr auto DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION = DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_DATA_LAKE_COLUMNS_METADATA;
 
 static constexpr auto DBMS_MIN_SUPPORTED_PARALLEL_REPLICAS_PROTOCOL_VERSION = 3;
 static constexpr auto DBMS_PARALLEL_REPLICAS_MIN_VERSION_WITH_MARK_SEGMENT_SIZE_FIELD = 4;
diff --git a/src/Core/Range.cpp b/src/Core/Range.cpp
index 139fb8db76c9..6d037d7e9004 100644
--- a/src/Core/Range.cpp
+++ b/src/Core/Range.cpp
@@ -151,6 +151,13 @@ bool Range::isInfinite() const
     return left.isNegativeInfinity() && right.isPositiveInfinity();
 }
 
+/// [x, x]
+bool Range::isPoint() const
+{
+    return fullBounded() && left_included && right_included && equals(left, right)
+        && !left.isNegativeInfinity() && !left.isPositiveInfinity();
+}
+
 bool Range::intersectsRange(const Range & r) const
 {
     /// r to the left of me.
diff --git a/src/Core/Range.h b/src/Core/Range.h
index 6072795db0a9..921e1e6aa3f0 100644
--- a/src/Core/Range.h
+++ b/src/Core/Range.h
@@ -94,6 +94,8 @@ struct Range
 
     bool isBlank() const;
 
+    bool isPoint() const;
+
     bool intersectsRange(const Range & r) const;
 
     bool containsRange(const Range & r) const;
diff --git a/src/Core/ServerSettings.cpp b/src/Core/ServerSettings.cpp
index 004f8a16098c..493783927b7e 100644
--- a/src/Core/ServerSettings.cpp
+++ b/src/Core/ServerSettings.cpp
@@ -112,6 +112,7 @@ namespace DB
     DECLARE(UInt64, max_unexpected_parts_loading_thread_pool_size, 8, R"(The number of threads to load inactive set of data parts (Unexpected ones) at startup.)", 0) \
     DECLARE(UInt64, max_parts_cleaning_thread_pool_size, 128, R"(The number of threads for concurrent removal of inactive data parts.)", 0) \
     DECLARE(UInt64, max_mutations_bandwidth_for_server, 0, R"(The maximum read speed of all mutations on server in bytes per second. Zero means unlimited.)", 0) \
+    DECLARE(UInt64, max_exports_bandwidth_for_server, 0, R"(The maximum read speed of all exports on server in bytes per second. Zero means unlimited.)", 0) \
     DECLARE(UInt64, max_merges_bandwidth_for_server, 0, R"(The maximum read speed of all merges on server in bytes per second. Zero means unlimited.)", 0) \
     DECLARE(UInt64, max_replicated_fetches_network_bandwidth_for_server, 0, R"(The maximum speed of data exchange over the network in bytes per second for replicated fetches. Zero means unlimited.)", 0) \
     DECLARE(UInt64, max_replicated_sends_network_bandwidth_for_server, 0, R"(The maximum speed of data exchange over the network in bytes per second for replicated sends. Zero means unlimited.)", 0) \
@@ -748,6 +749,15 @@ namespace DB
     A value of `0` means unlimited.
     :::
     )", 0) \
+    DECLARE(Bool, enable_token_auth, true, R"(
+    Controls whether token-based (JWT) authentication is enabled.
+    When disabled:
+    - Token processors from the `token_processors` section are not parsed.
+    - `TokenAccessStorage` (token user directory) is not added.
+    - Authentication via tokens (`--jwt` option in clickhouse-client or `Authorization: Bearer` HTTP header) is rejected.
+
+    Default value: `true` (token authentication is enabled).
+    )", 0) \
     DECLARE(UInt64, concurrent_threads_soft_limit_num, 0, R"(
     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.
 
@@ -1027,6 +1037,12 @@ The policy on how to perform a scheduling of CPU slots specified by `concurrent_
     DECLARE(UInt64, memory_worker_period_ms, 0, R"(
     Tick period of background memory worker which corrects memory tracker memory usages and cleans up unused pages during higher memory usage. If set to 0, default value will be used depending on the memory usage source
     )", 0) \
+    DECLARE(Double, memory_worker_purge_dirty_pages_threshold_ratio, 0.2, R"(
+    The threshold ratio for jemalloc dirty pages relative to the memory available to ClickHouse server. When dirty pages size exceeds this ratio, the background memory worker forces purging of dirty pages. If set to 0, forced purging based on dirty pages ratio is disabled.
+    )", 0) \
+    DECLARE(Double, memory_worker_purge_total_memory_threshold_ratio, 0.9, R"(
+    The threshold ratio for purging jemalloc relative to the memory available to ClickHouse server. When total memory usage exceeds this ratio, the background memory worker forces purging of dirty pages. If set to 0, forced purging based on total memory is disabled.
+    )", 0) \
     DECLARE(Bool, memory_worker_correct_memory_tracker, 0, R"(
     Whether background memory worker should correct internal memory tracker based on the information from external sources like jemalloc and cgroups
     )", 0) \
@@ -1139,8 +1155,11 @@ The policy on how to perform a scheduling of CPU slots specified by `concurrent_
     DECLARE(UInt64, threadpool_local_fs_reader_queue_size, 1000000, R"(The maximum number of jobs that can be scheduled on the thread pool for reading from local filesystem.)", 0) \
     DECLARE(NonZeroUInt64, threadpool_remote_fs_reader_pool_size, 250, R"(Number of threads in the Thread pool used for reading from remote filesystem when `remote_filesystem_read_method = 'threadpool'`.)", 0) \
     DECLARE(UInt64, threadpool_remote_fs_reader_queue_size, 1000000, R"(The maximum number of jobs that can be scheduled on the thread pool for reading from remote filesystem.)", 0) \
-
-
+    DECLARE(UInt64, object_storage_list_objects_cache_size, 500000000, "Maximum size of ObjectStorage list objects cache in bytes. Zero means disabled.", 0)                            \
+    DECLARE(UInt64, object_storage_list_objects_cache_max_entries, 1000, "Maximum size of ObjectStorage list objects cache in entries. Zero means disabled.", 0)                      \
+    DECLARE(UInt64, object_storage_list_objects_cache_ttl, 3600, "Time to live of records in ObjectStorage list objects cache in seconds. Zero means unlimited", 0)                   \
+    DECLARE(UInt64, input_format_parquet_metadata_cache_max_size, 500000000, "Maximum size of parquet file metadata cache", 0) \
+    DECLARE(Bool, enable_experimental_export_merge_tree_partition_feature, false, "Enable export replicated merge tree partition feature. It is experimental and not yet ready for production use.", 0) \
 // clang-format on
 
 /// If you add a setting which can be updated at runtime, please update 'changeable_settings' map in dumpToSystemServerSettingsColumns below
diff --git a/src/Core/Settings.cpp b/src/Core/Settings.cpp
index b1c7be5d3f17..c39b79a29e5d 100644
--- a/src/Core/Settings.cpp
+++ b/src/Core/Settings.cpp
@@ -466,6 +466,11 @@ When set to `false` than all attempts are made with identical timeouts.
 When set to `true`, all threads executing S3 requests to the same backup endpoint are slowed down
 after any single s3 request encounters a retryable network error, such as socket timeout.
 When set to `false`, each thread handles S3 request backoff independently of the others.
+)", 0) \
+    DECLARE(Bool, backup_slow_all_threads_after_retryable_s3_error, false, R"(
+When set to `true`, all threads executing S3 requests to the same backup endpoint are slowed down
+after any single S3 request encounters a retryable S3 error, such as 'Slow Down'.
+When set to `false`, each thread handles s3 request backoff independently of the others.
 )", 0) \
     DECLARE(UInt64, azure_list_object_keys_size, 1000, R"(
 Maximum number of files that could be returned in batch by ListObject request
@@ -1755,6 +1760,22 @@ Possible values:
 - `global` — Replaces the `IN`/`JOIN` query with `GLOBAL IN`/`GLOBAL JOIN.`
 - `allow` — Allows the use of these types of subqueries.
 )", IMPORTANT) \
+    DECLARE(ObjectStorageClusterJoinMode, object_storage_cluster_join_mode, ObjectStorageClusterJoinMode::ALLOW, R"(
+Changes the behaviour of object storage cluster function or table.
+
+ClickHouse applies this setting when the query contains the product of object storage cluster function or table, i.e. when the query for a object storage cluster function or table contains a non-GLOBAL subquery for the object storage cluster function or table.
+
+Restrictions:
+
+- Only applied for JOIN subqueries.
+- Only if the FROM section uses a object storage cluster function or table.
+
+Possible values:
+
+- `local` — Replaces the database and table in the subquery with local ones for the destination server (shard), leaving the normal `IN`/`JOIN.`
+- `global` — Unsupported for now. Replaces the `IN`/`JOIN` query with `GLOBAL IN`/`GLOBAL JOIN.`
+- `allow` — Default value. Allows the use of these types of subqueries.
+)", 0) \
     \
     DECLARE(UInt64, max_concurrent_queries_for_all_users, 0, R"(
 Throw exception if the value of this setting is less or equal than the current number of simultaneously processed queries.
@@ -2089,6 +2110,11 @@ DECLARE(BoolAuto, query_plan_join_swap_table, Field("auto"), R"(
     DECLARE(Bool, query_plan_join_shard_by_pk_ranges, false, R"(
 Apply sharding for JOIN if join keys contain a prefix of PRIMARY KEY for both tables. Supported for hash, parallel_hash and full_sorting_merge algorithms. Usually does not speed up queries but may lower memory consumption.
  )", 0) \
+    \
+    DECLARE(Bool, enable_alias_marker, true, R"(
+Enable __aliasMarker injection for ALIAS column expressions when using the analyzer.
+This stabilizes action node names across planner/analyzer stages without changing query semantics.
+)", 0) \
     \
     DECLARE(UInt64, preferred_block_size_bytes, 1000000, R"(
 This setting adjusts the data block size for query processing and represents additional fine-tuning to the more rough 'max_block_size' setting. If the columns are large and with 'max_block_size' rows the block size is likely to be larger than the specified amount of bytes, its size will be lowered for better CPU cache locality.
@@ -3337,11 +3363,6 @@ Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means
 )", 0) \
     DECLARE(Float, backup_restore_s3_retry_jitter_factor, .1f, R"(
     Jitter factor applied to the retry backoff delay in Aws::Client::RetryStrategy during backup and restore operations. The computed backoff delay is multiplied by a random factor in the range [1.0, 1.0 + jitter], up to the maximum `backup_restore_s3_retry_max_backoff_ms`. Must be in [0.0, 1.0] interval
-)", 0) \
-    DECLARE(Bool, backup_slow_all_threads_after_retryable_s3_error, true, R"(
-When set to `true`, all threads executing S3 requests to the same backup endpoint are slowed down
-after any single S3 request encounters a retryable S3 error, such as 'Slow Down'.
-When set to `false`, each thread handles s3 request backoff independently of the others.
 )", 0) \
     DECLARE(UInt64, max_backup_bandwidth, 0, R"(
 The maximum read speed in bytes per second for particular backup on server. Zero means unlimited.
@@ -4867,6 +4888,18 @@ The maximum size of serialized literal in bytes to replace in `UPDATE` and `DELE
     \
     DECLARE(Float, create_replicated_merge_tree_fault_injection_probability, 0.0f, R"(
 The probability of a fault injection during table creation after creating metadata in ZooKeeper
+)", 0) \
+    DECLARE(IcebergMetadataLogLevel, iceberg_metadata_log_level, IcebergMetadataLogLevel::None, R"(
+Controls the level of metadata logging for Iceberg tables to system.iceberg_metadata_log.
+Usually this setting can be modified for debugging purposes.
+
+Possible values:
+- none - No metadata log.
+- metadata - Root metadata.json file.
+- manifest_list_metadata - Everything above + metadata from avro manifest list which corresponds to a snapshot.
+- manifest_list_entry - Everything above + avro manifest list entries.
+- manifest_file_metadata - Everything above + metadata from traversed avro manifest files.
+- manifest_file_entry - Everything above + traversed avro manifest files entries.
 )", 0) \
     \
     DECLARE(Bool, use_iceberg_metadata_files_cache, true, R"(
@@ -6459,12 +6492,12 @@ Query Iceberg table using the snapshot that was current at a specific timestamp.
 )", 0) \
     DECLARE(Int64, iceberg_snapshot_id, 0, R"(
 Query Iceberg table using the specific snapshot id.
-)", 0) \
-    DECLARE(Bool, delta_lake_enable_expression_visitor_logging, false, R"(
-Enables Test level logs of DeltaLake expression visitor. These logs can be too verbose even for test logging.
 )", 0) \
     DECLARE(Bool, show_data_lake_catalogs_in_system_tables, true, R"(
 Enables showing data lake catalogs in system tables.
+)", 0) \
+    DECLARE(Bool, delta_lake_enable_expression_visitor_logging, false, R"(
+Enables Test level logs of DeltaLake expression visitor. These logs can be too verbose even for test logging.
 )", 0) \
     DECLARE(Int64, delta_lake_snapshot_version, -1, R"(
 Version of delta lake snapshot to read. Value -1 means to read latest version (value 0 is a valid snapshot version).
@@ -6475,6 +6508,15 @@ Enables throwing an exception if there was an error when analyzing scan predicat
     DECLARE(Bool, delta_lake_enable_engine_predicate, true, R"(
 Enables delta-kernel internal data pruning.
 )", 0) \
+    DECLARE(NonZeroUInt64, delta_lake_insert_max_rows_in_data_file, 100000, R"(
+Defines a rows limit for a single inserted data file in delta lake.
+)", 0) \
+    DECLARE(NonZeroUInt64, delta_lake_insert_max_bytes_in_data_file, 1_GiB, R"(
+Defines a bytes limit for a single inserted data file in delta lake.
+)", 0) \
+    DECLARE(Bool, allow_experimental_delta_lake_writes, false, R"(
+Enables delta-kernel writes feature.
+)", EXPERIMENTAL) \
     DECLARE(Bool, allow_deprecated_error_prone_window_functions, false, R"(
 Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)
 )", 0) \
@@ -6608,13 +6650,13 @@ The timeout in milliseconds for connecting to a remote replica during query exec
     DECLARE(Bool, parallel_replicas_for_cluster_engines, true, R"(
 Replace table function engines with their -Cluster alternatives
 )", 0) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_iceberg, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_iceberg, true, R"(
 Allow experimental database engine DataLakeCatalog with catalog_type = 'iceberg'
 )", BETA, allow_database_iceberg) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_unity_catalog, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_unity_catalog, true, R"(
 Allow experimental database engine DataLakeCatalog with catalog_type = 'unity'
 )", BETA, allow_database_unity_catalog) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_glue_catalog, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_glue_catalog, true, R"(
 Allow experimental database engine DataLakeCatalog with catalog_type = 'glue'
 )", BETA, allow_database_glue_catalog) \
     DECLARE_WITH_ALIAS(Bool, allow_experimental_analyzer, true, R"(
@@ -6750,18 +6792,21 @@ It is unspecified how this setting affects views and distributed queries.
 The setting accepts a table name (then the table is resolved from the current database) or a qualified name in the form of 'database.table'.
 Both database and table names have to be unquoted - only simple identifiers are allowed.
 )", 0) \
-    \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_variant_type, true, R"(
-Allows creation of [Variant](../../sql-reference/data-types/variant.md) data type.
-)", 0, enable_variant_type) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_dynamic_type, true, R"(
-Allows creation of [Dynamic](../../sql-reference/data-types/dynamic.md) data type.
-)", 0, enable_dynamic_type) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_json_type, true, R"(
-Allows creation of [JSON](../../sql-reference/data-types/newjson.md) data type.
-)", 0, enable_json_type) \
     DECLARE(Bool, allow_general_join_planning, true, R"(
 Allows a more general join planning algorithm that can handle more complex conditions, but only works with hash join. If hash join is not enabled, then the usual join planning algorithm is used regardless of the value of this setting.
+)", 0) \
+    DECLARE(ObjectStorageGranularityLevel, cluster_table_function_split_granularity, ObjectStorageGranularityLevel::FILE, R"(
+Controls how data is split into tasks when executing a CLUSTER TABLE FUNCTION.
+
+This setting defines the granularity of work distribution across the cluster:
+- `file` — each task processes an entire file.
+- `bucket` — tasks are created per internal data block within a file (for example, Parquet row groups).
+
+Choosing finer granularity (like `bucket`) can improve parallelism when working with a small number of large files.
+For instance, if a Parquet file contains multiple row groups, enabling `bucket` granularity allows each group to be processed independently by different workers.
+)", 0) \
+    DECLARE(UInt64, cluster_table_function_buckets_batch_size, 0, R"(
+Defines the approximate size of a batch (in bytes) used in distributed processing of tasks in cluster table functions with `bucket` split granularity. The system accumulates data until at least this amount is reached. The actual size may be slightly larger to align with data boundaries.
 )", 0) \
     DECLARE(UInt64, merge_table_max_tables_to_look_for_schema_inference, 1000, R"(
 When creating a `Merge` table without an explicit schema or when using the `merge` table function, infer schema as a union of not more than the specified number of matching tables.
@@ -6843,6 +6888,52 @@ Possible values:
 )", 0) \
     DECLARE(Bool, use_roaring_bitmap_iceberg_positional_deletes, false, R"(
 Use roaring bitmap for iceberg positional deletes.
+)", 0) \
+    DECLARE(Bool, export_merge_tree_part_overwrite_file_if_exists, false, R"(
+Overwrite file if it already exists when exporting a merge tree part
+)", 0) \
+    DECLARE(Bool, export_merge_tree_partition_force_export, false, R"(
+Ignore existing partition export and overwrite the zookeeper entry
+)", 0) \
+    DECLARE(UInt64, export_merge_tree_partition_max_retries, 3, R"(
+Maximum number of retries for exporting a merge tree part in an export partition task
+)", 0) \
+    DECLARE(UInt64, export_merge_tree_partition_manifest_ttl, 180, R"(
+Determines how long the manifest will live in ZooKeeper. It prevents the same partition from being exported twice to the same destination.
+This setting does not affect / delete in progress tasks. It'll only cleanup the completed ones.
+)", 0) \
+    DECLARE(MergeTreePartExportFileAlreadyExistsPolicy, export_merge_tree_part_file_already_exists_policy, MergeTreePartExportFileAlreadyExistsPolicy::skip, R"(
+Possible values:
+- skip - Skip the file if it already exists.
+- error - Throw an error if the file already exists.
+- overwrite - Overwrite the file.
+)", 0) \
+    DECLARE(Timezone, iceberg_timezone_for_timestamptz, "UTC", R"(
+Timezone for Iceberg timestamptz field.
+
+Possible values:
+
+- Any valid timezone, e.g. `Europe/Berlin`, `UTC` or `Zulu`
+- `` (empty value) - use session timezone
+
+Default value is `UTC`.
+)", 0) \
+    DECLARE(UInt64, export_merge_tree_part_max_bytes_per_file, 0, R"(
+Maximum number of bytes to write to a single file when exporting a merge tree part. 0 means no limit.
+This is not a hard limit, and it highly depends on the output format granularity and input source chunk size.
+)", 0) \
+    DECLARE(UInt64, export_merge_tree_part_max_rows_per_file, 0, R"(
+Maximum number of rows to write to a single file when exporting a merge tree part. 0 means no limit.
+This is not a hard limit, and it highly depends on the output format granularity and input source chunk size.
+)", 0) \
+    DECLARE(Bool, export_merge_tree_part_throw_on_pending_mutations, true, R"(
+Throw an error if there are pending mutations when exporting a merge tree part.
+)", 0) \
+    DECLARE(Bool, export_merge_tree_part_throw_on_pending_patch_parts, true, R"(
+Throw an error if there are pending patch parts when exporting a merge tree part.
+)", 0) \
+    DECLARE(Bool, serialize_string_in_memory_with_zero_byte, true, R"(
+Serialize String values during aggregation with zero byte at the end. Enable to keep compatibility when querying cluster of incompatible versions.
 )", 0) \
     \
     /* ####################################################### */ \
@@ -6870,6 +6961,12 @@ Allows creation of tables with the [TimeSeries](../../engines/table-engines/inte
 - 0 — the [TimeSeries](../../engines/table-engines/integrations/time-series.md) table engine is disabled.
 - 1 — the [TimeSeries](../../engines/table-engines/integrations/time-series.md) table engine is enabled.
 )", EXPERIMENTAL) \
+    DECLARE(Bool, allow_experimental_hybrid_table, false, R"(
+Allows creation of tables with the [Hybrid](../../engines/table-engines/special/hybrid.md) table engine.
+)", EXPERIMENTAL) \
+    DECLARE(Bool, hybrid_table_auto_cast_columns, true, R"(
+Automatically cast columns to the schema defined in Hybrid tables when remote segments expose different physical types. Works only with analyzer. Enabled by default, does nothing if (experimental) Hybrid tables are disabled; disable it if it causes issues. Segment schemas are cached when the Hybrid table is created or attached; if a segment schema changes later, detach/attach or recreate the Hybrid table so the cached headers stay in sync.
+)", 0) \
     DECLARE(Bool, allow_experimental_codecs, false, R"(
 If it is set to true, allow to specify experimental compression codecs (but we don't have those yet and this option does nothing).
 )", EXPERIMENTAL) \
@@ -6959,6 +7056,15 @@ Enable PRQL - an alternative to SQL.
 )", EXPERIMENTAL) \
     DECLARE(Bool, enable_adaptive_memory_spill_scheduler, false, R"(
 Trigger processor to spill data into external storage adpatively. grace join is supported at present.
+)", EXPERIMENTAL) \
+    DECLARE(String, object_storage_cluster, "", R"(
+Cluster to make distributed requests to object storages with alternative syntax.
+)", EXPERIMENTAL) \
+    DECLARE(UInt64, object_storage_max_nodes, 0, R"(
+Limit for hosts used for request in object storage cluster table functions - azureBlobStorageCluster, s3Cluster, hdfsCluster, etc.
+Possible values:
+- Positive integer.
+- 0 — All hosts in cluster.
 )", EXPERIMENTAL) \
     DECLARE(Bool, allow_experimental_delta_kernel_rs, true, R"(
 Allow experimental delta-kernel-rs implementation.
@@ -6974,6 +7080,9 @@ Write full paths (including s3://) into iceberg metadata files.
 )", EXPERIMENTAL) \
     DECLARE(String, iceberg_metadata_compression_method, "", R"(
 Method to compress `.metadata.json` file.
+)", EXPERIMENTAL) \
+    DECLARE(Bool, use_object_storage_list_objects_cache, false, R"(
+Cache the list of objects returned by list objects calls in object storage
 )", EXPERIMENTAL) \
     DECLARE(Bool, make_distributed_plan, false, R"(
 Make distributed query plan.
@@ -6990,6 +7099,19 @@ Default number of tasks for parallel reading in distributed query. Tasks are spr
     DECLARE(Bool, distributed_plan_optimize_exchanges, true, R"(
 Removes unnecessary exchanges in distributed query plan. Disable it for debugging.
 )", 0) \
+    DECLARE(UInt64, lock_object_storage_task_distribution_ms, 500, R"(
+In object storage distribution queries do not distribute tasks on non-prefetched nodes until prefetched node is active.
+Determines how long the free executor node (one that finished processing all of it assigned tasks) should wait before "stealing" tasks from queue of currently busy executor nodes.
+
+Possible values:
+
+- 0  - steal tasks immediately after freeing up.
+- >0 - wait for specified period of time before stealing tasks.
+
+Having this `>0` helps with cache reuse and might improve overall query time.
+Because busy node might have warmed-up caches for this specific task, while free node needs to fetch lots of data from S3.
+Which might take longer than just waiting for the busy node and generate extra traffic.
+)", EXPERIMENTAL) \
     DECLARE(String, distributed_plan_force_exchange_kind, "", R"(
 Force specified kind of Exchange operators between distributed query stages.
 
@@ -7013,12 +7135,21 @@ DECLARE(Bool, allow_experimental_ytsaurus_dictionary_source, false, R"(
     )", EXPERIMENTAL) \
     DECLARE(Bool, distributed_plan_force_shuffle_aggregation, false, R"(
 Use Shuffle aggregation strategy instead of PartialAggregation + Merge in distributed query plan.
+)", EXPERIMENTAL) \
+    DECLARE(Bool, allow_experimental_iceberg_read_optimization, true, R"(
+Allow Iceberg read optimization based on Iceberg metadata.
+)", EXPERIMENTAL) \
+    DECLARE(Bool, object_storage_remote_initiator, false, R"(
+Execute request to object storage as remote on one of object_storage_cluster nodes.
 )", EXPERIMENTAL) \
     \
     /** Experimental timeSeries* aggregate functions. */ \
     DECLARE_WITH_ALIAS(Bool, allow_experimental_time_series_aggregate_functions, false, R"(
 Experimental timeSeries* aggregate functions for Prometheus-like timeseries resampling, rate, delta calculation.
 )", EXPERIMENTAL, allow_experimental_ts_to_grid_aggregate_function) \
+    DECLARE(Bool, allow_experimental_export_merge_tree_part, true, R"(
+Experimental export merge tree part.
+)", EXPERIMENTAL) \
     \
     DECLARE(String, promql_database, "", R"(
 Specifies the database name used by the 'promql' dialect. Empty string means the current database.
@@ -7074,6 +7205,13 @@ Sets the evaluation time to be used with promql dialect. 'auto' means the curren
     MAKE_OBSOLETE(M, LightweightMutationProjectionMode, lightweight_mutation_projection_mode, LightweightMutationProjectionMode::THROW) \
     MAKE_OBSOLETE(M, Bool, use_local_cache_for_remote_storage, false) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_join_condition, false) \
+    MAKE_OBSOLETE(M, Bool, allow_experimental_variant_type, true) \
+    MAKE_OBSOLETE(M, Bool, allow_experimental_dynamic_type, true) \
+    MAKE_OBSOLETE(M, Bool, allow_experimental_json_type, true) \
+    MAKE_OBSOLETE(M, Bool, enable_variant_type, true) \
+    MAKE_OBSOLETE(M, Bool, enable_dynamic_type, true) \
+    MAKE_OBSOLETE(M, Bool, enable_json_type, true) \
+    MAKE_OBSOLETE(M, Bool, s3_slow_all_threads_after_retryable_error, false) \
     \
     /* moved to config.xml: see also src/Core/ServerSettings.h */ \
     MAKE_DEPRECATED_BY_SERVER_CONFIG(M, UInt64, background_buffer_flush_schedule_pool_size, 16) \
@@ -7122,6 +7260,7 @@ Sets the evaluation time to be used with promql dialect. 'auto' means the curren
     MAKE_OBSOLETE(M, Bool, allow_experimental_shared_set_join, true) \
     MAKE_OBSOLETE(M, UInt64, min_external_sort_block_bytes, 100_MiB) \
     MAKE_OBSOLETE(M, UInt64, distributed_cache_read_alignment, 0) \
+    MAKE_OBSOLETE(M, Bool, allow_retries_in_cluster_requests, false) \
     /** The section above is for obsolete settings. Do not add anything there. */
 #endif /// __CLION_IDE__
 
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index fda6e5c83451..49d50d9ce3b5 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -58,10 +58,12 @@ class WriteBuffer;
     M(CLASS_NAME, DistributedCachePoolBehaviourOnLimit) /* Cloud only */ \
     M(CLASS_NAME, DistributedDDLOutputMode) \
     M(CLASS_NAME, DistributedProductMode) \
+    M(CLASS_NAME, ObjectStorageClusterJoinMode) \
     M(CLASS_NAME, Double) \
     M(CLASS_NAME, EscapingRule) \
     M(CLASS_NAME, Float) \
     M(CLASS_NAME, FloatAuto) \
+    M(CLASS_NAME, IcebergMetadataLogLevel) \
     M(CLASS_NAME, IdentifierQuotingRule) \
     M(CLASS_NAME, IdentifierQuotingStyle) \
     M(CLASS_NAME, Int32) \
@@ -79,6 +81,7 @@ class WriteBuffer;
     M(CLASS_NAME, LogsLevel) \
     M(CLASS_NAME, Map) \
     M(CLASS_NAME, MaxThreads) \
+    M(CLASS_NAME, MergeTreePartExportFileAlreadyExistsPolicy) \
     M(CLASS_NAME, Milliseconds) \
     M(CLASS_NAME, MsgPackUUIDRepresentation) \
     M(CLASS_NAME, MySQLDataTypesSupport) \
@@ -106,7 +109,8 @@ class WriteBuffer;
     M(CLASS_NAME, UInt64Auto) \
     M(CLASS_NAME, URI) \
     M(CLASS_NAME, VectorSearchFilterStrategy) \
-    M(CLASS_NAME, GeoToH3ArgumentOrder)
+    M(CLASS_NAME, GeoToH3ArgumentOrder) \
+    M(CLASS_NAME, ObjectStorageGranularityLevel)
 
 
 COMMON_SETTINGS_SUPPORTED_TYPES(Settings, DECLARE_SETTING_TRAIT)
diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index bf1ffcce7808..196efcc1b902 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -39,6 +39,35 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
         /// controls new feature and it's 'true' by default, use 'false' as previous_value).
         /// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972)
         /// Note: please check if the key already exists to prevent duplicate entries.
+        addSettingsChanges(settings_changes_history, "25.8.9.2000",
+        {
+            {"allow_experimental_iceberg_read_optimization", true, true, "New setting."},
+            {"object_storage_cluster_join_mode", "allow", "allow", "New setting"},
+            {"lock_object_storage_task_distribution_ms", 500, 500, "Raised the value to 500 to avoid hoping tasks between executors."},
+            {"allow_retries_in_cluster_requests", false, false, "New setting"},
+            {"object_storage_remote_initiator", false, false, "New setting."},
+            {"allow_experimental_export_merge_tree_part", false, false, "New setting."},
+            {"export_merge_tree_part_overwrite_file_if_exists", false, false, "New setting."},
+            {"allow_experimental_export_merge_tree_part", false, true, "Turned ON by default for Antalya."},
+            {"export_merge_tree_partition_force_export", false, false, "New setting."},
+            {"export_merge_tree_partition_max_retries", 3, 3, "New setting."},
+            {"export_merge_tree_partition_manifest_ttl", 180, 180, "New setting."},
+            {"export_merge_tree_part_file_already_exists_policy", "skip", "skip", "New setting."},
+            {"iceberg_timezone_for_timestamptz", "UTC", "UTC", "New setting."},
+            {"hybrid_table_auto_cast_columns", true, true, "New setting to automatically cast Hybrid table columns when segments disagree on types. Default enabled."},
+            {"allow_experimental_hybrid_table", false, false, "Added new setting to allow the Hybrid table engine."},
+            {"enable_alias_marker", true, true, "New setting."},
+            {"input_format_parquet_use_native_reader_v3", false, true, "Seems stable"},
+            {"input_format_parquet_verify_checksums", true, true, "New setting."},
+            {"output_format_parquet_write_checksums", false, true, "New setting."},
+            {"export_merge_tree_part_max_bytes_per_file", 0, 0, "New setting."},
+            {"export_merge_tree_part_max_rows_per_file", 0, 0, "New setting."},
+            {"allow_experimental_hybrid_table", false, false, "Added new setting to allow the Hybrid table engine."},
+            {"cluster_table_function_split_granularity", "file", "file", "New setting."},
+            {"cluster_table_function_buckets_batch_size", 0, 0, "New setting."},
+            {"export_merge_tree_part_throw_on_pending_mutations", true, true, "New setting."},
+            {"export_merge_tree_part_throw_on_pending_patch_parts", true, true, "New setting."},
+        });
         addSettingsChanges(settings_changes_history, "25.8",
         {
             {"output_format_json_quote_64bit_integers", true, false, "Disable quoting of the 64 bit integers in JSON by default"},
@@ -62,7 +91,7 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"distributed_cache_connect_max_tries", 20, 5, "Changed setting value"},
             {"opentelemetry_trace_cpu_scheduling", false, false, "New setting to trace `cpu_slot_preemption` feature."},
             {"output_format_parquet_max_dictionary_size", 1024 * 1024, 1024 * 1024, "New setting"},
-            {"input_format_parquet_use_native_reader_v3", false, true, "New setting"},
+            {"input_format_parquet_use_native_reader_v3", false, false, "New setting"},
             {"input_format_parquet_memory_low_watermark", 2ul << 20, 2ul << 20, "New setting"},
             {"input_format_parquet_memory_high_watermark", 4ul << 30, 4ul << 30, "New setting"},
             {"input_format_parquet_page_filter_push_down", true, true, "New setting (no effect when input_format_parquet_use_native_reader_v3 is disabled)"},
@@ -89,13 +118,15 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"backup_restore_s3_retry_max_backoff_ms", 5000, 5000, "New setting"},
             {"backup_restore_s3_retry_jitter_factor", 0.0, 0.1, "New setting"},
             {"vector_search_index_fetch_multiplier", 1.0, 1.0, "Alias for setting 'vector_search_postfilter_multiplier'"},
-            {"backup_slow_all_threads_after_retryable_s3_error", true, true, "New setting"},
+            {"backup_slow_all_threads_after_retryable_s3_error", false, false, "New setting"},
             {"allow_experimental_ytsaurus_table_engine", false, false, "New setting."},
             {"allow_experimental_ytsaurus_table_function", false, false, "New setting."},
             {"allow_experimental_ytsaurus_dictionary_source", false, false, "New setting."},
             {"per_part_index_stats", false, false, "New setting."},
-            {"allow_experimental_iceberg_compaction", 0, 0, "New setting "},
+            {"allow_experimental_iceberg_compaction", 0, 0, "New setting"},
             {"delta_lake_snapshot_version", -1, -1, "New setting"},
+            {"delta_lake_insert_max_bytes_in_data_file", 1_GiB, 1_GiB, "New setting."},
+            {"delta_lake_insert_max_rows_in_data_file", 100000, 100000, "New setting."},
             {"use_roaring_bitmap_iceberg_positional_deletes", false, false, "New setting"},
             {"iceberg_metadata_compression_method", "", "", "New setting"},
             {"allow_experimental_correlated_subqueries", false, true, "Mark correlated subqueries support as Beta."},
@@ -103,8 +134,13 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"promql_table", "", "", "New experimental setting"},
             {"evaluation_time", 0, 0, "New experimental setting"},
             {"output_format_parquet_date_as_uint16", false, false, "Added a compatibility setting for a minor compatibility-breaking change introduced back in 24.12."},
+            {"allow_experimental_delta_lake_writes", false, false, "New setting."},
             {"enable_lightweight_update", false, true, "Lightweight updates were moved to Beta. Added an alias for setting 'allow_experimental_lightweight_update'."},
-            {"allow_experimental_lightweight_update", false, true, "Lightweight updates were moved to Beta."}
+            {"allow_experimental_lightweight_update", false, true, "Lightweight updates were moved to Beta."},
+            {"s3_slow_all_threads_after_retryable_error", false, false, "Added an alias for setting `backup_slow_all_threads_after_retryable_s3_error`"},
+            {"serialize_string_in_memory_with_zero_byte", true, true, "New setting"},
+            {"iceberg_metadata_log_level", "none", "none", "New setting."},
+            {"use_object_storage_list_objects_cache", false, false, "New setting."},
         });
         addSettingsChanges(settings_changes_history, "25.7",
         {
@@ -128,6 +164,18 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"allow_experimental_insert_into_iceberg", false, false, "New setting."},
             /// RELEASE CLOSED
         });
+        addSettingsChanges(settings_changes_history, "25.6.5.2000",
+        {
+            {"allow_experimental_database_iceberg", false, true, "Turned ON by default for Antalya"},
+            {"allow_experimental_database_unity_catalog", false, true, "Turned ON by default for Antalya"},
+            {"allow_experimental_database_glue_catalog", false, true, "Turned ON by default for Antalya"},
+            {"output_format_parquet_enum_as_byte_array", true, true, "Enable writing Enum as byte array in Parquet by default"},
+            {"object_storage_cluster", "", "", "New setting"},
+            {"object_storage_max_nodes", 0, 0, "New setting"},
+            {"allow_experimental_export_merge_tree_part", false, false, "New setting."},
+            {"export_merge_tree_part_overwrite_file_if_exists", false, false, "New setting."},
+            {"lock_object_storage_task_distribution_ms", 0, 0, "New setting."},
+        });
         addSettingsChanges(settings_changes_history, "25.6",
         {
             /// RELEASE CLOSED
@@ -153,7 +201,8 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"format_schema_source", "file", "file", "New setting"},
             {"format_schema_message_name", "", "", "New setting"},
             {"enable_scopes_for_with_statement", true, true, "New setting for backward compatibility with the old analyzer."},
-            {"backup_slow_all_threads_after_retryable_s3_error", true, true, "New setting"},
+            {"backup_slow_all_threads_after_retryable_s3_error", false, false, "New setting"},
+            {"s3_slow_all_threads_after_retryable_error", false, false, "Added an alias for setting `backup_slow_all_threads_after_retryable_s3_error`"},
             /// RELEASE CLOSED
         });
         addSettingsChanges(settings_changes_history, "25.5",
@@ -248,6 +297,11 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"parallel_hash_join_threshold", 0, 0, "New setting"},
             /// Release closed. Please use 25.4
         });
+        addSettingsChanges(settings_changes_history, "24.12.2.20000",
+        {
+            // Altinity Antalya modifications atop of 24.12
+            {"input_format_parquet_use_metadata_cache", true, true, "New setting, turned ON by default"}, // https://github.com/Altinity/ClickHouse/pull/586
+        });
         addSettingsChanges(settings_changes_history, "25.2",
         {
             /// Release closed. Please use 25.3
@@ -848,6 +902,7 @@ const VersionToSettingsChangesMap & getMergeTreeSettingsChangesHistory()
     {
         addSettingsChanges(merge_tree_settings_changes_history, "25.8",
         {
+            {"merge_max_dynamic_subcolumns_in_wide_part", "auto", "auto", "Add a new setting to limit number of dynamic subcolumns in Wide part after merge regardless the parameters specified in the data type"},
             {"object_serialization_version", "v2", "v2", "Add a setting to control JSON serialization versions"},
             {"object_shared_data_serialization_version", "map", "map", "Add a setting to control JSON serialization versions"},
             {"object_shared_data_serialization_version_for_zero_level_parts", "map", "map", "Add a setting to control JSON serialization versions  for zero level parts"},
@@ -856,6 +911,7 @@ const VersionToSettingsChangesMap & getMergeTreeSettingsChangesHistory()
             {"dynamic_serialization_version", "v2", "v2", "Add a setting to control Dynamic serialization versions"},
             {"search_orphaned_parts_disks", "any", "any", "New setting"},
             {"shared_merge_tree_virtual_parts_discovery_batch", 1, 1, "New setting"},
+            {"max_digestion_size_per_segment", 256_MiB, 256_MiB, "Obsolete setting"},
             {"shared_merge_tree_update_replica_flags_delay_ms", 30000, 30000, "New setting"},
             {"write_marks_for_substreams_in_compact_parts", false, true, "Enable writing marks for substreams in compact parts by default"},
             {"allow_part_offset_column_in_projections", false, true, "Now projections can use _part_offset column."},
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index c4737ffb04c9..6dd69453d703 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -90,6 +90,11 @@ IMPLEMENT_SETTING_ENUM(DistributedProductMode, ErrorCodes::UNKNOWN_DISTRIBUTED_P
      {"global", DistributedProductMode::GLOBAL},
      {"allow",  DistributedProductMode::ALLOW}})
 
+IMPLEMENT_SETTING_ENUM(ObjectStorageClusterJoinMode, ErrorCodes::BAD_ARGUMENTS,
+    {{"local",  ObjectStorageClusterJoinMode::LOCAL},
+     {"global", ObjectStorageClusterJoinMode::GLOBAL},
+     {"allow",  ObjectStorageClusterJoinMode::ALLOW}})
+
 
 IMPLEMENT_SETTING_ENUM(QueryResultCacheNondeterministicFunctionHandling, ErrorCodes::BAD_ARGUMENTS,
     {{"throw",  QueryResultCacheNondeterministicFunctionHandling::Throw},
@@ -356,4 +361,21 @@ IMPLEMENT_SETTING_ENUM(
      {"local", SearchOrphanedPartsDisks::LOCAL},
      {"none", SearchOrphanedPartsDisks::NONE}})
 
+IMPLEMENT_SETTING_ENUM(
+    IcebergMetadataLogLevel,
+    ErrorCodes::BAD_ARGUMENTS,
+    {{"none", IcebergMetadataLogLevel::None},
+     {"metadata", IcebergMetadataLogLevel::Metadata},
+     {"manifest_list_metadata", IcebergMetadataLogLevel::ManifestListMetadata},
+     {"manifest_list_entry", IcebergMetadataLogLevel::ManifestListEntry},
+     {"manifest_file_metadata", IcebergMetadataLogLevel::ManifestFileMetadata},
+     {"manifest_file_entry", IcebergMetadataLogLevel::ManifestFileEntry}})
+
+IMPLEMENT_SETTING_AUTO_ENUM(MergeTreePartExportFileAlreadyExistsPolicy, ErrorCodes::BAD_ARGUMENTS);
+
+IMPLEMENT_SETTING_ENUM(
+    ObjectStorageGranularityLevel,
+    ErrorCodes::BAD_ARGUMENTS,
+    {{"file", ObjectStorageGranularityLevel::FILE},
+    {"bucket", ObjectStorageGranularityLevel::BUCKET}})
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index ff0aefe9ee92..225358d7541d 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -163,6 +163,16 @@ enum class DistributedProductMode : uint8_t
 
 DECLARE_SETTING_ENUM(DistributedProductMode)
 
+/// The setting for executing object storage cluster function or table JOIN sections.
+enum class ObjectStorageClusterJoinMode : uint8_t
+{
+    LOCAL,       /// Convert to local query
+    GLOBAL,      /// Convert to global query
+    ALLOW        /// Enable
+};
+
+DECLARE_SETTING_ENUM(ObjectStorageClusterJoinMode)
+
 /// How the query result cache handles queries with non-deterministic functions, e.g. now()
 enum class QueryResultCacheNondeterministicFunctionHandling : uint8_t
 {
@@ -459,4 +469,33 @@ enum class SearchOrphanedPartsDisks : uint8_t
 
 DECLARE_SETTING_ENUM(SearchOrphanedPartsDisks)
 
+enum class IcebergMetadataLogLevel : uint8_t
+{
+    None = 0,
+    Metadata = 1,
+    ManifestListMetadata = 2,
+    ManifestListEntry = 3,
+    ManifestFileMetadata = 4,
+    ManifestFileEntry = 5,
+};
+
+DECLARE_SETTING_ENUM(IcebergMetadataLogLevel)
+
+enum class ObjectStorageGranularityLevel : uint8_t
+{
+    FILE = 0,
+    BUCKET = 1,
+};
+
+DECLARE_SETTING_ENUM(ObjectStorageGranularityLevel)
+
+enum class MergeTreePartExportFileAlreadyExistsPolicy : uint8_t
+{
+    skip,
+    error,
+    overwrite,
+};
+
+DECLARE_SETTING_ENUM(MergeTreePartExportFileAlreadyExistsPolicy)
+
 }
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 273c5e1e9287..d3c54154ddd5 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -121,6 +121,7 @@ struct SettingAutoWrapper
     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; }
+    std::optional<Type> valueOrNullopt() const { return is_auto ? std::optional<Type>(std::nullopt) : base.value; }
 };
 
 using SettingFieldBoolAuto = SettingAutoWrapper<SettingFieldBool>;
diff --git a/src/Core/tests/gtest_BackgroundSchedulePool.cpp b/src/Core/tests/gtest_BackgroundSchedulePool.cpp
index e949fb2fafb2..6eb37d79bccd 100644
--- a/src/Core/tests/gtest_BackgroundSchedulePool.cpp
+++ b/src/Core/tests/gtest_BackgroundSchedulePool.cpp
@@ -54,8 +54,10 @@ TEST(BackgroundSchedulePool, ScheduleAfter)
     });
     ASSERT_EQ(task->activateAndSchedule(), true);
 
-    std::unique_lock lock(mutex);
-    condvar.wait(lock, [&] { return counter == ITERATIONS; });
+    {
+        std::unique_lock lock(mutex);
+        condvar.wait(lock, [&] { return counter == ITERATIONS; });
+    }
 
     ASSERT_EQ(counter, ITERATIONS);
 
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 05d7eec59305..aca47f335804 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -621,11 +621,7 @@ 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;
-            if (config().getString("logger.formatting.type", "") == "json")
-                pf = new OwnJSONPatternFormatter(config());
-            else
-                pf = new OwnPatternFormatter;
+            Poco::AutoPtr<OwnPatternFormatter> pf = getFormatForChannel(config(), "console");
             Poco::AutoPtr<OwnFormattingChannel> log = new OwnFormattingChannel(pf, new Poco::ConsoleChannel(std::cerr));
             logger().setChannel(log);
         }
diff --git a/src/Daemon/CrashWriter.cpp b/src/Daemon/CrashWriter.cpp
index 9b2bd02ffc10..86c20bb451f2 100644
--- a/src/Daemon/CrashWriter.cpp
+++ b/src/Daemon/CrashWriter.cpp
@@ -24,7 +24,8 @@ std::unique_ptr<CrashWriter> CrashWriter::instance;
 
 void CrashWriter::initialize(Poco::Util::LayeredConfiguration & config)
 {
-    instance.reset(new CrashWriter(config));
+    if (config.getBool("send_crash_reports.enabled", false))
+        instance.reset(new CrashWriter(config));
 }
 
 bool CrashWriter::initialized()
diff --git a/src/DataTypes/DataTypeDynamic.cpp b/src/DataTypes/DataTypeDynamic.cpp
index ea4a362f8d6a..186a806d5171 100644
--- a/src/DataTypes/DataTypeDynamic.cpp
+++ b/src/DataTypes/DataTypeDynamic.cpp
@@ -215,6 +215,8 @@ std::unique_ptr<IDataType::SubstreamData> DataTypeDynamic::getDynamicSubcolumnDa
     bool is_null_map_subcolumn = subcolumn_nested_name == "null";
     if (is_null_map_subcolumn)
     {
+        if (!subcolumn_type->canBeInsideNullable())
+            return nullptr;
         res->type = std::make_shared<DataTypeUInt8>();
     }
     else if (!subcolumn_nested_name.empty())
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index 9dbeef1a3fbb..84cacd747611 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -77,6 +77,12 @@ Field DataTypeEnum<Type>::getDefault() const
     return this->getValues().front().second;
 }
 
+template <typename Type>
+Type DataTypeEnum<Type>::getDefaultValue() const
+{
+    return this->getValues().front().second;
+}
+
 template <typename Type>
 void DataTypeEnum<Type>::insertDefaultInto(IColumn & column) const
 {
diff --git a/src/DataTypes/DataTypeEnum.h b/src/DataTypes/DataTypeEnum.h
index a622cadc4370..e14180645db3 100644
--- a/src/DataTypes/DataTypeEnum.h
+++ b/src/DataTypes/DataTypeEnum.h
@@ -66,6 +66,7 @@ class DataTypeEnum final : public IDataTypeEnum, public EnumValues<Type>
     MutableColumnPtr createColumn() const override { return ColumnType::create(); }
 
     Field getDefault() const override;
+    Type getDefaultValue() const;
     void insertDefaultInto(IColumn & column) const override;
 
     bool equals(const IDataType & rhs) const override;
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 41aefce682db..210750724c1a 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -133,7 +133,7 @@ MutableColumnPtr DataTypeLowCardinality::createColumn() const
 {
     MutableColumnPtr indexes = DataTypeUInt8().createColumn();
     MutableColumnPtr dictionary = createColumnUnique(*dictionary_type);
-    return ColumnLowCardinality::create(std::move(dictionary), std::move(indexes));
+    return ColumnLowCardinality::create(std::move(dictionary), std::move(indexes), /*is_shared=*/false);
 }
 
 Field DataTypeLowCardinality::getDefault() const
diff --git a/src/DataTypes/DataTypeObject.cpp b/src/DataTypes/DataTypeObject.cpp
index a16390192cd8..bb671740b71e 100644
--- a/src/DataTypes/DataTypeObject.cpp
+++ b/src/DataTypes/DataTypeObject.cpp
@@ -24,6 +24,7 @@
 #include <Interpreters/Context.h>
 #include <Core/Settings.h>
 #include <IO/Operators.h>
+#include <boost/algorithm/string.hpp>
 
 #include "config.h"
 
@@ -202,7 +203,11 @@ String DataTypeObject::doGetName() const
     for (const auto & path : sorted_typed_paths)
     {
         write_separator();
-        out << backQuoteIfNeed(path) << " " << typed_paths.at(path)->getName();
+        /// We must quote path "SKIP" to avoid its confusion with SKIP keyword.
+        if (boost::to_upper_copy(path) == "SKIP")
+            out << backQuote(path) << " " << typed_paths.at(path)->getName();
+        else
+            out << backQuoteIfNeed(path) << " " << typed_paths.at(path)->getName();
     }
 
     std::vector<String> sorted_skip_paths;
@@ -301,7 +306,7 @@ std::optional<String> tryGetSubObjectSubcolumn(std::string_view subcolumn_name)
     if (!subcolumn_name.starts_with("^`"))
         return std::nullopt;
 
-    ReadBufferFromMemory buf(subcolumn_name.data() + 1);
+    ReadBufferFromMemory buf(subcolumn_name.data() + 1, subcolumn_name.size() - 1);
     String path;
     /// Try to read back-quoted first path element.
     if (!tryReadBackQuotedString(path, buf))
@@ -360,6 +365,7 @@ std::unique_ptr<ISerialization::SubstreamData> DataTypeObject::getDynamicSubcolu
                 if (path.starts_with(prefix))
                     result_dynamic_paths.emplace_back(path.substr(prefix.size()), column);
             }
+            result_object_column.setMaxDynamicPaths(result_dynamic_paths.size());
             result_object_column.setDynamicPaths(result_dynamic_paths);
 
             const auto & shared_data_offsets = object_column.getSharedDataOffsets();
@@ -488,11 +494,12 @@ static DataTypePtr createObject(const ASTPtr & arguments, const DataTypeObject::
         }
         else if (object_type_argument->path_with_type)
         {
-            const auto * path_with_type = object_type_argument->path_with_type->as<ASTNameTypePair>();
+            const auto * path_with_type = object_type_argument->path_with_type->as<ASTObjectTypedPathArgument>();
             auto data_type = DataTypeFactory::instance().get(path_with_type->type);
-            if (typed_paths.contains(path_with_type->name))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Found duplicated path with type: {}", path_with_type->name);
-            typed_paths.emplace(path_with_type->name, data_type);
+            if (typed_paths.contains(path_with_type->path))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Found duplicated path with type: {}", path_with_type->path);
+
+            typed_paths.emplace(path_with_type->path, data_type);
         }
         else if (object_type_argument->skip_path)
         {
diff --git a/src/DataTypes/DataTypeVariant.cpp b/src/DataTypes/DataTypeVariant.cpp
index fe58b5e0f9f1..8c176fb5929b 100644
--- a/src/DataTypes/DataTypeVariant.cpp
+++ b/src/DataTypes/DataTypeVariant.cpp
@@ -182,7 +182,7 @@ SerializationPtr DataTypeVariant::doGetDefaultSerialization() const
         variant_names.push_back(variant->getName());
     }
 
-    return std::make_shared<SerializationVariant>(std::move(serializations), std::move(variant_names), SerializationVariant::getVariantsDeserializeTextOrder(variants), getName());
+    return std::make_shared<SerializationVariant>(variants, getName());
 }
 
 void DataTypeVariant::forEachChild(const DB::IDataType::ChildCallback & callback) const
diff --git a/src/DataTypes/DataTypesBinaryEncoding.cpp b/src/DataTypes/DataTypesBinaryEncoding.cpp
index 7195db707189..73c490e1706d 100644
--- a/src/DataTypes/DataTypesBinaryEncoding.cpp
+++ b/src/DataTypes/DataTypesBinaryEncoding.cpp
@@ -33,6 +33,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/FieldBinaryEncoding.h>
 #include <Common/assert_cast.h>
+#include <Common/checkStackSize.h>
 
 namespace DB
 {
@@ -582,6 +583,8 @@ String encodeDataType(const DataTypePtr & type)
 
 DataTypePtr decodeDataType(ReadBuffer & buf)
 {
+    checkStackSize();
+
     UInt8 type;
     readBinary(type, buf);
     switch (BinaryTypeIndex(type))
diff --git a/src/DataTypes/NestedUtils.cpp b/src/DataTypes/NestedUtils.cpp
index e31f23e18c59..b4a0747d8b7f 100644
--- a/src/DataTypes/NestedUtils.cpp
+++ b/src/DataTypes/NestedUtils.cpp
@@ -1,10 +1,10 @@
 #include <cstring>
 #include <memory>
 
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Common/StringUtils.h>
 #include <Columns/IColumn.h>
+#include <Common/StringUtils.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -19,6 +19,7 @@
 #include <Storages/ColumnsDescription.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/join.hpp>
 
 namespace DB
 {
@@ -27,6 +28,7 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
     extern const int SIZES_OF_ARRAYS_DONT_MATCH;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace Nested
@@ -48,11 +50,8 @@ std::string concatenateName(const std::string & nested_table_name, const std::st
   */
 std::pair<std::string, std::string> splitName(const std::string & name, bool reverse)
 {
-    auto idx = (reverse ? name.find_last_of('.') : name.find_first_of('.'));
-    if (idx == std::string::npos || idx == 0 || idx + 1 == name.size())
-        return {name, {}};
-
-    return {name.substr(0, idx), name.substr(idx + 1)};
+    auto res = splitName(std::string_view(name), reverse);
+    return {std::string(res.first), std::string(res.second)};
 }
 
 std::pair<std::string_view, std::string_view> splitName(std::string_view name, bool reverse)
@@ -64,6 +63,41 @@ std::pair<std::string_view, std::string_view> splitName(std::string_view name, b
     return {name.substr(0, idx), name.substr(idx + 1)};
 }
 
+std::vector<std::pair<std::string_view, std::string_view>> getAllColumnAndSubcolumnPairs(std::string_view name)
+{
+    std::vector<std::pair<std::string_view, std::string_view>> pairs;
+    auto idx = name.find_first_of('.');
+    while (idx != std::string::npos)
+    {
+        std::string_view column_name = name.substr(0, idx);
+        std::string_view subcolumn_name = name.substr(idx + 1);
+        if (!column_name.empty() && !subcolumn_name.empty())
+            pairs.emplace_back(column_name, subcolumn_name);
+        idx = name.find_first_of('.', idx + 1);
+    }
+
+    return pairs;
+}
+
+std::pair<std::string_view, std::string_view> getColumnAndSubcolumnPair(std::string_view name, const NameSet & storage_columns)
+{
+    for (auto [storage_column_name, subcolumn_name] : Nested::getAllColumnAndSubcolumnPairs(name))
+    {
+        if (storage_columns.contains(String(storage_column_name)))
+            return {storage_column_name, subcolumn_name};
+    }
+
+    throw Exception(
+        ErrorCodes::BAD_ARGUMENTS,
+        "Column or subcolumn '{}' is not found, there are only columns: {}",
+        name,
+        boost::join(storage_columns, ", "));
+}
+
+std::string_view getColumnFromSubcolumn(std::string_view name, const NameSet & storage_columns)
+{
+    return getColumnAndSubcolumnPair(name, storage_columns).first;
+}
 
 std::string extractTableName(const std::string & nested_name)
 {
diff --git a/src/DataTypes/NestedUtils.h b/src/DataTypes/NestedUtils.h
index 8f2ab20ac879..03d5ac883fa6 100644
--- a/src/DataTypes/NestedUtils.h
+++ b/src/DataTypes/NestedUtils.h
@@ -17,9 +17,26 @@ namespace Nested
     std::string concatenateName(const std::string & nested_table_name, const std::string & nested_field_name);
 
     /// Splits name of compound identifier by first/last dot (depending on 'reverse' parameter).
+    /// If the name is not nested (no dot or dot at start/end),
+    /// returns {name, ""}.
     std::pair<std::string, std::string> splitName(const std::string & name, bool reverse = false);
     std::pair<std::string_view, std::string_view> splitName(std::string_view name, bool reverse = false);
 
+    /// Returns all possible pairs of column + subcolumn for specified name.
+    /// For example:
+    /// "a.b.c.d" -> ("a", "b.c.d"), ("a.b", "c.d"), ("a.b.c", "d")
+    std::vector<std::pair<std::string_view, std::string_view>> getAllColumnAndSubcolumnPairs(std::string_view name);
+
+    /// Given all existing columns, return specific pair of column and subcolumn from specified name.
+    /// For example:
+    /// Columns: "a.x", "b", "c". Name: "a.x.y.z". Result: ("a.x", "y.z").
+    std::pair<std::string_view, std::string_view> getColumnAndSubcolumnPair(std::string_view name, const NameSet & storage_columns);
+
+    /// Given all existing columns, return column name of the subcolumn with specified name.
+    /// For example:
+    /// Columns: "a.x", "b", "c". Name: "a.x.y.z". Result: "a.x".
+    std::string_view getColumnFromSubcolumn(std::string_view name, const NameSet & storage_columns);
+
     /// Returns the prefix of the name to the first '.'. Or the name is unchanged if there is no dot.
     std::string extractTableName(const std::string & nested_name);
 
diff --git a/src/DataTypes/ObjectUtils.cpp b/src/DataTypes/ObjectUtils.cpp
index b351eb8f297a..b8f01cdc9c7b 100644
--- a/src/DataTypes/ObjectUtils.cpp
+++ b/src/DataTypes/ObjectUtils.cpp
@@ -70,12 +70,19 @@ DataTypePtr getBaseTypeOfArray(const DataTypePtr & type)
 DataTypePtr getBaseTypeOfArray(DataTypePtr type, const Names & tuple_elements)
 {
     auto it = tuple_elements.begin();
+
+    /// Get underlying type for array, but w/o processing tuple elements that are not part of the nested, so it is done in 3 steps:
+    /// 1. Find Nested type (since it can be part of Tuple/Array)
+    /// 2. Process all Nested types (this is Array(Tuple()), it is responsibility of the caller to re-create proper Array nesting)
+    /// 3. Strip all nested arrays (it is responsibility of the caller to re-create proper Array nesting)
+
+    /// 1. Find Nested type (since it can be part of Tuple/Array)
     while (true)
     {
-        if (const auto * type_array = typeid_cast<const DataTypeArray *>(type.get()))
-        {
+        if (type->hasCustomName())
+            break;
+        else if (const auto * type_array = typeid_cast<const DataTypeArray *>(type.get()))
             type = type_array->getNestedType();
-        }
         else if (const auto * type_tuple = typeid_cast<const DataTypeTuple *>(type.get()))
         {
             if (it == tuple_elements.end())
@@ -84,16 +91,38 @@ DataTypePtr getBaseTypeOfArray(DataTypePtr type, const Names & tuple_elements)
             auto pos = type_tuple->tryGetPositionByName(*it);
             if (!pos)
                 break;
-
             ++it;
+
             type = type_tuple->getElement(*pos);
         }
         else
-        {
             break;
+    }
+
+    /// 2. Process all Nested types (this is Array(Tuple()), it is responsibility of the caller to re-create proper Array nesting)
+    while (type->hasCustomName())
+    {
+        if (const auto * type_nested = typeid_cast<const DataTypeNestedCustomName *>(type->getCustomName()))
+        {
+            if (it == tuple_elements.end())
+                break;
+
+            const auto & names = type_nested->getNames();
+            auto pos = std::find(names.begin(), names.end(), *it);
+            if (pos == names.end())
+                break;
+            ++it;
+
+            type = type_nested->getElements().at(std::distance(names.begin(), pos));
         }
+        else
+            break;
     }
 
+    /// 3. Strip all nested arrays (it is responsibility of the caller to re-create proper Array nesting)
+    while (const auto * type_array = typeid_cast<const DataTypeArray *>(type.get()))
+        type = type_array->getNestedType();
+
     return type;
 }
 
diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
index 6cfe5f9c0644..d932033192d2 100644
--- a/src/DataTypes/Serializations/ISerialization.cpp
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -364,7 +364,7 @@ void ISerialization::addElementToSubstreamsCache(ISerialization::SubstreamsCache
     if (!cache || path.empty())
         return;
 
-    cache->emplace(getSubcolumnNameForStream(path), std::move(element));
+    cache->insert_or_assign(getSubcolumnNameForStream(path), std::move(element));
 }
 
 ISerialization::ISubstreamsCacheElement * ISerialization::getElementFromSubstreamsCache(ISerialization::SubstreamsCache * cache, const ISerialization::SubstreamPath & path)
@@ -614,11 +614,11 @@ bool ISerialization::insertDataFromSubstreamsCacheIfAny(SubstreamsCache * cache,
     if (!cached_column_with_num_read_rows)
         return false;
 
-    insertDataFromCachedColumn(settings, result_column, cached_column_with_num_read_rows->first, cached_column_with_num_read_rows->second);
+    insertDataFromCachedColumn(settings, result_column, cached_column_with_num_read_rows->first, cached_column_with_num_read_rows->second, cache);
     return true;
 }
 
-void ISerialization::insertDataFromCachedColumn(const ISerialization::DeserializeBinaryBulkSettings & settings, ColumnPtr & result_column, const ColumnPtr & cached_column, size_t num_read_rows)
+void ISerialization::insertDataFromCachedColumn(const ISerialization::DeserializeBinaryBulkSettings & settings, ColumnPtr & result_column, const ColumnPtr & cached_column, size_t num_read_rows, SubstreamsCache * cache)
 {
     /// Usually substreams cache contains the whole column from currently deserialized block with rows from multiple ranges.
     /// It's done to avoid extra data copy, in this case we just use this cached column as the result column.
@@ -626,9 +626,16 @@ void ISerialization::insertDataFromCachedColumn(const ISerialization::Deserializ
     /// constructing another column). In this case we need to insert data into resulting column from cached column.
     /// To determine what case we have we store number of read rows in last range in cache.
     if ((settings.insert_only_rows_in_current_range_from_substreams_cache) || (result_column != cached_column && !result_column->empty() && cached_column->size() == num_read_rows))
+    {
         result_column->assumeMutable()->insertRangeFrom(*cached_column, cached_column->size() - num_read_rows, num_read_rows);
+        /// Replace column in the cache with the new column to avoid inserting into it again
+        /// from currently cached range if this substream will be read again in current range.
+        addColumnWithNumReadRowsToSubstreamsCache(cache, settings.path, result_column, num_read_rows);
+    }
     else
+    {
         result_column = cached_column;
+    }
 }
 
 }
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
index b48b38243b28..779eb4f6c27b 100644
--- a/src/DataTypes/Serializations/ISerialization.h
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -593,7 +593,7 @@ class ISerialization : private boost::noncopyable, public std::enable_shared_fro
     /// into resulting column and return true, otherwise do nothing and return false.
     static bool insertDataFromSubstreamsCacheIfAny(SubstreamsCache * cache, const DeserializeBinaryBulkSettings & settings, ColumnPtr & result_column);
     /// Perform insertion from column found in substreams cache.
-    static void insertDataFromCachedColumn(const DeserializeBinaryBulkSettings & settings, ColumnPtr & result_column, const ColumnPtr & cached_column, size_t num_read_rows);
+    static void insertDataFromCachedColumn(const DeserializeBinaryBulkSettings & settings, ColumnPtr & result_column, const ColumnPtr & cached_column, size_t num_read_rows, SubstreamsCache * cache);
 
 protected:
     void addSubstreamAndCallCallback(SubstreamPath & path, const StreamCallback & callback, Substream substream) const;
diff --git a/src/DataTypes/Serializations/SerializationArray.cpp b/src/DataTypes/Serializations/SerializationArray.cpp
index 0de2811ad3a2..74405f8c1864 100644
--- a/src/DataTypes/Serializations/SerializationArray.cpp
+++ b/src/DataTypes/Serializations/SerializationArray.cpp
@@ -2,6 +2,7 @@
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/Serializations/SerializationNumber.h>
 #include <DataTypes/Serializations/SerializationNamed.h>
+#include <DataTypes/Serializations/SerializationArrayOffsets.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnArray.h>
@@ -248,7 +249,7 @@ void SerializationArray::enumerateStreams(
 
     auto subcolumn_name = "size" + std::to_string(getArrayLevel(settings.path));
     auto offsets_serialization = std::make_shared<SerializationNamed>(
-        std::make_shared<SerializationNumber<UInt64>>(),
+        std::make_shared<SerializationArrayOffsets>(),
         subcolumn_name, SubstreamType::NamedOffsets);
 
     auto offsets_column = offsets && !settings.position_independent_encoding
@@ -371,7 +372,7 @@ void SerializationArray::serializeBinaryBulkWithMultipleStreams(
     settings.path.pop_back();
 }
 
-void SerializationArray::deserializeOffsetsBinaryBulk(
+bool SerializationArray::deserializeOffsetsBinaryBulk(
     ColumnPtr & offsets_column,
     size_t limit,
     ISerialization::DeserializeBinaryBulkSettings & settings,
@@ -389,8 +390,11 @@ void SerializationArray::deserializeOffsetsBinaryBulk(
             insertArraySizesToOffsets(offsets_column, cached_column, cached_column->size() - num_read_rows, cached_column->size());
         else
             offsets_column = arraySizesToOffsets(*cached_column);
+
+        return true;
     }
-    else if (auto * stream = settings.getter(settings.path))
+
+    if (auto * stream = settings.getter(settings.path))
     {
         size_t prev_size = offsets_column->size();
 
@@ -415,7 +419,11 @@ void SerializationArray::deserializeOffsetsBinaryBulk(
         /// Add array sizes read from current range into the cache.
         if (cache)
             addColumnWithNumReadRowsToSubstreamsCache(cache, settings.path, arrayOffsetsToSizes(*offsets_column), offsets_column->size() - prev_size);
+
+        return true;
     }
+
+    return false;
 }
 
 std::pair<size_t, size_t> SerializationArray::deserializeOffsetsBinaryBulkAndGetNestedOffsetAndLimit(
@@ -428,7 +436,8 @@ std::pair<size_t, size_t> SerializationArray::deserializeOffsetsBinaryBulkAndGet
     const auto & offsets_data = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets_column).getData();
     size_t prev_last_offset = offsets_data.back();
     size_t prev_offset_size = offsets_data.size();
-    deserializeOffsetsBinaryBulk(offsets_column, offset + limit, settings, cache);
+    if (!deserializeOffsetsBinaryBulk(offsets_column, offset + limit, settings, cache))
+        return {0, 0};
 
     size_t skipped_nested_rows = 0;
 
diff --git a/src/DataTypes/Serializations/SerializationArray.h b/src/DataTypes/Serializations/SerializationArray.h
index badbdee45368..fde4e238631c 100644
--- a/src/DataTypes/Serializations/SerializationArray.h
+++ b/src/DataTypes/Serializations/SerializationArray.h
@@ -74,7 +74,7 @@ class SerializationArray final : public SimpleTextSerialization
         SubstreamsCache * cache) const override;
 
     static void serializeOffsetsBinaryBulk(const IColumn & offsets_column, size_t offset, size_t limit, SerializeBinaryBulkSettings & settings);
-    static void deserializeOffsetsBinaryBulk(ColumnPtr & offsets_column, size_t limit, DeserializeBinaryBulkSettings & settings, SubstreamsCache * cache);
+    static bool deserializeOffsetsBinaryBulk(ColumnPtr & offsets_column, size_t limit, DeserializeBinaryBulkSettings & settings, SubstreamsCache * cache);
     static std::pair<size_t, size_t> deserializeOffsetsBinaryBulkAndGetNestedOffsetAndLimit(ColumnPtr & offsets_column, size_t offset, size_t limit, DeserializeBinaryBulkSettings & settings, SubstreamsCache * cache);
 
     struct SubcolumnCreator : public ISubcolumnCreator
diff --git a/src/DataTypes/Serializations/SerializationArrayOffsets.cpp b/src/DataTypes/Serializations/SerializationArrayOffsets.cpp
new file mode 100644
index 000000000000..9526168dfb2a
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationArrayOffsets.cpp
@@ -0,0 +1,70 @@
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/Serializations/SerializationArrayOffsets.h>
+
+namespace DB
+{
+
+void SerializationArrayOffsets::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t rows_offset,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr &,
+    SubstreamsCache * cache) const
+{
+    settings.path.push_back(Substream::Regular);
+
+    size_t num_read_rows = 0;
+    if (auto cached_column_with_num_read_rows = getColumnWithNumReadRowsFromSubstreamsCache(cache, settings.path))
+    {
+        auto cached_column = cached_column_with_num_read_rows->first;
+        num_read_rows = cached_column_with_num_read_rows->second;
+
+        /// Cached column contains data without applied rows_offset and can be used in other serializations (for example in SerializationArray)
+        /// so if rows_offset is not 0 we cannot use it as is because we will modify it here later by applying rows_offset.
+        /// Instead we need to insert data from the current range from it.
+        if (rows_offset)
+            column->assumeMutable()->insertRangeFrom(*cached_column, cached_column->size() - num_read_rows, num_read_rows);
+        else
+            insertDataFromCachedColumn(settings, column, cached_column, num_read_rows, cache);
+    }
+    else if (ReadBuffer * stream = settings.getter(settings.path))
+    {
+        auto mutable_column = column->assumeMutable();
+        size_t prev_size = mutable_column->size();
+        /// Deserialize rows_offset + limit rows, we will apply rows_offset later.
+        deserializeBinaryBulk(*mutable_column, *stream, 0, rows_offset + limit, settings.avg_value_size_hint);
+        num_read_rows = mutable_column->size() - prev_size;
+
+        if (cache)
+        {
+            ColumnPtr column_for_cache;
+            /// If rows_offset != 0 we should keep data without applied offsets in the cache to be able
+            /// to calculate offset for nested data in SerializationArray if the whole array is also read.
+            /// As we will apply offsets to the current column we cannot put in the cache, so we use cut()
+            /// method to create a separate column with all the data from current range.
+            if (rows_offset)
+                column_for_cache = mutable_column->cut(prev_size, num_read_rows);
+            else
+                column_for_cache = column;
+
+            addColumnWithNumReadRowsToSubstreamsCache(cache, settings.path, column_for_cache, num_read_rows);
+        }
+    }
+
+    /// Apply rows_offset if needed.
+    if (rows_offset)
+    {
+        auto mutable_column = column->assumeMutable();
+        auto & data = assert_cast<ColumnUInt64 &>(*mutable_column).getData();
+        size_t prev_size = mutable_column->size() - num_read_rows;
+        size_t actual_new_size = mutable_column->size() - rows_offset;
+        for (size_t i = prev_size; i != actual_new_size; ++i)
+            data[i] = data[i + rows_offset];
+        data.resize(actual_new_size);
+    }
+
+    settings.path.pop_back();
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationArrayOffsets.h b/src/DataTypes/Serializations/SerializationArrayOffsets.h
new file mode 100644
index 000000000000..2be36f44b84a
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationArrayOffsets.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationNumber.h>
+
+namespace DB
+{
+
+/// Class for deserialization of Array offsets as a separate subcolumn.
+class SerializationArrayOffsets : public SerializationNumber<UInt64>
+{
+public:
+    void deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t rows_offset,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const override;
+};
+
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDynamicElement.cpp b/src/DataTypes/Serializations/SerializationDynamicElement.cpp
index 037237157bfa..86b90026f76d 100644
--- a/src/DataTypes/Serializations/SerializationDynamicElement.cpp
+++ b/src/DataTypes/Serializations/SerializationDynamicElement.cpp
@@ -233,11 +233,19 @@ void SerializationDynamicElement::deserializeBinaryBulkWithMultipleStreams(
                             null_map->push_back(0);
                     }
                 }
+                else if (is_null_map_subcolumn)
+                {
+                    null_map->push_back(static_cast<UInt8>(1));
+                }
                 else
                 {
                     variant_column->insertDefault();
                 }
             }
+            else if (is_null_map_subcolumn)
+            {
+                null_map->push_back(static_cast<UInt8>(1));
+            }
             else
             {
                 variant_column->insertDefault();
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
index eec367faac1c..c7325aab43a8 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.cpp
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -622,7 +622,7 @@ void SerializationLowCardinality::deserializeBinaryBulkWithMultipleStreams(
             if (column_is_empty)
                 low_cardinality_column.setSharedDictionary(global_dictionary);
 
-            auto local_column = ColumnLowCardinality::create(global_dictionary, std::move(indexes_column));
+            auto local_column = ColumnLowCardinality::create(global_dictionary, std::move(indexes_column), /*is_shared=*/true);
             low_cardinality_column.insertRangeFrom(*local_column, 0, num_rows);
         }
         else
diff --git a/src/DataTypes/Serializations/SerializationNullable.cpp b/src/DataTypes/Serializations/SerializationNullable.cpp
index 276dc87b413b..7071bc2dfee7 100644
--- a/src/DataTypes/Serializations/SerializationNullable.cpp
+++ b/src/DataTypes/Serializations/SerializationNullable.cpp
@@ -21,6 +21,8 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_READ_ALL_DATA;
+    extern const int INCORRECT_DATA;
+    extern const int LOGICAL_ERROR;
 }
 
 void SerializationNullable::enumerateStreams(
@@ -139,6 +141,16 @@ void SerializationNullable::deserializeBinaryBulkWithMultipleStreams(
     settings.path.back() = Substream::NullableElements;
     nested->deserializeBinaryBulkWithMultipleStreams(col.getNestedColumnPtr(), rows_offset, limit, settings, state, cache);
     settings.path.pop_back();
+
+    auto null_map = col.getNullMapColumnPtr();
+    auto nested_column = col.getNestedColumnPtr();
+    if (null_map->size() != nested_column->size())
+        throw Exception(
+            settings.native_format ? ErrorCodes::INCORRECT_DATA : ErrorCodes::LOGICAL_ERROR,
+            "Sizes of nested column and null map of Nullable column are not equal after deserialization (null map size = {}, nested "
+            "column size = {})",
+            null_map->size(),
+            nested_column->size());
 }
 
 
diff --git a/src/DataTypes/Serializations/SerializationObject.cpp b/src/DataTypes/Serializations/SerializationObject.cpp
index 7b6908390d7a..e164e10d6bd1 100644
--- a/src/DataTypes/Serializations/SerializationObject.cpp
+++ b/src/DataTypes/Serializations/SerializationObject.cpp
@@ -806,6 +806,7 @@ void SerializationObject::serializeBinaryBulkWithMultipleStreams(
         return;
     }
 
+    column_object.validateDynamicPathsSizes();
     const auto & dynamic_paths = column_object.getDynamicPaths();
     const auto & shared_data = column_object.getSharedDataPtr();
 
@@ -1031,10 +1032,27 @@ void SerializationObject::deserializeBinaryBulkWithMultipleStreams(
         settings.path.pop_back();
     }
 
+    size_t shared_data_previous_size = shared_data->size();
     settings.path.push_back(Substream::ObjectSharedData);
     object_state->shared_data_serialization->deserializeBinaryBulkWithMultipleStreams(shared_data, rows_offset, limit, settings, object_state->shared_data_state, cache);
     settings.path.pop_back();
     settings.path.pop_back();
+
+    /// Verify that all typed paths, dynamic paths and shared data has consistent sizes
+    size_t expected_size = shared_data->size();
+    for (const auto & [path, path_column] : typed_paths)
+    {
+        if (path_column->size() != expected_size)
+            throw Exception(settings.native_format ? ErrorCodes::INCORRECT_DATA : ErrorCodes::LOGICAL_ERROR, "Unexpected size of typed path {}: {}. Expected size {}", path, path_column->size(), expected_size);
+    }
+
+    for (const auto & [path, path_column] : dynamic_paths)
+    {
+        if (path_column->size() != expected_size)
+            throw Exception(settings.native_format ? ErrorCodes::INCORRECT_DATA : ErrorCodes::LOGICAL_ERROR, "Unexpected size of dynamic path {}: {}. Expected size {}", path, path_column->size(), expected_size);
+    }
+
+    column_object.repairDuplicatesInDynamicPathsAndSharedData(shared_data_previous_size);
 }
 
 void SerializationObject::serializeBinary(const Field & field, WriteBuffer & ostr, const DB::FormatSettings & settings) const
@@ -1226,7 +1244,9 @@ void SerializationObject::deserializeBinary(IColumn & col, ReadBuffer & istr, co
                     String value;
                     Field field;
                     readParsedValueIntoString(value, istr, [&](ReadBuffer & buf){ dynamic_serialization->deserializeBinary(field, buf, settings); });
-                    paths_and_values_for_shared_data.emplace_back(std::move(path), std::move(value));
+                    /// Don't write nulls into shared data.
+                    if (!field.isNull())
+                        paths_and_values_for_shared_data.emplace_back(std::move(path), std::move(value));
                 }
             }
             else
diff --git a/src/DataTypes/Serializations/SerializationObjectHelpers.cpp b/src/DataTypes/Serializations/SerializationObjectHelpers.cpp
index 8bee9306e919..71905982a674 100644
--- a/src/DataTypes/Serializations/SerializationObjectHelpers.cpp
+++ b/src/DataTypes/Serializations/SerializationObjectHelpers.cpp
@@ -226,6 +226,9 @@ void deserializeIndexesAndCollectPathsImpl(ColumnString & paths_column, ReadBuff
         T index;
         readBinaryLittleEndian(index, istr);
 
+        if (index >= paths.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Object path index is out of range: {} >= {}", static_cast<UInt64>(index), paths.size());
+
         const String & path = paths[index];
         offset += path.size();
         offsets.push_back(offset);
@@ -282,7 +285,6 @@ void deserializeIndexesAndCollectPaths(IColumn & paths_column, ReadBuffer & istr
         default:
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected column type of paths indexes: {}", indexes_type->getName());
     }
-
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationObjectSharedData.cpp b/src/DataTypes/Serializations/SerializationObjectSharedData.cpp
index af41d02c95f8..52676c4c09d2 100644
--- a/src/DataTypes/Serializations/SerializationObjectSharedData.cpp
+++ b/src/DataTypes/Serializations/SerializationObjectSharedData.cpp
@@ -962,6 +962,9 @@ std::shared_ptr<SerializationObjectSharedData::PathsDataGranules> SerializationO
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Info for path {} is not deserialized", requested_path);
 
             const auto & path_info = path_info_it->second;
+            /// Reset callbacks that might be different for different paths.
+            deserialization_settings.seek_stream_to_current_mark_callback = {};
+            deserialization_settings.getter = {};
 
             /// If we have only subcolumns requested for this path, read all subcolumns.
             auto paths_subcolumns_it = structure_state.requested_paths_subcolumns.find(requested_path);
@@ -1322,7 +1325,9 @@ void SerializationObjectSharedData::deserializeBinaryBulkWithMultipleStreams(
 
             /// Read array sizes.
             settings.path.push_back(Substream::ObjectSharedDataCopySizes);
-            SerializationArray::deserializeOffsetsBinaryBulk(offsets_column, rows_offset + limit, settings, cache);
+            if (!SerializationArray::deserializeOffsetsBinaryBulk(offsets_column, rows_offset + limit, settings, cache))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty stream for object shared data copy sizes");
+
             settings.path.pop_back();
 
             /// Read paths indexes.
diff --git a/src/DataTypes/Serializations/SerializationObjectSharedDataPath.cpp b/src/DataTypes/Serializations/SerializationObjectSharedDataPath.cpp
index 4f1d8b9183b5..0d44bbb614c1 100644
--- a/src/DataTypes/Serializations/SerializationObjectSharedDataPath.cpp
+++ b/src/DataTypes/Serializations/SerializationObjectSharedDataPath.cpp
@@ -250,7 +250,7 @@ void SerializationObjectSharedDataPath::deserializeBinaryBulkWithMultipleStreams
         /// Check if we don't have any paths in shared data in current range.
         const auto & offsets = assert_cast<const ColumnArray &>(*map_column).getOffsets();
         if (offsets.back() == offsets[ssize_t(map_column_offset) - 1])
-            dynamic_column->insertManyDefaults(limit);
+            dynamic_column->insertManyDefaults(num_read_rows);
         else
             ColumnObject::fillPathColumnFromSharedData(*dynamic_column, path, map_column, map_column_offset, map_column->size());
 
diff --git a/src/DataTypes/Serializations/SerializationSubObject.cpp b/src/DataTypes/Serializations/SerializationSubObject.cpp
index 61611490d6be..8c855a61f733 100644
--- a/src/DataTypes/Serializations/SerializationSubObject.cpp
+++ b/src/DataTypes/Serializations/SerializationSubObject.cpp
@@ -187,7 +187,10 @@ void SerializationSubObject::deserializeBinaryBulkWithMultipleStreams(
     auto & column_object = assert_cast<ColumnObject &>(*mutable_column);
     /// If it's a new object column, set dynamic paths and statistics.
     if (column_object.empty())
+    {
+        column_object.setMaxDynamicPaths(sub_object_state->dynamic_sub_paths.size());
         column_object.setDynamicPaths(sub_object_state->dynamic_sub_paths);
+    }
 
     auto & typed_paths = column_object.getTypedPaths();
     auto & dynamic_paths = column_object.getDynamicPaths();
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index 108c80576e77..da4d5109f88a 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -20,6 +20,7 @@ namespace ErrorCodes
     extern const int SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH;
     extern const int NOT_FOUND_COLUMN_IN_BLOCK;
     extern const int INCORRECT_DATA;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -801,6 +802,14 @@ void SerializationTuple::deserializeBinaryBulkWithMultipleStreams(
     for (size_t i = 0; i < elems.size(); ++i)
         elems[i]->deserializeBinaryBulkWithMultipleStreams(column_tuple.getColumnPtr(i), rows_offset, limit, settings, tuple_state->states[i], cache);
 
+    /// Verify that all Tuple elements have the same size.
+    size_t expected_size = column_tuple.getColumn(0).size();
+    for (size_t i = 1; i < elems.size(); ++i)
+    {
+        if (column_tuple.getColumn(i).size() != expected_size)
+            throw Exception(settings.native_format ? ErrorCodes::INCORRECT_DATA : ErrorCodes::LOGICAL_ERROR, "Unexpected size of tuple element {}: {}. Expected size: {}", i, column_tuple.getColumn(i).size(), expected_size);
+    }
+
     typeid_cast<ColumnTuple &>(*mutable_column).addSize(column_tuple.getColumn(0).size());
 }
 
diff --git a/src/DataTypes/Serializations/SerializationVariant.cpp b/src/DataTypes/Serializations/SerializationVariant.cpp
index 143b7a14fa9d..8bf1a829abe2 100644
--- a/src/DataTypes/Serializations/SerializationVariant.cpp
+++ b/src/DataTypes/Serializations/SerializationVariant.cpp
@@ -57,6 +57,19 @@ struct DeserializeBinaryBulkStateVariant : public ISerialization::DeserializeBin
     }
 };
 
+SerializationVariant::SerializationVariant(const DataTypes & variant_types_, const String & variant_name_) : variant_types(variant_types_), deserialize_text_order(getVariantsDeserializeTextOrder(variant_types_)), variant_name(variant_name_)
+{
+    variant_serializations.reserve(variant_serializations.size());
+    variant_names.reserve(variant_serializations.size());
+
+    for (const auto & variant : variant_types)
+    {
+        variant_serializations.push_back(variant->getDefaultSerialization());
+        variant_names.push_back(variant->getName());
+    }
+}
+
+
 void SerializationVariant::enumerateStreams(
     EnumerateStreamsSettings & settings,
     const StreamCallback & callback,
@@ -89,7 +102,7 @@ void SerializationVariant::enumerateStreams(
     settings.path.push_back(Substream::VariantElements);
     settings.path.back().data = data;
 
-    for (size_t i = 0; i < variants.size(); ++i)
+    for (size_t i = 0; i < variant_serializations.size(); ++i)
     {
         DataTypePtr type = type_variant ? type_variant->getVariant(i) : nullptr;
         settings.path.back().creator = std::make_shared<SerializationVariantElement::VariantSubcolumnCreator>(
@@ -99,7 +112,7 @@ void SerializationVariant::enumerateStreams(
             column_variant ? column_variant->localDiscriminatorByGlobal(i) : i,
             !type || type->canBeInsideNullable() || type->lowCardinality());
 
-        auto variant_data = SubstreamData(variants[i])
+        auto variant_data = SubstreamData(variant_serializations[i])
                              .withType(type)
                              .withColumn(column_variant ? column_variant->getVariantPtrByGlobalDiscriminator(i) : nullptr)
                              .withSerializationInfo(data.serialization_info)
@@ -107,7 +120,7 @@ void SerializationVariant::enumerateStreams(
 
         addVariantElementToPath(settings.path, i);
         settings.path.back().data = variant_data;
-        variants[i]->enumerateStreams(settings, callback, variant_data);
+        variant_serializations[i]->enumerateStreams(settings, callback, variant_data);
         settings.path.pop_back();
     }
 
@@ -119,8 +132,11 @@ void SerializationVariant::enumerateStreams(
                              .withType(type_variant ? std::make_shared<DataTypeUInt8>() : nullptr)
                              .withColumn(column_variant ? ColumnUInt8::create() : nullptr);
 
-    for (size_t i = 0; i < variants.size(); ++i)
+    for (size_t i = 0; i < variant_serializations.size(); ++i)
     {
+        if (!variant_types[i]->canBeInsideNullable())
+            continue;
+
         settings.path.back().creator = std::make_shared<SerializationVariantElementNullMap::VariantNullMapSubcolumnCreator>(local_discriminators, variant_names[i], i, column_variant ? column_variant->localDiscriminatorByGlobal(i) : i);
         settings.path.push_back(Substream::VariantElementNullMap);
         settings.path.back().variant_element_name = variant_names[i];
@@ -149,14 +165,14 @@ void SerializationVariant::serializeBinaryBulkStatePrefix(
 
     const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
     auto variant_state = std::make_shared<SerializeBinaryBulkStateVariant>(mode);
-    variant_state->variant_states.resize(variants.size());
+    variant_state->variant_states.resize(variant_serializations.size());
 
     settings.path.push_back(Substream::VariantElements);
 
-    for (size_t i = 0; i < variants.size(); ++i)
+    for (size_t i = 0; i < variant_serializations.size(); ++i)
     {
         addVariantElementToPath(settings.path, i);
-        variants[i]->serializeBinaryBulkStatePrefix(col.getVariantByGlobalDiscriminator(i), settings, variant_state->variant_states[i]);
+        variant_serializations[i]->serializeBinaryBulkStatePrefix(col.getVariantByGlobalDiscriminator(i), settings, variant_state->variant_states[i]);
         settings.path.pop_back();
     }
 
@@ -172,10 +188,10 @@ void SerializationVariant::serializeBinaryBulkStateSuffix(
     auto * variant_state = checkAndGetState<SerializeBinaryBulkStateVariant>(state);
 
     settings.path.push_back(Substream::VariantElements);
-    for (size_t i = 0; i < variants.size(); ++i)
+    for (size_t i = 0; i < variant_serializations.size(); ++i)
     {
         addVariantElementToPath(settings.path, i);
-        variants[i]->serializeBinaryBulkStateSuffix(settings, variant_state->variant_states[i]);
+        variant_serializations[i]->serializeBinaryBulkStateSuffix(settings, variant_state->variant_states[i]);
         settings.path.pop_back();
     }
     settings.path.pop_back();
@@ -193,13 +209,13 @@ void SerializationVariant::deserializeBinaryBulkStatePrefix(
 
     auto variant_state = std::make_shared<DeserializeBinaryBulkStateVariant>();
     variant_state->discriminators_state = discriminators_state;
-    variant_state->variant_states.resize(variants.size());
+    variant_state->variant_states.resize(variant_serializations.size());
 
     settings.path.push_back(Substream::VariantElements);
-    for (size_t i = 0; i < variants.size(); ++i)
+    for (size_t i = 0; i < variant_serializations.size(); ++i)
     {
         addVariantElementToPath(settings.path, i);
-        variants[i]->deserializeBinaryBulkStatePrefix(settings, variant_state->variant_states[i], cache);
+        variant_serializations[i]->deserializeBinaryBulkStatePrefix(settings, variant_state->variant_states[i], cache);
         settings.path.pop_back();
     }
 
@@ -260,10 +276,10 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
     if (limit == 0)
     {
         settings.path.push_back(Substream::VariantElements);
-        for (size_t i = 0; i != variants.size(); ++i)
+        for (size_t i = 0; i != variant_serializations.size(); ++i)
         {
             addVariantElementToPath(settings.path, i);
-            variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), col.getVariantByGlobalDiscriminator(i).size(), 0, settings, variant_state->variant_states[i]);
+            variant_serializations[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), col.getVariantByGlobalDiscriminator(i).size(), 0, settings, variant_state->variant_states[i]);
             settings.path.pop_back();
         }
         settings.path.pop_back();
@@ -294,14 +310,14 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
         }
 
         settings.path.push_back(Substream::VariantElements);
-        for (size_t i = 0; i != variants.size(); ++i)
+        for (size_t i = 0; i != variant_serializations.size(); ++i)
         {
             addVariantElementToPath(settings.path, i);
             /// We can use the same offset/limit as for whole Variant column
             if (i == non_empty_global_discr)
-                variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), offset, limit, settings, variant_state->variant_states[i]);
+                variant_serializations[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), offset, limit, settings, variant_state->variant_states[i]);
             else
-                variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), col.getVariantByGlobalDiscriminator(i).size(), 0, settings, variant_state->variant_states[i]);
+                variant_serializations[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), col.getVariantByGlobalDiscriminator(i).size(), 0, settings, variant_state->variant_states[i]);
             settings.path.pop_back();
         }
         variants_statistics[variant_names[non_empty_global_discr]] += limit;
@@ -326,10 +342,10 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
         }
 
         settings.path.push_back(Substream::VariantElements);
-        for (size_t i = 0; i != variants.size(); ++i)
+        for (size_t i = 0; i != variant_serializations.size(); ++i)
         {
             addVariantElementToPath(settings.path, i);
-            variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), col.getVariantByGlobalDiscriminator(i).size(), 0, settings, variant_state->variant_states[i]);
+            variant_serializations[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), col.getVariantByGlobalDiscriminator(i).size(), 0, settings, variant_state->variant_states[i]);
             settings.path.pop_back();
         }
         settings.path.pop_back();
@@ -360,10 +376,10 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
 
         /// Second, serialize variants in global order.
         settings.path.push_back(Substream::VariantElements);
-        for (size_t i = 0; i != variants.size(); ++i)
+        for (size_t i = 0; i != variant_serializations.size(); ++i)
         {
             addVariantElementToPath(settings.path, i);
-            variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), 0, 0, settings, variant_state->variant_states[i]);
+            variant_serializations[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), 0, 0, settings, variant_state->variant_states[i]);
             size_t variant_size = col.getVariantByGlobalDiscriminator(i).size();
             variants_statistics[variant_names[i]] += variant_size;
             total_size_of_variants += variant_size;
@@ -376,7 +392,7 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
     /// In general case we should iterate through local discriminators in range [offset, offset + limit] to serialize global discriminators and calculate offset/limit pair for each variant.
     const auto & local_discriminators = col.getLocalDiscriminators();
     const auto & offsets = col.getOffsets();
-    std::vector<std::pair<size_t, size_t>> variant_offsets_and_limits(variants.size(), {0, 0});
+    std::vector<std::pair<size_t, size_t>> variant_offsets_and_limits(variant_serializations.size(), {0, 0});
     size_t end = offset + limit;
     std::bitset<ColumnVariant::MAX_NESTED_COLUMNS> non_empty_variants_in_range;
     ColumnVariant::Discriminator last_non_empty_variant_discr = 0;
@@ -424,10 +440,10 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
 
     /// Serialize variants in global order.
     settings.path.push_back(Substream::VariantElements);
-    for (size_t i = 0; i != variants.size(); ++i)
+    for (size_t i = 0; i != variant_serializations.size(); ++i)
     {
         addVariantElementToPath(settings.path, i);
-        variants[i]->serializeBinaryBulkWithMultipleStreams(
+        variant_serializations[i]->serializeBinaryBulkWithMultipleStreams(
             col.getVariantByGlobalDiscriminator(i),
             variant_offsets_and_limits[i].second ? variant_offsets_and_limits[i].first : col.getVariantByGlobalDiscriminator(i).size(),
             variant_offsets_and_limits[i].second,
@@ -484,7 +500,7 @@ void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
         if (rows_offset)
             col.getLocalDiscriminatorsPtr()->assumeMutable()->insertRangeFrom(*cached_column, cached_column->size() - num_read_rows, num_read_rows);
         else
-            insertDataFromCachedColumn(settings, col.getLocalDiscriminatorsPtr(), cached_column, num_read_rows);
+            insertDataFromCachedColumn(settings, col.getLocalDiscriminatorsPtr(), cached_column, num_read_rows, cache);
 
         num_read_discriminators = num_read_rows;
         variant_state = checkAndGetState<DeserializeBinaryBulkStateVariant>(state);
@@ -545,7 +561,7 @@ void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
     /// if we didn't do it during discriminators deserialization.
     if (variant_rows_offsets.empty())
     {
-        variant_rows_offsets.resize(variants.size(), 0);
+        variant_rows_offsets.resize(variant_serializations.size(), 0);
 
         if (rows_offset)
         {
@@ -571,7 +587,7 @@ void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
 
     if (variant_limits.empty())
     {
-        variant_limits.resize(variants.size(), 0);
+        variant_limits.resize(variant_serializations.size(), 0);
         auto & discriminators_data = col.getLocalDiscriminators();
 
         for (size_t i = discriminators_offset ; i != discriminators_data.size(); ++i)
@@ -584,13 +600,17 @@ void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
 
     /// Now we can deserialize variants according to their limits.
     settings.path.push_back(Substream::VariantElements);
-    for (size_t i = 0; i != variants.size(); ++i)
+    for (size_t i = 0; i != variant_serializations.size(); ++i)
     {
         addVariantElementToPath(settings.path, i);
-        variants[i]->deserializeBinaryBulkWithMultipleStreams(
+        variant_serializations[i]->deserializeBinaryBulkWithMultipleStreams(
             col.getVariantPtrByLocalDiscriminator(i), variant_rows_offsets[i], variant_limits[i],
             settings, variant_state->variant_states[i], cache);
         settings.path.pop_back();
+
+        /// Verify that we deserialized data of this variant.
+        if (variant_limits[i] && col.getVariantPtrByLocalDiscriminator(i)->empty())
+            throw Exception(settings.native_format ? ErrorCodes::INCORRECT_DATA : ErrorCodes::LOGICAL_ERROR, "Variant {} is empty, but expected to be read {} values", variant_names[i], variant_limits[i]);
     }
     settings.path.pop_back();
 
@@ -608,10 +628,10 @@ void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
     if (settings.insert_only_rows_in_current_range_from_substreams_cache || !insertDataFromSubstreamsCacheIfAny(cache, settings, col.getOffsetsPtr()))
     {
         std::vector<size_t> variant_offsets;
-        variant_offsets.reserve(variants.size());
+        variant_offsets.reserve(variant_serializations.size());
         size_t num_non_empty_variants = 0;
         ColumnVariant::Discriminator last_non_empty_discr = 0;
-        for (size_t i = 0; i != variants.size(); ++i)
+        for (size_t i = 0; i != variant_serializations.size(); ++i)
         {
             if (variant_limits[i])
             {
@@ -674,8 +694,8 @@ std::pair<std::vector<size_t>, std::vector<size_t>> SerializationVariant::deseri
         state.remaining_rows_in_granule = 0;
 
     /// Calculate limits for variants during discriminators deserialization.
-    std::vector<size_t> variant_rows_offsets(variants.size(), 0);
-    std::vector<size_t> variant_limits(variants.size(), 0);
+    std::vector<size_t> variant_rows_offsets(variant_serializations.size(), 0);
+    std::vector<size_t> variant_limits(variant_serializations.size(), 0);
     limit += rows_offset;
 
     while (limit)
@@ -776,7 +796,7 @@ void SerializationVariant::serializeBinary(const IColumn & column, size_t row_nu
     auto global_discr = col.globalDiscriminatorAt(row_num);
     writeBinaryLittleEndian(global_discr, ostr);
     if (global_discr != ColumnVariant::NULL_DISCRIMINATOR)
-        variants[global_discr]->serializeBinary(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeBinary(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 void SerializationVariant::deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -788,10 +808,10 @@ void SerializationVariant::deserializeBinary(IColumn & column, ReadBuffer & istr
     {
         col.insertDefault();
     }
-    else if (global_discr < variants.size())
+    else if (global_discr < variant_serializations.size())
     {
         auto & variant_column = col.getVariantByGlobalDiscriminator(global_discr);
-        variants[global_discr]->deserializeBinary(variant_column, istr, settings);
+        variant_serializations[global_discr]->deserializeBinary(variant_column, istr, settings);
         col.getLocalDiscriminators().push_back(col.localDiscriminatorByGlobal(global_discr));
         col.getOffsets().push_back(variant_column.size() - 1);
     }
@@ -992,7 +1012,7 @@ bool SerializationVariant::tryDeserializeImpl(
         ReadBufferFromString variant_buf(field);
         auto & variant_column = column_variant.getVariantByGlobalDiscriminator(global_discr);
         size_t prev_size = variant_column.size();
-        if (try_deserialize_nested(variant_column, variants[global_discr], variant_buf, modified_settings) && variant_buf.eof())
+        if (try_deserialize_nested(variant_column, variant_serializations[global_discr], variant_buf, modified_settings) && variant_buf.eof())
         {
             column_variant.getLocalDiscriminators().push_back(column_variant.localDiscriminatorByGlobal(global_discr));
             column_variant.getOffsets().push_back(prev_size);
@@ -1014,7 +1034,7 @@ void SerializationVariant::serializeTextEscaped(const IColumn & column, size_t r
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullEscaped(ostr, settings);
     else
-        variants[global_discr]->serializeTextEscaped(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeTextEscaped(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 bool SerializationVariant::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -1053,7 +1073,7 @@ void SerializationVariant::serializeTextRaw(const IColumn & column, size_t row_n
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullRaw(ostr, settings);
     else
-        variants[global_discr]->serializeTextRaw(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeTextRaw(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 bool SerializationVariant::tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -1092,7 +1112,7 @@ void SerializationVariant::serializeTextQuoted(const IColumn & column, size_t ro
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullQuoted(ostr);
     else
-        variants[global_discr]->serializeTextQuoted(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeTextQuoted(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 bool SerializationVariant::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -1132,7 +1152,7 @@ void SerializationVariant::serializeTextCSV(const IColumn & column, size_t row_n
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullCSV(ostr, settings);
     else
-        variants[global_discr]->serializeTextCSV(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeTextCSV(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 bool SerializationVariant::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -1171,7 +1191,7 @@ void SerializationVariant::serializeText(const IColumn & column, size_t row_num,
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullText(ostr, settings);
     else
-        variants[global_discr]->serializeText(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeText(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 bool SerializationVariant::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -1210,7 +1230,7 @@ void SerializationVariant::serializeTextJSON(const IColumn & column, size_t row_
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullJSON(ostr);
     else
-        variants[global_discr]->serializeTextJSON(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeTextJSON(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 void SerializationVariant::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
@@ -1220,7 +1240,7 @@ void SerializationVariant::serializeTextJSONPretty(const IColumn & column, size_
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullJSON(ostr);
     else
-        variants[global_discr]->serializeTextJSONPretty(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings, indent);
+        variant_serializations[global_discr]->serializeTextJSONPretty(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings, indent);
 }
 
 bool SerializationVariant::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -1260,7 +1280,7 @@ void SerializationVariant::serializeTextXML(const IColumn & column, size_t row_n
     if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
         SerializationNullable::serializeNullXML(ostr);
     else
-        variants[global_discr]->serializeTextXML(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+        variant_serializations[global_discr]->serializeTextXML(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationVariant.h b/src/DataTypes/Serializations/SerializationVariant.h
index b4eaf70f4201..450b442978ba 100644
--- a/src/DataTypes/Serializations/SerializationVariant.h
+++ b/src/DataTypes/Serializations/SerializationVariant.h
@@ -72,14 +72,7 @@ class SerializationVariant : public ISerialization
 
     using VariantSerializations = std::vector<SerializationPtr>;
 
-    explicit SerializationVariant(
-        const VariantSerializations & variants_,
-        const std::vector<String> & variant_names_,
-        const std::vector<size_t> & deserialize_text_order_,
-        const String & variant_name_)
-        : variants(variants_), variant_names(variant_names_), deserialize_text_order(deserialize_text_order_), variant_name(variant_name_)
-    {
-    }
+    explicit SerializationVariant(const DataTypes & variant_types_, const String & variant_name_);
 
     void enumerateStreams(
         EnumerateStreamsSettings & settings,
@@ -222,8 +215,9 @@ class SerializationVariant : public ISerialization
         std::function<bool(IColumn & variant_columm, const SerializationPtr & nested, ReadBuffer &, const FormatSettings &)> try_deserialize_nested,
         const FormatSettings & settings) const;
 
-    VariantSerializations variants;
+    VariantSerializations variant_serializations;
     std::vector<String> variant_names;
+    DataTypes variant_types;
     std::vector<size_t> deserialize_text_order;
     /// Name of Variant data type for better exception messages.
     String variant_name;
diff --git a/src/DataTypes/Serializations/SerializationVariantElement.cpp b/src/DataTypes/Serializations/SerializationVariantElement.cpp
index ca985f03096e..b3ef19b987f9 100644
--- a/src/DataTypes/Serializations/SerializationVariantElement.cpp
+++ b/src/DataTypes/Serializations/SerializationVariantElement.cpp
@@ -250,6 +250,11 @@ void SerializationVariantElement::deserializeBinaryBulkWithMultipleStreams(
     nested_serialization->deserializeBinaryBulkWithMultipleStreams(variant_element_state->variant, *variant_rows_offset, *variant_limit, nested_settings, variant_element_state->variant_element_state, cache);
     removeVariantFromPath(settings.path);
 
+    /// We want to keep dynamic structure of the variant during deserialization.
+    /// Keeping dynamic structure improves performance of insertFrom/insertRangeFrom methods.
+    if (mutable_column->empty())
+        mutable_column->takeDynamicStructureFromColumn(variant_element_state->variant);
+
     /// If there was nothing to deserialize or nothing was actually deserialized when variant_limit > 0, just insert defaults.
     /// The second case means that we don't have a stream for such sub-column. It may happen during ALTER MODIFY column with Variant extension.
     if (variant_limit == 0 || variant_element_state->variant->empty())
diff --git a/src/DataTypes/Serializations/SerializationVariantElementNullMap.cpp b/src/DataTypes/Serializations/SerializationVariantElementNullMap.cpp
index 54043db3f29c..dce31cb7f851 100644
--- a/src/DataTypes/Serializations/SerializationVariantElementNullMap.cpp
+++ b/src/DataTypes/Serializations/SerializationVariantElementNullMap.cpp
@@ -163,12 +163,12 @@ void SerializationVariantElementNullMap::deserializeBinaryBulkWithMultipleStream
     /// Check if there are no such variant in read range.
     if (variant_limit && *variant_limit == 0)
     {
-        data.resize_fill(data.size() + limit, 1);
+        data.resize_fill(data.size() + num_read_discriminators, 1);
     }
     /// Check if there is only our variant in read range.
-    else if (variant_limit && *variant_limit == limit)
+    else if (variant_limit && *variant_limit == num_read_discriminators)
     {
-        data.resize_fill(data.size() + limit, 0);
+        data.resize_fill(data.size() + num_read_discriminators, 0);
     }
     /// Iterate through new discriminators to calculate the null map of our variant.
     else
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
index 9e6cae8bf172..7a3382d73276 100644
--- a/src/Databases/DDLDependencyVisitor.cpp
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -378,34 +378,32 @@ namespace
 
             const auto & arg = args[arg_idx];
 
-            if (evaluate)
+            if (const auto * id = arg->as<ASTIdentifier>())
+                return id->name();
+
+            if (const auto * literal = arg->as<ASTLiteral>())
             {
-                try
-                {
-                    /// We're just searching for dependencies here, it's not safe to execute subqueries now.
-                    /// Use copy of the global_context and set current database, because expressions can contain currentDatabase() function.
-                    ContextMutablePtr global_context_copy = Context::createCopy(global_context);
-                    global_context_copy->setCurrentDatabase(current_database);
-                    auto evaluated = evaluateConstantExpressionOrIdentifierAsLiteral(arg, global_context_copy);
-                    const auto * literal = evaluated->as<ASTLiteral>();
-                    if (!literal || (literal->value.getType() != Field::Types::String))
-                        return {};
+                if (literal->value.getType() == Field::Types::String)
                     return literal->value.safeGet<String>();
-                }
-                catch (...)
-                {
+            }
+
+            if (!evaluate)
+                return {};
+
+            try
+            {
+                /// We're just searching for dependencies here, it's not safe to execute subqueries now.
+                /// Use copy of the global_context and set current database, because expressions can contain currentDatabase() function.
+                ContextMutablePtr global_context_copy = Context::createCopy(global_context);
+                global_context_copy->setCurrentDatabase(current_database);
+                auto evaluated = evaluateConstantExpressionOrIdentifierAsLiteral(arg, global_context_copy);
+                const auto * literal = evaluated->as<ASTLiteral>();
+                if (!literal || (literal->value.getType() != Field::Types::String))
                     return {};
-                }
+                return literal->value.safeGet<String>();
             }
-            else
+            catch (...)
             {
-                if (const auto * id = arg->as<ASTIdentifier>())
-                    return id->name();
-                if (const auto * literal = arg->as<ASTLiteral>())
-                {
-                    if (literal->value.getType() == Field::Types::String)
-                        return literal->value.safeGet<String>();
-                }
                 return {};
             }
         }
diff --git a/src/Databases/DataLake/Common.cpp b/src/Databases/DataLake/Common.cpp
index a31bf35e0673..8946d3412d70 100644
--- a/src/Databases/DataLake/Common.cpp
+++ b/src/Databases/DataLake/Common.cpp
@@ -61,14 +61,14 @@ std::vector<String> splitTypeArguments(const String & type_str)
     return args;
 }
 
-DB::DataTypePtr getType(const String & type_name, bool nullable, const String & prefix)
+DB::DataTypePtr getType(const String & type_name, bool nullable, DB::ContextPtr context, const String & prefix)
 {
     String name = trim(type_name);
 
     if (name.starts_with("array<") && name.ends_with(">"))
     {
         String inner = name.substr(6, name.size() - 7);
-        return std::make_shared<DB::DataTypeArray>(getType(inner, nullable));
+        return std::make_shared<DB::DataTypeArray>(getType(inner, nullable, context));
     }
 
     if (name.starts_with("map<") && name.ends_with(">"))
@@ -79,7 +79,7 @@ DB::DataTypePtr getType(const String & type_name, bool nullable, const String &
         if (args.size() != 2)
             throw DB::Exception(DB::ErrorCodes::DATALAKE_DATABASE_ERROR, "Invalid data type {}", type_name);
 
-        return std::make_shared<DB::DataTypeMap>(getType(args[0], false), getType(args[1], nullable));
+        return std::make_shared<DB::DataTypeMap>(getType(args[0], false, context), getType(args[1], nullable, context));
     }
 
     if (name.starts_with("struct<") && name.ends_with(">"))
@@ -101,12 +101,13 @@ DB::DataTypePtr getType(const String & type_name, bool nullable, const String &
             String full_field_name = prefix.empty() ? field_name : prefix + "." + field_name;
 
             field_names.push_back(full_field_name);
-            field_types.push_back(getType(field_type, nullable, full_field_name));
+            field_types.push_back(getType(field_type, nullable, context, full_field_name));
         }
         return std::make_shared<DB::DataTypeTuple>(field_types, field_names);
     }
 
-    return nullable ? DB::makeNullable(DB::IcebergSchemaProcessor::getSimpleType(name)) : DB::IcebergSchemaProcessor::getSimpleType(name);
+    return nullable ? DB::makeNullable(DB::Iceberg::IcebergSchemaProcessor::getSimpleType(name, context))
+                    : DB::Iceberg::IcebergSchemaProcessor::getSimpleType(name, context);
 }
 
 std::pair<std::string, std::string> parseTableName(const std::string & name)
diff --git a/src/Databases/DataLake/Common.h b/src/Databases/DataLake/Common.h
index cd4b6214e343..9b0dd7c626a6 100644
--- a/src/Databases/DataLake/Common.h
+++ b/src/Databases/DataLake/Common.h
@@ -2,6 +2,7 @@
 
 #include <Core/NamesAndTypes.h>
 #include <Core/Types.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DataLake
 {
@@ -10,7 +11,7 @@ String trim(const String & str);
 
 std::vector<String> splitTypeArguments(const String & type_str);
 
-DB::DataTypePtr getType(const String & type_name, bool nullable, const String & prefix = "");
+DB::DataTypePtr getType(const String & type_name, bool nullable, DB::ContextPtr context, const String & prefix = "");
 
 /// Parse a string, containing at least one dot, into a two substrings:
 /// A.B.C.D.E -> A.B.C.D and E, where
diff --git a/src/Databases/DataLake/DataLakeConstants.h b/src/Databases/DataLake/DataLakeConstants.h
index eaa8f5a276e6..02f6a7dcfcd7 100644
--- a/src/Databases/DataLake/DataLakeConstants.h
+++ b/src/Databases/DataLake/DataLakeConstants.h
@@ -8,6 +8,7 @@ namespace DataLake
 {
 
 static constexpr auto DATABASE_ENGINE_NAME = "DataLakeCatalog";
+static constexpr auto DATABASE_ALIAS_NAME = "Iceberg";
 static constexpr std::string_view FILE_PATH_PREFIX = "file:/";
 
 /// Some catalogs (Unity or Glue) may store not only Iceberg/DeltaLake tables but other kinds of "tables"
diff --git a/src/Databases/DataLake/DatabaseDataLake.cpp b/src/Databases/DataLake/DatabaseDataLake.cpp
index fd41602a3a40..52a51aaa31e3 100644
--- a/src/Databases/DataLake/DatabaseDataLake.cpp
+++ b/src/Databases/DataLake/DatabaseDataLake.cpp
@@ -22,6 +22,7 @@
 #include <Storages/ConstraintsDescription.h>
 #include <Storages/StorageNull.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h>
+#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/Context.h>
@@ -47,9 +48,12 @@ namespace DatabaseDataLakeSetting
     extern const DatabaseDataLakeSettingsString oauth_server_uri;
     extern const DatabaseDataLakeSettingsBool oauth_server_use_request_body;
     extern const DatabaseDataLakeSettingsBool vended_credentials;
+    extern const DatabaseDataLakeSettingsString object_storage_cluster;
     extern const DatabaseDataLakeSettingsString aws_access_key_id;
     extern const DatabaseDataLakeSettingsString aws_secret_access_key;
     extern const DatabaseDataLakeSettingsString region;
+    extern const DatabaseDataLakeSettingsString aws_role_arn;
+    extern const DatabaseDataLakeSettingsString aws_role_session_name;
 }
 
 namespace Setting
@@ -59,6 +63,9 @@ namespace Setting
     extern const SettingsBool allow_experimental_database_glue_catalog;
     extern const SettingsBool allow_experimental_database_hms_catalog;
     extern const SettingsBool use_hive_partitioning;
+    extern const SettingsBool parallel_replicas_for_cluster_engines;
+    extern const SettingsString cluster_for_parallel_replicas;
+
 }
 namespace DataLakeStorageSetting
 {
@@ -119,6 +126,8 @@ std::shared_ptr<DataLake::ICatalog> DatabaseDataLake::getCatalog() const
         .aws_access_key_id = settings[DatabaseDataLakeSetting::aws_access_key_id].value,
         .aws_secret_access_key = settings[DatabaseDataLakeSetting::aws_secret_access_key].value,
         .region = settings[DatabaseDataLakeSetting::region].value,
+        .aws_role_arn = settings[DatabaseDataLakeSetting::aws_role_arn].value,
+        .aws_role_session_name = settings[DatabaseDataLakeSetting::aws_role_session_name].value,
     };
 
     switch (settings[DatabaseDataLakeSetting::catalog_type].value)
@@ -176,7 +185,7 @@ std::shared_ptr<DataLake::ICatalog> DatabaseDataLake::getCatalog() const
     return catalog_impl;
 }
 
-std::shared_ptr<StorageObjectStorageConfiguration> DatabaseDataLake::getConfiguration(
+StorageObjectStorageConfigurationPtr DatabaseDataLake::getConfiguration(
     DatabaseDataLakeStorageType type,
     DataLakeStorageSettingsPtr storage_settings) const
 {
@@ -324,7 +333,7 @@ StoragePtr DatabaseDataLake::tryGetTableImpl(const String & name, ContextPtr con
 
     auto [namespace_name, table_name] = DataLake::parseTableName(name);
 
-    if (!catalog->tryGetTableMetadata(namespace_name, table_name, table_metadata))
+    if (!catalog->tryGetTableMetadata(namespace_name, table_name, context_, table_metadata))
         return nullptr;
 
     if (ignore_if_not_iceberg && !table_metadata.isDefaultReadableTable())
@@ -373,7 +382,8 @@ StoragePtr DatabaseDataLake::tryGetTableImpl(const String & name, ContextPtr con
                 LOG_DEBUG(log, "Has no credentials");
             }
         }
-        else if (!lightweight && table_metadata.requiresCredentials())
+        else if (!lightweight && table_metadata.requiresCredentials()
+            && table_metadata.getStorageType() != DatabaseDataLakeStorageType::Local)
         {
             throw Exception(
                ErrorCodes::BAD_ARGUMENTS,
@@ -423,25 +433,43 @@ StoragePtr DatabaseDataLake::tryGetTableImpl(const String & name, ContextPtr con
 
     /// with_table_structure = false: because there will be
     /// no table structure in table definition AST.
-    StorageObjectStorageConfiguration::initialize(*configuration, args, context_copy, /* with_table_structure */false);
+    configuration->initialize(args, context_copy, /* with_table_structure */false);
+
+    auto cluster_name = settings[DatabaseDataLakeSetting::object_storage_cluster].value;
+
+    const auto & query_settings = context_->getSettingsRef();
+
+    const auto parallel_replicas_cluster_name = query_settings[Setting::cluster_for_parallel_replicas].toString();
+    if (!parallel_replicas_cluster_name.empty())
+        cluster_name = parallel_replicas_cluster_name;
+
+    const auto can_use_parallel_replicas = !parallel_replicas_cluster_name.empty()
+        && query_settings[Setting::parallel_replicas_for_cluster_engines]
+        && context_->canUseTaskBasedParallelReplicas()
+        && !context_->isDistributed();
 
-    return std::make_shared<StorageObjectStorage>(
+    bool can_use_distributed_iterator =
+        context_->getClientInfo().collaborate_with_initiator &&
+        can_use_parallel_replicas;
+
+    return std::make_shared<StorageObjectStorageCluster>(
+        cluster_name,
         configuration,
         configuration->createObjectStorage(context_copy, /* is_readonly */ false),
-        context_copy,
         StorageID(getDatabaseName(), name),
-        /* columns */columns,
-        /* constraints */ConstraintsDescription{},
-        /* comment */"",
+        /* columns */ columns,
+        /* constraints */ ConstraintsDescription{},
+        /* partition_by */ nullptr,
+        context_copy,
+        /* comment */ "",
         getFormatSettings(context_copy),
         LoadingStrictnessLevel::CREATE,
         getCatalog(),
-        /* if_not_exists*/true,
-        /* is_datalake_query*/true,
-        /* distributed_processing */false,
-        /* partition_by */nullptr,
-        /* is_table_function */false,
-        /* lazy_init */true);
+        /* if_not_exists */ true,
+        /* is_datalake_query */ true,
+        can_use_distributed_iterator,
+        /* is_table_function */ true,
+        /* lazy_init */ true);
 }
 
 void DatabaseDataLake::dropTable( /// NOLINT
@@ -500,7 +528,6 @@ DatabaseTablesIteratorPtr DatabaseDataLake::getTablesIterator(
                     }
                     catch (...)
                     {
-                        tryLogCurrentException(log, fmt::format("Ignoring table {}", table_name));
                         promise->set_exception(std::current_exception());
                     }
                 });
@@ -533,14 +560,10 @@ DatabaseTablesIteratorPtr DatabaseDataLake::getTablesIterator(
 DatabaseTablesIteratorPtr DatabaseDataLake::getLightweightTablesIterator(
     ContextPtr context_,
     const FilterByNameFunction & filter_by_table_name,
-    bool skip_not_loaded,
-    bool skip_data_lake_catalog) const
+    bool skip_not_loaded) const
 {
     Tables tables;
 
-    if (skip_data_lake_catalog)
-        return std::make_unique<DatabaseTablesSnapshotIterator>(tables, getDatabaseName());
-
     auto catalog = getCatalog();
     DB::Names iceberg_tables;
 
@@ -587,7 +610,7 @@ DatabaseTablesIteratorPtr DatabaseDataLake::getLightweightTablesIterator(
                     }
                     catch (...)
                     {
-                        tryLogCurrentException(log, fmt::format("ignoring table {}", table_name));
+                        tryLogCurrentException(log, fmt::format("Ignoring table {}", table_name));
                     }
                     promise->set_value(storage);
                 });
@@ -629,18 +652,19 @@ ASTPtr DatabaseDataLake::getCreateDatabaseQuery() const
 
 ASTPtr DatabaseDataLake::getCreateTableQueryImpl(
     const String & name,
-    ContextPtr /* context_ */,
-    bool /* throw_on_error */) const
+    ContextPtr context_,
+    bool throw_on_error) const
 {
     auto catalog = getCatalog();
     auto table_metadata = DataLake::TableMetadata().withLocation().withSchema();
 
     const auto [namespace_name, table_name] = DataLake::parseTableName(name);
 
-    if (!catalog->tryGetTableMetadata(namespace_name, table_name, table_metadata))
+    if (!catalog->tryGetTableMetadata(namespace_name, table_name, context_, table_metadata))
     {
-        throw Exception(
-            ErrorCodes::CANNOT_GET_CREATE_TABLE_QUERY, "Table `{}` doesn't exist", name);
+        if (throw_on_error)
+            throw Exception(ErrorCodes::CANNOT_GET_CREATE_TABLE_QUERY, "Table `{}` doesn't exist", name);
+        return {};
     }
 
     auto create_table_query = std::make_shared<ASTCreateQuery>();
@@ -729,6 +753,11 @@ void registerDatabaseDataLake(DatabaseFactory & factory)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", database_engine_name);
         }
 
+        if (database_engine_name == "Iceberg" && catalog_type != DatabaseDataLakeCatalogType::ICEBERG_REST)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `Iceberg` must have `rest` catalog type only");
+        }
+
         for (auto & engine_arg : engine_args)
             engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.context);
 
@@ -810,6 +839,7 @@ void registerDatabaseDataLake(DatabaseFactory & factory)
             args.uuid);
     };
     factory.registerDatabase("DataLakeCatalog", create_fn, { .supports_arguments = true, .supports_settings = true });
+    factory.registerDatabase("Iceberg", create_fn, { .supports_arguments = true, .supports_settings = true });
 }
 
 }
diff --git a/src/Databases/DataLake/DatabaseDataLake.h b/src/Databases/DataLake/DatabaseDataLake.h
index c46b0eb3dcd2..8e3438108706 100644
--- a/src/Databases/DataLake/DatabaseDataLake.h
+++ b/src/Databases/DataLake/DatabaseDataLake.h
@@ -31,6 +31,7 @@ class DatabaseDataLake final : public IDatabase, WithContext
     bool canContainDistributedTables() const override { return false; }
     bool canContainRocksDBTables() const override { return false; }
     bool shouldBeEmptyOnDetach() const override { return false; }
+    bool isDatalakeCatalog() const override { return true; }
 
     bool empty() const override;
 
@@ -47,8 +48,7 @@ class DatabaseDataLake final : public IDatabase, WithContext
     DatabaseTablesIteratorPtr getLightweightTablesIterator(
         ContextPtr context,
         const FilterByNameFunction & filter_by_table_name,
-        bool skip_not_loaded,
-        bool skip_data_lake_catalog) const override;
+        bool skip_not_loaded) const override;
 
 
     void shutdown() override {}
@@ -88,7 +88,7 @@ class DatabaseDataLake final : public IDatabase, WithContext
     void validateSettings();
     std::shared_ptr<DataLake::ICatalog> getCatalog() const;
 
-    std::shared_ptr<StorageObjectStorageConfiguration> getConfiguration(
+    StorageObjectStorageConfigurationPtr getConfiguration(
         DatabaseDataLakeStorageType type,
         DataLakeStorageSettingsPtr storage_settings) const;
 
diff --git a/src/Databases/DataLake/DatabaseDataLakeSettings.cpp b/src/Databases/DataLake/DatabaseDataLakeSettings.cpp
index 7a6b4c07b599..588d8e47ee8f 100644
--- a/src/Databases/DataLake/DatabaseDataLakeSettings.cpp
+++ b/src/Databases/DataLake/DatabaseDataLakeSettings.cpp
@@ -18,16 +18,18 @@ namespace ErrorCodes
 
 #define DATABASE_ICEBERG_RELATED_SETTINGS(DECLARE, ALIAS) \
     DECLARE(DatabaseDataLakeCatalogType, catalog_type, DatabaseDataLakeCatalogType::NONE, "Catalog type", 0) \
-    DECLARE(String, catalog_credential, "", "", 0)             \
-    DECLARE(Bool, vended_credentials, true, "Use vended credentials (storage credentials) from catalog", 0)             \
-    DECLARE(String, auth_scope, "PRINCIPAL_ROLE:ALL", "Authorization scope for client credentials or token exchange", 0)             \
-    DECLARE(String, oauth_server_uri, "", "OAuth server uri", 0)             \
-    DECLARE(Bool, oauth_server_use_request_body, true, "Put parameters into request body or query params", 0)             \
-    DECLARE(String, warehouse, "", "Warehouse name inside the catalog", 0)             \
-    DECLARE(String, auth_header, "", "Authorization header of format 'Authorization: <scheme> <auth_info>'", 0)           \
-    DECLARE(String, aws_access_key_id, "", "Key for AWS connection for Glue catalog", 0)           \
-    DECLARE(String, aws_secret_access_key, "", "Key for AWS connection for Glue Catalog'", 0)           \
-    DECLARE(String, region, "", "Region for Glue catalog", 0)           \
+    DECLARE(String, catalog_credential, "", "", 0) \
+    DECLARE(Bool, vended_credentials, true, "Use vended credentials (storage credentials) from catalog", 0) \
+    DECLARE(String, auth_scope, "PRINCIPAL_ROLE:ALL", "Authorization scope for client credentials or token exchange", 0) \
+    DECLARE(String, oauth_server_uri, "", "OAuth server uri", 0) \
+    DECLARE(Bool, oauth_server_use_request_body, true, "Put parameters into request body or query params", 0) \
+    DECLARE(String, warehouse, "", "Warehouse name inside the catalog", 0) \
+    DECLARE(String, auth_header, "", "Authorization header of format 'Authorization: <scheme> <auth_info>'", 0) \
+    DECLARE(String, aws_access_key_id, "", "Key for AWS connection for Glue catalog", 0) \
+    DECLARE(String, aws_secret_access_key, "", "Key for AWS connection for Glue Catalog'", 0) \
+    DECLARE(String, region, "", "Region for Glue catalog", 0) \
+    DECLARE(String, aws_role_arn, "", "Role arn for AWS connection for Glue catalog", 0) \
+    DECLARE(String, aws_role_session_name, "", "Role session name for AWS connection for Glue catalog", 0) \
     DECLARE(String, storage_endpoint, "", "Object storage endpoint", 0) \
 
 #define LIST_OF_DATABASE_ICEBERG_SETTINGS(M, ALIAS) \
diff --git a/src/Databases/DataLake/GlueCatalog.cpp b/src/Databases/DataLake/GlueCatalog.cpp
index 35ebd782b882..978caeb23922 100644
--- a/src/Databases/DataLake/GlueCatalog.cpp
+++ b/src/Databases/DataLake/GlueCatalog.cpp
@@ -66,11 +66,6 @@ namespace DB::Setting
     extern const SettingsUInt64 s3_request_timeout_ms;
 }
 
-namespace DB::StorageObjectStorageSetting
-{
-    extern const StorageObjectStorageSettingsString iceberg_metadata_file_path;
-}
-
 namespace DB::DatabaseDataLakeSetting
 {
     extern const DatabaseDataLakeSettingsString storage_endpoint;
@@ -96,7 +91,6 @@ GlueCatalog::GlueCatalog(
     : ICatalog("")
     , DB::WithContext(context_)
     , log(getLogger("GlueCatalog(" + settings_.region + ")"))
-    , credentials(settings_.aws_access_key_id, settings_.aws_secret_access_key)
     , region(settings_.region)
     , settings(settings_)
     , table_engine_definition(table_engine_definition_)
@@ -104,6 +98,8 @@ GlueCatalog::GlueCatalog(
 {
     DB::S3::CredentialsConfiguration creds_config;
     creds_config.use_environment_credentials = true;
+    creds_config.role_arn = settings.aws_role_arn;
+    creds_config.role_session_name = settings.aws_role_session_name;
 
     const DB::Settings & global_settings = getContext()->getGlobalContext()->getSettingsRef();
 
@@ -121,9 +117,11 @@ GlueCatalog::GlueCatalog(
         s3_slow_all_threads_after_network_error,
         s3_slow_all_threads_after_retryable_error,
         enable_s3_requests_logging,
-        false,
-        nullptr,
-        nullptr);
+        /* for_disk_s3 = */ false,
+        /* opt_disk_name = */ {},
+        /* get_request_throttler = */ nullptr,
+        /* put_request_throttler = */ nullptr);
+
 
     Aws::Glue::GlueClientConfiguration client_configuration;
     client_configuration.maxConnections = static_cast<unsigned>(global_settings[DB::Setting::s3_max_connections]);
@@ -132,31 +130,40 @@ GlueCatalog::GlueCatalog(
     client_configuration.region = region;
     auto endpoint_provider = std::make_shared<Aws::Glue::GlueEndpointProvider>();
 
+    Aws::Auth::AWSCredentials credentials(settings_.aws_access_key_id, settings_.aws_secret_access_key);
     /// Only for testing when we are mocking glue
     if (!endpoint.empty())
     {
         client_configuration.endpointOverride = endpoint;
         endpoint_provider->OverrideEndpoint(endpoint);
-        Aws::Auth::AWSCredentials fake_credentials_for_fake_catalog;
+
         if (credentials.IsEmpty())
         {
             /// You can specify any key for fake moto glue, it's just important
             /// for it not to be empty.
-            fake_credentials_for_fake_catalog.SetAWSAccessKeyId("testing");
-            fake_credentials_for_fake_catalog.SetAWSSecretKey("testing");
+            credentials.SetAWSAccessKeyId("testing");
+            credentials.SetAWSSecretKey("testing");
         }
-        else
-            fake_credentials_for_fake_catalog = credentials;
 
-        glue_client = std::make_unique<Aws::Glue::GlueClient>(fake_credentials_for_fake_catalog, endpoint_provider, client_configuration);
+        Poco::URI uri(endpoint);
+        if (uri.getScheme() == "http")
+            poco_config.scheme = Aws::Http::Scheme::HTTP;
     }
     else
     {
         LOG_TRACE(log, "Creating AWS glue client with credentials empty {}, region '{}', endpoint '{}'", credentials.IsEmpty(), region, endpoint);
-        std::shared_ptr<DB::S3::S3CredentialsProviderChain> chain = std::make_shared<DB::S3::S3CredentialsProviderChain>(poco_config, credentials, creds_config);
-        glue_client = std::make_unique<Aws::Glue::GlueClient>(chain, endpoint_provider, client_configuration);
     }
 
+    credentials_provider = std::make_shared<DB::S3::S3CredentialsProviderChain>(poco_config, credentials, creds_config);
+    if (!creds_config.role_arn.empty())
+        credentials_provider = std::make_shared<DB::S3::AwsAuthSTSAssumeRoleCredentialsProvider>(
+            creds_config.role_arn,
+            creds_config.role_session_name,
+            creds_config.expiration_window_seconds,
+            std::move(credentials_provider),
+            poco_config,
+            creds_config.sts_endpoint_override);
+    glue_client = std::make_unique<Aws::Glue::GlueClient>(credentials_provider, endpoint_provider, client_configuration);
 }
 
 GlueCatalog::~GlueCatalog() = default;
@@ -274,13 +281,13 @@ bool GlueCatalog::existsTable(const std::string & database_name, const std::stri
 bool GlueCatalog::tryGetTableMetadata(
     const std::string & database_name,
     const std::string & table_name,
+    DB::ContextPtr /* context_ */,
     TableMetadata & result) const
 {
     Aws::Glue::Model::GetTableRequest request;
     request.SetDatabaseName(database_name);
     request.SetName(table_name);
 
-
     auto outcome = glue_client->GetTable(request);
     if (outcome.IsSuccess())
     {
@@ -315,11 +322,31 @@ bool GlueCatalog::tryGetTableMetadata(
             {
                 result.setDataLakeSpecificProperties(DataLakeSpecificProperties{.iceberg_metadata_file_location = table_params.at("metadata_location")});
             }
+            else if (table_outcome.GetStorageDescriptor().LocationHasBeenSet())
+            {
+                const auto & location = table_outcome.GetStorageDescriptor().GetLocation();
+
+                std::string location_with_slash = location;
+                if (!location_with_slash.ends_with('/'))
+                    location_with_slash += '/';
+
+                // Resolve the actual metadata file path based on table location
+                std::string resolved_metadata_path = resolveMetadataPathFromTableLocation(location_with_slash, result);
+                if (resolved_metadata_path.empty())
+                {
+                    result.setTableIsNotReadable(fmt::format("Could not determine metadata_location of table `{}`. ",
+                        database_name + "." + table_name));
+                }
+                else
+                {
+                    result.setDataLakeSpecificProperties(DataLakeSpecificProperties{.iceberg_metadata_file_location = resolved_metadata_path});
+                }
+            }
             else
             {
-                 result.setTableIsNotReadable(fmt::format("Cannot read table `{}` because it has no metadata_location. " \
-                     "It means that it's unreadable with Glue catalog in ClickHouse, readable tables must have 'metadata_location' in table parameters",
-                     database_name + "." + table_name));
+                result.setTableIsNotReadable(fmt::format("Cannot read table `{}` because it has no metadata_location. " \
+                    "It means that it's unreadable with Glue catalog in ClickHouse, readable tables must have 'metadata_location' in table parameters",
+                    database_name + "." + table_name));
             }
         };
 
@@ -350,7 +377,7 @@ bool GlueCatalog::tryGetTableMetadata(
                         column_type = "timestamptz";
                 }
 
-                schema.push_back({column.GetName(), getType(column_type, can_be_nullable)});
+                schema.push_back({column.GetName(), getType(column_type, can_be_nullable, getContext())});
             }
             result.setSchema(schema);
         }
@@ -372,9 +399,10 @@ bool GlueCatalog::tryGetTableMetadata(
 void GlueCatalog::getTableMetadata(
     const std::string & database_name,
     const std::string & table_name,
+    DB::ContextPtr context_,
     TableMetadata & result) const
 {
-    if (!tryGetTableMetadata(database_name, table_name, result))
+    if (!tryGetTableMetadata(database_name, table_name, context_, result))
     {
         throw DB::Exception(
             DB::ErrorCodes::DATALAKE_DATABASE_ERROR,
@@ -389,8 +417,9 @@ void GlueCatalog::setCredentials(TableMetadata & metadata) const
 
     if (storage_type == StorageType::S3)
     {
-        auto creds = std::make_shared<S3Credentials>(credentials.GetAWSAccessKeyId(), credentials.GetAWSSecretKey(), credentials.GetSessionToken());
-        metadata.setStorageCredentials(creds);
+        auto credentials = credentials_provider->GetAWSCredentials();
+        auto s3_creds = std::make_shared<S3Credentials>(credentials.GetAWSAccessKeyId(), credentials.GetAWSSecretKey(), credentials.GetSessionToken());
+        metadata.setStorageCredentials(s3_creds);
     }
     else
     {
@@ -413,43 +442,51 @@ bool GlueCatalog::empty() const
 bool GlueCatalog::classifyTimestampTZ(const String & column_name, const TableMetadata & table_metadata) const
 {
     String metadata_path;
+    String metadata_uri;
     if (auto table_specific_properties = table_metadata.getDataLakeSpecificProperties();
         table_specific_properties.has_value())
     {
         metadata_path = table_specific_properties->iceberg_metadata_file_location;
+        metadata_uri = metadata_path;
         if (metadata_path.starts_with("s3:/"))
             metadata_path = metadata_path.substr(5);
 
-        // Delete bucket
+        // Delete bucket from path
         std::size_t pos = metadata_path.find('/');
         if (pos != std::string::npos)
             metadata_path = metadata_path.substr(pos + 1);
     }
     else
-        throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Metadata specific properties should be defined");
+        throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Failed to read table metadata, reason why table is unreadable: {}", table_metadata.getReasonWhyTableIsUnreadable());
 
-    if (!metadata_objects.get(metadata_path))
+    if (!metadata_objects.get(metadata_uri))
     {
         DB::ASTStorage * storage = table_engine_definition->as<DB::ASTStorage>();
         DB::ASTs args = storage->engine->arguments->children;
 
-        auto table_endpoint = settings.storage_endpoint;
+        String storage_endpoint = !settings.storage_endpoint.empty() ? settings.storage_endpoint : metadata_uri;
+
         if (args.empty())
-            args.emplace_back(std::make_shared<DB::ASTLiteral>(table_endpoint));
+            args.emplace_back(std::make_shared<DB::ASTLiteral>(storage_endpoint));
         else
-            args[0] = std::make_shared<DB::ASTLiteral>(table_endpoint);
+            args[0] = std::make_shared<DB::ASTLiteral>(storage_endpoint);
 
-        if (args.size() == 1 && table_metadata.hasStorageCredentials())
+        if (args.size() == 1)
         {
-            auto storage_credentials = table_metadata.getStorageCredentials();
-            if (storage_credentials)
-                storage_credentials->addCredentialsToEngineArgs(args);
+            if (table_metadata.hasStorageCredentials())
+                table_metadata.getStorageCredentials()->addCredentialsToEngineArgs(args);
+           else
+           {
+               auto credentials = credentials_provider->GetAWSCredentials();
+               if (!credentials.IsExpiredOrEmpty())
+                   DataLake::S3Credentials(credentials.GetAWSAccessKeyId(), credentials.GetAWSSecretKey(), credentials.GetSessionToken()).addCredentialsToEngineArgs(args);
+           }
         }
 
         auto storage_settings = std::make_shared<DB::DataLakeStorageSettings>();
         storage_settings->loadFromSettingsChanges(settings.allChanged());
         auto configuration = std::make_shared<DB::StorageS3IcebergConfiguration>(storage_settings);
-        DB::StorageObjectStorageConfiguration::initialize(*configuration, args, getContext(), false);
+        configuration->initialize(args, getContext(), false);
 
         auto object_storage = configuration->createObjectStorage(getContext(), true);
         const auto & read_settings = getContext()->getReadSettings();
@@ -457,14 +494,14 @@ bool GlueCatalog::classifyTimestampTZ(const String & column_name, const TableMet
         DB::StoredObject metadata_stored_object(metadata_path);
         auto read_buf = object_storage->readObject(metadata_stored_object, read_settings);
         String metadata_file;
-        readString(metadata_file, *read_buf);
+        readStringUntilEOF(metadata_file, *read_buf);
 
         Poco::JSON::Parser parser;
         Poco::Dynamic::Var result = parser.parse(metadata_file);
         auto metadata_object = result.extract<Poco::JSON::Object::Ptr>();
-        metadata_objects.set(metadata_path, std::make_shared<Poco::JSON::Object::Ptr>(metadata_object));
+        metadata_objects.set(metadata_uri, std::make_shared<Poco::JSON::Object::Ptr>(metadata_object));
     }
-    auto metadata_object = *metadata_objects.get(metadata_path);
+    auto metadata_object = *metadata_objects.get(metadata_uri);
     auto current_schema_id = metadata_object->getValue<Int64>("current-schema-id");
     auto schemas = metadata_object->getArray(DB::Iceberg::f_schemas);
     for (size_t i = 0; i < schemas->size(); ++i)
@@ -485,6 +522,131 @@ bool GlueCatalog::classifyTimestampTZ(const String & column_name, const TableMet
     return false;
 }
 
+/// This function tries two resolve the metadata file path by following means:
+/// 1. Tries to read version-hint.text to get the latest version.
+/// 2. Lists all *.metadata.json files in the metadata directory and takes the most recent one.
+String GlueCatalog::resolveMetadataPathFromTableLocation(const String & table_location, const TableMetadata & table_metadata) const
+{
+    // Construct path to version-hint.text
+    String version_hint_path = table_location + "metadata/version-hint.text";
+
+    DB::ASTStorage * storage = table_engine_definition->as<DB::ASTStorage>();
+    DB::ASTs args = storage->engine->arguments->children;
+
+    String storage_endpoint = !settings.storage_endpoint.empty() ? settings.storage_endpoint : table_location;
+    if (args.empty())
+        args.emplace_back(std::make_shared<DB::ASTLiteral>(storage_endpoint));
+    else
+        args[0] = std::make_shared<DB::ASTLiteral>(storage_endpoint);
+
+    if (args.size() == 1)
+    {
+        if (table_metadata.hasStorageCredentials())
+        {
+            table_metadata.getStorageCredentials()->addCredentialsToEngineArgs(args);
+        }
+        else
+        {
+            auto credentials = credentials_provider->GetAWSCredentials();
+            DataLake::S3Credentials(credentials.GetAWSAccessKeyId(), credentials.GetAWSSecretKey(), credentials.GetSessionToken()).addCredentialsToEngineArgs(args);
+        }
+    }
+
+    auto storage_settings = std::make_shared<DB::DataLakeStorageSettings>();
+    storage_settings->loadFromSettingsChanges(settings.allChanged());
+    auto configuration = std::make_shared<DB::StorageS3IcebergConfiguration>(storage_settings);
+    configuration->initialize(args, getContext(), false);
+
+    auto object_storage = configuration->createObjectStorage(getContext(), true);
+    const auto & read_settings = getContext()->getReadSettings();
+
+    try
+    {
+        // Try to read version-hint.text to get the latest version
+        String version_hint_object_path = version_hint_path;
+        if (version_hint_object_path.starts_with("s3://"))
+        {
+            version_hint_object_path = version_hint_object_path.substr(5);
+            // Remove bucket from path
+            std::size_t pos = version_hint_object_path.find('/');
+            if (pos != std::string::npos)
+                version_hint_object_path = version_hint_object_path.substr(pos + 1);
+        }
+
+        DB::StoredObject version_hint_stored_object(version_hint_object_path);
+        auto version_hint_buf = object_storage->readObject(version_hint_stored_object, read_settings);
+        String version_str;
+        readString(version_str, *version_hint_buf);
+
+        boost::algorithm::trim(version_str);
+
+        LOG_TRACE(log, "Read version {} from version-hint.text for table location '{}'", version_str, table_location);
+
+        return table_location + "metadata/v" + version_str + "-metadata.json";
+    }
+    catch (...)
+    {
+        LOG_TRACE(log, "Could not read version-hint.text from '{}', trying to find latest metadata file", version_hint_path);
+
+        try
+        {
+            String bucket_with_prefix;
+            String metadata_dir = table_location + "metadata/";
+            String metadata_dir_path = metadata_dir;
+
+            if (metadata_dir_path.starts_with("s3://"))
+            {
+                metadata_dir_path = metadata_dir_path.substr(5);
+                // Remove bucket from path
+                std::size_t pos = metadata_dir_path.find('/');
+                if (pos != std::string::npos)
+                {
+                    metadata_dir_path = metadata_dir_path.substr(pos + 1);
+                    bucket_with_prefix = table_location.substr(0, pos + 6);
+                }
+            }
+            else
+                return "";
+
+            // List all files in metadata directory
+            DB::PathsWithMetadata files;
+            object_storage->listObjects(metadata_dir_path, files, 0);
+
+            // Filter for .metadata.json files and find the most recent one
+            String latest_metadata_file;
+            std::optional<DB::ObjectMetadata> latest_metadata;
+
+            for (const auto & file : files)
+            {
+                if (file->getPath().ends_with(".metadata.json"))
+                {
+                    // Get file metadata to check last modified time
+                    if (!latest_metadata.has_value() ||
+                        (file->metadata->last_modified > latest_metadata->last_modified))
+                    {
+                        latest_metadata_file = file->getPath();
+                        latest_metadata = file->metadata;
+                    }
+                }
+            }
+
+            if (!latest_metadata_file.empty())
+            {
+                LOG_TRACE(log, "Found latest metadata file: {}", latest_metadata_file);
+                return bucket_with_prefix + latest_metadata_file;
+            }
+
+            LOG_TRACE(log, "No <...>.metadata.json files found,");
+            return "";
+        }
+        catch (...)
+        {
+            LOG_TRACE(log, "Failed to list metadata directory");
+            return "";
+        }
+    }
+}
+
 void GlueCatalog::createNamespaceIfNotExists(const String & namespace_name) const
 {
     Aws::Glue::Model::CreateDatabaseRequest create_request;
diff --git a/src/Databases/DataLake/GlueCatalog.h b/src/Databases/DataLake/GlueCatalog.h
index bed6e93c5dcc..3d0616a8a8ab 100644
--- a/src/Databases/DataLake/GlueCatalog.h
+++ b/src/Databases/DataLake/GlueCatalog.h
@@ -17,6 +17,11 @@ namespace Aws::Glue
     class GlueClient;
 }
 
+namespace Aws::Auth
+{
+    class AWSCredentialsProvider;
+}
+
 namespace DataLake
 {
 
@@ -40,11 +45,13 @@ class GlueCatalog final : public ICatalog, private DB::WithContext
     void getTableMetadata(
         const std::string & database_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const override;
 
     bool tryGetTableMetadata(
         const std::string & database_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const override;
 
     std::optional<StorageType> getStorageType() const override
@@ -68,7 +75,7 @@ class GlueCatalog final : public ICatalog, private DB::WithContext
 
     std::unique_ptr<Aws::Glue::GlueClient> glue_client;
     const LoggerPtr log;
-    Aws::Auth::AWSCredentials credentials;
+    std::shared_ptr<Aws::Auth::AWSCredentialsProvider> credentials_provider;
     std::string region;
     CatalogSettings settings;
     DB::ASTPtr table_engine_definition;
@@ -81,6 +88,8 @@ class GlueCatalog final : public ICatalog, private DB::WithContext
     /// This method allows to clarify the actual type of the timestamp column.
     bool classifyTimestampTZ(const String & column_name, const TableMetadata & table_metadata) const;
 
+    String resolveMetadataPathFromTableLocation(const String & table_location, const TableMetadata & table_metadata) const;
+
     mutable DB::CacheBase<String, Poco::JSON::Object::Ptr> metadata_objects;
 };
 
diff --git a/src/Databases/DataLake/HiveCatalog.cpp b/src/Databases/DataLake/HiveCatalog.cpp
index d174034349b0..7a80571fce56 100644
--- a/src/Databases/DataLake/HiveCatalog.cpp
+++ b/src/Databases/DataLake/HiveCatalog.cpp
@@ -96,13 +96,21 @@ bool HiveCatalog::existsTable(const std::string & namespace_name, const std::str
     return true;
 }
 
-void HiveCatalog::getTableMetadata(const std::string & namespace_name, const std::string & table_name, TableMetadata & result) const
+void HiveCatalog::getTableMetadata(
+    const std::string & namespace_name,
+    const std::string & table_name,
+    DB::ContextPtr context_,
+    TableMetadata & result) const
 {
-    if (!tryGetTableMetadata(namespace_name, table_name, result))
+    if (!tryGetTableMetadata(namespace_name, table_name, context_, result))
         throw DB::Exception(DB::ErrorCodes::DATALAKE_DATABASE_ERROR, "No response from iceberg catalog");
 }
 
-bool HiveCatalog::tryGetTableMetadata(const std::string & namespace_name, const std::string & table_name, TableMetadata & result) const
+bool HiveCatalog::tryGetTableMetadata(
+    const std::string & namespace_name,
+    const std::string & table_name,
+    DB::ContextPtr context_,
+    TableMetadata & result) const
 {
     Apache::Hadoop::Hive::Table table;
 
@@ -130,7 +138,7 @@ bool HiveCatalog::tryGetTableMetadata(const std::string & namespace_name, const
         auto columns = table.sd.cols;
         for (const auto & column : columns)
         {
-            schema.push_back({column.name, getType(column.type, true)});
+            schema.push_back({column.name, getType(column.type, true, context_)});
         }
         result.setSchema(schema);
     }
diff --git a/src/Databases/DataLake/HiveCatalog.h b/src/Databases/DataLake/HiveCatalog.h
index 29b4e6ce6c63..0fba0e132486 100644
--- a/src/Databases/DataLake/HiveCatalog.h
+++ b/src/Databases/DataLake/HiveCatalog.h
@@ -38,9 +38,17 @@ class HiveCatalog final : public ICatalog, private DB::WithContext
 
     bool existsTable(const std::string & namespace_name, const std::string & table_name) const override;
 
-    void getTableMetadata(const std::string & namespace_name, const std::string & table_name, TableMetadata & result) const override;
-
-    bool tryGetTableMetadata(const std::string & namespace_name, const std::string & table_name, TableMetadata & result) const override;
+    void getTableMetadata(
+        const std::string & namespace_name,
+        const std::string & table_name,
+        DB::ContextPtr context_,
+        TableMetadata & result) const override;
+
+    bool tryGetTableMetadata(
+        const std::string & namespace_name,
+        const std::string & table_name,
+        DB::ContextPtr context_,
+        TableMetadata & result) const override;
 
     std::optional<StorageType> getStorageType() const override;
 
diff --git a/src/Databases/DataLake/ICatalog.cpp b/src/Databases/DataLake/ICatalog.cpp
index 363293933d53..0fd82e47951a 100644
--- a/src/Databases/DataLake/ICatalog.cpp
+++ b/src/Databases/DataLake/ICatalog.cpp
@@ -5,10 +5,18 @@
 
 #include <filesystem>
 
+#include <Common/FailPoint.h>
+
 namespace DB::ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace DB::FailPoints
+{
+    extern const char database_iceberg_gcs[];
 }
 
 namespace DataLake
@@ -49,9 +57,14 @@ StorageType parseStorageTypeFromString(const std::string & type)
     }
     if (capitalize_first_letter(storage_type_str) == "File")
         storage_type_str = "Local";
-
-    if (capitalize_first_letter(storage_type_str) == "S3a")
+    else if (capitalize_first_letter(storage_type_str) == "S3a" || storage_type_str == "oss" || storage_type_str == "gs")
+    {
+        fiu_do_on(DB::FailPoints::database_iceberg_gcs,
+        {
+            throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Google cloud storage converts to S3");
+        });
         storage_type_str = "S3";
+    }
 
     auto storage_type = magic_enum::enum_cast<StorageType>(capitalize_first_letter(storage_type_str));
 
@@ -84,13 +97,19 @@ void TableMetadata::setLocation(const std::string & location_)
     auto pos_to_path = location_.substr(pos_to_bucket).find('/');
 
     if (pos_to_path == std::string::npos)
-        throw DB::Exception(DB::ErrorCodes::NOT_IMPLEMENTED, "Unexpected location format: {}", location_);
-
-    pos_to_path = pos_to_bucket + pos_to_path;
+    { // empty path
+        location_without_path = location_;
+        path.clear();
+        bucket = location_.substr(pos_to_bucket);
+    }
+    else
+    {
+        pos_to_path = pos_to_bucket + pos_to_path;
 
-    location_without_path = location_.substr(0, pos_to_path);
-    path = location_.substr(pos_to_path + 1);
-    bucket = location_.substr(pos_to_bucket, pos_to_path - pos_to_bucket);
+        location_without_path = location_.substr(0, pos_to_path);
+        path = location_.substr(pos_to_path + 1);
+        bucket = location_.substr(pos_to_bucket, pos_to_path - pos_to_bucket);
+    }
 
     LOG_TEST(getLogger("TableMetadata"),
              "Parsed location without path: {}, path: {}",
@@ -230,6 +249,8 @@ DB::SettingsChanges CatalogSettings::allChanged() const
     changes.emplace_back("aws_access_key_id", aws_access_key_id);
     changes.emplace_back("aws_secret_access_key", aws_secret_access_key);
     changes.emplace_back("region", region);
+    changes.emplace_back("aws_role_arn", aws_role_arn);
+    changes.emplace_back("aws_role_session_name", aws_role_session_name);
 
     return changes;
 }
diff --git a/src/Databases/DataLake/ICatalog.h b/src/Databases/DataLake/ICatalog.h
index ce3970d6d046..a9f63b52a3f9 100644
--- a/src/Databases/DataLake/ICatalog.h
+++ b/src/Databases/DataLake/ICatalog.h
@@ -8,6 +8,14 @@
 #include <Databases/DataLake/DatabaseDataLakeStorageType.h>
 #include <Poco/JSON/Object.h>
 
+namespace DB
+{
+
+class Context;
+using ContextPtr = std::shared_ptr<const Context>;
+
+}
+
 namespace DataLake
 {
 
@@ -117,6 +125,8 @@ struct CatalogSettings
     String aws_access_key_id;
     String aws_secret_access_key;
     String region;
+    String aws_role_arn;
+    String aws_role_session_name;
 
     DB::SettingsChanges allChanged() const;
 };
@@ -150,6 +160,7 @@ class ICatalog
     virtual void getTableMetadata(
         const std::string & namespace_name,
         const std::string & table_name,
+        DB::ContextPtr context,
         TableMetadata & result) const = 0;
 
     /// Get table metadata in the given namespace.
@@ -157,6 +168,7 @@ class ICatalog
     virtual bool tryGetTableMetadata(
         const std::string & namespace_name,
         const std::string & table_name,
+        DB::ContextPtr context,
         TableMetadata & result) const = 0;
 
     /// Get storage type, where Iceberg tables' data is stored.
diff --git a/src/Databases/DataLake/RestCatalog.cpp b/src/Databases/DataLake/RestCatalog.cpp
index de7f8a587c69..50492902de0a 100644
--- a/src/Databases/DataLake/RestCatalog.cpp
+++ b/src/Databases/DataLake/RestCatalog.cpp
@@ -28,6 +28,11 @@
 #include <Poco/URI.h>
 #include <Poco/JSON/Array.h>
 #include <Poco/JSON/Parser.h>
+#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/Net/HTTPSClientSession.h>
+#include <Poco/Net/SSLManager.h>
+#include <Poco/StreamCopier.h>
 
 
 namespace DB::ErrorCodes
@@ -87,6 +92,19 @@ std::string correctAPIURI(const std::string & uri)
     return std::filesystem::path(uri) / "v1";
 }
 
+String encodeNamespaceForURI(const String & namespace_name)
+{
+    String encoded;
+    for (const auto & ch : namespace_name)
+    {
+        if (ch == '.')
+            encoded += "%1F";
+        else
+            encoded.push_back(ch);
+    }
+    return encoded;
+}
+
 }
 
 std::string RestCatalog::Config::toString() const
@@ -138,7 +156,7 @@ RestCatalog::Config RestCatalog::loadConfig()
     std::string json_str;
     readJSONObjectPossiblyInvalid(json_str, *buf);
 
-    LOG_TEST(log, "Received catalog configuration settings: {}", json_str);
+    LOG_DEBUG(log, "Received catalog configuration settings: {}", json_str);
 
     Poco::JSON::Parser parser;
     Poco::Dynamic::Var json = parser.parse(json_str);
@@ -152,7 +170,7 @@ RestCatalog::Config RestCatalog::loadConfig()
     auto overrides_object = object->get("overrides").extract<Poco::JSON::Object::Ptr>();
     parseCatalogConfigurationSettings(overrides_object, result);
 
-    LOG_TEST(log, "Parsed catalog configuration settings: {}", result.toString());
+    LOG_DEBUG(log, "Parsed catalog configuration settings: {}", result.toString());
     return result;
 }
 
@@ -203,12 +221,11 @@ std::string RestCatalog::retrieveAccessToken() const
     /// 1. support oauth2-server-uri
     /// https://github.com/apache/iceberg/blob/918f81f3c3f498f46afcea17c1ac9cdc6913cb5c/open-api/rest-catalog-open-api.yaml#L183C82-L183C99
 
-    DB::HTTPHeaderEntries headers;
-    headers.emplace_back("Content-Type", "application/x-www-form-urlencoded");
-    headers.emplace_back("Accepts", "application/json; charset=UTF-8");
-
     Poco::URI url;
     DB::ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback;
+    size_t body_size = 0;
+    String body;
+
     if (oauth_server_uri.empty() && !oauth_server_use_request_body)
     {
         url = Poco::URI(base_url / oauth_tokens_endpoint);
@@ -223,11 +240,20 @@ std::string RestCatalog::retrieveAccessToken() const
     }
     else
     {
+        String encoded_auth_scope;
+        String encoded_client_id;
+        String encoded_client_secret;
+        Poco::URI::encode(auth_scope, auth_scope, encoded_auth_scope);
+        Poco::URI::encode(client_id, client_id, encoded_client_id);
+        Poco::URI::encode(client_secret, client_secret, encoded_client_secret);
+
+        body = fmt::format(
+            "grant_type=client_credentials&scope={}&client_id={}&client_secret={}",
+            encoded_auth_scope, encoded_client_id, encoded_client_secret);
+        body_size = body.size();
         out_stream_callback = [&](std::ostream & os)
         {
-            os << fmt::format(
-                "grant_type=client_credentials&scope={}&client_id={}&client_secret={}",
-                auth_scope, client_id, client_secret);
+            os << body;
         };
 
         if (oauth_server_uri.empty())
@@ -237,19 +263,23 @@ std::string RestCatalog::retrieveAccessToken() const
     }
 
     const auto & context = getContext();
-    auto wb = DB::BuilderRWBufferFromHTTP(url)
-        .withConnectionGroup(DB::HTTPConnectionGroupType::HTTP)
-        .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
-        .withSettings(context->getReadSettings())
-        .withTimeouts(DB::ConnectionTimeouts::getHTTPTimeouts(context->getSettingsRef(), context->getServerSettings()))
-        .withHostFilter(&context->getRemoteHostFilter())
-        .withOutCallback(std::move(out_stream_callback))
-        .withSkipNotFound(false)
-        .withHeaders(headers)
-        .create(credentials);
+    auto timeouts = DB::ConnectionTimeouts::getHTTPTimeouts(context->getSettingsRef(), context->getServerSettings());
+    auto session = makeHTTPSession(DB::HTTPConnectionGroupType::HTTP, url, timeouts, {});
+
+    Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, url.getPathAndQuery(),
+                                Poco::Net::HTTPMessage::HTTP_1_1);
+    request.setContentType("application/x-www-form-urlencoded");
+    request.setContentLength(body_size);
+    request.set("Accept", "application/json");
+
+    std::ostream & os = session->sendRequest(request);
+    out_stream_callback(os);
+
+    Poco::Net::HTTPResponse response;
+    std::istream & rs = session->receiveResponse(response);
 
     std::string json_str;
-    readJSONObjectPossiblyInvalid(json_str, *wb);
+    Poco::StreamCopier::copyToString(rs, json_str);
 
     Poco::JSON::Parser parser;
     Poco::Dynamic::Var res_json = parser.parse(json_str);
@@ -272,7 +302,7 @@ DB::ReadWriteBufferFromHTTPPtr RestCatalog::createReadBuffer(
 {
     const auto & context = getContext();
 
-    Poco::URI url(base_url / endpoint);
+    Poco::URI url(base_url / endpoint, false);
     if (!params.empty())
         url.setQueryParameters(params);
 
@@ -292,7 +322,7 @@ DB::ReadWriteBufferFromHTTPPtr RestCatalog::createReadBuffer(
             .create(credentials);
     };
 
-    LOG_TEST(log, "Requesting: {}", url.toString());
+    LOG_DEBUG(log, "Requesting: {}", url.toString());
 
     try
     {
@@ -410,7 +440,7 @@ RestCatalog::Namespaces RestCatalog::getNamespaces(const std::string & base_name
     {
         auto buf = createReadBuffer(config.prefix / NAMESPACES_ENDPOINT, params);
         auto namespaces = parseNamespaces(*buf, base_namespace);
-        LOG_TEST(log, "Loaded {} namespaces in base namespace {}", namespaces.size(), base_namespace);
+        LOG_DEBUG(log, "Loaded {} namespaces in base namespace {}", namespaces.size(), base_namespace);
         return namespaces;
     }
     catch (const DB::HTTPException & e)
@@ -438,7 +468,7 @@ RestCatalog::Namespaces RestCatalog::parseNamespaces(DB::ReadBuffer & buf, const
     String json_str;
     readJSONObjectPossiblyInvalid(json_str, buf);
 
-    LOG_TEST(log, "Received response: {}", json_str);
+    LOG_DEBUG(log, "Received response: {}", json_str);
 
     try
     {
@@ -483,7 +513,8 @@ RestCatalog::Namespaces RestCatalog::parseNamespaces(DB::ReadBuffer & buf, const
 
 DB::Names RestCatalog::getTables(const std::string & base_namespace, size_t limit) const
 {
-    const std::string endpoint = std::filesystem::path(NAMESPACES_ENDPOINT) / base_namespace / "tables";
+    auto encoded_namespace = encodeNamespaceForURI(base_namespace);
+    const std::string endpoint = std::filesystem::path(NAMESPACES_ENDPOINT) / encoded_namespace / "tables";
 
     auto buf = createReadBuffer(config.prefix / endpoint);
     return parseTables(*buf, base_namespace, limit);
@@ -497,6 +528,8 @@ DB::Names RestCatalog::parseTables(DB::ReadBuffer & buf, const std::string & bas
     String json_str;
     readJSONObjectPossiblyInvalid(json_str, buf);
 
+    LOG_DEBUG(log, "Received tables response: {}", json_str);
+
     try
     {
         Poco::JSON::Parser parser;
@@ -511,7 +544,10 @@ DB::Names RestCatalog::parseTables(DB::ReadBuffer & buf, const std::string & bas
         for (size_t i = 0; i < identifiers_object->size(); ++i)
         {
             const auto current_table_json = identifiers_object->get(static_cast<int>(i)).extract<Poco::JSON::Object::Ptr>();
-            const auto table_name = current_table_json->get("name").extract<String>();
+
+            const auto table_name_raw = current_table_json->get("name").extract<String>();
+            std::string table_name;
+            Poco::URI::encode(table_name_raw, "/", table_name);
 
             tables.push_back(base_namespace + "." + table_name);
             if (limit && tables.size() >= limit)
@@ -530,21 +566,22 @@ DB::Names RestCatalog::parseTables(DB::ReadBuffer & buf, const std::string & bas
 bool RestCatalog::existsTable(const std::string & namespace_name, const std::string & table_name) const
 {
     TableMetadata table_metadata;
-    return tryGetTableMetadata(namespace_name, table_name, table_metadata);
+    return tryGetTableMetadata(namespace_name, table_name, getContext(), table_metadata);
 }
 
 bool RestCatalog::tryGetTableMetadata(
     const std::string & namespace_name,
     const std::string & table_name,
+    DB::ContextPtr context_,
     TableMetadata & result) const
 {
     try
     {
-        return getTableMetadataImpl(namespace_name, table_name, result);
+        return getTableMetadataImpl(namespace_name, table_name, context_, result);
     }
-    catch (...)
+    catch (const DB::Exception & ex)
     {
-        DB::tryLogCurrentException(log);
+        LOG_DEBUG(log, "tryGetTableMetadata response: {}", ex.what());
         return false;
     }
 }
@@ -552,18 +589,20 @@ bool RestCatalog::tryGetTableMetadata(
 void RestCatalog::getTableMetadata(
     const std::string & namespace_name,
     const std::string & table_name,
+    DB::ContextPtr context_,
     TableMetadata & result) const
 {
-    if (!getTableMetadataImpl(namespace_name, table_name, result))
+    if (!getTableMetadataImpl(namespace_name, table_name, context_, result))
         throw DB::Exception(DB::ErrorCodes::DATALAKE_DATABASE_ERROR, "No response from iceberg catalog");
 }
 
 bool RestCatalog::getTableMetadataImpl(
     const std::string & namespace_name,
     const std::string & table_name,
+    DB::ContextPtr context_,
     TableMetadata & result) const
 {
-    LOG_TEST(log, "Checking table {} in namespace {}", table_name, namespace_name);
+    LOG_DEBUG(log, "Checking table {} in namespace {}", table_name, namespace_name);
 
     DB::HTTPHeaderEntries headers;
     if (result.requiresCredentials())
@@ -577,22 +616,23 @@ bool RestCatalog::getTableMetadataImpl(
         headers.emplace_back("X-Iceberg-Access-Delegation", "vended-credentials");
     }
 
-    const std::string endpoint = std::filesystem::path(NAMESPACES_ENDPOINT) / namespace_name / "tables" / table_name;
+    const std::string endpoint = std::filesystem::path(NAMESPACES_ENDPOINT) / encodeNamespaceForURI(namespace_name) / "tables" / table_name;
     auto buf = createReadBuffer(config.prefix / endpoint, /* params */{}, headers);
 
     if (buf->eof())
     {
-        LOG_TEST(log, "Table doesn't exist (endpoint: {})", endpoint);
+        LOG_DEBUG(log, "Table doesn't exist (endpoint: {})", endpoint);
         return false;
     }
 
     String json_str;
     readJSONObjectPossiblyInvalid(json_str, *buf);
+    LOG_DEBUG(log, "Receiving table metadata {} {}", table_name, json_str);
 
 #ifdef DEBUG_OR_SANITIZER_BUILD
     /// This log message might contain credentials,
     /// so log it only for debugging.
-    LOG_TEST(log, "Received metadata for table {}: {}", table_name, json_str);
+    LOG_DEBUG(log, "Received metadata for table {}: {}", table_name, json_str);
 #endif
 
     Poco::JSON::Parser parser;
@@ -610,7 +650,7 @@ bool RestCatalog::getTableMetadataImpl(
         {
             location = metadata_object->get("location").extract<String>();
             result.setLocation(location);
-            LOG_TEST(log, "Location for table {}: {}", table_name, location);
+            LOG_DEBUG(log, "Location for table {}: {}", table_name, location);
         }
         else
         {
@@ -621,8 +661,8 @@ bool RestCatalog::getTableMetadataImpl(
     if (result.requiresSchema())
     {
         // int format_version = metadata_object->getValue<int>("format-version");
-        auto schema_processor = DB::IcebergSchemaProcessor();
-        auto id = DB::IcebergMetadata::parseTableSchema(metadata_object, schema_processor, log);
+        auto schema_processor = DB::Iceberg::IcebergSchemaProcessor(context_);
+        auto id = DB::IcebergMetadata::parseTableSchema(metadata_object, schema_processor, context_, log);
         auto schema = schema_processor.getClickhouseTableSchemaById(id);
         result.setSchema(*schema);
     }
@@ -700,7 +740,7 @@ void RestCatalog::sendRequest(const String & endpoint, Poco::JSON::Object::Ptr r
         };
     }
 
-    Poco::URI url(endpoint);
+    Poco::URI url(endpoint, false);
     auto wb = DB::BuilderRWBufferFromHTTP(url)
         .withConnectionGroup(DB::HTTPConnectionGroupType::HTTP)
         .withMethod(method)
diff --git a/src/Databases/DataLake/RestCatalog.h b/src/Databases/DataLake/RestCatalog.h
index 182e3de0ae55..a98e719ff09d 100644
--- a/src/Databases/DataLake/RestCatalog.h
+++ b/src/Databases/DataLake/RestCatalog.h
@@ -42,11 +42,13 @@ class RestCatalog final : public ICatalog, private DB::WithContext
     void getTableMetadata(
         const std::string & namespace_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const override;
 
     bool tryGetTableMetadata(
         const std::string & namespace_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const override;
 
     std::optional<StorageType> getStorageType() const override;
@@ -126,6 +128,7 @@ class RestCatalog final : public ICatalog, private DB::WithContext
     bool getTableMetadataImpl(
         const std::string & namespace_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const;
 
     Config loadConfig();
diff --git a/src/Databases/DataLake/UnityCatalog.cpp b/src/Databases/DataLake/UnityCatalog.cpp
index 18c20931e608..8054d971c9e0 100644
--- a/src/Databases/DataLake/UnityCatalog.cpp
+++ b/src/Databases/DataLake/UnityCatalog.cpp
@@ -91,9 +91,10 @@ DB::Names UnityCatalog::getTables() const
 void UnityCatalog::getTableMetadata(
     const std::string & namespace_name,
     const std::string & table_name,
+    DB::ContextPtr context_,
     TableMetadata & result) const
 {
-    if (!tryGetTableMetadata(namespace_name, table_name, result))
+    if (!tryGetTableMetadata(namespace_name, table_name, context_, result))
         throw DB::Exception(DB::ErrorCodes::DATALAKE_DATABASE_ERROR, "No response from unity catalog");
 }
 
@@ -136,6 +137,7 @@ void UnityCatalog::getCredentials(const std::string & table_id, TableMetadata &
 bool UnityCatalog::tryGetTableMetadata(
     const std::string & schema_name,
     const std::string & table_name,
+    DB::ContextPtr /* context_ */,
     TableMetadata & result) const
 {
     auto full_table_name = warehouse + "." + schema_name + "." + table_name;
diff --git a/src/Databases/DataLake/UnityCatalog.h b/src/Databases/DataLake/UnityCatalog.h
index 2e6262d6e5d7..9d4dc0a74877 100644
--- a/src/Databases/DataLake/UnityCatalog.h
+++ b/src/Databases/DataLake/UnityCatalog.h
@@ -34,11 +34,13 @@ class UnityCatalog final : public ICatalog, private DB::WithContext
     void getTableMetadata(
         const std::string & namespace_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const override;
 
     bool tryGetTableMetadata(
         const std::string & schema_name,
         const std::string & table_name,
+        DB::ContextPtr context_,
         TableMetadata & result) const override;
 
     std::optional<StorageType> getStorageType() const override { return std::nullopt; }
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index 266de24116b4..34e1c04491ba 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -87,6 +87,7 @@ void DatabaseMemory::dropTable(
     std::lock_guard lock{mutex};
     table->is_dropped = true;
     create_queries.erase(table_name);
+    snapshot_detached_tables.erase(table_name);
     UUID table_uuid = table->getStorageID().uuid;
     if (table_uuid != UUIDHelpers::Nil)
         DatabaseCatalog::instance().removeUUIDMappingFinally(table_uuid);
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 01405053011c..09a0413c4fa3 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -137,7 +137,8 @@ std::pair<String, StoragePtr> createTableFromAST(
     /// those query settings
     /// In order to ignore them now we call `applySettingsFromQuery` which will move the settings from engine to query level
     auto ast = std::make_shared<ASTCreateQuery>(std::move(ast_create_query));
-    InterpreterSetQuery::applySettingsFromQuery(ast, context);
+    auto set_context = Context::createCopy(context);
+    InterpreterSetQuery::applySettingsFromQuery(ast, set_context);
 
     return {
         ast->getTable(),
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index c931bc169afa..3a0aecd573a8 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -1,6 +1,8 @@
+#include <Core/UUID.h>
 #include <DataTypes/DataTypeString.h>
 
 #include <atomic>
+#include <tuple>
 #include <utility>
 
 #include <Backups/IRestoreCoordination.h>
@@ -83,7 +85,7 @@ namespace DatabaseReplicatedSetting
     extern const DatabaseReplicatedSettingsString collection_name;
     extern const DatabaseReplicatedSettingsFloat max_broken_tables_ratio;
     extern const DatabaseReplicatedSettingsUInt64 max_replication_lag_to_enqueue;
-    extern const DatabaseReplicatedSettingsUInt32 logs_to_keep;
+    extern const DatabaseReplicatedSettingsNonZeroUInt64 logs_to_keep;
 }
 
 namespace ErrorCodes
@@ -104,6 +106,7 @@ namespace ErrorCodes
     extern const int QUERY_IS_PROHIBITED;
     extern const int SUPPORT_IS_DISABLED;
     extern const int ASYNC_LOAD_CANCELED;
+    extern const int SYNTAX_ERROR;
 }
 
 namespace FailPoints
@@ -126,6 +129,21 @@ static inline String getHostID(ContextPtr global_context, const UUID & db_uuid,
     return Cluster::Address::toString(getFQDNOrHostName(), port) + ':' + toString(db_uuid);
 }
 
+// Return <address, port, uuid>
+static inline std::tuple<String, UInt16, UUID> parseHostID(const String & content)
+{
+    auto pos = content.find_last_of(':');
+    if (pos == std::string::npos || pos + 1 >= content.size())
+        throw Exception(ErrorCodes::SYNTAX_ERROR, "Invalid host ID '{}'", content);
+
+    auto [address, port] = Cluster::Address::fromString(content.substr(0, pos));
+    UUID db_uuid;
+    if (!tryParse(db_uuid, content.substr(pos + 1)))
+        throw Exception(ErrorCodes::SYNTAX_ERROR, "Invalid host ID '{}'", content);
+
+    return {address, port, db_uuid};
+}
+
 static inline UInt64 getMetadataHash(const String & table_name, const String & metadata)
 {
     SipHash hash;
@@ -511,10 +529,39 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessL
 
             if (replica_host_id != host_id && replica_host_id != host_id_default)
             {
-                throw Exception(
-                    ErrorCodes::REPLICA_ALREADY_EXISTS,
-                    "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);
+                UUID uuid_in_keeper = UUIDHelpers::Nil;
+                try
+                {
+                    uuid_in_keeper = std::get<2>(parseHostID(replica_host_id));
+                }
+                catch (const Exception & e)
+                {
+                    LOG_WARNING(log, "Failed to parse host_id {} in zookeeper, error {}", replica_host_id, e.what());
+                }
+
+                if (uuid_in_keeper != db_uuid)
+                    throw Exception(
+                        ErrorCodes::REPLICA_ALREADY_EXISTS,
+                        "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);
+
+                // After restarting, InterserverIOAddress might change (e.g: config updated, `getFQDNOrHostName` returns a different one)
+                // If the UUID in the keeper is the same as the current server UUID, we will update the host_id in keeper
+                LOG_INFO(
+                    log,
+                    "Replicated database replica: {}, shard {}, zk_path: {} already exists with the same UUID, replica host ID: '{}', "
+                    "current host ID: '{}', will set the host_id to the current host ID",
+                    replica_name,
+                    shard_name,
+                    zookeeper_path,
+                    replica_host_id,
+                    host_id);
+                current_zookeeper->set(replica_path, host_id, -1);
+                createEmptyLogEntry(current_zookeeper);
             }
 
             /// Before 24.6 we always created host_id with insecure port, even if cluster_auth_info.cluster_secure_connection was true.
@@ -931,7 +978,11 @@ ASTPtr DatabaseReplicated::tryGetCreateOrAttachTableQuery(const String & name, C
 {
     auto res = tryGetCreateTableQuery(name, local_context);
     auto & create = res->as<ASTCreateQuery &>();
-    create.attach = create.is_materialized_view_with_inner_table();
+    create.attach = false;
+    if (create.is_materialized_view_with_inner_table())
+        create.attach = true;
+    if (create.storage && create.storage->engine && (create.storage->engine->name == "TimeSeries"))
+        create.attach = true;
     return res;
 }
 
@@ -1212,7 +1263,7 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_
     }
 }
 
-BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context, QueryFlags flags)
+BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context, QueryFlags flags, DDLGuardPtr && database_guard)
 {
     waitDatabaseStarted();
 
@@ -1255,7 +1306,7 @@ BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, Contex
     }
 
 
-    return getQueryStatus(node_path, fs::path(zookeeper_path) / "replicas", query_context, hosts_to_wait);
+    return getQueryStatus(node_path, fs::path(zookeeper_path) / "replicas", query_context, hosts_to_wait, std::move(database_guard));
 }
 
 static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context)
@@ -1428,9 +1479,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
 
     for (const auto & table_name : tables_to_detach)
     {
-        DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, table_name);
-        if (getDatabaseName() != db_name)
-            throw Exception(ErrorCodes::UNKNOWN_DATABASE, "Database was renamed, will retry");
+        DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, table_name, this);
 
         auto table = tryGetTable(table_name, getContext());
         if (!table)
@@ -1445,7 +1494,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             String to_name = fmt::format("{}_{}_{}", broken_table_name, max_log_ptr, thread_local_rng() % 1000);
             LOG_DEBUG(log, "Will RENAME TABLE {} TO {}.{}", backQuoteIfNeed(broken_table_name), backQuoteIfNeed(to_database_name), backQuoteIfNeed(to_name));
             assert(db_name < to_database_name);
-            DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(to_database_name, to_name);
+            DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(to_database_name, to_name, nullptr);
             auto to_db_ptr = DatabaseCatalog::instance().getDatabase(to_database_name);
 
             std::lock_guard lock{metadata_mutex};
@@ -1462,7 +1511,7 @@ 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();
+            table->flushAndShutdown(/*is_drop=*/true);
 
             if (table->getName() == "MaterializedView" || table->getName() == "WindowView")
             {
@@ -1505,8 +1554,8 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     auto rename_table = [&](String from, String to)
     {
         LOG_DEBUG(log, "Will RENAME TABLE {} TO {}", backQuoteIfNeed(from), backQuoteIfNeed(to));
-        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));
+        DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::min(from, to), this);
+        DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::max(from, to), this);
 
         std::lock_guard lock{metadata_mutex};
         UInt64 new_digest = tables_metadata_digest;
@@ -1616,6 +1665,16 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     /// It's a very rare case, and it's okay if some queries throw TIMEOUT_EXCEEDED when waiting for all replicas
     if (first_entry_to_mark_finished)
     {
+        /// Skip non-existing entries that were removed a long time ago (if the replica was offline for a long time)
+        Strings all_nodes = current_zookeeper->getChildren(fs::path(zookeeper_path) / "log");
+        std::erase_if(all_nodes, [] (const String & s) { return !startsWith(s, "query-"); });
+        auto oldest_node = std::min_element(all_nodes.begin(), all_nodes.end());
+        if (oldest_node != all_nodes.end())
+        {
+            UInt32 oldest_entry = DDLTaskBase::getLogEntryNumber(*oldest_node);
+            first_entry_to_mark_finished = std::max(oldest_entry, first_entry_to_mark_finished);
+        }
+
         /// If the replica is new and some of the queries applied during recovery
         /// where issued after the replica was created, then other nodes might be
         /// waiting for this node to notify them that the query was applied.
@@ -1731,7 +1790,13 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadata(const String & table_name, con
 
     create.setDatabase(getDatabaseName());
     create.setTable(table_name);
-    create.attach = create.is_materialized_view_with_inner_table();
+    create.attach = false;
+
+    /// In both cases we need to set attach = true to avoid creating inner table(s) twice.
+    if (create.is_materialized_view_with_inner_table())
+        create.attach = true;
+    if (create.storage && create.storage->engine && (create.storage->engine->name == "TimeSeries"))
+        create.attach = true;
 
     return ast;
 }
@@ -2235,7 +2300,8 @@ bool DatabaseReplicated::shouldReplicateQuery(const ContextPtr & query_context,
     if (const auto * alter = query_ptr->as<const ASTAlterQuery>())
     {
         if (alter->isAttachAlter() || alter->isFetchAlter() || alter->isDropPartitionAlter()
-            || is_keeper_map_table(query_ptr) || alter->isFreezeAlter() || alter->isUnlockSnapshot())
+            || is_keeper_map_table(query_ptr) || alter->isFreezeAlter() || alter->isUnlockSnapshot()
+            || alter->isExportPartAlter())
             return false;
 
         if (has_many_shards() || !is_replicated_table(query_ptr))
@@ -2328,13 +2394,13 @@ void registerDatabaseReplicated(DatabaseFactory & factory)
 }
 
 BlockIO DatabaseReplicated::getQueryStatus(
-    const String & node_path, const String & replicas_path, ContextPtr context_, const Strings & hosts_to_wait)
+    const String & node_path, const String & replicas_path, ContextPtr context_, const Strings & hosts_to_wait, DDLGuardPtr && database_guard)
 {
     BlockIO io;
     if (context_->getSettingsRef()[Setting::distributed_ddl_task_timeout] == 0)
         return io;
 
-    auto source = std::make_shared<ReplicatedDatabaseQueryStatusSource>(node_path, replicas_path, context_, hosts_to_wait);
+    auto source = std::make_shared<ReplicatedDatabaseQueryStatusSource>(node_path, replicas_path, context_, hosts_to_wait, std::move(database_guard));
     io.pipeline = QueryPipeline(std::move(source));
 
     if (context_->getSettingsRef()[Setting::distributed_ddl_output_mode] == DistributedDDLOutputMode::NONE
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 0100723e28c5..4348a30caecb 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -71,7 +71,7 @@ class DatabaseReplicated : public DatabaseAtomic
 
     /// Try to execute DLL query on current host as initial query. If query is succeed,
     /// then it will be executed on all replicas.
-    BlockIO tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context, QueryFlags flags) override;
+    BlockIO tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context, QueryFlags flags, DDLGuardPtr && database_guard) override;
 
     bool canExecuteReplicatedMetadataAlter() const override;
 
@@ -182,7 +182,7 @@ class DatabaseReplicated : public DatabaseAtomic
     void reinitializeDDLWorker();
 
     static BlockIO
-    getQueryStatus(const String & node_path, const String & replicas_path, ContextPtr context, const Strings & hosts_to_wait);
+    getQueryStatus(const String & node_path, const String & replicas_path, ContextPtr context, const Strings & hosts_to_wait, DDLGuardPtr && database_guard);
 
     String zookeeper_path;
     String shard_name;
diff --git a/src/Databases/DatabaseReplicatedSettings.cpp b/src/Databases/DatabaseReplicatedSettings.cpp
index 148f491a8e00..c1a737af49af 100644
--- a/src/Databases/DatabaseReplicatedSettings.cpp
+++ b/src/Databases/DatabaseReplicatedSettings.cpp
@@ -22,7 +22,7 @@ extern const int UNKNOWN_SETTING;
     DECLARE(Bool, check_consistency, true, "Check consistency of local metadata and metadata in Keeper, do replica recovery on inconsistency", 0) \
     DECLARE(UInt64, max_retries_before_automatic_recovery, 10, "Max number of attempts to execute a queue entry before marking replica as lost recovering it from snapshot (0 means infinite)", 0) \
     DECLARE(Bool, allow_skipping_old_temporary_tables_ddls_of_refreshable_materialized_views, false, "If enabled, when processing DDLs in Replicated databases, it skips creating and exchanging DDLs of the temporary tables of refreshable materialized views if possible", 0) \
-    DECLARE(UInt32, logs_to_keep, 1000, "Default number of logs to keep in ZooKeeper for Replicated database.", 0) \
+    DECLARE(NonZeroUInt64, logs_to_keep, 1000, "Default number of logs to keep in ZooKeeper for Replicated database.", 0) \
 
 DECLARE_SETTINGS_TRAITS(DatabaseReplicatedSettingsTraits, LIST_OF_DATABASE_REPLICATED_SETTINGS)
 IMPLEMENT_SETTINGS_TRAITS(DatabaseReplicatedSettingsTraits, LIST_OF_DATABASE_REPLICATED_SETTINGS)
diff --git a/src/Databases/DatabaseReplicatedSettings.h b/src/Databases/DatabaseReplicatedSettings.h
index 98c1605c6936..4a337633f1fb 100644
--- a/src/Databases/DatabaseReplicatedSettings.h
+++ b/src/Databases/DatabaseReplicatedSettings.h
@@ -22,7 +22,7 @@ struct DatabaseReplicatedSettingsImpl;
     M(CLASS_NAME, Float) \
     M(CLASS_NAME, String) \
     M(CLASS_NAME, UInt64) \
-    M(CLASS_NAME, UInt32)
+    M(CLASS_NAME, NonZeroUInt64)
 
 DATABASE_REPLICATED_SETTINGS_SUPPORTED_TYPES(DatabaseReplicatedSettings, DECLARE_SETTING_TRAIT)
 
diff --git a/src/Databases/IDatabase.cpp b/src/Databases/IDatabase.cpp
index 2ee26f233f9b..5619947ab550 100644
--- a/src/Databases/IDatabase.cpp
+++ b/src/Databases/IDatabase.cpp
@@ -204,7 +204,7 @@ void IDatabase::stopReplication()
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Database engine {} does not run a replication thread", getEngineName());
 }
 
-BlockIO IDatabase::tryEnqueueReplicatedDDL(const ASTPtr & /*query*/, ContextPtr /*query_context*/, [[maybe_unused]] QueryFlags flags) /// NOLINT
+BlockIO IDatabase::tryEnqueueReplicatedDDL(const ASTPtr & /*query*/, ContextPtr /*query_context*/, [[maybe_unused]] QueryFlags flags, DDLGuardPtr && /*database_guard*/) /// NOLINT
 {
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Database engine {} does not have replicated DDL queue", getEngineName());
 }
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 8a9f412c00a0..86e69842dd15 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -4,6 +4,7 @@
 #include <Databases/LoadingStrictnessLevel.h>
 #include <Disks/IDisk.h>
 #include <Interpreters/Context_fwd.h>
+#include <Interpreters/DDLGuard.h>
 #include <Interpreters/QueryFlags.h>
 #include <Parsers/IAST_fwd.h>
 #include <QueryPipeline/BlockIO.h>
@@ -179,6 +180,8 @@ class IDatabase : public std::enable_shared_from_this<IDatabase>
 
     virtual bool canContainRocksDBTables() const { return true; }
 
+    virtual bool isDatalakeCatalog() const { return false; }
+
     /// Load a set of existing tables.
     /// You can call only once, right after the object is created.
     virtual void loadStoredObjects( /// NOLINT
@@ -267,7 +270,7 @@ class IDatabase : public std::enable_shared_from_this<IDatabase>
 
     /// Same as above, but may return non-fully initialized StoragePtr objects which are not suitable for reading.
     /// Useful for queries like "SHOW TABLES"
-    virtual DatabaseTablesIteratorPtr getLightweightTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}, bool skip_not_loaded = false, [[maybe_unused]] bool skip_data_lake_catalog = false) const /// NOLINT
+    virtual DatabaseTablesIteratorPtr getLightweightTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}, bool skip_not_loaded = false) const /// NOLINT
     {
         return getTablesIterator(context, filter_by_table_name, skip_not_loaded);
     }
@@ -346,15 +349,18 @@ class IDatabase : public std::enable_shared_from_this<IDatabase>
         return static_cast<time_t>(0);
     }
 
-    /// Get the CREATE TABLE query for the table. It can also provide information for detached tables for which there is metadata.
-    ASTPtr tryGetCreateTableQuery(const String & name, ContextPtr context) const noexcept
+    /// Get the CREATE TABLE query for the table.
+    /// It can also provide information for detached tables for which there is metadata.
+    ///
+    /// Does not throw if the table does not exist, but can throw on other errors.
+    ASTPtr tryGetCreateTableQuery(const String & name, ContextPtr context) const
     {
-        return getCreateTableQueryImpl(name, context, false);
+        return getCreateTableQueryImpl(name, context, /*throw_on_error=*/ false);
     }
 
     ASTPtr getCreateTableQuery(const String & name, ContextPtr context) const
     {
-        return getCreateTableQueryImpl(name, context, true);
+        return getCreateTableQueryImpl(name, context, /*throw_on_error=*/ true);
     }
 
     /// Get the CREATE DATABASE query for current database.
@@ -420,7 +426,7 @@ class IDatabase : public std::enable_shared_from_this<IDatabase>
 
     virtual bool shouldReplicateQuery(const ContextPtr & /*query_context*/, const ASTPtr & /*query_ptr*/) const { return false; }
 
-    virtual BlockIO tryEnqueueReplicatedDDL(const ASTPtr & /*query*/, ContextPtr /*query_context*/, [[maybe_unused]] QueryFlags flags);
+    virtual BlockIO tryEnqueueReplicatedDDL(const ASTPtr & /*query*/, ContextPtr /*query_context*/, [[maybe_unused]] QueryFlags flags, DDLGuardPtr && /*database_guard*/);
 
     /// Returns CREATE TABLE queries and corresponding tables prepared for writing to a backup.
     virtual std::vector<std::pair<ASTPtr, StoragePtr>> getTablesForBackup(const FilterByNameFunction & filter, const ContextPtr & context) const;
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index bd21af241fb2..c49ccf79284a 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -508,11 +508,12 @@ void registerDatabaseMaterializedPostgreSQL(DatabaseFactory & factory)
     {
         auto * engine_define = args.create_query.storage;
         const ASTFunction * engine = engine_define->engine;
-        ASTs & engine_args = engine->arguments->children;
-        const String & engine_name = engine_define->engine->name;
 
         if (!engine->arguments)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `MaterializedPostgreSQL` must have arguments");
+
+        ASTs & engine_args = engine->arguments->children;
+        const String & engine_name = engine_define->engine->name;
 
         StoragePostgreSQL::Configuration configuration;
 
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 7da72be1d62e..379fd82df776 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -6,6 +6,7 @@
 
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/StoragePostgreSQL.h>
@@ -519,6 +520,9 @@ ASTPtr DatabasePostgreSQL::getColumnDeclaration(const DataTypePtr & data_type) c
     if (which.isDateTime64())
         return makeASTDataType("DateTime64", std::make_shared<ASTLiteral>(static_cast<UInt32>(6)));
 
+    if (which.isDecimal())
+        return makeASTDataType("Decimal", std::make_shared<ASTLiteral>(getDecimalPrecision(*data_type)), std::make_shared<ASTLiteral>(getDecimalScale(*data_type)));
+
     return makeASTDataType(data_type->getName());
 }
 
@@ -528,11 +532,12 @@ void registerDatabasePostgreSQL(DatabaseFactory & factory)
     {
         auto * engine_define = args.create_query.storage;
         const ASTFunction * engine = engine_define->engine;
-        ASTs & engine_args = engine->arguments->children;
-        const String & engine_name = engine_define->engine->name;
 
         if (!engine->arguments)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `PostgreSQL` must have arguments");
+
+        ASTs & engine_args = engine->arguments->children;
+        const String & engine_name = engine_define->engine->name;
 
         auto use_table_cache = false;
         StoragePostgreSQL::Configuration configuration;
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index eaa7ae680a40..913d86e59b86 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -16,6 +16,7 @@
 #include <Parsers/ASTFunction.h>
 #include <Storages/StorageSQLite.h>
 #include <Databases/SQLite/SQLiteUtils.h>
+#include <Common/quoteString.h>
 
 
 namespace DB
@@ -104,7 +105,7 @@ bool DatabaseSQLite::checkSQLiteTable(const String & table_name) const
     if (!sqlite_db)
         sqlite_db = openSQLiteDB(database_path, getContext(), /* throw_on_error */true);
 
-    const String query = fmt::format("SELECT name FROM sqlite_master WHERE type='table' AND name='{}';", table_name);
+    const String query = "SELECT name FROM sqlite_master WHERE type = 'table' AND name = " + quoteStringSQLite(table_name) + ";";
 
     auto callback_get_data = [](void * res, int, char **, char **) -> int
     {
diff --git a/src/Databases/enableAllExperimentalSettings.cpp b/src/Databases/enableAllExperimentalSettings.cpp
index c552f3df42d3..215ed5ad9248 100644
--- a/src/Databases/enableAllExperimentalSettings.cpp
+++ b/src/Databases/enableAllExperimentalSettings.cpp
@@ -21,9 +21,6 @@ void enableAllExperimentalSettings(ContextMutablePtr context)
     context->setSetting("allow_experimental_nlp_functions", 1);
     context->setSetting("allow_experimental_hash_functions", 1);
     context->setSetting("allow_experimental_object_type", 1);
-    context->setSetting("allow_experimental_variant_type", 1);
-    context->setSetting("allow_experimental_dynamic_type", 1);
-    context->setSetting("allow_experimental_json_type", 1);
     context->setSetting("allow_experimental_vector_similarity_index", 1);
     context->setSetting("allow_experimental_window_functions", 1);
     context->setSetting("allow_experimental_geo_types", 1);
@@ -64,9 +61,11 @@ void enableAllExperimentalSettings(ContextMutablePtr context)
     context->setSetting("allow_experimental_ytsaurus_table_engine", 1);
     context->setSetting("allow_experimental_ytsaurus_dictionary_source", 1);
     context->setSetting("allow_experimental_time_series_aggregate_functions", 1);
+    context->setSetting("allow_experimental_hybrid_table", 1);
     context->setSetting("allow_experimental_lightweight_update", 1);
     context->setSetting("allow_experimental_insert_into_iceberg", 1);
     context->setSetting("allow_experimental_iceberg_compaction", 1);
+    context->setSetting("allow_experimental_delta_lake_writes", 1);
 
     /// clickhouse-private settings
     context->setSetting("allow_experimental_shared_set_join", 1);
diff --git a/src/Dictionaries/DictionaryHelpers.cpp b/src/Dictionaries/DictionaryHelpers.cpp
index 504322e8de71..742558e97469 100644
--- a/src/Dictionaries/DictionaryHelpers.cpp
+++ b/src/Dictionaries/DictionaryHelpers.cpp
@@ -18,10 +18,10 @@ MutableColumns deserializeColumnsFromKeys(
     for (size_t index = start; index < end; ++index)
     {
         const auto & key = keys[index];
-        const auto * ptr = key.data;
+        ReadBufferFromString in({key.data, key.size});
 
         for (auto & result_column : result_columns)
-            ptr = result_column->deserializeAndInsertFromArena(ptr);
+            result_column->deserializeAndInsertFromArena(in, nullptr);
     }
 
     return result_columns;
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 0791bfa83d7b..d48ab9b47b49 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -229,7 +229,7 @@ static inline void insertDefaultValuesIntoColumns( /// NOLINT
 static inline void deserializeAndInsertIntoColumns( /// NOLINT
     MutableColumns & columns,
     const DictionaryStorageFetchRequest & fetch_request,
-    const char * place_for_serialized_columns)
+    ReadBuffer & in)
 {
     size_t columns_size = columns.size();
 
@@ -238,9 +238,9 @@ static inline void deserializeAndInsertIntoColumns( /// NOLINT
         const auto & column = columns[column_index];
 
         if (fetch_request.shouldFillResultColumnWithIndex(column_index))
-            place_for_serialized_columns = column->deserializeAndInsertFromArena(place_for_serialized_columns);
+            column->deserializeAndInsertFromArena(in, nullptr);
         else
-            place_for_serialized_columns = column->skipSerializedInArena(place_for_serialized_columns);
+            column->skipSerializedInArena(in);
     }
 }
 
@@ -478,7 +478,7 @@ class DictionaryKeysExtractor
 
             for (const auto & column : key_columns)
             {
-                StringRef serialized_data = column->serializeValueIntoArena(current_key_index, *complex_key_arena, block_start);
+                StringRef serialized_data = column->serializeValueIntoArena(current_key_index, *complex_key_arena, block_start, nullptr);
                 allocated_size_for_columns += serialized_data.size;
             }
 
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index 3b3341a21d91..54f153bc697c 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -281,23 +281,25 @@ void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
         else if (!endpoint.empty() && !endpoint.starts_with('/'))
             url.push_back('/');
 
+
+        auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
+
+        auto uri = url + endpoint;
+        if (created_from_ddl)
+        {
+            context->getRemoteHostFilter().checkURL(Poco::URI(uri));
+            context->getHTTPHeaderFilter().checkAndNormalizeHeaders(header_entries);
+        }
+
         auto configuration = HTTPDictionarySource::Configuration
         {
-            .url = url + endpoint,
+            .url = uri,
             .format = format,
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
             .header_entries = std::move(header_entries)
         };
 
-        auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
-
-        if (created_from_ddl)
-        {
-            context->getRemoteHostFilter().checkURL(Poco::URI(configuration.url));
-            context->getHTTPHeaderFilter().checkHeaders(configuration.header_entries);
-        }
-
         return std::make_unique<HTTPDictionarySource>(dict_struct, configuration, credentials, sample_block, context);
     };
     factory.registerSource("http", create_table_source);
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index 062d13918b2f..9c5fa5508f69 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -1072,7 +1072,10 @@ class SSDCacheDictionaryStorage final : public ICacheDictionaryStorage
 
                     const auto & partition = memory_buffer_partitions[cell.in_memory_partition_index];
                     char * serialized_columns_place = partition.getPlace(cell.index);
-                    deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, serialized_columns_place);
+                    /// This is larger size than necessary but we don't know the exact size of serialized columns
+                    size_t size = partition.block_size;
+                    ReadBufferFromString in({serialized_columns_place, size});
+                    deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, in);
                     break;
                 }
                 case Cell::on_disk:
@@ -1119,7 +1122,10 @@ class SSDCacheDictionaryStorage final : public ICacheDictionaryStorage
             for (auto & key_in_block : keys_in_block)
             {
                 char * key_data = block_data + key_in_block.offset_in_block;
-                deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, key_data);
+                /// This is larger size than necessary but we don't know the exact size of serialized columns
+                size_t size = configuration.read_buffer_blocks_size;
+                ReadBufferFromString in({key_data, size});
+                deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, in);
 
                 result.key_index_to_state[key_in_block.key_index].setFetchedColumnIndex(
                     default_mask ? fetched_columns_index_without_default : fetched_columns_index);
@@ -1151,7 +1157,7 @@ class SSDCacheDictionaryStorage final : public ICacheDictionaryStorage
             for (size_t column_index = 0; column_index < columns_to_serialize_size; ++column_index)
             {
                 auto & column = columns[column_index];
-                temporary_column_data[column_index] = column->serializeValueIntoArena(key_index, temporary_values_pool, block_start);
+                temporary_column_data[column_index] = column->serializeValueIntoArena(key_index, temporary_values_pool, block_start, nullptr);
                 allocated_size_for_columns += temporary_column_data[column_index].size;
             }
 
diff --git a/src/Disks/DiskEncrypted.h b/src/Disks/DiskEncrypted.h
index dac01956733c..6c46e0f7366c 100644
--- a/src/Disks/DiskEncrypted.h
+++ b/src/Disks/DiskEncrypted.h
@@ -331,6 +331,12 @@ class DiskEncrypted : public IDisk
     bool supportsChmod() const override { return delegate->supportsChmod(); }
     bool isSymlinkSupported() const override { return delegate->isSymlinkSupported(); }
 
+    bool isReadOnly() const override { return delegate->isReadOnly(); }
+    bool isWriteOnce() const override { return delegate->isWriteOnce(); }
+    bool isPlain() const override { return delegate->isPlain(); }
+
+    ObjectStoragePtr getObjectStorage() override { return delegate->getObjectStorage(); }
+
     SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
 
     std::shared_ptr<DiskEncryptedTransaction> createEncryptedTransaction() const
diff --git a/src/Disks/DiskFromAST.cpp b/src/Disks/DiskFromAST.cpp
index fd42e32df295..815d53bb071a 100644
--- a/src/Disks/DiskFromAST.cpp
+++ b/src/Disks/DiskFromAST.cpp
@@ -15,7 +15,6 @@
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Common/NamedCollections/NamedCollectionConfiguration.h>
 #include <Common/ZooKeeper/ZooKeeperNodeCache.h>
-#include <queue>
 
 namespace DB
 {
@@ -31,10 +30,14 @@ std::string getOrCreateCustomDisk(
     ContextPtr context,
     bool attach)
 {
+    std::string default_path = "/etc/metrika.xml";
+
     const auto & server_config = context->getConfigRef();
     std::string include_from_path;
     if (server_config.has("include_from"))
         include_from_path = server_config.getString("include_from");
+    else if (fs::exists(default_path))
+        include_from_path = default_path;
 
     Poco::AutoPtr<Poco::Util::XMLConfiguration> config(new Poco::Util::XMLConfiguration());
     {
diff --git a/src/Disks/DiskType.cpp b/src/Disks/DiskType.cpp
index 0dafa86ce4fa..dbfba8e5686e 100644
--- a/src/Disks/DiskType.cpp
+++ b/src/Disks/DiskType.cpp
@@ -12,7 +12,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-MetadataStorageType metadataTypeFromString(const String & type)
+MetadataStorageType metadataTypeFromString(const std::string & type)
 {
     auto check_type = Poco::toLower(type);
     if (check_type == "local")
@@ -60,25 +60,49 @@ std::string DataSourceDescription::toString() const
         case DataSourceType::RAM:
             return "memory";
         case DataSourceType::ObjectStorage:
-        {
-            switch (object_storage_type)
-            {
-                case ObjectStorageType::S3:
-                    return "s3";
-                case ObjectStorageType::HDFS:
-                    return "hdfs";
-                case ObjectStorageType::Azure:
-                    return "azure_blob_storage";
-                case ObjectStorageType::Local:
-                    return "local_blob_storage";
-                case ObjectStorageType::Web:
-                    return "web";
-                case ObjectStorageType::None:
-                    return "none";
-                case ObjectStorageType::Max:
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected object storage type: Max");
-            }
-        }
+            return DB::toString(object_storage_type);
     }
 }
+
+ObjectStorageType objectStorageTypeFromString(const std::string & type)
+{
+    auto check_type = Poco::toLower(type);
+    if (check_type == "s3")
+        return ObjectStorageType::S3;
+    if (check_type == "hdfs")
+        return ObjectStorageType::HDFS;
+    if (check_type == "azure_blob_storage" || check_type == "azure")
+        return ObjectStorageType::Azure;
+    if (check_type == "local_blob_storage" || check_type == "local")
+        return ObjectStorageType::Local;
+    if (check_type == "web")
+        return ObjectStorageType::Web;
+    if (check_type == "none")
+        return ObjectStorageType::None;
+
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+        "Unknown object storage type: {}", type);
+}
+
+std::string toString(ObjectStorageType type)
+{
+    switch (type)
+    {
+        case ObjectStorageType::S3:
+            return "s3";
+        case ObjectStorageType::HDFS:
+            return "hdfs";
+        case ObjectStorageType::Azure:
+            return "azure_blob_storage";
+        case ObjectStorageType::Local:
+            return "local_blob_storage";
+        case ObjectStorageType::Web:
+            return "web";
+        case ObjectStorageType::None:
+            return "none";
+        case ObjectStorageType::Max:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected object storage type: Max");
+    }
+}
+
 }
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
index f8eb31b2f988..9662a0dc7b4e 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -36,8 +36,10 @@ enum class MetadataStorageType : uint8_t
     Memory,
 };
 
-MetadataStorageType metadataTypeFromString(const String & type);
-String toString(DataSourceType data_source_type);
+MetadataStorageType metadataTypeFromString(const std::string & type);
+
+ObjectStorageType objectStorageTypeFromString(const std::string & type);
+std::string toString(ObjectStorageType type);
 
 struct DataSourceDescription
 {
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
index 8be2e4d7e141..8d3b3696be12 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
@@ -93,8 +93,6 @@ namespace ErrorCodes
 namespace AzureBlobStorage
 {
 
-#if USE_AZURE_BLOB_STORAGE
-
 static void validateStorageAccountUrl(const String & storage_account_url)
 {
     const auto * storage_account_url_pattern_str = R"(http(()|s)://[a-z0-9-.:]+(()|/)[a-z0-9]*(()|/))";
@@ -121,6 +119,8 @@ static void validateContainerName(const String & container_name)
                         container_name_pattern_str, container_name);
 }
 
+#if USE_AZURE_BLOB_STORAGE
+
 static bool isConnectionString(const std::string & candidate)
 {
     return !candidate.starts_with("http");
@@ -223,113 +223,6 @@ std::unique_ptr<ContainerClient> ConnectionParams::createForContainer() const
     }, auth_method);
 }
 
-Endpoint processEndpoint(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-{
-    String storage_url;
-    String account_name;
-    String container_name;
-    String prefix;
-
-    auto get_container_name = [&]
-    {
-        if (config.has(config_prefix + ".container_name"))
-            return config.getString(config_prefix + ".container_name");
-
-        if (config.has(config_prefix + ".container"))
-            return config.getString(config_prefix + ".container");
-
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected either `container` or `container_name` parameter in config");
-    };
-
-    if (config.has(config_prefix + ".endpoint"))
-    {
-        String endpoint = config.getString(config_prefix + ".endpoint");
-
-        /// For some authentication methods account name is not present in the endpoint
-        /// 'endpoint_contains_account_name' bool is used to understand how to split the endpoint (default : true)
-        bool endpoint_contains_account_name = config.getBool(config_prefix + ".endpoint_contains_account_name", true);
-
-        size_t pos = endpoint.find("//");
-        if (pos == std::string::npos)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected '//' in endpoint");
-
-        if (endpoint_contains_account_name)
-        {
-            size_t acc_pos_begin = endpoint.find('/', pos + 2);
-            if (acc_pos_begin == std::string::npos)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected account_name in endpoint");
-
-            storage_url = endpoint.substr(0, acc_pos_begin);
-            size_t acc_pos_end = endpoint.find('/', acc_pos_begin + 1);
-
-            if (acc_pos_end == std::string::npos)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected container_name in endpoint");
-
-            account_name = endpoint.substr(acc_pos_begin + 1, acc_pos_end - acc_pos_begin - 1);
-
-            size_t cont_pos_end = endpoint.find('/', acc_pos_end + 1);
-
-            if (cont_pos_end != std::string::npos)
-            {
-                container_name = endpoint.substr(acc_pos_end + 1, cont_pos_end - acc_pos_end - 1);
-                prefix = endpoint.substr(cont_pos_end + 1);
-            }
-            else
-            {
-                container_name = endpoint.substr(acc_pos_end + 1);
-            }
-        }
-        else
-        {
-            size_t cont_pos_begin = endpoint.find('/', pos + 2);
-
-            if (cont_pos_begin == std::string::npos)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected container_name in endpoint");
-
-            storage_url = endpoint.substr(0, cont_pos_begin);
-            size_t cont_pos_end = endpoint.find('/', cont_pos_begin + 1);
-
-            if (cont_pos_end != std::string::npos)
-            {
-                container_name = endpoint.substr(cont_pos_begin + 1,cont_pos_end - cont_pos_begin - 1);
-                prefix = endpoint.substr(cont_pos_end + 1);
-            }
-            else
-            {
-                container_name = endpoint.substr(cont_pos_begin + 1);
-            }
-        }
-
-        if (config.has(config_prefix + ".endpoint_subpath"))
-        {
-            String endpoint_subpath = config.getString(config_prefix + ".endpoint_subpath");
-            prefix = fs::path(prefix) / endpoint_subpath;
-        }
-    }
-    else if (config.has(config_prefix + ".connection_string"))
-    {
-        storage_url = config.getString(config_prefix + ".connection_string");
-        container_name = get_container_name();
-    }
-    else if (config.has(config_prefix + ".storage_account_url"))
-    {
-        storage_url = config.getString(config_prefix + ".storage_account_url");
-        validateStorageAccountUrl(storage_url);
-        container_name = get_container_name();
-    }
-    else
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected either `storage_account_url` or `connection_string` or `endpoint` in config");
-
-    if (!container_name.empty())
-        validateContainerName(container_name);
-
-    std::optional<bool> container_already_exists {};
-    if (config.has(config_prefix + ".container_already_exists"))
-        container_already_exists = {config.getBool(config_prefix + ".container_already_exists")};
-
-    return {storage_url, account_name, container_name, prefix, "", container_already_exists};
-}
-
 void processURL(const String & url, const String & container_name, Endpoint & endpoint, AuthMethod & auth_method)
 {
     endpoint.container_name = container_name;
@@ -505,6 +398,113 @@ BlobClientOptions getClientOptions(
 
 #endif
 
+Endpoint processEndpoint(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    String storage_url;
+    String account_name;
+    String container_name;
+    String prefix;
+
+    auto get_container_name = [&]
+    {
+        if (config.has(config_prefix + ".container_name"))
+            return config.getString(config_prefix + ".container_name");
+
+        if (config.has(config_prefix + ".container"))
+            return config.getString(config_prefix + ".container");
+
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Expected either `container` or `container_name` parameter in config");
+    };
+
+    if (config.has(config_prefix + ".endpoint"))
+    {
+        String endpoint = config.getString(config_prefix + ".endpoint");
+
+        /// For some authentication methods account name is not present in the endpoint
+        /// 'endpoint_contains_account_name' bool is used to understand how to split the endpoint (default : true)
+        bool endpoint_contains_account_name = config.getBool(config_prefix + ".endpoint_contains_account_name", true);
+
+        size_t pos = endpoint.find("//");
+        if (pos == std::string::npos)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected '//' in endpoint");
+
+        if (endpoint_contains_account_name)
+        {
+            size_t acc_pos_begin = endpoint.find('/', pos + 2);
+            if (acc_pos_begin == std::string::npos)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected account_name in endpoint");
+
+            storage_url = endpoint.substr(0, acc_pos_begin);
+            size_t acc_pos_end = endpoint.find('/', acc_pos_begin + 1);
+
+            if (acc_pos_end == std::string::npos)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected container_name in endpoint");
+
+            account_name = endpoint.substr(acc_pos_begin + 1, acc_pos_end - acc_pos_begin - 1);
+
+            size_t cont_pos_end = endpoint.find('/', acc_pos_end + 1);
+
+            if (cont_pos_end != std::string::npos)
+            {
+                container_name = endpoint.substr(acc_pos_end + 1, cont_pos_end - acc_pos_end - 1);
+                prefix = endpoint.substr(cont_pos_end + 1);
+            }
+            else
+            {
+                container_name = endpoint.substr(acc_pos_end + 1);
+            }
+        }
+        else
+        {
+            size_t cont_pos_begin = endpoint.find('/', pos + 2);
+
+            if (cont_pos_begin == std::string::npos)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected container_name in endpoint");
+
+            storage_url = endpoint.substr(0, cont_pos_begin);
+            size_t cont_pos_end = endpoint.find('/', cont_pos_begin + 1);
+
+            if (cont_pos_end != std::string::npos)
+            {
+                container_name = endpoint.substr(cont_pos_begin + 1,cont_pos_end - cont_pos_begin - 1);
+                prefix = endpoint.substr(cont_pos_end + 1);
+            }
+            else
+            {
+                container_name = endpoint.substr(cont_pos_begin + 1);
+            }
+        }
+        if (config.has(config_prefix + ".endpoint_subpath"))
+        {
+            String endpoint_subpath = config.getString(config_prefix + ".endpoint_subpath");
+            prefix = fs::path(prefix) / endpoint_subpath;
+        }
+    }
+    else if (config.has(config_prefix + ".connection_string"))
+    {
+        storage_url = config.getString(config_prefix + ".connection_string");
+        container_name = get_container_name();
+    }
+    else if (config.has(config_prefix + ".storage_account_url"))
+    {
+        storage_url = config.getString(config_prefix + ".storage_account_url");
+        validateStorageAccountUrl(storage_url);
+        container_name = get_container_name();
+    }
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected either `storage_account_url` or `connection_string` or `endpoint` in config");
+
+    if (!container_name.empty())
+        validateContainerName(container_name);
+
+    std::optional<bool> container_already_exists {};
+    if (config.has(config_prefix + ".container_already_exists"))
+        container_already_exists = {config.getBool(config_prefix + ".container_already_exists")};
+
+    return {storage_url, account_name, container_name, prefix, "", container_already_exists};
+}
+
 std::unique_ptr<RequestSettings> getRequestSettings(const Settings & query_settings)
 {
     auto settings = std::make_unique<RequestSettings>();
@@ -608,31 +608,41 @@ void AzureSettingsByEndpoint::loadFromConfig(
 
     for (const String & key : config_keys)
     {
-        const auto key_path = config_prefix + "." + key;
-        String endpoint_path = key_path + ".connection_string";
-
-        if (!config.has(endpoint_path))
+        if (config.has(config_prefix + "." + key + ".object_storage_type"))
         {
-            endpoint_path = key_path + ".storage_account_url";
+            const auto &object_storage_type = config.getString(config_prefix + "." + key + ".object_storage_type");
+            if (object_storage_type != "azure" && object_storage_type != "azure_blob_storage")
+            {
+                /// Then its not an azure config
+                continue;
+            }
+
+            const auto key_path = config_prefix + "." + key;
+            String endpoint_path = key_path + ".connection_string";
 
             if (!config.has(endpoint_path))
             {
-                endpoint_path = key_path + ".endpoint";
+                endpoint_path = key_path + ".storage_account_url";
 
                 if (!config.has(endpoint_path))
                 {
-                    /// Error, shouldn't hit this todo:: throw error
-                    continue;
+                    endpoint_path = key_path + ".endpoint";
+
+                    if (!config.has(endpoint_path))
+                    {
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "URL not provided for azure blob storage disk {}",
+                                        object_storage_type);
+                    }
                 }
             }
-        }
 
-        auto request_settings = AzureBlobStorage::getRequestSettings(config, key_path, settings);
-
-        azure_settings.emplace(
-                config.getString(endpoint_path),
-                std::move(*request_settings));
+            auto endpoint = AzureBlobStorage::processEndpoint(config, key_path);
+            auto request_settings = AzureBlobStorage::getRequestSettings(config, key_path, settings);
 
+            azure_settings.emplace(
+                    endpoint.storage_account_url,
+                    std::move(*request_settings));
+        }
     }
 }
 
@@ -654,4 +664,5 @@ std::optional<AzureBlobStorage::RequestSettings> AzureSettingsByEndpoint::getSet
     return {};
 }
 
+
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h
index 5980255ac484..e0bd961b2f6f 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h
@@ -149,8 +149,6 @@ struct ConnectionParams
     std::unique_ptr<ContainerClient> createForContainer() const;
 };
 
-
-Endpoint processEndpoint(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 void processURL(const String & url, const String & container_name, Endpoint & endpoint, AuthMethod & auth_method);
 
 std::unique_ptr<ContainerClient> getContainerClient(const ConnectionParams & params, bool readonly);
@@ -165,6 +163,8 @@ AuthMethod getAuthMethod(const Poco::Util::AbstractConfiguration & config, const
 
 #endif
 
+Endpoint processEndpoint(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
+
 std::unique_ptr<RequestSettings> getRequestSettings(const Settings & query_settings);
 std::unique_ptr<RequestSettings> getRequestSettingsForBackup(ContextPtr context, String endpoint, bool use_native_copy);
 std::unique_ptr<RequestSettings> getRequestSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Settings & settings_ref);
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
index 4fe9c5c43117..ba2b5fc09f2c 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -9,10 +9,12 @@
 #include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Disks/IO/AsynchronousBoundedReadBuffer.h>
+#include <IO/AzureBlobStorage/copyAzureBlobStorageFile.h>
 
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.h>
 #include <Disks/ObjectStorages/ObjectStorageIteratorAsync.h>
 #include <Interpreters/Context.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 
 
 namespace CurrentMetrics
@@ -25,6 +27,7 @@ namespace CurrentMetrics
 namespace ProfileEvents
 {
     extern const Event AzureListObjects;
+    extern const Event AzureListObjectsMicroseconds;
     extern const Event DiskAzureListObjects;
     extern const Event AzureDeleteObjects;
     extern const Event DiskAzureDeleteObjects;
@@ -71,11 +74,12 @@ class AzureIteratorAsync final : public IObjectStorageIteratorAsync
     }
 
 private:
-    bool getBatchAndCheckNext(RelativePathsWithMetadata & batch) override
+    bool getBatchAndCheckNext(PathsWithMetadata & batch) override
     {
         ProfileEvents::increment(ProfileEvents::AzureListObjects);
         if (client->IsClientForDisk())
             ProfileEvents::increment(ProfileEvents::DiskAzureListObjects);
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::AzureListObjectsMicroseconds);
 
         chassert(batch.empty());
         auto blob_list_response = client->ListBlobs(options);
@@ -84,7 +88,7 @@ class AzureIteratorAsync final : public IObjectStorageIteratorAsync
 
         for (const auto & blob : blobs_list)
         {
-            batch.emplace_back(std::make_shared<RelativePathWithMetadata>(
+            batch.emplace_back(std::make_shared<PathWithMetadata>(
                 blob.Name,
                 ObjectMetadata{
                     static_cast<uint64_t>(blob.BlobSize),
@@ -166,7 +170,7 @@ ObjectStorageIteratorPtr AzureObjectStorage::iterate(const std::string & path_pr
     return std::make_shared<AzureIteratorAsync>(path_prefix, client_ptr, max_keys ? max_keys : settings_ptr->list_object_keys_size);
 }
 
-void AzureObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const
+void AzureObjectStorage::listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const
 {
     auto client_ptr = client.get();
 
@@ -183,12 +187,16 @@ void AzureObjectStorage::listObjects(const std::string & path, RelativePathsWith
         if (client_ptr->IsClientForDisk())
             ProfileEvents::increment(ProfileEvents::DiskAzureListObjects);
 
-        blob_list_response = client_ptr->ListBlobs(options);
+        {
+            ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::AzureListObjectsMicroseconds);
+            blob_list_response = client_ptr->ListBlobs(options);
+        }
+
         const auto & blobs_list = blob_list_response.Blobs;
 
         for (const auto & blob : blobs_list)
         {
-            children.emplace_back(std::make_shared<RelativePathWithMetadata>(
+            children.emplace_back(std::make_shared<PathWithMetadata>(
                 blob.Name,
                 ObjectMetadata{
                     static_cast<uint64_t>(blob.BlobSize),
@@ -199,13 +207,8 @@ void AzureObjectStorage::listObjects(const std::string & path, RelativePathsWith
                     {}}));
         }
 
-        if (max_keys)
-        {
-            ssize_t keys_left = static_cast<ssize_t>(max_keys) - children.size();
-            if (keys_left <= 0)
-                break;
-            options.PageSizeHint = keys_left;
-        }
+        if (max_keys && children.size() >= max_keys)
+            break;
     }
 }
 
@@ -327,26 +330,34 @@ ObjectMetadata AzureObjectStorage::getObjectMetadata(const std::string & path) c
 void AzureObjectStorage::copyObject( /// NOLINT
     const StoredObject & object_from,
     const StoredObject & object_to,
-    const ReadSettings &,
+    const ReadSettings & read_settings,
     const WriteSettings &,
     std::optional<ObjectAttributes> object_to_attributes)
 {
+    auto settings_ptr = settings.get();
     auto client_ptr = client.get();
-    auto dest_blob_client = client_ptr->GetBlobClient(object_to.remote_path);
-    auto source_blob_client = client_ptr->GetBlobClient(object_from.remote_path);
-
-    Azure::Storage::Blobs::CopyBlobFromUriOptions copy_options;
-    if (object_to_attributes.has_value())
-    {
-        for (const auto & [key, value] : *object_to_attributes)
-            copy_options.Metadata[key] = value;
-    }
+    auto object_metadata = getObjectMetadata(object_from.remote_path);
 
     ProfileEvents::increment(ProfileEvents::AzureCopyObject);
     if (client_ptr->IsClientForDisk())
         ProfileEvents::increment(ProfileEvents::DiskAzureCopyObject);
-
-    dest_blob_client.CopyFromUri(source_blob_client.GetUrl(), copy_options);
+    LOG_TRACE(log, "AzureObjectStorage::copyObject of size {}", object_metadata.size_bytes);
+
+    auto scheduler = threadPoolCallbackRunnerUnsafe<void>(getThreadPoolWriter(), "AzureObjCopy");
+
+    copyAzureBlobStorageFile(
+        client_ptr,
+        client_ptr,
+        connection_params.getContainer(),
+        object_from.remote_path,
+        0,
+        object_metadata.size_bytes,
+        connection_params.getContainer(),
+        object_to.remote_path,
+        settings_ptr,
+        read_settings,
+        object_to_attributes,
+        scheduler);
 }
 
 void AzureObjectStorage::applyNewSettings(
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index 5a23deb9b65b..1e4ed18b4605 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -35,7 +35,9 @@ class AzureObjectStorage : public IObjectStorage
         const String & description_,
         const String & common_key_prefix_);
 
-    void listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const override;
+    bool supportsListObjectsCache() override { return true; }
+
+    void listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const override;
 
     /// Sanitizer build may crash with max_keys=1; this looks like a false positive.
     ObjectStorageIteratorPtr iterate(const std::string & path_prefix, size_t max_keys) const override;
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
index 8675555f2668..8d483a5581dd 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
@@ -193,7 +193,7 @@ void CachedObjectStorage::copyObject( // NOLINT
     object_storage->copyObject(object_from, object_to, read_settings, write_settings, object_to_attributes);
 }
 
-void CachedObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const
+void CachedObjectStorage::listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const
 {
     object_storage->listObjects(path, children, max_keys);
 }
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
index 68cce9f2ccb6..34c2b7f2054f 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
@@ -64,7 +64,7 @@ class CachedObjectStorage final : public IObjectStorage
         IObjectStorage & object_storage_to,
         std::optional<ObjectAttributes> object_to_attributes = {}) override;
 
-    void listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const override;
+    void listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const override;
 
     ObjectMetadata getObjectMetadata(const std::string & path) const override;
 
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
index 514db575197c..2064c72bd36d 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
@@ -90,7 +90,7 @@ struct PureMetadataObjectStorageOperation final : public IDiskObjectStorageOpera
         on_execute(transaction);
     }
 
-    void undo() override
+    void undo(StoredObjects & /*to_remove*/) override
     {
     }
 
@@ -177,9 +177,8 @@ struct RemoveObjectStorageOperation final : public IDiskObjectStorageOperation
         }
     }
 
-    void undo() override
+    void undo(StoredObjects & /*to_remove*/) override
     {
-
     }
 
     void finalize(StoredObjects & to_remove) override
@@ -280,7 +279,7 @@ struct RemoveManyObjectStorageOperation final : public IDiskObjectStorageOperati
         }
     }
 
-    void undo() override
+    void undo(StoredObjects & /*to_remove*/) override
     {
     }
 
@@ -397,7 +396,7 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
             removeMetadataRecursive(tx, path);
     }
 
-    void undo() override
+    void undo(StoredObjects & /*to_remove*/) override
     {
     }
 
@@ -473,9 +472,8 @@ struct ReplaceFileObjectStorageOperation final : public IDiskObjectStorageOperat
             tx->moveFile(path_from, path_to);
     }
 
-    void undo() override
+    void undo(StoredObjects & /*to_remove*/) override
     {
-
     }
 
     void finalize(StoredObjects & to_remove) override
@@ -516,9 +514,11 @@ struct WriteFileObjectStorageOperation final : public IDiskObjectStorageOperatio
             on_execute(tx);
     }
 
-    void undo() override
+    void undo(StoredObjects & to_remove) override
     {
-        object_storage.removeObjectIfExists(object);
+        LOG_DEBUG(getLogger("DiskObjectStorageTransaction"), "Undoing WriteFileObjectStorageOperation for path {}, key {}", object.local_path, object.remote_path);
+        /// If the file was created, we need to remove it
+        to_remove.push_back(object);
     }
 
     void finalize(StoredObjects & /*to_remove*/) override
@@ -586,9 +586,9 @@ struct CopyFileObjectStorageOperation final : public IDiskObjectStorageOperation
     }
 
 
-    void undo() override
+    void undo(StoredObjects & to_remove) override
     {
-         destination_object_storage.removeObjectsIfExist(created_objects);
+        to_remove.append_range(created_objects);
     }
 
     void finalize(StoredObjects & /*to_remove*/) override
@@ -639,7 +639,7 @@ struct TruncateFileObjectStorageOperation final : public IDiskObjectStorageOpera
             truncate_outcome = tx->truncateFile(path, size);
     }
 
-    void undo() override
+    void undo(StoredObjects & /*to_remove*/) override
     {
 
     }
@@ -679,9 +679,9 @@ struct CreateEmptyFileObjectStorageOperation final : public IDiskObjectStorageOp
         buf->finalize();
     }
 
-    void undo() override
+    void undo(StoredObjects & to_remove) override
     {
-        object_storage.removeObjectIfExists(object);
+        to_remove.push_back(object);
     }
 
     void finalize(StoredObjects & /*to_remove*/) override
@@ -1072,21 +1072,8 @@ void DiskObjectStorageTransaction::commit(const TransactionCommitOptionsVariant
                 getLogger("DiskObjectStorageTransaction"),
                 fmt::format("An error occurred while executing transaction's operation #{} ({})", i, operations_to_execute[i]->getInfoForLog()));
 
-            for (int64_t j = i; j >= 0; --j)
-            {
-                try
-                {
-                    operations_to_execute[j]->undo();
-                }
-                catch (...)
-                {
-                    tryLogCurrentException(
-                        getLogger("DiskObjectStorageTransaction"),
-                        fmt::format("An error occurred while undoing transaction's operation #{}", i));
+            undo();
 
-                    throw;
-                }
-            }
             throw;
         }
     }
@@ -1129,20 +1116,7 @@ TransactionCommitOutcomeVariant DiskObjectStorageTransaction::tryCommit(const Tr
             ex.addMessage(fmt::format("While executing operation #{}", i));
 
             if (needRollbackBlobs(options))
-            {
-                for (int64_t j = i; j >= 0; --j)
-                {
-                    try
-                    {
-                        operations_to_execute[j]->undo();
-                    }
-                    catch (Exception & rollback_ex)
-                    {
-                        rollback_ex.addMessage(fmt::format("While undoing operation #{}", i));
-                        throw;
-                    }
-                }
-            }
+                undo();
 
             throw;
         }
@@ -1189,10 +1163,23 @@ TransactionCommitOutcomeVariant DiskObjectStorageTransaction::tryCommit(const Tr
 
 void DiskObjectStorageTransaction::undo()
 {
-    if (!is_committed)
+    if (is_committed)
+    {
+        operations_to_execute.clear();
+        return;
+    }
+
+    StoredObjects objects_to_remove;
+    for (const auto & operation : operations_to_execute | std::views::reverse)
+        operation->undo(objects_to_remove);
+
+    try
+    {
+        object_storage.removeObjectsIfExist(objects_to_remove);
+    }
+    catch (...)
     {
-        for (const auto & operation : operations_to_execute | std::views::reverse)
-            operation->undo();
+        tryLogCurrentException(getLogger("DiskObjectStorageTransaction"), "An error occurred during transaction cleanup");
     }
 
     operations_to_execute.clear();
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
index 04785ce8b8e1..4da9627cf838 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
@@ -25,7 +25,10 @@ struct IDiskObjectStorageOperation
     /// Execute operation and something to metadata transaction
     virtual void execute(MetadataTransactionPtr transaction) = 0;
     /// Revert operation if possible
-    virtual void undo() = 0;
+    /// It is called if something went wrong before commit of metadata transaction
+    /// It is called in reverse order of execution of operations for all operations
+    /// even if they were not executed at all
+    virtual void undo(StoredObjects & to_remove) = 0;
     /// Action to execute after metadata transaction successfully committed.
     /// Useful when it's impossible to revert operation
     /// like removal of blobs. Such implementation can lead to garbage.
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
index 5dea86c49027..443a8b4c6920 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
@@ -167,7 +167,7 @@ ObjectMetadata HDFSObjectStorage::getObjectMetadata(const std::string & path) co
     return metadata;
 }
 
-void HDFSObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const
+void HDFSObjectStorage::listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const
 {
     initializeHDFSFS();
     LOG_TEST(log, "Trying to list files for {}", path);
@@ -203,7 +203,7 @@ void HDFSObjectStorage::listObjects(const std::string & path, RelativePathsWithM
         }
         else
         {
-            children.emplace_back(std::make_shared<RelativePathWithMetadata>(
+            children.emplace_back(std::make_shared<PathWithMetadata>(
                 String(file_path),
                 ObjectMetadata{
                     static_cast<uint64_t>(ls.file_info[i].mSize),
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
index 733407e236ef..c3fe9ce0cf6c 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
@@ -92,7 +92,7 @@ class HDFSObjectStorage : public IObjectStorage, public HDFSErrorWrapper
         const WriteSettings & write_settings,
         std::optional<ObjectAttributes> object_to_attributes = {}) override;
 
-    void listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const override;
+    void listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const override;
 
     String getObjectsNamespace() const override { return ""; }
 
diff --git a/src/Disks/ObjectStorages/IMetadataStorage.h b/src/Disks/ObjectStorages/IMetadataStorage.h
index f193c78dfc78..c7c8de877c4a 100644
--- a/src/Disks/ObjectStorages/IMetadataStorage.h
+++ b/src/Disks/ObjectStorages/IMetadataStorage.h
@@ -325,6 +325,9 @@ class IMetadataStorage : private boost::noncopyable
         const std::string & /* config_prefix */,
         ContextPtr /* context */) {}
 
+    /// Only support writing with Append if MetadataTransactionPtr created by `createTransaction` has `supportAddingBlobToMetadata`
+    virtual bool supportWritingWithAppend() const { return false; }
+
 protected:
     [[noreturn]] static void throwNotImplemented()
     {
diff --git a/src/Disks/ObjectStorages/IObjectStorage.cpp b/src/Disks/ObjectStorages/IObjectStorage.cpp
index acbd3e1fa2c0..2541d71c49f2 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/IObjectStorage.cpp
@@ -7,6 +7,11 @@
 #include <Interpreters/Context.h>
 #include <Common/Exception.h>
 #include <Common/ObjectStorageKeyGenerator.h>
+#include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
+
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Parser.h>
+#include <Poco/JSON/JSONException.h>
 
 
 namespace DB
@@ -25,12 +30,12 @@ const MetadataStorageMetrics & IObjectStorage::getMetadataStorageMetrics() const
 
 bool IObjectStorage::existsOrHasAnyChild(const std::string & path) const
 {
-    RelativePathsWithMetadata files;
+    PathsWithMetadata files;
     listObjects(path, files, 1);
     return !files.empty();
 }
 
-void IObjectStorage::listObjects(const std::string &, RelativePathsWithMetadata &, size_t) const
+void IObjectStorage::listObjects(const std::string &, PathsWithMetadata &, size_t) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "listObjects() is not supported");
 }
@@ -38,7 +43,7 @@ void IObjectStorage::listObjects(const std::string &, RelativePathsWithMetadata
 
 ObjectStorageIteratorPtr IObjectStorage::iterate(const std::string & path_prefix, size_t max_keys) const
 {
-    RelativePathsWithMetadata files;
+    PathsWithMetadata files;
     listObjects(path_prefix, files, max_keys);
 
     return std::make_shared<ObjectStorageIteratorFromList>(std::move(files));
@@ -97,11 +102,59 @@ WriteSettings IObjectStorage::patchSettings(const WriteSettings & write_settings
     return write_settings;
 }
 
-std::string RelativePathWithMetadata::getPathOrPathToArchiveIfArchive() const
+std::string PathWithMetadata::getPathOrPathToArchiveIfArchive() const
 {
     if (isArchive())
         return getPathToArchive();
     return getPath();
 }
 
+PathWithMetadata::CommandInTaskResponse::CommandInTaskResponse(const std::string & task)
+{
+    Poco::JSON::Parser parser;
+    try
+    {
+        auto json = parser.parse(task).extract<Poco::JSON::Object::Ptr>();
+        if (!json)
+            return;
+
+        is_valid = true;
+
+        if (json->has("retry_after_us"))
+            retry_after_us = json->getValue<size_t>("retry_after_us");
+    }
+    catch (const Poco::JSON::JSONException &)
+    { /// Not a JSON
+        return;
+    }
+}
+
+std::string PathWithMetadata::CommandInTaskResponse::toString() const
+{
+    Poco::JSON::Object json;
+    if (retry_after_us.has_value())
+        json.set("retry_after_us", retry_after_us.value());
+
+    std::ostringstream oss;
+    oss.exceptions(std::ios::failbit);
+    Poco::JSON::Stringifier::stringify(json, oss);
+    return oss.str();
+}
+
+
+void PathWithMetadata::loadMetadata(ObjectStoragePtr object_storage, bool ignore_non_existent_file)
+{
+    if (!metadata)
+    {
+        const auto & path = isArchive() ? getPathToArchive() : getPath();
+
+        auto storage_to_use = object_storage_to_use ? object_storage_to_use : object_storage;
+
+        if (ignore_non_existent_file)
+            metadata = storage_to_use->tryGetObjectMetadata(path);
+        else
+            metadata = storage_to_use->getObjectMetadata(path);
+    }
+}
+
 }
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index 1f3a4278f135..a6093d4d92f9 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -29,6 +29,7 @@
 #include <Disks/WriteMode.h>
 
 #include <Processors/ISimpleTransform.h>
+#include <Processors/Formats/IInputFormat.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeObjectMetadata.h>
 
 #include <Interpreters/Context_fwd.h>
@@ -107,33 +108,97 @@ struct ObjectMetadata
     ObjectAttributes attributes;
 };
 
+
+class DataFileMetaInfo;
+using DataFileMetaInfoPtr = std::shared_ptr<DataFileMetaInfo>;
+
 struct DataLakeObjectMetadata;
 
-struct RelativePathWithMetadata
+struct PathWithMetadata
 {
+    class CommandInTaskResponse
+    {
+    public:
+        CommandInTaskResponse() = default;
+        explicit CommandInTaskResponse(const std::string & task);
+
+        bool isValid() const { return is_valid; }
+        void setRetryAfterUs(Poco::Timestamp::TimeDiff time_us)
+        {
+            retry_after_us = time_us;
+            is_valid = true;
+        }
+
+        std::string toString() const;
+
+        std::optional<Poco::Timestamp::TimeDiff> getRetryAfterUs() const { return retry_after_us; }
+
+    private:
+        bool is_valid = false;
+        std::optional<Poco::Timestamp::TimeDiff> retry_after_us;
+    };
+
     String relative_path;
     /// Object metadata: size, modification time, etc.
     std::optional<ObjectMetadata> metadata;
     /// Delta lake related object metadata.
     std::optional<DataLakeObjectMetadata> data_lake_metadata;
-
-    RelativePathWithMetadata() = default;
-
-    explicit RelativePathWithMetadata(String relative_path_, std::optional<ObjectMetadata> metadata_ = std::nullopt)
-        : relative_path(std::move(relative_path_))
+    /// Information about columns
+    std::optional<DataFileMetaInfoPtr> file_meta_info;
+    /// Retry request after short pause
+    CommandInTaskResponse command;
+    std::optional<String> absolute_path;
+    ObjectStoragePtr object_storage_to_use = nullptr;
+
+    FileBucketInfoPtr file_bucket_info;
+
+    PathWithMetadata() = default;
+
+    explicit PathWithMetadata(
+        const String & command_or_path,
+        std::optional<ObjectMetadata> metadata_ = std::nullopt,
+        std::optional<String> absolute_path_ = std::nullopt,
+        ObjectStoragePtr object_storage_to_use_ = nullptr)
+        : relative_path(std::move(command_or_path))
         , metadata(std::move(metadata_))
-    {}
+        , command(relative_path)
+        , absolute_path((absolute_path_.has_value() && !absolute_path_.value().empty()) ? absolute_path_ : std::nullopt)
+        , object_storage_to_use(object_storage_to_use_)
+    {
+        if (command.isValid())
+            relative_path = "";
+    }
 
-    RelativePathWithMetadata(const RelativePathWithMetadata & other) = default;
+    PathWithMetadata(const PathWithMetadata & other) = default;
 
-    virtual ~RelativePathWithMetadata() = default;
+    virtual ~PathWithMetadata() = default;
 
     virtual std::string getFileName() const { return std::filesystem::path(relative_path).filename(); }
+    virtual std::string getFileNameWithoutExtension() const { return std::filesystem::path(relative_path).stem(); }
+
     virtual std::string getPath() const { return relative_path; }
+    virtual std::optional<std::string> getAbsolutePath() const { return absolute_path; }
     virtual bool isArchive() const { return false; }
     virtual std::string getPathToArchive() const { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not an archive"); }
     virtual size_t fileSizeInArchive() const { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not an archive"); }
     virtual std::string getPathOrPathToArchiveIfArchive() const;
+
+    void setFileMetaInfo(std::optional<DataFileMetaInfoPtr> file_meta_info_ ) { file_meta_info = file_meta_info_; }
+    std::optional<DataFileMetaInfoPtr> getFileMetaInfo() const { return file_meta_info; }
+
+    const CommandInTaskResponse & getCommand() const { return command; }
+
+    void loadMetadata(ObjectStoragePtr object_storage, bool ignore_non_existent_file = true);
+
+    ObjectStoragePtr getObjectStorage() const { return object_storage_to_use; }
+
+    String getIdentifier() const
+    {
+        String result = getAbsolutePath().value_or(getPath());
+        if (file_bucket_info)
+            result += file_bucket_info->getIdentifier();
+        return result;
+    }
 };
 
 struct ObjectKeyWithMetadata
@@ -149,8 +214,8 @@ struct ObjectKeyWithMetadata
     {}
 };
 
-using RelativePathWithMetadataPtr = std::shared_ptr<RelativePathWithMetadata>;
-using RelativePathsWithMetadata = std::vector<RelativePathWithMetadataPtr>;
+using PathWithMetadataPtr = std::shared_ptr<PathWithMetadata>;
+using PathsWithMetadata = std::vector<PathWithMetadataPtr>;
 using ObjectKeysWithMetadata = std::vector<ObjectKeyWithMetadata>;
 
 class IObjectStorageIterator;
@@ -191,7 +256,7 @@ class IObjectStorage
     virtual bool existsOrHasAnyChild(const std::string & path) const;
 
     /// List objects recursively by certain prefix.
-    virtual void listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const;
+    virtual void listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const;
 
     /// List objects recursively by certain prefix. Use it instead of listObjects, if you want to list objects lazily.
     virtual ObjectStorageIteratorPtr iterate(const std::string & path_prefix, size_t max_keys) const;
@@ -327,6 +392,14 @@ class IObjectStorage
     }
     virtual std::shared_ptr<const S3::Client> tryGetS3StorageClient() { return nullptr; }
 #endif
+
+
+    virtual bool supportsListObjectsCache() { return false; }
+
+private:
+    mutable std::mutex throttlers_mutex;
+    ThrottlerPtr remote_read_throttler;
+    ThrottlerPtr remote_write_throttler;
 };
 
 using ObjectStoragePtr = std::shared_ptr<IObjectStorage>;
diff --git a/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
index 2c444954d538..40e83286e416 100644
--- a/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
@@ -151,7 +151,7 @@ ObjectMetadata LocalObjectStorage::getObjectMetadata(const std::string & path) c
     return object_metadata;
 }
 
-void LocalObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t/* max_keys */) const
+void LocalObjectStorage::listObjects(const std::string & path, PathsWithMetadata & children, size_t/* max_keys */) const
 {
     if (!fs::exists(path) || !fs::is_directory(path))
         return;
@@ -164,7 +164,7 @@ void LocalObjectStorage::listObjects(const std::string & path, RelativePathsWith
             continue;
         }
 
-        children.emplace_back(std::make_shared<RelativePathWithMetadata>(entry.path(), getObjectMetadata(entry.path())));
+        children.emplace_back(std::make_shared<PathWithMetadata>(entry.path(), getObjectMetadata(entry.path())));
     }
 }
 
diff --git a/src/Disks/ObjectStorages/Local/LocalObjectStorage.h b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
index a8a9fe321894..3b2a8b31d562 100644
--- a/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
@@ -62,7 +62,7 @@ class LocalObjectStorage : public IObjectStorage
 
     ObjectMetadata getObjectMetadata(const std::string & path) const override;
 
-    void listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const override;
+    void listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const override;
 
     bool existsOrHasAnyChild(const std::string & path) const override;
 
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp b/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
index a30d3081c639..72ebe2abf3d8 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
@@ -134,6 +134,12 @@ MetadataTransactionPtr MetadataStorageFromDisk::createTransaction()
     return std::make_shared<MetadataStorageFromDiskTransaction>(*this);
 }
 
+/// It supports writing with Append because `createTransaction` creates `MetadataStorageFromDiskTransaction` which has `supportAddingBlobToMetadata`
+bool MetadataStorageFromDisk::supportWritingWithAppend() const
+{
+    return true;
+}
+
 StoredObjects MetadataStorageFromDisk::getStorageObjects(const std::string & path) const
 {
     auto metadata = readMetadata(path);
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
index 75a26e83604c..ce3c7dcc3129 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
@@ -33,6 +33,8 @@ class MetadataStorageFromDisk final : public IMetadataStorage
 
     MetadataTransactionPtr createTransaction() override;
 
+    bool supportWritingWithAppend() const override;
+
     const std::string & getPath() const override;
 
     MetadataStorageType getType() const override { return MetadataStorageType::Local; }
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
index 23e9752ce043..2609d0a123a8 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
@@ -124,7 +124,7 @@ std::vector<std::string> MetadataStorageFromPlainObjectStorage::listDirectory(co
 {
     auto key_prefix = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */).serialize();
 
-    RelativePathsWithMetadata files;
+    PathsWithMetadata files;
     std::string absolute_key = key_prefix;
     if (!absolute_key.ends_with('/'))
         absolute_key += '/';
@@ -290,6 +290,15 @@ void MetadataStorageFromPlainObjectStorageTransaction::createDirectory(const std
         return;
 
     auto normalized_path = normalizeDirectoryPath(path);
+    if (normalized_path.empty())
+    {
+        LOG_TRACE(
+            getLogger("MetadataStorageFromPlainObjectStorageTransaction"),
+            "Skipping creation of a directory '{}' with an empty normalized path",
+            path);
+        return;
+    }
+
     auto op = std::make_unique<MetadataStorageFromPlainObjectStorageCreateDirectoryOperation>(
         std::move(normalized_path),
         *metadata_storage.getPathMap(),
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
index 6990e0280075..2a3c2d0591ab 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
@@ -158,8 +158,13 @@ void MetadataStorageFromPlainRewritableObjectStorage::load(bool is_initial_load)
 
                 try
                 {
-                    auto read_buf = object_storage->readObject(object, settings);
-                    readStringUntilEOF(local_path, *read_buf);
+                    if (metadata->size_bytes == 0)
+                        LOG_TRACE(log, "The object with the key '{}' has size 0, skipping the read", remote_metadata_path);
+                    else
+                    {
+                        auto read_buf = object_storage->readObject(object, settings);
+                        readStringUntilEOF(local_path, *read_buf);
+                    }
 
                     /// Load the list of files inside the directory.
                     fs::path full_remote_path = object_storage->getCommonKeyPrefix() / remote_path;
diff --git a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
index b84391530651..67c09c0e0a59 100644
--- a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
+++ b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
@@ -189,7 +189,7 @@ void registerS3ObjectStorage(ObjectStorageFactory & factory)
         auto endpoint = getEndpoint(config, config_prefix, context);
         auto settings = std::make_unique<S3Settings>();
         settings->loadFromConfigForObjectStorage(config, config_prefix, context->getSettingsRef(), uri.uri.getScheme(), true);
-        auto client = getClient(endpoint, *settings, context, /* for_disk_s3 */true);
+        auto client = getClient(endpoint, *settings, context, /* for_disk_s3 */ true, name);
         auto key_generator = getKeyGenerator(uri, config, config_prefix);
 
         auto object_storage = createObjectStorage<S3ObjectStorage>(
@@ -217,7 +217,7 @@ void registerS3PlainObjectStorage(ObjectStorageFactory & factory)
         auto endpoint = getEndpoint(config, config_prefix, context);
         auto settings = std::make_unique<S3Settings>();
         settings->loadFromConfigForObjectStorage(config, config_prefix, context->getSettingsRef(), uri.uri.getScheme(), true);
-        auto client = getClient(endpoint, *settings, context, /* for_disk_s3 */true);
+        auto client = getClient(endpoint, *settings, context, /* for_disk_s3 */ true, name);
         auto key_generator = getKeyGenerator(uri, config, config_prefix);
 
         auto object_storage = std::make_shared<PlainObjectStorage<S3ObjectStorage>>(
@@ -244,7 +244,7 @@ void registerS3PlainRewritableObjectStorage(ObjectStorageFactory & factory)
             auto endpoint = getEndpoint(config, config_prefix, context);
             auto settings = std::make_unique<S3Settings>();
             settings->loadFromConfigForObjectStorage(config, config_prefix, context->getSettingsRef(), uri.uri.getScheme(), true);
-            auto client = getClient(endpoint, *settings, context, /* for_disk_s3 */true);
+            auto client = getClient(endpoint, *settings, context, /* for_disk_s3 */ true, name);
             auto key_generator = getKeyGenerator(uri, config, config_prefix);
 
             auto metadata_storage_metrics = DB::MetadataStorageMetrics::create<S3ObjectStorage, MetadataStorageType::PlainRewritable>();
diff --git a/src/Disks/ObjectStorages/ObjectStorageIterator.cpp b/src/Disks/ObjectStorages/ObjectStorageIterator.cpp
index 3d939ce92302..bec76452b2d5 100644
--- a/src/Disks/ObjectStorages/ObjectStorageIterator.cpp
+++ b/src/Disks/ObjectStorages/ObjectStorageIterator.cpp
@@ -9,7 +9,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-RelativePathWithMetadataPtr ObjectStorageIteratorFromList::current()
+PathWithMetadataPtr ObjectStorageIteratorFromList::current()
 {
     if (!isValid())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to access invalid iterator");
diff --git a/src/Disks/ObjectStorages/ObjectStorageIterator.h b/src/Disks/ObjectStorages/ObjectStorageIterator.h
index d814514ddcc9..b62992f6a719 100644
--- a/src/Disks/ObjectStorages/ObjectStorageIterator.h
+++ b/src/Disks/ObjectStorages/ObjectStorageIterator.h
@@ -16,10 +16,10 @@ class IObjectStorageIterator
     virtual bool isValid() = 0;
 
     /// Return the current element.
-    virtual RelativePathWithMetadataPtr current() = 0;
+    virtual PathWithMetadataPtr current() = 0;
 
     /// This will initiate prefetching the next batch in background, so it can be obtained faster when needed.
-    virtual std::optional<RelativePathsWithMetadata> getCurrentBatchAndScheduleNext() = 0;
+    virtual std::optional<PathsWithMetadata> getCurrentBatchAndScheduleNext() = 0;
 
     /// Returns the number of elements in the batches that were fetched so far.
     virtual size_t getAccumulatedSize() const = 0;
@@ -36,7 +36,7 @@ class IObjectStorageIterator
     /// Return the current batch of elements.
     /// It is unspecified how batches are formed.
     /// But this method can be used for more efficient processing.
-    virtual RelativePathsWithMetadata currentBatch() = 0;
+    virtual PathsWithMetadata currentBatch() = 0;
 };
 
 using ObjectStorageIteratorPtr = std::shared_ptr<IObjectStorageIterator>;
@@ -45,7 +45,7 @@ class ObjectStorageIteratorFromList : public IObjectStorageIterator
 {
 public:
     /// Everything is represented by just a single batch.
-    explicit ObjectStorageIteratorFromList(RelativePathsWithMetadata && batch_)
+    explicit ObjectStorageIteratorFromList(PathsWithMetadata && batch_)
         : batch(std::move(batch_))
         , batch_iterator(batch.begin()) {}
 
@@ -59,11 +59,11 @@ class ObjectStorageIteratorFromList : public IObjectStorageIterator
 
     bool isValid() override { return batch_iterator != batch.end(); }
 
-    RelativePathWithMetadataPtr current() override;
+    PathWithMetadataPtr current() override;
 
-    RelativePathsWithMetadata currentBatch() override { return batch; }
+    PathsWithMetadata currentBatch() override { return batch; }
 
-    std::optional<RelativePathsWithMetadata> getCurrentBatchAndScheduleNext() override
+    std::optional<PathsWithMetadata> getCurrentBatchAndScheduleNext() override
     {
         if (batch.empty())
             return {};
@@ -76,8 +76,8 @@ class ObjectStorageIteratorFromList : public IObjectStorageIterator
     size_t getAccumulatedSize() const override { return batch.size(); }
 
 private:
-    RelativePathsWithMetadata batch;
-    RelativePathsWithMetadata::iterator batch_iterator;
+    PathsWithMetadata batch;
+    PathsWithMetadata::iterator batch_iterator;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.cpp b/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.cpp
index 2d2e8cd2c1a5..c488e8596aaa 100644
--- a/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.cpp
+++ b/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.cpp
@@ -112,7 +112,7 @@ bool IObjectStorageIteratorAsync::isValid()
     return !is_finished;
 }
 
-RelativePathWithMetadataPtr IObjectStorageIteratorAsync::current()
+PathWithMetadataPtr IObjectStorageIteratorAsync::current()
 {
     std::lock_guard lock(mutex);
 
@@ -123,7 +123,7 @@ RelativePathWithMetadataPtr IObjectStorageIteratorAsync::current()
 }
 
 
-RelativePathsWithMetadata IObjectStorageIteratorAsync::currentBatch()
+PathsWithMetadata IObjectStorageIteratorAsync::currentBatch()
 {
     std::lock_guard lock(mutex);
 
@@ -133,7 +133,7 @@ RelativePathsWithMetadata IObjectStorageIteratorAsync::currentBatch()
     return current_batch;
 }
 
-std::optional<RelativePathsWithMetadata> IObjectStorageIteratorAsync::getCurrentBatchAndScheduleNext()
+std::optional<PathsWithMetadata> IObjectStorageIteratorAsync::getCurrentBatchAndScheduleNext()
 {
     std::lock_guard lock(mutex);
 
diff --git a/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h b/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h
index 013714151245..b8a0d6e0249a 100644
--- a/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h
+++ b/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h
@@ -23,24 +23,24 @@ class IObjectStorageIteratorAsync : public IObjectStorageIterator
 
     bool isValid() override;
 
-    RelativePathWithMetadataPtr current() override;
-    RelativePathsWithMetadata currentBatch() override;
+    PathWithMetadataPtr current() override;
+    PathsWithMetadata currentBatch() override;
 
     void next() override;
     void nextBatch() override;
 
     size_t getAccumulatedSize() const override;
-    std::optional<RelativePathsWithMetadata> getCurrentBatchAndScheduleNext() override;
+    std::optional<PathsWithMetadata> getCurrentBatchAndScheduleNext() override;
 
     void deactivate();
 
 protected:
     /// This method fetches the next batch, and returns true if there are more batches after it.
-    virtual bool getBatchAndCheckNext(RelativePathsWithMetadata & batch) = 0;
+    virtual bool getBatchAndCheckNext(PathsWithMetadata & batch) = 0;
 
     struct BatchAndHasNext
     {
-        RelativePathsWithMetadata batch;
+        PathsWithMetadata batch;
         bool has_next;
     };
 
@@ -55,8 +55,8 @@ class IObjectStorageIteratorAsync : public IObjectStorageIterator
     ThreadPool list_objects_pool;
     ThreadPoolCallbackRunnerUnsafe<BatchAndHasNext> list_objects_scheduler;
     std::future<BatchAndHasNext> outcome_future;
-    RelativePathsWithMetadata current_batch;
-    RelativePathsWithMetadata::iterator current_batch_iterator;
+    PathsWithMetadata current_batch;
+    PathsWithMetadata::iterator current_batch_iterator;
     std::atomic<size_t> accumulated_size = 0;
 };
 
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index bb0f6c663ba8..f1cb2561674c 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -30,11 +30,13 @@
 #include <Common/logger_useful.h>
 #include <Common/MultiVersion.h>
 #include <Common/Macros.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 
 
 namespace ProfileEvents
 {
     extern const Event S3ListObjects;
+    extern const Event S3ListObjectsMicroseconds;
     extern const Event DiskS3DeleteObjects;
     extern const Event DiskS3ListObjects;
 }
@@ -132,12 +134,17 @@ class S3IteratorAsync final : public IObjectStorageIteratorAsync
     }
 
 private:
-    bool getBatchAndCheckNext(RelativePathsWithMetadata & batch) override
+    bool getBatchAndCheckNext(PathsWithMetadata & batch) override
     {
         ProfileEvents::increment(ProfileEvents::S3ListObjects);
         ProfileEvents::increment(ProfileEvents::DiskS3ListObjects);
 
-        auto outcome = client->ListObjectsV2(*request);
+        Aws::S3::Model::ListObjectsV2Outcome outcome;
+
+        {
+            ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::S3ListObjectsMicroseconds);
+            outcome = client->ListObjectsV2(*request);
+        }
 
         /// Outcome failure will be handled on the caller side.
         if (outcome.IsSuccess())
@@ -148,7 +155,7 @@ class S3IteratorAsync final : public IObjectStorageIteratorAsync
             for (const auto & object : objects)
             {
                 ObjectMetadata metadata{static_cast<uint64_t>(object.GetSize()), Poco::Timestamp::fromEpochTime(object.GetLastModified().Seconds()), object.GetETag(), {}};
-                batch.emplace_back(std::make_shared<RelativePathWithMetadata>(object.GetKey(), std::move(metadata)));
+                batch.emplace_back(std::make_shared<PathWithMetadata>(object.GetKey(), std::move(metadata)));
             }
 
             /// It returns false when all objects were returned
@@ -246,7 +253,7 @@ ObjectStorageIteratorPtr S3ObjectStorage::iterate(const std::string & path_prefi
     return std::make_shared<S3IteratorAsync>(uri.bucket, path_prefix, client.get(), max_keys);
 }
 
-void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const
+void S3ObjectStorage::listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const
 {
     auto settings_ptr = s3_settings.get();
 
@@ -264,7 +271,11 @@ void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMet
         ProfileEvents::increment(ProfileEvents::S3ListObjects);
         ProfileEvents::increment(ProfileEvents::DiskS3ListObjects);
 
-        outcome = client.get()->ListObjectsV2(request);
+        {
+            ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::S3ListObjectsMicroseconds);
+            outcome = client.get()->ListObjectsV2(request);
+        }
+
         throwIfError(outcome);
 
         auto result = outcome.GetResult();
@@ -274,7 +285,7 @@ void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMet
             break;
 
         for (const auto & object : objects)
-            children.emplace_back(std::make_shared<RelativePathWithMetadata>(
+            children.emplace_back(std::make_shared<PathWithMetadata>(
                 object.GetKey(),
                 ObjectMetadata{
                     static_cast<uint64_t>(object.GetSize()),
@@ -348,8 +359,7 @@ void S3ObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
 std::optional<ObjectMetadata> S3ObjectStorage::tryGetObjectMetadata(const std::string & path) const
 {
     auto settings_ptr = s3_settings.get();
-    auto object_info = S3::getObjectInfo(
-        *client.get(), uri.bucket, path, {}, /* with_metadata= */ true, /* throw_on_error= */ false);
+    auto object_info = S3::getObjectInfoIfExists(*client.get(), uri.bucket, path, {}, /* with_metadata= */ true);
 
     if (object_info.size == 0 && object_info.last_modification_time == 0 && object_info.metadata.empty())
         return {};
@@ -509,7 +519,7 @@ void S3ObjectStorage::applyNewSettings(
     if (options.allow_client_change
         && (current_settings->auth_settings.hasUpdates(modified_settings->auth_settings) || for_disk_s3))
     {
-        auto new_client = getClient(uri, *modified_settings, context, for_disk_s3);
+        auto new_client = getClient(uri, *modified_settings, context, for_disk_s3, disk_name);
         client.set(std::move(new_client));
     }
     s3_settings.set(std::move(modified_settings));
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index 7b64d3b0f9fe..fbeb32916280 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -61,6 +61,8 @@ class S3ObjectStorage : public IObjectStorage
 
     ObjectStorageType getType() const override { return ObjectStorageType::S3; }
 
+    bool supportsListObjectsCache() override { return true; }
+
     bool exists(const StoredObject & object) const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
@@ -77,7 +79,7 @@ class S3ObjectStorage : public IObjectStorage
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         const WriteSettings & write_settings = {}) override;
 
-    void listObjects(const std::string & path, RelativePathsWithMetadata & children, size_t max_keys) const override;
+    void listObjects(const std::string & path, PathsWithMetadata & children, size_t max_keys) const override;
 
     ObjectStorageIteratorPtr iterate(const std::string & path_prefix, size_t max_keys) const override;
 
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.cpp b/src/Disks/ObjectStorages/S3/diskSettings.cpp
index e3c5ef5a271f..e9c4fe2df80a 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -71,19 +71,18 @@ std::unique_ptr<S3::Client> getClient(
     const std::string & endpoint,
     const S3Settings & settings,
     ContextPtr context,
-    bool for_disk_s3)
+    bool for_disk_s3,
+    std::optional<std::string> opt_disk_name)
+
 {
     auto url = S3::URI(endpoint);
     if (!url.key.ends_with('/'))
         url.key.push_back('/');
-    return getClient(url, settings, context, for_disk_s3);
+    return getClient(url, settings, context, for_disk_s3, opt_disk_name);
 }
 
-std::unique_ptr<S3::Client> getClient(
-    const S3::URI & url,
-    const S3Settings & settings,
-    ContextPtr context,
-    bool for_disk_s3)
+std::unique_ptr<S3::Client>
+getClient(const S3::URI & url, const S3Settings & settings, ContextPtr context, bool for_disk_s3, std::optional<std::string> opt_disk_name)
 {
     const Settings & global_settings = context->getGlobalContext()->getSettingsRef();
     const auto & auth_settings = settings.auth_settings;
@@ -111,8 +110,6 @@ std::unique_ptr<S3::Client> getClient(
     if (!for_disk_s3 && local_settings.isChanged("s3_slow_all_threads_after_network_error"))
         s3_slow_all_threads_after_network_error = static_cast<int>(local_settings[Setting::s3_slow_all_threads_after_network_error]);
 
-    bool s3_slow_all_threads_after_retryable_error = false;
-
     bool enable_s3_requests_logging = global_settings[Setting::enable_s3_requests_logging];
     if (!for_disk_s3 && local_settings.isChanged("enable_s3_requests_logging"))
         enable_s3_requests_logging = local_settings[Setting::enable_s3_requests_logging];
@@ -123,9 +120,10 @@ std::unique_ptr<S3::Client> getClient(
         s3_max_redirects,
         S3::PocoHTTPClientConfiguration::RetryStrategy{.max_retries = static_cast<unsigned>(s3_retry_attempts)},
         s3_slow_all_threads_after_network_error,
-        s3_slow_all_threads_after_retryable_error,
+        /* s3_slow_all_threads_after_retryable_error = */ false,
         enable_s3_requests_logging,
         for_disk_s3,
+        opt_disk_name,
         request_settings.get_request_throttler,
         request_settings.put_request_throttler,
         url.uri.getScheme());
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.h b/src/Disks/ObjectStorages/S3/diskSettings.h
index 26023c345124..86226dbb2c6c 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.h
+++ b/src/Disks/ObjectStorages/S3/diskSettings.h
@@ -17,14 +17,11 @@ std::unique_ptr<S3::Client> getClient(
     const std::string & endpoint,
     const S3Settings & settings,
     ContextPtr context,
-    bool for_disk_s3);
+    bool for_disk_s3,
+    std::optional<std::string> opt_disk_name = {});
 
 std::unique_ptr<S3::Client> getClient(
-    const S3::URI & url_,
-    const S3Settings & settings,
-    ContextPtr context,
-    bool for_disk_s3);
-
+    const S3::URI & url_, const S3Settings & settings, ContextPtr context, bool for_disk_s3, std::optional<std::string> opt_disk_name = {});
 }
 
 #endif
diff --git a/src/Disks/supportWritingWithAppend.cpp b/src/Disks/supportWritingWithAppend.cpp
new file mode 100644
index 000000000000..80d342c4fde6
--- /dev/null
+++ b/src/Disks/supportWritingWithAppend.cpp
@@ -0,0 +1,21 @@
+#include <Disks/supportWritingWithAppend.h>
+
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+
+namespace DB
+{
+bool supportWritingWithAppend(const DiskPtr & disk)
+{
+    auto target_disk = disk;
+    if (auto delegate_disk = target_disk->getDelegateDiskIfExists())
+        target_disk = delegate_disk;
+
+    if (auto * object_storage = dynamic_cast<DiskObjectStorage *>(target_disk.get()))
+    {
+        if (!object_storage->getMetadataStorage()->supportWritingWithAppend())
+            return false;
+    }
+    return true;
+}
+}
+
diff --git a/src/Disks/supportWritingWithAppend.h b/src/Disks/supportWritingWithAppend.h
new file mode 100644
index 000000000000..ce133c9e335c
--- /dev/null
+++ b/src/Disks/supportWritingWithAppend.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <Disks/IDisk.h>
+namespace DB
+{
+bool supportWritingWithAppend(const DiskPtr & disk);
+}
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 2a3b7f6d67fd..5d605eac01ea 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -35,7 +35,6 @@ FORMAT_FACTORY_SETTINGS(DECLARE_FORMAT_EXTERN, INITIALIZE_SETTING_EXTERN)
 #undef DECLARE_FORMAT_EXTERN
 
     extern const SettingsBool allow_experimental_object_type;
-    extern const SettingsBool allow_experimental_json_type;
     extern const SettingsBool http_write_exception_in_output_format;
     extern const SettingsBool input_format_parallel_parsing;
     extern const SettingsBool log_queries;
@@ -175,7 +174,6 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.json.validate_utf8 = settings[Setting::output_format_json_validate_utf8];
     format_settings.json_object_each_row.column_for_object_name = settings[Setting::format_json_object_each_row_column_for_object_name];
     format_settings.json.allow_deprecated_object_type = context->getSettingsRef()[Setting::allow_experimental_object_type];
-    format_settings.json.allow_json_type = context->getSettingsRef()[Setting::allow_experimental_json_type];
     format_settings.json.compact_allow_variable_number_of_columns = settings[Setting::input_format_json_compact_allow_variable_number_of_columns];
     format_settings.json.try_infer_objects_as_tuples = settings[Setting::input_format_json_try_infer_named_tuples_from_objects];
     format_settings.json.throw_on_bad_escape_sequence = settings[Setting::input_format_json_throw_on_bad_escape_sequence];
@@ -212,6 +210,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.parquet.output_date_as_uint16 = settings[Setting::output_format_parquet_date_as_uint16];
     format_settings.parquet.max_dictionary_size = settings[Setting::output_format_parquet_max_dictionary_size];
     format_settings.parquet.output_enum_as_byte_array = settings[Setting::output_format_parquet_enum_as_byte_array];
+    format_settings.parquet.write_checksums = settings[Setting::output_format_parquet_write_checksums];
     format_settings.parquet.max_block_size = settings[Setting::input_format_parquet_max_block_size];
     format_settings.parquet.prefer_block_bytes = settings[Setting::input_format_parquet_prefer_block_bytes];
     format_settings.parquet.output_compression_method = settings[Setting::output_format_parquet_compression_method];
@@ -227,6 +226,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.parquet.bloom_filter_flush_threshold_bytes = settings[Setting::output_format_parquet_bloom_filter_flush_threshold_bytes];
     format_settings.parquet.local_read_min_bytes_for_seek = settings[Setting::input_format_parquet_local_file_min_bytes_for_seek];
     format_settings.parquet.enable_row_group_prefetch = settings[Setting::input_format_parquet_enable_row_group_prefetch];
+    format_settings.parquet.verify_checksums = settings[Setting::input_format_parquet_verify_checksums];
     format_settings.parquet.allow_geoparquet_parser = settings[Setting::input_format_parquet_allow_geoparquet_parser];
     format_settings.parquet.write_geometadata = settings[Setting::output_format_parquet_geometadata];
     format_settings.pretty.charset = settings[Setting::output_format_pretty_grid_charset].toString() == "ASCII" ? FormatSettings::Pretty::Charset::ASCII : FormatSettings::Pretty::Charset::UTF8;
@@ -376,6 +376,20 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     return format_settings;
 }
 
+FileBucketInfoPtr FormatFactory::getFileBucketInfo(const String & format)
+{
+    auto creator = getCreators(format);
+    return creator.file_bucket_info_creator();
+}
+
+void FormatFactory::registerFileBucketInfo(const String & format, FileBucketInfoCreator bucket_info)
+{
+    chassert(bucket_info);
+    auto & creators = getOrCreateCreators(format);
+    if (creators.file_bucket_info_creator)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Bucket splitter for format {} is already registered", format);
+    creators.file_bucket_info_creator = std::move(bucket_info);
+}
 
 InputFormatPtr FormatFactory::getInput(
     const String & name,
@@ -696,6 +710,21 @@ void FormatFactory::registerInputFormat(const String & name, InputCreator input_
     KnownFormatNames::instance().add(name, /* case_insensitive = */ true);
 }
 
+void FormatFactory::registerSplitter(const String & format, BucketSplitterCreator splitter)
+{
+    chassert(splitter);
+    auto & creators = getOrCreateCreators(format);
+    if (creators.bucket_splitter_creator)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Bucket splitter for format {} is already registered", format);
+    creators.bucket_splitter_creator = std::move(splitter);
+}
+
+BucketSplitter FormatFactory::getSplitter(const String & format)
+{
+    auto creator = getCreators(format);
+    return creator.bucket_splitter_creator();
+}
+
 void FormatFactory::registerRandomAccessInputFormat(const String & name, RandomAccessInputCreator input_creator)
 {
     chassert(input_creator);
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 365df6585ae0..1aab5426a319 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -10,6 +10,8 @@
 #include <base/types.h>
 #include <Common/Allocator.h>
 
+#include <Processors/Formats/IInputFormat.h>
+
 #include <boost/noncopyable.hpp>
 
 #include <functional>
@@ -94,6 +96,10 @@ class FormatFactory final : private boost::noncopyable
             const RowInputFormatParams & params,
             const FormatSettings & settings)>;
 
+    using FileBucketInfoCreator = std::function<FileBucketInfoPtr()>;
+
+    using BucketSplitterCreator = std::function<BucketSplitter()>;
+
     // Incompatible with FileSegmentationEngine.
     using RandomAccessInputCreator = std::function<InputFormatPtr(
         ReadBuffer & buf,
@@ -142,6 +148,8 @@ class FormatFactory final : private boost::noncopyable
     {
         String name;
         InputCreator input_creator;
+        FileBucketInfoCreator file_bucket_info_creator;
+        BucketSplitterCreator bucket_splitter_creator;
         RandomAccessInputCreator random_access_input_creator;
         OutputCreator output_creator;
         FileSegmentationEngineCreator file_segmentation_engine_creator;
@@ -178,7 +186,7 @@ class FormatFactory final : private boost::noncopyable
         UInt64 max_block_size,
         const std::optional<FormatSettings> & format_settings = std::nullopt,
         FormatParserSharedResourcesPtr parser_shared_resources = nullptr,
-        FormatFilterInfoPtr format_filter_info = std::make_shared<FormatFilterInfo>(),
+        FormatFilterInfoPtr format_filter_info = nullptr,
         // affects things like buffer sizes and parallel reading
         bool is_remote_fs = false,
         // allows to do: buf -> parallel read -> decompression,
@@ -286,6 +294,11 @@ class FormatFactory final : private boost::noncopyable
     void checkFormatName(const String & name) const;
     bool exists(const String & name) const;
 
+    FileBucketInfoPtr getFileBucketInfo(const String & format);
+    void registerFileBucketInfo(const String & format, FileBucketInfoCreator bucket_info);
+    void registerSplitter(const String & format, BucketSplitterCreator splitter);
+    BucketSplitter getSplitter(const String & format);
+
 private:
     FormatsDictionary dict;
     FileExtensionFormats file_extension_formats;
diff --git a/src/Formats/FormatFilterInfo.cpp b/src/Formats/FormatFilterInfo.cpp
index 8d25deefb397..ac130771fbb9 100644
--- a/src/Formats/FormatFilterInfo.cpp
+++ b/src/Formats/FormatFilterInfo.cpp
@@ -15,11 +15,16 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int ICEBERG_SPECIFICATION_VIOLATION;
 }
 
 void ColumnMapper::setStorageColumnEncoding(std::unordered_map<String, Int64> && storage_encoding_)
 {
+    chassert(storage_encoding.empty());
     storage_encoding = std::move(storage_encoding_);
+    for (const auto & [column_name, field_id] : storage_encoding)
+        if (!field_id_to_clickhouse_name.emplace(field_id, column_name).second)
+            throw Exception(ErrorCodes::ICEBERG_SPECIFICATION_VIOLATION, "Duplicate field id {}", field_id);
 }
 
 std::pair<std::unordered_map<String, String>, std::unordered_map<String, String>> ColumnMapper::makeMapping(
diff --git a/src/Formats/FormatFilterInfo.h b/src/Formats/FormatFilterInfo.h
index 3d37a95c93b2..024c4e5321aa 100644
--- a/src/Formats/FormatFilterInfo.h
+++ b/src/Formats/FormatFilterInfo.h
@@ -18,14 +18,20 @@ class ColumnMapper
 {
 public:
     /// clickhouse_column_name -> field_id
+    /// For tuples, the map contains both the tuple itself and all its elements, e.g. {t, t.x, t.y}.
+    /// Note that parquet schema reader has to apply the mapping to all tuple fields recursively
+    /// even if the whole tuple was requested, because the names of the fields may be different.
     void setStorageColumnEncoding(std::unordered_map<String, Int64> && storage_encoding_);
 
     const std::unordered_map<String, Int64> & getStorageColumnEncoding() const { return storage_encoding; }
+    const std::unordered_map<Int64, String> & getFieldIdToClickHouseName() const { return field_id_to_clickhouse_name; }
+
     /// clickhouse_column_name -> format_column_name (just join the maps above by field_id).
     std::pair<std::unordered_map<String, String>, std::unordered_map<String, String>> makeMapping(const std::unordered_map<Int64, String> & format_encoding);
 
 private:
     std::unordered_map<String, Int64> storage_encoding;
+    std::unordered_map<Int64, String> field_id_to_clickhouse_name;
 };
 
 using ColumnMapperPtr = std::shared_ptr<ColumnMapper>;
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index c064697b7c01..ba551d64a0f4 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -237,7 +237,6 @@ struct FormatSettings
         bool validate_types_from_metadata = true;
         bool validate_utf8 = false;
         bool allow_deprecated_object_type = false;
-        bool allow_json_type = false;
         bool valid_output_on_exception = false;
         bool compact_allow_variable_number_of_columns = false;
         bool try_infer_objects_as_tuples = false;
@@ -293,6 +292,7 @@ struct FormatSettings
         bool enable_json_parsing = true;
         bool preserve_order = false;
         bool enable_row_group_prefetch = true;
+        bool verify_checksums = true;
         std::unordered_set<int> skip_row_groups = {};
         UInt64 max_block_size = DEFAULT_BLOCK_SIZE;
         size_t prefer_block_bytes = DEFAULT_BLOCK_SIZE * 256;
@@ -313,6 +313,7 @@ struct FormatSettings
         bool output_compliant_nested_types = true;
         bool write_page_index = false;
         bool write_bloom_filter = false;
+        bool write_checksums = true;
         ParquetVersion output_version = ParquetVersion::V2_LATEST;
         ParquetCompression output_compression_method = ParquetCompression::SNAPPY;
         uint64_t output_compression_level;
diff --git a/src/Formats/JSONExtractTree.cpp b/src/Formats/JSONExtractTree.cpp
index 909b9c8cb367..ae60f9ce7e0a 100644
--- a/src/Formats/JSONExtractTree.cpp
+++ b/src/Formats/JSONExtractTree.cpp
@@ -131,7 +131,7 @@ void jsonElementToString(const typename JSONParser::Element & element, WriteBuff
 
 template <typename JSONParser, typename NumberType>
 bool tryGetNumericValueFromJSONElement(
-    NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error)
+    NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error)
 {
     switch (element.type())
     {
@@ -164,13 +164,10 @@ bool tryGetNumericValueFromJSONElement(
             }
             break;
         case ElementType::BOOL:
-            if constexpr (is_integer<NumberType>)
+            if (convert_bool_to_number && allow_type_conversion)
             {
-                if (convert_bool_to_integer && allow_type_conversion)
-                {
-                    value = static_cast<NumberType>(element.getBool());
-                    break;
-                }
+                value = static_cast<NumberType>(element.getBool());
+                break;
             }
             error = fmt::format("cannot convert bool value to {}", TypeName<NumberType>);
             return false;
@@ -262,7 +259,7 @@ class NumericNode : public JSONExtractTreeNode<JSONParser>
         }
 
         NumberType value;
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || is_bool_type, insert_settings.allow_type_conversion, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, /*convert_bool_to_number=*/ true, insert_settings.allow_type_conversion, error))
         {
             if (error.empty())
                 error = fmt::format("cannot read {} value from JSON element: {}", TypeName<NumberType>, jsonElementToString<JSONParser>(element, format_settings));
@@ -319,7 +316,7 @@ class LowCardinalityNumericNode : public NumericNode<JSONParser, NumberType>
         }
 
         NumberType value;
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || this->is_bool_type, insert_settings.allow_type_conversion, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, /*convert_bool_to_number=*/ true, insert_settings.allow_type_conversion, error))
         {
             if (error.empty())
                 error = fmt::format("cannot read {} value from JSON element: {}", TypeName<NumberType>, jsonElementToString<JSONParser>(element, format_settings));
@@ -1041,7 +1038,7 @@ template <typename JSONParser, typename Type>
 class EnumNode : public JSONExtractTreeNode<JSONParser>
 {
 public:
-    explicit EnumNode(const std::vector<std::pair<String, Type>> & name_value_pairs_) : name_value_pairs(name_value_pairs_)
+    explicit EnumNode(const std::vector<std::pair<String, Type>> & name_value_pairs_, Type default_value_) : name_value_pairs(name_value_pairs_), default_value(default_value_)
     {
         for (const auto & name_value_pair : name_value_pairs)
         {
@@ -1057,11 +1054,13 @@ class EnumNode : public JSONExtractTreeNode<JSONParser>
         const FormatSettings & format_settings,
         String & error) const override
     {
+        auto & col_vec = assert_cast<ColumnVector<Type> &>(column);
+
         if (element.isNull())
         {
             if (format_settings.null_as_default)
             {
-                column.insertDefault();
+                col_vec.insertValue(default_value);
                 return true;
             }
 
@@ -1069,8 +1068,6 @@ class EnumNode : public JSONExtractTreeNode<JSONParser>
             return false;
         }
 
-        auto & col_vec = assert_cast<ColumnVector<Type> &>(column);
-
         if (element.isInt64())
         {
             Type value;
@@ -1115,6 +1112,7 @@ class EnumNode : public JSONExtractTreeNode<JSONParser>
     std::vector<std::pair<String, Type>> name_value_pairs;
     std::unordered_map<std::string_view, Type> name_to_value_map;
     std::unordered_set<Type> only_values;
+    Type default_value;
 };
 
 template <typename JSONParser>
@@ -1780,11 +1778,13 @@ class ObjectJSONNode : public JSONExtractTreeNode<JSONParser>
 {
 public:
     ObjectJSONNode(
+        const std::unordered_map<String, DataTypePtr> & typed_paths_types_,
         std::unordered_map<String, std::unique_ptr<JSONExtractTreeNode<JSONParser>>> typed_path_nodes_,
         const std::unordered_set<String> & paths_to_skip_,
         const std::vector<String> & path_regexps_to_skip_,
         const DataTypePtr & type_of_nested_objects)
-        : typed_path_nodes(std::move(typed_path_nodes_))
+        : typed_paths_types(typed_paths_types_)
+        , typed_path_nodes(std::move(typed_path_nodes_))
         , paths_to_skip(paths_to_skip_)
         , dynamic_node(std::make_unique<DynamicNode<JSONParser>>(type_of_nested_objects))
         , dynamic_serialization(std::make_shared<SerializationDynamic>())
@@ -1850,10 +1850,10 @@ class ObjectJSONNode : public JSONExtractTreeNode<JSONParser>
         column_object.getSharedDataOffsets().push_back(shared_data_paths->size());
 
         /// Fill remaining typed and dynamic paths.
-        for (auto & [_, typed_column] : column_object.getTypedPaths())
+        for (auto & [typed_path, typed_column] : column_object.getTypedPaths())
         {
             if (typed_column->size() == prev_size)
-                typed_column->insertDefault();
+                typed_paths_types.at(typed_path)->insertDefaultInto(*typed_column);
         }
 
         for (auto & [_, dynamic_column] : column_object.getDynamicPathsPtrs())
@@ -2015,6 +2015,7 @@ class ObjectJSONNode : public JSONExtractTreeNode<JSONParser>
         return settings;
     }
 
+    std::unordered_map<String, DataTypePtr> typed_paths_types;
     std::unordered_map<String, std::unique_ptr<JSONExtractTreeNode<JSONParser>>> typed_path_nodes;
     std::unordered_set<String> paths_to_skip;
     std::vector<String> sorted_paths_to_skip;
@@ -2089,9 +2090,15 @@ std::unique_ptr<JSONExtractTreeNode<JSONParser>> buildJSONExtractTree(const Data
         case TypeIndex::Decimal256:
             return std::make_unique<DecimalNode<JSONParser, Decimal256>>(type);
         case TypeIndex::Enum8:
-            return std::make_unique<EnumNode<JSONParser, Int8>>(assert_cast<const DataTypeEnum8 &>(*type).getValues());
+        {
+            const auto & enum_type = assert_cast<const DataTypeEnum8 &>(*type);
+            return std::make_unique<EnumNode<JSONParser, Int8>>(enum_type.getValues(), enum_type.getDefaultValue());
+        }
         case TypeIndex::Enum16:
-            return std::make_unique<EnumNode<JSONParser, Int16>>(assert_cast<const DataTypeEnum16 &>(*type).getValues());
+        {
+            const auto & enum_type = assert_cast<const DataTypeEnum16 &>(*type);
+            return std::make_unique<EnumNode<JSONParser, Int16>>(enum_type.getValues(), enum_type.getDefaultValue());
+        }
         case TypeIndex::LowCardinality:
         {
             /// To optimize inserting into LowCardinality we have special nodes for LowCardinality of numeric and string types.
@@ -2184,6 +2191,7 @@ std::unique_ptr<JSONExtractTreeNode<JSONParser>> buildJSONExtractTree(const Data
             {
                 case DataTypeObject::SchemaFormat::JSON:
                     return std::make_unique<ObjectJSONNode<JSONParser>>(
+                        typed_paths,
                         std::move(typed_path_nodes),
                         object_type.getPathsToSkip(),
                         object_type.getPathRegexpsToSkip(),
@@ -2207,13 +2215,13 @@ template std::unique_ptr<JSONExtractTreeNode<SimdJSONParser>> buildJSONExtractTr
 #if USE_RAPIDJSON
 template void jsonElementToString<RapidJSONParser>(const RapidJSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 template std::unique_ptr<JSONExtractTreeNode<RapidJSONParser>> buildJSONExtractTree<RapidJSONParser>(const DataTypePtr & type, const char * source_for_exception_message);
-template bool tryGetNumericValueFromJSONElement<RapidJSONParser, Float64>(Float64 & value, const RapidJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<RapidJSONParser, Float64>(Float64 & value, const RapidJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
 #else
 template void jsonElementToString<DummyJSONParser>(const DummyJSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 template std::unique_ptr<JSONExtractTreeNode<DummyJSONParser>> buildJSONExtractTree<DummyJSONParser>(const DataTypePtr & type, const char * source_for_exception_message);
-template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Float64>(Float64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
-template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Int64>(Int64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
-template bool tryGetNumericValueFromJSONElement<DummyJSONParser, UInt64>(UInt64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Float64>(Float64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Int64>(Int64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<DummyJSONParser, UInt64>(UInt64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
 #endif
 
 }
diff --git a/src/Formats/JSONExtractTree.h b/src/Formats/JSONExtractTree.h
index 63f38c50d2f0..616f6c8d64ea 100644
--- a/src/Formats/JSONExtractTree.h
+++ b/src/Formats/JSONExtractTree.h
@@ -9,9 +9,6 @@ struct FormatSettings;
 
 struct JSONExtractInsertSettings
 {
-    /// If false, JSON boolean values won't be inserted into columns with integer types
-    /// It's used in JSONExtractInt64/JSONExtractUInt64/... functions.
-    bool convert_bool_to_integer = true;
     /// If true, when complex type like Array/Map has both valid and invalid elements,
     /// the default value will be inserted on invalid elements.
     /// For example, if we have [1, "hello", 2] and type Array(UInt32),
@@ -44,6 +41,6 @@ template <typename JSONParser>
 void jsonElementToString(const typename JSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 
 template <typename JSONParser, typename NumberType>
-bool tryGetNumericValueFromJSONElement(NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+bool tryGetNumericValueFromJSONElement(NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
 
 }
diff --git a/src/Formats/ReadSchemaUtils.cpp b/src/Formats/ReadSchemaUtils.cpp
index 4c4a61318aea..524c2e7b4223 100644
--- a/src/Formats/ReadSchemaUtils.cpp
+++ b/src/Formats/ReadSchemaUtils.cpp
@@ -166,10 +166,7 @@ try
                         throw Exception(ErrorCodes::LOGICAL_ERROR, "Schema from cache was returned, but format name is unknown");
 
                     if (mode == SchemaInferenceMode::DEFAULT)
-                    {
-                        read_buffer_iterator.setResultingSchema(*iterator_data.cached_columns);
                         return {*iterator_data.cached_columns, *format_name};
-                    }
 
                     schemas_for_union_mode.emplace_back(iterator_data.cached_columns->getAll(), read_buffer_iterator.getLastFilePath());
                     continue;
@@ -258,12 +255,13 @@ try
                     if (num_rows)
                         read_buffer_iterator.setNumRowsToLastFile(*num_rows);
 
+                    if (!names_and_types.empty())
+                        read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
+
                     /// In default mode, we finish when schema is inferred successfully from any file.
                     if (mode == SchemaInferenceMode::DEFAULT)
                         break;
 
-                    if (!names_and_types.empty())
-                        read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
                     schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFilePath());
                 }
                 catch (...)
@@ -416,6 +414,9 @@ try
                         read_buffer_iterator.setFormatName(*format_name);
                 }
 
+                if (format_name)
+                    read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
+
                 if (mode == SchemaInferenceMode::UNION)
                 {
                     /// For UNION mode we need to know the schema of each file,
@@ -424,7 +425,6 @@ try
                     if (!format_name)
                         throw Exception(ErrorCodes::CANNOT_DETECT_FORMAT, "The data format cannot be detected by the contents of the files. You can specify the format manually");
 
-                    read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
                     schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFilePath());
                 }
 
@@ -527,10 +527,7 @@ try
             std::remove_if(names_and_types.begin(), names_and_types.end(), [](const NameAndTypePair & pair) { return pair.name.empty(); }),
             names_and_types.end());
 
-        auto columns = ColumnsDescription(names_and_types);
-        if (mode == SchemaInferenceMode::DEFAULT)
-            read_buffer_iterator.setResultingSchema(columns);
-        return {columns, *format_name};
+        return {ColumnsDescription(names_and_types), *format_name};
     }
 
     throw Exception(
diff --git a/src/Formats/ReadSchemaUtils.h b/src/Formats/ReadSchemaUtils.h
index e2187d48245a..559f87a40bd2 100644
--- a/src/Formats/ReadSchemaUtils.h
+++ b/src/Formats/ReadSchemaUtils.h
@@ -46,14 +46,9 @@ struct IReadBufferIterator
     /// Used for caching number of rows from files metadata during schema inference.
     virtual void setNumRowsToLastFile(size_t /*num_rows*/) {}
 
-    /// Set schema inferred from last file. Used for UNION mode to cache schema
-    /// per file.
+    /// Set schema inferred from last file.
     virtual void setSchemaToLastFile(const ColumnsDescription & /*columns*/) {}
 
-    /// Set resulting inferred schema. Used for DEFAULT mode to cache schema
-    /// for all files.
-    virtual void setResultingSchema(const ColumnsDescription & /*columns*/) {}
-
     /// Set auto detected format name.
     virtual void setFormatName(const String & /*format_name*/) {}
 
diff --git a/src/Formats/SchemaInferenceUtils.cpp b/src/Formats/SchemaInferenceUtils.cpp
index 74fdae757fc0..837947997fb2 100644
--- a/src/Formats/SchemaInferenceUtils.cpp
+++ b/src/Formats/SchemaInferenceUtils.cpp
@@ -791,7 +791,7 @@ namespace
 
         ReadBufferFromString buf(field);
         DayNum tmp;
-        return tryReadDateText(tmp, buf, DateLUT::instance(), /*allowed_delimiters=*/"-/:") && buf.eof();
+        return tryReadDateText(tmp, buf, DateLUT::instance(), /*allowed_delimiters=*/"-/:", /*saturate_on_overflow=*/false) && buf.eof();
     }
 
     DataTypePtr tryInferDateTimeOrDateTime64(std::string_view field, const FormatSettings & settings)
@@ -827,7 +827,7 @@ namespace
             switch (settings.date_time_input_format)
             {
                 case FormatSettings::DateTimeInputFormat::Basic:
-                    if (tryReadDateTimeText(tmp, buf, DateLUT::instance(), /*allowed_date_delimiters=*/"-/:", /*allowed_time_delimiters=*/":") && buf.eof())
+                    if (tryReadDateTimeText(tmp, buf, DateLUT::instance(), /*allowed_date_delimiters=*/"-/:", /*allowed_time_delimiters=*/":", /*saturate_on_overflow=*/false) && buf.eof())
                         return std::make_shared<DataTypeDateTime>();
                     break;
                 case FormatSettings::DateTimeInputFormat::BestEffort:
@@ -846,7 +846,7 @@ namespace
         switch (settings.date_time_input_format)
         {
             case FormatSettings::DateTimeInputFormat::Basic:
-                if (tryReadDateTime64Text(tmp, 9, buf, DateLUT::instance(), /*allowed_date_delimiters=*/"-/:", /*allowed_time_delimiters=*/":") && buf.eof())
+                if (tryReadDateTime64Text(tmp, 9, buf, DateLUT::instance(), /*allowed_date_delimiters=*/"-/:", /*allowed_time_delimiters=*/":", /*saturate_on_overflow=*/false) && buf.eof())
                     return std::make_shared<DataTypeDateTime64>(9);
                 break;
             case FormatSettings::DateTimeInputFormat::BestEffort:
@@ -1639,6 +1639,11 @@ DataTypePtr makeNullableRecursively(DataTypePtr type, const FormatSettings & set
     if (which.isNullable())
         return type;
 
+    /// Leave named compound types unchanged.
+    /// E.g. don't turn `Point` into `Tuple(Nullable(Float64), Nullable(Float64))`.
+    if (type->hasCustomName())
+        return makeNullableSafe(type);
+
     if (which.isArray())
     {
         const auto * array_type = assert_cast<const DataTypeArray *>(type.get());
@@ -1710,25 +1715,8 @@ DataTypePtr makeNullableRecursively(DataTypePtr type, const FormatSettings & set
 NamesAndTypesList getNamesAndRecursivelyNullableTypes(const Block & header, const FormatSettings & settings)
 {
     NamesAndTypesList result;
-
-    std::unordered_map<String, DataTypeCustomDescPtr> custom_descs;
-    const auto & prev_schema = header.getNamesAndTypesList();
-    for (const auto & [name, type] : prev_schema)
-        if (type->hasCustomName() && (type->getTypeId() == TypeIndex::Tuple || type->getTypeId() == TypeIndex::Array))
-            custom_descs[name] = std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>(type->getCustomName()->getName()));
-
     for (auto & [name, type] : header.getNamesAndTypesList())
         result.emplace_back(name, makeNullableRecursively(type, settings));
-
-    for (auto & [name, type] : result)
-    {
-        auto it = custom_descs.find(name);
-        if (it != custom_descs.end())
-        {
-            type->setCustomization(std::move(it->second));
-        }
-    }
-
     return result;
 }
 
diff --git a/src/Formats/SchemaInferenceUtils.h b/src/Formats/SchemaInferenceUtils.h
index 45c00afd5f4d..62de7be9a225 100644
--- a/src/Formats/SchemaInferenceUtils.h
+++ b/src/Formats/SchemaInferenceUtils.h
@@ -101,11 +101,15 @@ void transformFinalInferredJSONTypeIfNeeded(DataTypePtr & data_type, const Forma
 void transformInferredJSONTypesFromDifferentFilesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings);
 
 /// Make type Nullable recursively:
-/// - Type -> Nullable(type)
-/// - Array(Type) -> Array(Nullable(Type))
-/// - Tuple(Type1, ..., TypeN) -> Tuple(Nullable(Type1), ..., Nullable(TypeN))
-/// - Map(KeyType, ValueType) -> Map(KeyType, Nullable(ValueType))
-/// - LowCardinality(Type) -> LowCardinality(Nullable(Type))
+///  - Type -> Nullable(type)
+///  - Array(Type) -> Array(Nullable(Type))
+///  - Tuple(Type1, ..., TypeN) -> Tuple(Nullable(Type1), ..., Nullable(TypeN))
+///  - Map(KeyType, ValueType) -> Map(KeyType, Nullable(ValueType))
+///  - LowCardinality(Type) -> LowCardinality(Nullable(Type))
+/// Does not recurse into types with custom name.
+/// E.g. type `Point` (aka `Tuple(Float64, Float64)`) stays unchanged as `Point`, it does not become
+/// `Tuple(Nullable(Float64), Nullable(Float64))`.
+/// But `Bool` becomes `Nullable(Bool)`.
 DataTypePtr makeNullableRecursively(DataTypePtr type, const FormatSettings & settings);
 
 /// Call makeNullableRecursively for all types
diff --git a/src/Functions/FunctionBase32Conversion.h b/src/Functions/FunctionBase32Conversion.h
index 251a409444ed..28fd7ebd422e 100644
--- a/src/Functions/FunctionBase32Conversion.h
+++ b/src/Functions/FunctionBase32Conversion.h
@@ -12,10 +12,9 @@ struct Base32EncodeTraits
     static size_t getBufferSize(Col const & src_column)
     {
         auto const src_length = src_column.getChars().size();
-        auto const string_count = src_column.size();
         /// Every 5 bytes becomes 8 bytes in base32
         /// Add padding for incomplete blocks and round up
-        return (src_length + 4) / 5 * 8 * string_count;
+        return ((src_length + src_column.size() * 4) / 5) * 8;
     }
 
     static size_t perform(std::string_view src, UInt8 * dst)
@@ -29,10 +28,9 @@ struct Base32DecodeTraits
     template <typename Col>
     static size_t getBufferSize(Col const & src_column)
     {
-        auto const string_length = src_column.byteSize();
-        auto const string_count = src_column.size();
+        auto const string_length = src_column.getChars().size();
         /// decoded size is at most length of encoded (every 8 bytes becomes at most 5 bytes)
-        return (string_length * 5 + 7) / 8 * string_count;
+        return (string_length * 5 + 7) / 8;
     }
 
     static std::optional<size_t> perform(std::string_view src, UInt8 * dst)
diff --git a/src/Functions/FunctionBase58Conversion.h b/src/Functions/FunctionBase58Conversion.h
index 25c8f60eb215..3a5c5e1a718c 100644
--- a/src/Functions/FunctionBase58Conversion.h
+++ b/src/Functions/FunctionBase58Conversion.h
@@ -29,10 +29,14 @@ struct Base58DecodeTraits
     template <typename Col>
     static size_t getBufferSize(Col const & src_column)
     {
-        auto const string_length = src_column.byteSize();
-        auto const string_count = src_column.size();
-        /// decoded size is at most length of encoded (every 8 bytes becomes at most 6 bytes)
-        return (string_length * 6 + 7) / 8 * string_count;
+        /// According to the RFC https://datatracker.ietf.org/doc/html/draft-msporny-base58-03
+        /// base58 doesn't have a clean bitsequence-to-character mapping like base32 or base64.
+        /// Instead, it uses division by 58 and modulo operations on big integers.
+        /// In addition all the leading zeros are converted to "1"s as is.
+        /// Thus, if we decode the can have at most same amount of bytes as a result.
+        /// Example:
+        /// "11111" (5 chars) -> b'\x00\x00\x00\x00\x00' (5 bytes)
+        return src_column.getChars().size();
     }
 
     static std::optional<size_t> perform(std::string_view src, UInt8 * dst)
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index cbda1bf2b2de..ec7e23d9f587 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -4744,6 +4744,13 @@ class FunctionCast final : public IFunctionBase
             const auto * col = arguments.front().column.get();
 
             size_t tuple_size = to_element_types.size();
+
+            if (tuple_size == 0)
+            {
+                /// Preserve the number of rows for empty tuple columns
+                return ColumnTuple::create(col->size());
+            }
+
             const ColumnTuple & column_tuple = typeid_cast<const ColumnTuple &>(*col);
 
             Columns converted_columns(tuple_size);
@@ -5559,16 +5566,16 @@ class FunctionCast final : public IFunctionBase
                     }
                 }
 
-                MutableColumnPtr variant_column;
+                ColumnPtr variant_column;
                 /// If there were no NULLs, we can just clone the column.
+                /// We use cloneWithDefaultOnNull to make the dictionary not-nullable in the result column.
                 if (variant_size_hint == col_lc.size())
-                    variant_column = IColumn::mutate(column);
+                    variant_column = col_lc.cloneWithDefaultOnNull();
                 /// Otherwise we should filter column.
                 else
-                    variant_column = IColumn::mutate(column->filter(filter, variant_size_hint));
+                    variant_column = assert_cast<const ColumnLowCardinality &>(*column->filter(filter, variant_size_hint)).cloneWithDefaultOnNull();
 
-                assert_cast<ColumnLowCardinality &>(*variant_column).nestedRemoveNullable();
-                return createVariantFromDescriptorsAndOneNonEmptyVariant(variant_types, std::move(discriminators), std::move(variant_column), variant_discr);
+                return createVariantFromDescriptorsAndOneNonEmptyVariant(variant_types, std::move(discriminators), variant_column, variant_discr);
             }
             else
             {
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 95130ba9450e..76251b874e25 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -94,7 +94,7 @@ class FunctionDictHelper : public WithContext
         return getDictionary(dict_name_col->getValue<String>());
     }
 
-    static const DictionaryAttribute & getDictionaryHierarchicalAttribute(const std::shared_ptr<const IDictionary> & dictionary)
+    static void checkDictionaryHierarchySupport(const std::shared_ptr<const IDictionary> & dictionary)
     {
         const auto & dictionary_structure = dictionary->getStructure();
         auto hierarchical_attribute_index_optional = dictionary_structure.hierarchical_attribute_index;
@@ -103,6 +103,14 @@ class FunctionDictHelper : public WithContext
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
                 "Dictionary {} does not support hierarchy",
                 dictionary->getFullName());
+    }
+
+    static const DictionaryAttribute & getDictionaryHierarchicalAttribute(const std::shared_ptr<const IDictionary> & dictionary)
+    {
+        checkDictionaryHierarchySupport(dictionary);
+
+        const auto & dictionary_structure = dictionary->getStructure();
+        auto hierarchical_attribute_index_optional = dictionary_structure.hierarchical_attribute_index;
 
         size_t hierarchical_attribute_index = *hierarchical_attribute_index_optional;
         const auto & hierarchical_attribute = dictionary_structure.attributes[hierarchical_attribute_index];
@@ -1316,6 +1324,9 @@ class FunctionDictGetDescendantsOverloadResolverImpl final : public IFunctionOve
     FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override
     {
         auto dictionary = dictionary_helper->getDictionary(arguments[0].column);
+
+        FunctionDictHelper::checkDictionaryHierarchySupport(dictionary);
+
         auto hierarchical_parent_to_child_index = dictionary->getHierarchicalIndex();
 
         size_t level = Strategy::default_level;
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index b65a3179370b..980489629067 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -772,7 +772,7 @@ class JSONTypeImpl
 };
 
 
-template <typename JSONParser, typename NumberType, bool convert_bool_to_integer = false>
+template <typename JSONParser, typename NumberType>
 class JSONExtractNumericImpl
 {
 public:
@@ -794,7 +794,7 @@ class JSONExtractNumericImpl
     {
         NumberType value;
 
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, convert_bool_to_integer, /*allow_type_conversion=*/true, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, /*convert_bool_to_number=*/false, /*allow_type_conversion=*/true, error))
             return false;
         auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
         col_vec.insertValue(value);
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 32f6ff57183a..dd4ad34a5366 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -406,9 +406,9 @@ ColumnPtr IExecutableFunction::executeWithoutSparseColumns(
             ColumnUniquePtr res_dictionary = std::move(res_mut_dictionary);
 
             if (indexes && !res_is_constant)
-                result = ColumnLowCardinality::create(res_dictionary, res_indexes->index(*indexes, 0));
+                result = ColumnLowCardinality::create(res_dictionary, res_indexes->index(*indexes, 0), /*is_shared=*/false);
             else
-                result = ColumnLowCardinality::create(res_dictionary, res_indexes);
+                result = ColumnLowCardinality::create(res_dictionary, res_indexes, /*is_shared=*/false);
 
             if (res_is_constant)
                 result = ColumnConst::create(std::move(result), input_rows_count);
diff --git a/src/Functions/IFunctionCustomWeek.h b/src/Functions/IFunctionCustomWeek.h
index fc9b5a31dd29..99941e5c186c 100644
--- a/src/Functions/IFunctionCustomWeek.h
+++ b/src/Functions/IFunctionCustomWeek.h
@@ -3,6 +3,9 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeString.h>
 #include <Functions/CustomWeekTransforms.h>
 #include <Functions/IFunction.h>
 #include <Functions/TransformDateTime64.h>
@@ -29,25 +32,47 @@ class IFunctionCustomWeek : public IFunction
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
+    bool canBeExecutedOnDefaultArguments() const override
+    {
+        /// String default is empty (not parseable as DateTime), so avoid executing on LC default dictionary key
+        if constexpr (Transform::value_may_be_string)
+            return false;
+
+        return true;
+    }
+
     bool hasInformationAboutMonotonicity() const override { return true; }
 
     Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
     {
+        const IDataType * type_ptr = &type;
+
+        if (const auto * lc_type = checkAndGetDataType<DataTypeLowCardinality>(type_ptr))
+            type_ptr = lc_type->getDictionaryType().get();
+
+        if (const auto * nullable_type = checkAndGetDataType<DataTypeNullable>(type_ptr))
+            type_ptr = nullable_type->getNestedType().get();
+
+        const IFunction::Monotonicity is_not_monotonic;
+
+        /// Parsing of String arguments is not monotonic w.r.t. String ordering
+        if (checkAndGetDataType<DataTypeString>(type_ptr))
+            return is_not_monotonic;
+
         if constexpr (std::is_same_v<typename Transform::FactorTransform, ZeroTransform>)
             return {.is_monotonic = true, .is_always_monotonic = true};
 
+        if (left.isNull() || right.isNull())
+            return is_not_monotonic;
+
         const IFunction::Monotonicity is_monotonic = {.is_monotonic = true};
-        const IFunction::Monotonicity is_not_monotonic;
 
         /// This method is called only if the function has one argument. Therefore, we do not care about the non-local time zone.
         const DateLUTImpl & date_lut = DateLUT::instance();
 
-        if (left.isNull() || right.isNull())
-            return {};
-
         /// The function is monotonous on the [left, right] segment, if the factor transformation returns the same values for them.
 
-        if (checkAndGetDataType<DataTypeDate>(&type))
+        if (checkAndGetDataType<DataTypeDate>(type_ptr))
         {
             return Transform::FactorTransform::execute(UInt16(left.safeGet<UInt64>()), date_lut)
                     == Transform::FactorTransform::execute(UInt16(right.safeGet<UInt64>()), date_lut)
@@ -55,9 +80,16 @@ class IFunctionCustomWeek : public IFunction
                 : is_not_monotonic;
         }
 
-        if (checkAndGetDataType<DataTypeDateTime64>(&type))
+        if (checkAndGetDataType<DataTypeDate32>(type_ptr))
         {
+            return Transform::FactorTransform::execute(Int32(left.safeGet<Int32>()), date_lut)
+                    == Transform::FactorTransform::execute(Int32(right.safeGet<Int32>()), date_lut)
+                ? is_monotonic
+                : is_not_monotonic;
+        }
 
+        if (checkAndGetDataType<DataTypeDateTime64>(type_ptr))
+        {
             const auto & left_date_time = left.safeGet<DateTime64>();
             TransformDateTime64<typename Transform::FactorTransform> transformer_left(left_date_time.getScale());
 
@@ -70,10 +102,15 @@ class IFunctionCustomWeek : public IFunction
                 : is_not_monotonic;
         }
 
-        return Transform::FactorTransform::execute(UInt32(left.safeGet<UInt64>()), date_lut)
-                == Transform::FactorTransform::execute(UInt32(right.safeGet<UInt64>()), date_lut)
-            ? is_monotonic
-            : is_not_monotonic;
+        if (checkAndGetDataType<DataTypeDateTime>(type_ptr))
+        {
+            return Transform::FactorTransform::execute(UInt32(left.safeGet<UInt64>()), date_lut)
+                    == Transform::FactorTransform::execute(UInt32(right.safeGet<UInt64>()), date_lut)
+                ? is_monotonic
+                : is_not_monotonic;
+        }
+
+        return is_not_monotonic;
     }
 
 protected:
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index 80006bda1338..0b93ab8910f9 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -450,8 +450,8 @@ struct ReplaceRegexpImpl
             chassert(input_rows_count == haystack_data.size() / n);
             res_data.assign(haystack_data.begin(), haystack_data.end());
             res_offsets.resize(input_rows_count);
-            for (size_t i = 1; i <= input_rows_count; ++i)
-                res_offsets[i] = i * n;
+            for (size_t i = 0; i < input_rows_count; ++i)
+                res_offsets[i] = (i + 1) * n;
             return;
         }
 
diff --git a/src/Functions/ReplaceStringImpl.h b/src/Functions/ReplaceStringImpl.h
index cf24ab6eafab..e4e046685b35 100644
--- a/src/Functions/ReplaceStringImpl.h
+++ b/src/Functions/ReplaceStringImpl.h
@@ -354,7 +354,7 @@ struct ReplaceStringImpl
             res_data.assign(haystack_data.begin(), haystack_data.end());
             res_offsets.resize(input_rows_count);
             for (size_t i = 1; i <= input_rows_count; ++i)
-                res_offsets[i] = i * n;
+                res_offsets[i - 1] = i * n;
             return;
         }
 
diff --git a/src/Functions/URL/domain.h b/src/Functions/URL/domain.h
index f37b26d5d740..a3d11b0497ac 100644
--- a/src/Functions/URL/domain.h
+++ b/src/Functions/URL/domain.h
@@ -26,6 +26,9 @@ inline std::string_view checkAndReturnHost(const Pos & pos, const Pos & dot_pos,
 /// @return empty string view if the host is not valid (i.e. it does not have dot, or there no symbol after dot).
 inline std::string_view getURLHostRFC(const char * data, size_t size)
 {
+    if (size < 2)
+        return std::string_view{};
+
     Pos pos = data;
     Pos end = data + size;
 
@@ -172,7 +175,7 @@ inline std::string_view getURLHost(const char * data, size_t size)
     Pos pos = data;
     Pos end = data + size;
 
-    if (*pos == '/' && *(pos + 1) == '/')
+    if (size >= 2 && *pos == '/' && *(pos + 1) == '/')
     {
         pos += 2;
     }
diff --git a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
index 345f1c514ad3..d87901e81bb0 100644
--- a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
@@ -37,14 +37,6 @@ void UserDefinedSQLFunctionVisitor::visit(ASTPtr & ast, ContextPtr context_)
 {
     chassert(ast);
 
-    if (const auto * function = ast->template as<ASTFunction>())
-    {
-        std::unordered_set<std::string> udf_in_replace_process;
-        auto replace_result = tryToReplaceFunction(*function, udf_in_replace_process, context_);
-        if (replace_result)
-            ast = replace_result;
-    }
-
     for (auto & child : ast->children)
     {
         if (!child)
@@ -69,15 +61,6 @@ void UserDefinedSQLFunctionVisitor::visit(ASTPtr & ast, ContextPtr context_)
     }
 }
 
-void UserDefinedSQLFunctionVisitor::visit(IAST * ast, ContextPtr context_)
-{
-    if (!ast)
-        return;
-
-    for (auto & child : ast->children)
-        visit(child, context_);
-}
-
 namespace
 {
 bool isVariadic(const ASTPtr & arg)
diff --git a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.h b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.h
index 633f68db3487..e9bcd145d701 100644
--- a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.h
+++ b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.h
@@ -23,8 +23,8 @@ class UserDefinedSQLFunctionVisitor
 {
 public:
     static void visit(ASTPtr & ast, ContextPtr context_);
+
 private:
-    static void visit(IAST *, ContextPtr context_);
     static ASTPtr tryToReplaceFunction(const ASTFunction & function, std::unordered_set<std::string> & udf_in_replace_process, ContextPtr context_);
 
 };
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index 872eda71e8cc..715ee70bf9b8 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -17,7 +17,6 @@ namespace DB
 {
 namespace Setting
 {
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool use_variant_as_common_type;
 }
 
@@ -31,7 +30,7 @@ class FunctionArray : public IFunction
 
     static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionArray>(context->getSettingsRef()[Setting::allow_experimental_variant_type] && context->getSettingsRef()[Setting::use_variant_as_common_type]);
+        return std::make_shared<FunctionArray>(context->getSettingsRef()[Setting::use_variant_as_common_type]);
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 518ea3c09c3f..037ee25936d8 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -24,6 +24,7 @@
 #include <base/range.h>
 #include <base/TypeLists.h>
 #include <Interpreters/castColumn.h>
+#include <IO/ReadBufferFromString.h>
 
 
 namespace DB
@@ -613,7 +614,7 @@ ColumnPtr FunctionArrayIntersect<Mode>::execute(const UnpackedArrays & arrays, M
                     else
                     {
                         const char * data = nullptr;
-                        value = &map[columns[arg_num]->serializeValueIntoArena(i, arena, data)];
+                        value = &map[columns[arg_num]->serializeValueIntoArena(i, arena, data, nullptr)];
                     }
 
                     /// Here we count the number of element appearances, but no more than once per array.
@@ -711,7 +712,7 @@ ColumnPtr FunctionArrayIntersect<Mode>::execute(const UnpackedArrays & arrays, M
                 else
                 {
                     const char * data = nullptr;
-                    pair = map.find(columns[0]->serializeValueIntoArena(i, arena, data));
+                    pair = map.find(columns[0]->serializeValueIntoArena(i, arena, data, nullptr));
                 }
 
                 if (!current_has_nullable)
@@ -753,7 +754,8 @@ void FunctionArrayIntersect<Mode>::insertElement(typename Map::LookupResult & pa
     }
     else
     {
-        std::ignore = result_data.deserializeAndInsertFromArena(pair->getKey().data);
+        ReadBufferFromString in({pair->getKey().data, pair->getKey().size});
+        result_data.deserializeAndInsertFromArena(in, /*settings=*/nullptr);
     }
     if (use_null_map)
         null_map.push_back(0);
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index e1b7ce565ed1..7eba8caf7a70 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -29,7 +29,6 @@ class FunctionCaseWithExpression : public IFunction
     bool isVariadic() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return false; }
     bool useDefaultImplementationForNulls() const override { return false; }
-    bool useDefaultImplementationForNothing() const override { return false; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     String getName() const override { return name; }
@@ -62,14 +61,6 @@ class FunctionCaseWithExpression : public IFunction
     /// Helper function to implement CASE WHEN equality semantics where NULL = NULL is true
     ColumnPtr caseWhenEquals(const ColumnWithTypeAndName & expr, const ColumnWithTypeAndName & when_value, size_t input_rows_count) const
     {
-        // handle Nothing type - it's an empty type that can't contain any values
-        // if either argument is Nothing, the result should be an empty column
-        if (expr.type->onlyNull() || when_value.type->onlyNull())
-        {
-            // return a constant false column
-            return DataTypeUInt8().createColumnConst(input_rows_count, 0u);
-        }
-
         // for CASE WHEN semantics, NULL should match NULL
         // we need: if (isNull(expr)) then (isNull(when)) else if (isNull(when)) then 0 else (expr = when)
 
diff --git a/src/Functions/countMatches.cpp b/src/Functions/countMatches.cpp
index 078823744dd0..79eaadeaa393 100644
--- a/src/Functions/countMatches.cpp
+++ b/src/Functions/countMatches.cpp
@@ -1,9 +1,166 @@
+#include <Core/Settings.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/countMatches.h>
+#include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/Regexps.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace Setting
+{
+    extern const SettingsBool count_matches_stop_at_empty_match;
+}
 
 namespace
 {
 
+using Pos = const char *;
+
+template <typename CountMatchesBase>
+class FunctionCountMatches : public IFunction
+{
+    const bool count_matches_stop_at_empty_match;
+
+public:
+    static constexpr auto name = CountMatchesBase::name;
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionCountMatches<CountMatchesBase>>(context); }
+
+    explicit FunctionCountMatches(ContextPtr context)
+        : count_matches_stop_at_empty_match(context->getSettingsRef()[Setting::count_matches_stop_at_empty_match])
+    {
+    }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        FunctionArgumentDescriptors args
+        {
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"},
+            {"pattern", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "constant String"}
+        };
+        validateFunctionArguments(*this, arguments, args);
+
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    DataTypePtr getReturnTypeForDefaultImplementationForDynamic() const override
+    {
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        const IColumn * col_pattern = arguments[1].column.get();
+        const ColumnConst * col_pattern_const = checkAndGetColumnConst<ColumnString>(col_pattern);
+        if (col_pattern_const == nullptr)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Pattern argument is not const");
+
+        const OptimizedRegularExpression re = Regexps::createRegexp</*is_like*/ false, /*no_capture*/ true, CountMatchesBase::case_insensitive>(col_pattern_const->getValue<String>());
+
+        const IColumn * col_haystack = arguments[0].column.get();
+        OptimizedRegularExpression::MatchVec matches;
+
+        if (const ColumnConst * col_haystack_const = checkAndGetColumnConstStringOrFixedString(col_haystack))
+        {
+            std::string_view str = col_haystack_const->getDataColumn().getDataAt(0).toView();
+            uint64_t matches_count = countMatches(str, re, matches);
+            return result_type->createColumnConst(input_rows_count, matches_count);
+        }
+        if (const ColumnString * col_haystack_string = checkAndGetColumn<ColumnString>(col_haystack))
+        {
+            auto col_res = ColumnUInt64::create();
+
+            const ColumnString::Chars & src_chars = col_haystack_string->getChars();
+            const ColumnString::Offsets & src_offsets = col_haystack_string->getOffsets();
+
+            ColumnUInt64::Container & vec_res = col_res->getData();
+            vec_res.resize(input_rows_count);
+
+            ColumnString::Offset current_src_offset = 0;
+
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                Pos pos = reinterpret_cast<Pos>(&src_chars[current_src_offset]);
+                current_src_offset = src_offsets[i];
+                Pos end = reinterpret_cast<Pos>(&src_chars[current_src_offset]);
+
+                std::string_view str(pos, end - pos);
+                vec_res[i] = countMatches(str, re, matches);
+            }
+
+            return col_res;
+        }
+        if (const ColumnFixedString * col_haystack_fixedstring = checkAndGetColumn<ColumnFixedString>(col_haystack))
+        {
+            auto col_res = ColumnUInt64::create();
+
+            ColumnUInt64::Container & vec_res = col_res->getData();
+            vec_res.resize(input_rows_count);
+
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                std::string_view str = col_haystack_fixedstring->getDataAt(i).toView();
+                vec_res[i] = countMatches(str, re, matches);
+            }
+
+            return col_res;
+        }
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Could not cast haystack argument to String or FixedString");
+    }
+
+    uint64_t countMatches(std::string_view src, const OptimizedRegularExpression & re, OptimizedRegularExpression::MatchVec & matches) const
+    {
+        /// Only one match is required, no need to copy more.
+        static const unsigned matches_limit = 1;
+
+        Pos pos = reinterpret_cast<Pos>(src.data());
+        Pos end = reinterpret_cast<Pos>(src.data() + src.size());
+
+        uint64_t match_count = 0;
+        while (pos < end)
+        {
+            if (re.match(pos, end - pos, matches, matches_limit))
+            {
+                if (matches[0].length > 0)
+                {
+                    pos += matches[0].offset + matches[0].length;
+                    ++match_count;
+                }
+                else
+                {
+                    if (count_matches_stop_at_empty_match)
+                        /// Progress should be made, but with empty match the progress will not be done.
+                        break;
+
+                    /// Progress is made by a single character in case the pattern does not match or have zero-byte match.
+                    /// The reason is simply because the pattern could match another part of input when forwarded.
+                    ++pos;
+                }
+            }
+            else
+                break;
+        }
+
+        return match_count;
+    }
+};
+
 struct FunctionCountMatchesCaseSensitive
 {
     static constexpr auto name = "countMatches";
@@ -17,9 +174,6 @@ struct FunctionCountMatchesCaseInsensitive
 
 }
 
-namespace DB
-{
-
 REGISTER_FUNCTION(CountMatches)
 {
     factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseSensitive>>();
diff --git a/src/Functions/countMatches.h b/src/Functions/countMatches.h
deleted file mode 100644
index 7a77ad4ec3ab..000000000000
--- a/src/Functions/countMatches.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#pragma once
-
-#include <Core/Settings.h>
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnsNumber.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
-#include <Functions/Regexps.h>
-#include <Interpreters/Context.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-}
-
-namespace Setting
-{
-    extern const SettingsBool count_matches_stop_at_empty_match;
-}
-
-using Pos = const char *;
-
-template <typename CountMatchesBase>
-class FunctionCountMatches : public IFunction
-{
-    const bool count_matches_stop_at_empty_match;
-
-public:
-    static constexpr auto name = CountMatchesBase::name;
-    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionCountMatches<CountMatchesBase>>(context); }
-
-    explicit FunctionCountMatches(ContextPtr context)
-        : count_matches_stop_at_empty_match(context->getSettingsRef()[Setting::count_matches_stop_at_empty_match])
-    {
-    }
-
-    String getName() const override { return name; }
-    size_t getNumberOfArguments() const override { return 2; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        FunctionArgumentDescriptors args{
-            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"},
-            {"pattern", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "constant String"}
-        };
-        validateFunctionArguments(*this, arguments, args);
-
-        return std::make_shared<DataTypeUInt64>();
-    }
-
-    DataTypePtr getReturnTypeForDefaultImplementationForDynamic() const override
-    {
-        return std::make_shared<DataTypeUInt64>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        const IColumn * col_pattern = arguments[1].column.get();
-        const ColumnConst * col_pattern_const = checkAndGetColumnConst<ColumnString>(col_pattern);
-        if (col_pattern_const == nullptr)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Pattern argument is not const");
-
-        const OptimizedRegularExpression re = Regexps::createRegexp</*is_like*/ false, /*no_capture*/ true, CountMatchesBase::case_insensitive>(col_pattern_const->getValue<String>());
-
-        const IColumn * col_haystack = arguments[0].column.get();
-        OptimizedRegularExpression::MatchVec matches;
-
-        if (const ColumnConst * col_haystack_const = checkAndGetColumnConstStringOrFixedString(col_haystack))
-        {
-            std::string_view str = col_haystack_const->getDataColumn().getDataAt(0).toView();
-            uint64_t matches_count = countMatches(str, re, matches);
-            return result_type->createColumnConst(input_rows_count, matches_count);
-        }
-        if (const ColumnString * col_haystack_string = checkAndGetColumn<ColumnString>(col_haystack))
-        {
-            auto col_res = ColumnUInt64::create();
-
-            const ColumnString::Chars & src_chars = col_haystack_string->getChars();
-            const ColumnString::Offsets & src_offsets = col_haystack_string->getOffsets();
-
-            ColumnUInt64::Container & vec_res = col_res->getData();
-            vec_res.resize(input_rows_count);
-
-            ColumnString::Offset current_src_offset = 0;
-
-            for (size_t i = 0; i < input_rows_count; ++i)
-            {
-                Pos pos = reinterpret_cast<Pos>(&src_chars[current_src_offset]);
-                current_src_offset = src_offsets[i];
-                Pos end = reinterpret_cast<Pos>(&src_chars[current_src_offset]);
-
-                std::string_view str(pos, end - pos);
-                vec_res[i] = countMatches(str, re, matches);
-            }
-
-            return col_res;
-        }
-        if (const ColumnFixedString * col_haystack_fixedstring = checkAndGetColumn<ColumnFixedString>(col_haystack))
-        {
-            auto col_res = ColumnUInt64::create();
-
-            ColumnUInt64::Container & vec_res = col_res->getData();
-            vec_res.resize(input_rows_count);
-
-            for (size_t i = 0; i < input_rows_count; ++i)
-            {
-                std::string_view str = col_haystack_fixedstring->getDataAt(i).toView();
-                vec_res[i] = countMatches(str, re, matches);
-            }
-
-            return col_res;
-        }
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Could not cast haystack argument to String or FixedString");
-    }
-
-    uint64_t countMatches(std::string_view src, const OptimizedRegularExpression & re, OptimizedRegularExpression::MatchVec & matches) const
-    {
-        /// Only one match is required, no need to copy more.
-        static const unsigned matches_limit = 1;
-
-        Pos pos = reinterpret_cast<Pos>(src.data());
-        Pos end = reinterpret_cast<Pos>(src.data() + src.size());
-
-        uint64_t match_count = 0;
-        while (pos < end)
-        {
-            if (re.match(pos, end - pos, matches, matches_limit) && matches[0].length > 0)
-            {
-                pos += matches[0].offset + matches[0].length;
-                ++match_count;
-            }
-            else
-            {
-                if (count_matches_stop_at_empty_match)
-                    /// Progress should be made, but with empty match the progress will not be done.
-                    break;
-
-                /// Progress is made by a single character in case the pattern does not match or have zero-byte match.
-                /// The reason is simply because the pattern could match another part of input when forwarded.
-                ++pos;
-            }
-        }
-
-        return match_count;
-    }
-};
-
-}
diff --git a/src/Functions/firstNonDefault.cpp b/src/Functions/firstNonDefault.cpp
new file mode 100644
index 000000000000..296532906364
--- /dev/null
+++ b/src/Functions/firstNonDefault.cpp
@@ -0,0 +1,153 @@
+#include <Columns/IColumn.h>
+
+#include <DataTypes/getLeastSupertype.h>
+
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+
+#include <Interpreters/castColumn.h>
+#include <Interpreters/Context_fwd.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+namespace
+{
+
+/// Implements the function which takes a set of arguments and
+/// returns the value of the leftmost non-falsey argument.
+/// If all arguments are falsey, returns the default value for the result type.
+/// Result type is the supertype of all arguments.
+class FunctionFirstNonDefault : public IFunction
+{
+public:
+    static constexpr auto name = "firstNonDefault";
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionFirstNonDefault>();
+    }
+
+    FunctionFirstNonDefault() = default;
+
+    String getName() const override { return name; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+    size_t getNumberOfArguments() const override { return 0; }
+
+    ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t number_of_arguments) const override
+    {
+        ColumnNumbers args;
+        for (size_t i = 0; i + 1 < number_of_arguments; ++i)
+            args.push_back(i);
+        return args;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} requires at least one argument", getName());
+        size_t max_args = 1024;
+        if (arguments.size() > max_args)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} requires at most {} arguments, got {}", getName(), max_args, arguments.size());
+
+        if (arguments.size() == 1)
+            return arguments[0];
+
+        return getLeastSupertype(arguments);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        if (arguments.size() == 1)
+            return arguments[0].column;
+
+        size_t num_columns = arguments.size();
+
+        auto result_col = result_type->createColumn();
+        result_col->reserve(input_rows_count);
+
+        /// Cast all arguments to the result type
+        /// Use this columns to insert values into the result column
+        std::vector<ColumnPtr> casted_columns;
+        casted_columns.reserve(num_columns);
+        for (const auto & arg : arguments)
+        {
+            auto casted_column = castColumn(arg, result_type);
+            casted_column = casted_column->convertToFullColumnIfConst();
+            casted_column = casted_column->convertToFullColumnIfSparse();
+
+            if (casted_column->getDataType() != result_col->getDataType())
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "All arguments must cast to the same type, got {} and {} for result type {}",
+                    casted_column->dumpStructure(), result_col->dumpStructure(), result_type->getName());
+            }
+
+            casted_columns.push_back(std::move(casted_column));
+        }
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            bool found = false;
+
+            /// Check each argument for truthiness
+            for (size_t arg_idx = 0; !found && arg_idx < num_columns; ++arg_idx)
+            {
+                /// A value is considered "falsey" if it's NULL or the default value for its type
+                /// For example:
+                /// - for numeric types, the default is 0
+                /// - for strings, the default is ''
+                /// - for arrays, the default is []
+                if (!arguments[arg_idx].column->isDefaultAt(row))
+                {
+                    /// Found a truthy value, insert it into the result
+                    result_col->insertFrom(*casted_columns[arg_idx], row);
+                    found = true;
+                }
+            }
+
+            if (!found)
+                result_col->insertDefault();
+        }
+        return result_col;
+    }
+};
+
+}
+
+REGISTER_FUNCTION(FirstNonDefault)
+{
+    FunctionDocumentation doc;
+    doc.description = "Returns the first non-default value from a set of arguments";
+    doc.arguments = {
+        {"arg1", "The first argument to check"},
+        {"arg2", "The second argument to check"},
+        {"...", "Additional arguments to check"},
+    };
+
+    doc.returned_value = FunctionDocumentation::ReturnedValue{"Result type is the supertype of all arguments", {}};
+    doc.examples = {
+        {"integers", "SELECT firstNonDefault(0, 1, 2)", "1"},
+        {"strings", "SELECT firstNonDefault('', 'hello', 'world')", "'hello'"},
+        {"nulls", "SELECT firstNonDefault(NULL, 0 :: UInt8, 1 :: UInt8)", "1"},
+        {"nullable zero", "SELECT firstNonDefault(NULL, 0 :: Nullable(UInt8), 1 :: Nullable(UInt8))", "0"},
+    };
+    doc.category = {FunctionDocumentation::Category::Null};
+
+    doc.introduced_in = {25, 9};
+    factory.registerFunction<FunctionFirstNonDefault>(doc, FunctionFactory::Case::Insensitive);
+}
+
+}
diff --git a/src/Functions/generateSnowflakeID.cpp b/src/Functions/generateSnowflakeID.cpp
index 5055f548a0ee..d3c8137e6611 100644
--- a/src/Functions/generateSnowflakeID.cpp
+++ b/src/Functions/generateSnowflakeID.cpp
@@ -154,6 +154,11 @@ uint64_t generateSnowflakeID()
     return fromSnowflakeId(snowflake_id);
 }
 
+std::string generateSnowflakeIDString()
+{
+    return std::to_string(generateSnowflakeID());
+}
+
 class FunctionGenerateSnowflakeID : public IFunction
 {
 public:
diff --git a/src/Functions/generateSnowflakeID.h b/src/Functions/generateSnowflakeID.h
index 38fa684a9b4b..4fc173dcf1be 100644
--- a/src/Functions/generateSnowflakeID.h
+++ b/src/Functions/generateSnowflakeID.h
@@ -7,4 +7,6 @@ namespace DB
 
 uint64_t generateSnowflakeID();
 
+std::string generateSnowflakeIDString();
+
 }
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index 268cd6a88d1c..8fdd65be45ee 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -37,6 +37,7 @@ class FunctionGetSetting : public IFunction, WithContext
 
     String getName() const override { return name; }
     bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return false; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return (mode == ErrorHandlingMode::Default) ? 2 : 1 ; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 1}; }
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index 2541e715cb16..b9d293510442 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -1,5 +1,6 @@
 #include <Functions/identity.h>
 #include <Functions/FunctionFactory.h>
+#include <Common/FunctionDocumentation.h>
 
 namespace DB
 {
@@ -19,4 +20,21 @@ REGISTER_FUNCTION(ActionName)
     factory.registerFunction<FunctionActionName>();
 }
 
+REGISTER_FUNCTION(AliasMarker)
+{
+    factory.registerFunction<FunctionAliasMarker>(FunctionDocumentation{
+        .description = R"(
+Internal function that marks ALIAS column expressions for the analyzer. Not intended for direct use.
+)",
+        .syntax = {"__aliasMarker(expr, alias_name)"},
+        .arguments = {
+            {"expr", "Expression to mark.", {"Any"}},
+            {"alias_name", "Alias name attached to the expression.", {"String"}},
+        },
+        .returned_value = {"Returns expr unchanged.", {"Any"}},
+        .introduced_in = {25, 8},
+        .category = FunctionDocumentation::Category::Other,
+    });
+}
+
 }
diff --git a/src/Functions/identity.h b/src/Functions/identity.h
index e1ce253a46d9..77bb9e8ed52f 100644
--- a/src/Functions/identity.h
+++ b/src/Functions/identity.h
@@ -79,4 +79,38 @@ class FunctionActionName : public FunctionIdentityBase<ActionNameName>
     }
 };
 
+struct AliasMarkerName
+{
+    static constexpr auto name = "__aliasMarker";
+};
+
+class FunctionAliasMarker : public IFunction
+{
+public:
+    static constexpr auto name = AliasMarkerName::name;
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionAliasMarker>(); }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 2; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    bool isSuitableForConstantFolding() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (arguments.size() != 2)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker expects 2 arguments");
+
+        if (!WhichDataType(arguments[1]).isString())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker is internal and should not be used directly");
+
+        return arguments.front();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        return arguments.front().column;
+    }
+};
+
 }
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 3bc283d8232e..d1bc33fd354e 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -39,7 +39,6 @@ namespace DB
 {
 namespace Setting
 {
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool use_variant_as_common_type;
 }
 
@@ -269,7 +268,7 @@ class FunctionIf : public FunctionIfBase
     static constexpr auto name = "if";
     static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionIf>(context->getSettingsRef()[Setting::allow_experimental_variant_type] && context->getSettingsRef()[Setting::use_variant_as_common_type]);
+        return std::make_shared<FunctionIf>(context->getSettingsRef()[Setting::use_variant_as_common_type]);
     }
 
     explicit FunctionIf(bool use_variant_when_no_common_type_ = false) : FunctionIfBase(), use_variant_when_no_common_type(use_variant_when_no_common_type_) {}
@@ -1368,9 +1367,9 @@ SELECT if(1, 2 + 2, 2 + 6) AS res;
     factory.registerFunction<FunctionIf>(documentation, FunctionFactory::Case::Insensitive);
 }
 
-FunctionOverloadResolverPtr createInternalFunctionIfOverloadResolver(bool allow_experimental_variant_type, bool use_variant_as_common_type)
+FunctionOverloadResolverPtr createInternalFunctionIfOverloadResolver(bool use_variant_as_common_type)
 {
-    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionIf>(allow_experimental_variant_type && use_variant_as_common_type));
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionIf>(use_variant_as_common_type));
 }
 
 }
diff --git a/src/Functions/if.h b/src/Functions/if.h
index 09a7a6a3e786..36ed9a79830e 100644
--- a/src/Functions/if.h
+++ b/src/Functions/if.h
@@ -7,6 +7,6 @@ namespace DB
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
-FunctionOverloadResolverPtr createInternalFunctionIfOverloadResolver(bool allow_experimental_variant_type, bool use_variant_as_common_type);
+FunctionOverloadResolverPtr createInternalFunctionIfOverloadResolver(bool use_variant_as_common_type);
 
 }
diff --git a/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h b/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h
index 9f656fe6e54e..ce3a002aef66 100644
--- a/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h
+++ b/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h
@@ -173,7 +173,7 @@ struct KeyValuePairExtractorReferenceMap : extractKV::KeyValuePairExtractor<extr
     explicit KeyValuePairExtractorReferenceMap(const extractKV::Configuration & configuration_, std::size_t max_number_of_pairs_)
         : KeyValuePairExtractor(configuration_, max_number_of_pairs_) {}
 
-    uint64_t extract(std::string_view data, absl::flat_hash_map<std::string_view, std::string_view> & map)
+    uint64_t extract(std::string_view data, std::map<std::string_view, std::string_view> & map)
     {
         auto pair_writer = typename StateHandler::PairWriter(map);
         return extractImpl(data, pair_writer);
diff --git a/src/Functions/keyvaluepair/impl/StateHandlerImpl.h b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
index d37792daa7ee..1a7584667b82 100644
--- a/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
+++ b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
@@ -13,7 +13,6 @@
 #include <string_view>
 #include <string>
 #include <vector>
-#include <absl/container/flat_hash_map.h>
 
 
 namespace DB
@@ -637,13 +636,13 @@ struct ReferencesMapStateHandler : public StateHandlerImpl<false>
      * */
     class PairWriter
     {
-        absl::flat_hash_map<std::string_view, std::string_view> & map;
+        std::map<std::string_view, std::string_view> & map;
 
         std::string_view key;
         std::string_view value;
 
     public:
-        explicit PairWriter(absl::flat_hash_map<std::string_view, std::string_view> & map_)
+        explicit PairWriter(std::map<std::string_view, std::string_view> & map_)
             : map(map_)
         {}
 
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index adc4c68d385a..bb0ac64fed03 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -23,7 +23,6 @@ namespace DB
 {
 namespace Setting
 {
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool use_variant_as_common_type;
 }
 
@@ -47,8 +46,7 @@ class FunctionMap : public IFunction
 
     explicit FunctionMap(ContextPtr context_)
         : context(context_)
-        , use_variant_as_common_type(
-              context->getSettingsRef()[Setting::allow_experimental_variant_type] && context->getSettingsRef()[Setting::use_variant_as_common_type])
+        , use_variant_as_common_type(context->getSettingsRef()[Setting::use_variant_as_common_type])
         , function_array(FunctionFactory::instance().get("array", context))
         , function_map_from_arrays(FunctionFactory::instance().get("mapFromArrays", context))
     {
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index fec5f79601e7..fe9aa36afd14 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -28,7 +28,6 @@ namespace DB
 namespace Setting
 {
     extern const SettingsBool allow_execute_multiif_columnar;
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool use_variant_as_common_type;
 }
 
@@ -61,12 +60,11 @@ class FunctionMultiIf final : public FunctionIfBase
     {
         const auto & settings = context_->getSettingsRef();
         return std::make_shared<FunctionMultiIf>(
-            settings[Setting::allow_execute_multiif_columnar], settings[Setting::allow_experimental_variant_type], settings[Setting::use_variant_as_common_type]);
+            settings[Setting::allow_execute_multiif_columnar], settings[Setting::use_variant_as_common_type]);
     }
 
-    explicit FunctionMultiIf(bool allow_execute_multiif_columnar_, bool allow_experimental_variant_type_, bool use_variant_as_common_type_)
+    explicit FunctionMultiIf(bool allow_execute_multiif_columnar_, bool use_variant_as_common_type_)
         : allow_execute_multiif_columnar(allow_execute_multiif_columnar_)
-        , allow_experimental_variant_type(allow_experimental_variant_type_)
         , use_variant_as_common_type(use_variant_as_common_type_)
     {}
 
@@ -144,7 +142,7 @@ class FunctionMultiIf final : public FunctionIfBase
             types_of_branches.emplace_back(arg);
         });
 
-        if (allow_experimental_variant_type && use_variant_as_common_type)
+        if (use_variant_as_common_type)
             return getLeastSupertypeOrVariant(types_of_branches);
 
         return getLeastSupertype(types_of_branches);
@@ -530,7 +528,6 @@ class FunctionMultiIf final : public FunctionIfBase
     }
 
     const bool allow_execute_multiif_columnar;
-    const bool allow_experimental_variant_type;
     const bool use_variant_as_common_type;
 };
 
@@ -596,9 +593,9 @@ FROM LEFT_RIGHT;
     factory.registerAlias("caseWithoutExpression", "multiIf");
 }
 
-FunctionOverloadResolverPtr createInternalMultiIfOverloadResolver(bool allow_execute_multiif_columnar, bool allow_experimental_variant_type, bool use_variant_as_common_type)
+FunctionOverloadResolverPtr createInternalMultiIfOverloadResolver(bool allow_execute_multiif_columnar, bool use_variant_as_common_type)
 {
-    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMultiIf>(allow_execute_multiif_columnar, allow_experimental_variant_type, use_variant_as_common_type));
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMultiIf>(allow_execute_multiif_columnar, use_variant_as_common_type));
 }
 
 }
diff --git a/src/Functions/multiIf.h b/src/Functions/multiIf.h
index 617d63b89bc5..a2ac7132b354 100644
--- a/src/Functions/multiIf.h
+++ b/src/Functions/multiIf.h
@@ -7,6 +7,6 @@ namespace DB
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
-FunctionOverloadResolverPtr createInternalMultiIfOverloadResolver(bool allow_execute_multiif_columnar, bool allow_experimental_variant_type, bool use_variant_as_common_type);
+FunctionOverloadResolverPtr createInternalMultiIfOverloadResolver(bool allow_execute_multiif_columnar, bool use_variant_as_common_type);
 
 }
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 03697ff7c89e..dfc767027453 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -68,9 +68,14 @@ class FunctionRandomStringUTF8 : public IFunction
 
         const IColumn & col_length = *arguments[0].column;
         size_t total_codepoints = 0;
+        const size_t max_total_codepoints = 1ULL << 29;
         for (size_t row_num = 0; row_num < input_rows_count; ++row_num)
         {
             size_t codepoints = col_length.getUInt(row_num);
+
+            if (codepoints > max_total_codepoints - total_codepoints)
+                throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size in function {}", getName());
+
             total_codepoints += codepoints;
         }
 
@@ -78,9 +83,6 @@ class FunctionRandomStringUTF8 : public IFunction
          * per generated code point ~= 3.85. So, reserving for coefficient 4 will not be an overhead
          */
 
-        if (total_codepoints > (1 << 29))
-            throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large string size in function {}", getName());
-
         size_t max_byte_size = total_codepoints * 4 + input_rows_count;
         data_to.resize(max_byte_size);
 
@@ -117,7 +119,7 @@ class FunctionRandomStringUTF8 : public IFunction
             size_t codepoints = col_length.getUInt(row_num);
             auto * pos = data_to.data() + offset;
 
-            for (size_t i = 0; i < codepoints; i +=2)
+            for (size_t i = 0; i < codepoints; i += 2)
             {
                 UInt64 rand = rng(); /// that's the bottleneck
 
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index b59090c3cf66..d0822afe2443 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -98,6 +98,13 @@ class FunctionReverse : public IFunction
         if (const ColumnTuple * col_tuple = checkAndGetColumn<ColumnTuple>(column.get()))
         {
             size_t tuple_size = col_tuple->tupleSize();
+
+            if (tuple_size == 0)
+            {
+                /// Preserve the number of rows for empty tuple columns
+                return ColumnTuple::create(col_tuple->size());
+            }
+
             Columns tuple_columns(tuple_size);
             for (size_t i = 0; i < tuple_size; ++i)
             {
diff --git a/src/Functions/reverseUTF8.cpp b/src/Functions/reverseUTF8.cpp
index 9da27c85950d..15deed86c256 100644
--- a/src/Functions/reverseUTF8.cpp
+++ b/src/Functions/reverseUTF8.cpp
@@ -46,7 +46,7 @@ struct ReverseUTF8Impl
             ColumnString::Offset j = prev_offset;
             while (j < offsets[i])
             {
-                if (data[j] < 0xBF)
+                if (data[j] < 0xC0)
                 {
                     res_data[offsets[i] + prev_offset - 1 - j] = data[j];
                     j += 1;
@@ -63,8 +63,8 @@ struct ReverseUTF8Impl
                 }
                 else
                 {
-                    res_data[offsets[i] + prev_offset - 1 - j] = data[j];
-                    j += 1;
+                    memcpy(&res_data[offsets[i] + prev_offset - 1 - j - 3], &data[j], 4);
+                    j += 4;
                 }
             }
 
diff --git a/src/Functions/toLowCardinality.cpp b/src/Functions/toLowCardinality.cpp
index e3c9fd71f51e..3c64199a5537 100644
--- a/src/Functions/toLowCardinality.cpp
+++ b/src/Functions/toLowCardinality.cpp
@@ -3,10 +3,17 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnLowCardinality.h>
 #include <Common/typeid_cast.h>
+#include <Common/Exception.h>
 
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
 
@@ -40,6 +47,9 @@ class FunctionToLowCardinality: public IFunction
         if (arg.type->lowCardinality())
             return arg.column;
 
+        if (!res_type->lowCardinality())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected LowCardinality type as result type for toLowCardinality function, got: {}", res_type->getName());
+
         auto column = res_type->createColumn();
         typeid_cast<ColumnLowCardinality &>(*column).insertRangeFromFullColumn(*arg.column, 0, arg.column->size());
         return column;
diff --git a/src/Functions/tuple.h b/src/Functions/tuple.h
index 1f89eae4a7cd..3fe809ce0f43 100644
--- a/src/Functions/tuple.h
+++ b/src/Functions/tuple.h
@@ -66,7 +66,7 @@ class FunctionTuple : public IFunction
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         if (arguments.empty())
-            return ColumnTuple::create(input_rows_count);
+            return DataTypeTuple({}).createColumnConstWithDefaultValue(input_rows_count);
 
         size_t tuple_size = arguments.size();
         Columns tuple_columns(tuple_size);
diff --git a/src/IO/Archives/ZipArchiveWriter.cpp b/src/IO/Archives/ZipArchiveWriter.cpp
index ac72c3ded02e..a9ca9e6f05f0 100644
--- a/src/IO/Archives/ZipArchiveWriter.cpp
+++ b/src/IO/Archives/ZipArchiveWriter.cpp
@@ -385,7 +385,7 @@ int ZipArchiveWriter::compressionMethodToInt(const String & compression_method_)
 
 String ZipArchiveWriter::intToCompressionMethod(int compression_method_)
 {
-    switch (compression_method_) // NOLINT(bugprone-switch-missing-default-case)
+    switch (compression_method_)
     {
         case MZ_COMPRESS_METHOD_STORE:   return kStore;
         case MZ_COMPRESS_METHOD_DEFLATE: return kDeflate;
@@ -393,14 +393,15 @@ String ZipArchiveWriter::intToCompressionMethod(int compression_method_)
         case MZ_COMPRESS_METHOD_LZMA:    return kLzma;
         case MZ_COMPRESS_METHOD_ZSTD:    return kZstd;
         case MZ_COMPRESS_METHOD_XZ:      return kXz;
+        default:
+            throw Exception(ErrorCodes::CANNOT_PACK_ARCHIVE, "Unknown compression method specified for a zip archive: {}", compression_method_);
     }
-    throw Exception(ErrorCodes::CANNOT_PACK_ARCHIVE, "Unknown compression method specified for a zip archive: {}", compression_method_);
 }
 
 /// Checks that a passed compression method can be used.
 void ZipArchiveWriter::checkCompressionMethodIsEnabled(int compression_method_)
 {
-    switch (compression_method_) // NOLINT(bugprone-switch-missing-default-case)
+    switch (compression_method_)
     {
         case MZ_COMPRESS_METHOD_STORE: [[fallthrough]];
         case MZ_COMPRESS_METHOD_DEFLATE:
@@ -417,8 +418,10 @@ void ZipArchiveWriter::checkCompressionMethodIsEnabled(int compression_method_)
             throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "bzip2 compression method is disabled");
 #endif
         }
+
+        default:
+            throw Exception(ErrorCodes::CANNOT_PACK_ARCHIVE, "Unknown compression method specified for a zip archive: {}", compression_method_);
     }
-    throw Exception(ErrorCodes::CANNOT_PACK_ARCHIVE, "Unknown compression method specified for a zip archive: {}", compression_method_);
 }
 
 /// Checks that encryption is enabled.
diff --git a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp
index b49e34dd2d3a..d319b1550ee1 100644
--- a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp
+++ b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp
@@ -353,60 +353,98 @@ void copyAzureBlobStorageFile(
     const String & dest_blob,
     std::shared_ptr<const AzureBlobStorage::RequestSettings> settings,
     const ReadSettings & read_settings,
-    bool same_credentials,
+    const std::optional<ObjectAttributes> & object_to_attributes,
     ThreadPoolCallbackRunnerUnsafe<void> schedule)
 {
     auto log = getLogger("copyAzureBlobStorageFile");
+    bool is_native_copy_done = false;
 
-    if (settings->use_native_copy && same_credentials)
+    if (settings->use_native_copy)
     {
+        /// Do native copy
         LOG_TRACE(log, "Copying Blob: {} from Container: {} using native copy", src_blob, src_container_for_logging);
         ProfileEvents::increment(ProfileEvents::AzureCopyObject);
         if (dest_client->IsClientForDisk())
             ProfileEvents::increment(ProfileEvents::DiskAzureCopyObject);
 
-        auto block_blob_client_src = src_client->GetBlockBlobClient(src_blob);
-        auto block_blob_client_dest = dest_client->GetBlockBlobClient(dest_blob);
+        try
+        {
+            auto block_blob_client_src = src_client->GetBlockBlobClient(src_blob);
+            auto block_blob_client_dest = dest_client->GetBlockBlobClient(dest_blob);
 
-        auto source_uri = block_blob_client_src.GetUrl();
+            auto source_uri = block_blob_client_src.GetUrl();
 
-        if (size < settings->max_single_part_copy_size)
-        {
-            LOG_TRACE(log, "Copy blob sync {} -> {}", src_blob, dest_blob);
-            block_blob_client_dest.CopyFromUri(source_uri);
-        }
-        else
-        {
-            Azure::Storage::Blobs::StartBlobCopyOperation operation = block_blob_client_dest.StartCopyFromUri(source_uri);
+            if (size < settings->max_single_part_copy_size)
+            {
+                Azure::Storage::Blobs::CopyBlobFromUriOptions copy_options;
+                if (object_to_attributes.has_value())
+                {
+                    for (const auto & [key, value] : *object_to_attributes)
+                        copy_options.Metadata[key] = value;
+                }
+
+                LOG_TRACE(log, "Copy blob sync {} -> {}", src_blob, dest_blob);
+                block_blob_client_dest.CopyFromUri(source_uri, copy_options);
+            }
+            else
+            {
+                Azure::Storage::Blobs::StartBlobCopyFromUriOptions copy_options;
+                if (object_to_attributes.has_value())
+                {
+                    for (const auto & [key, value] : *object_to_attributes)
+                        copy_options.Metadata[key] = value;
+                }
 
-            auto copy_response = operation.PollUntilDone(std::chrono::milliseconds(100));
-            auto properties_model = copy_response.Value;
+                Azure::Storage::Blobs::StartBlobCopyOperation operation = block_blob_client_dest.StartCopyFromUri(source_uri, copy_options);
 
-            auto copy_status = properties_model.CopyStatus;
-            auto copy_status_description = properties_model.CopyStatusDescription;
+                auto copy_response = operation.PollUntilDone(std::chrono::milliseconds(100));
+                auto properties_model = copy_response.Value;
 
+                auto copy_status = properties_model.CopyStatus;
+                auto copy_status_description = properties_model.CopyStatusDescription;
 
-            if (copy_status.HasValue() && copy_status.Value() == Azure::Storage::Blobs::Models::CopyStatus::Success)
+
+                if (copy_status.HasValue() && copy_status.Value() == Azure::Storage::Blobs::Models::CopyStatus::Success)
+                {
+                    LOG_TRACE(log, "Copy of {} to {} finished", properties_model.CopySource.Value(), dest_blob);
+                }
+                else
+                {
+                    if (copy_status.HasValue())
+                        throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Copy from {} to {} failed with status {} description {} (operation is done {})",
+                                        src_blob, dest_blob, copy_status.Value().ToString(), copy_status_description.Value(), operation.IsDone());
+                    throw Exception(
+                        ErrorCodes::AZURE_BLOB_STORAGE_ERROR,
+                        "Copy from {} to {} didn't complete with success status (operation is done {})",
+                        src_blob,
+                        dest_blob,
+                        operation.IsDone());
+                }
+            }
+            is_native_copy_done = true;
+        }
+        catch (const Azure::Storage::StorageException & e)
+        {
+            if (e.StatusCode == Azure::Core::Http::HttpStatusCode::Unauthorized)
             {
-                LOG_TRACE(log, "Copy of {} to {} finished", properties_model.CopySource.Value(), dest_blob);
+                LOG_TRACE(log, "Copy operation has thrown unauthorized access error, which indicates that the storage account of the source & destination are not the same. "
+                               "Will attempt to copy using read & write. source container = {} blob = {} and destination container = {} blob = {}",
+                          src_container_for_logging, src_blob, dest_container_for_logging, dest_blob);
             }
-            else
+            else if (e.StatusCode == Azure::Core::Http::HttpStatusCode::BadRequest)
             {
-                if (copy_status.HasValue())
-                    throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Copy from {} to {} failed with status {} description {} (operation is done {})",
-                                    src_blob, dest_blob, copy_status.Value().ToString(), copy_status_description.Value(), operation.IsDone());
-                throw Exception(
-                    ErrorCodes::AZURE_BLOB_STORAGE_ERROR,
-                    "Copy from {} to {} didn't complete with success status (operation is done {})",
-                    src_blob,
-                    dest_blob,
-                    operation.IsDone());
+                LOG_TRACE(log, "Copy operation has thrown bad argument error. e.what = {}. "
+                               "Will attempt to copy using read & write. source container = {} blob = {} and destination container = {} blob = {}",
+                          e.what(), src_container_for_logging, src_blob, dest_container_for_logging, dest_blob);
             }
+            else
+                throw;
         }
     }
-    else
+    if (!is_native_copy_done)
     {
-        LOG_TRACE(log, "Copying Blob: {} from Container: {} native copy is disabled {}", src_blob, src_container_for_logging, same_credentials ? "" : " because of different credentials");
+        /// Copy through read and write
+        LOG_TRACE(log, "Reading and writing Blob: {} from Container: {}", src_blob, src_container_for_logging);
         auto create_read_buffer = [&]
         {
             return std::make_unique<ReadBufferFromAzureBlobStorage>(
diff --git a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h
index 036fbf34b0da..2059e715a7a7 100644
--- a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h
+++ b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h
@@ -30,7 +30,7 @@ void copyAzureBlobStorageFile(
     const String & dest_blob,
     std::shared_ptr<const AzureBlobStorage::RequestSettings> settings,
     const ReadSettings & read_settings,
-    bool same_credentials = true,
+    const std::optional<ObjectAttributes> & object_to_attributes,
     ThreadPoolCallbackRunnerUnsafe<void> schedule_ = {});
 
 
diff --git a/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp b/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp
index 2dccea140120..876dbb1b1404 100644
--- a/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp
+++ b/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp
@@ -27,6 +27,7 @@ ProtobufZeroCopyOutputStreamFromWriteBuffer::ProtobufZeroCopyOutputStreamFromWri
 
 bool ProtobufZeroCopyOutputStreamFromWriteBuffer::Next(void ** data, int * size)
 {
+    out->nextIfAtEnd();
     *data = out->position();
     *size = static_cast<int>(out->available());
     out->position() += *size;
diff --git a/src/IO/ReadBuffer.cpp b/src/IO/ReadBuffer.cpp
index be355e266977..add00abeee84 100644
--- a/src/IO/ReadBuffer.cpp
+++ b/src/IO/ReadBuffer.cpp
@@ -107,6 +107,15 @@ bool ReadBuffer::next()
     }
     else
     {
+        /// It might happen that we need to skip all data in the buffer,
+        /// in this case we should call next() one more time to load new data.
+        if (nextimpl_working_buffer_offset == working_buffer.size())
+        {
+            pos = working_buffer.end();
+            nextimpl_working_buffer_offset = 0;
+            return next();
+        }
+
         pos = working_buffer.begin() + std::min(nextimpl_working_buffer_offset, working_buffer.size());
         chassert(position() < working_buffer.end());
     }
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index 93562e7bfed6..0e7f3a496a59 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -1,6 +1,7 @@
 #include <Poco/Net/NetException.h>
 
 #include <base/scope_guard.h>
+#include <Common/scope_guard_safe.h>
 
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <Common/Exception.h>
@@ -56,7 +57,7 @@ ssize_t ReadBufferFromPocoSocketBase::socketReceiveBytesImpl(char * ptr, size_t
         if (async_callback)
         {
             socket.setBlocking(false);
-            SCOPE_EXIT(socket.setBlocking(true));
+            SCOPE_EXIT_SAFE(socket.setBlocking(true));
             bool secure = socket.secure();
             bytes_read = socket.impl()->receiveBytes(ptr, static_cast<int>(size));
 
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index 3bfc8628f294..c3a3d9f9ff86 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -429,7 +429,7 @@ Aws::S3::Model::GetObjectResult ReadBufferFromS3::sendRequest(size_t attempt, si
     if (!version_id.empty())
         req.SetVersionId(version_id);
 
-    req.SetAdditionalCustomHeaderValue("clickhouse-request", fmt::format("attempt={}", attempt));
+    S3::setClickhouseAttemptNumber(req, attempt);
 
     if (range_end_incl)
     {
@@ -445,6 +445,12 @@ Aws::S3::Model::GetObjectResult ReadBufferFromS3::sendRequest(size_t attempt, si
             log, "Read S3 object. Bucket: {}, Key: {}, Version: {}, Offset: {}",
             bucket, key, version_id.empty() ? "Latest" : version_id, range_begin);
     }
+    else
+    {
+        LOG_TEST(
+            log, "Read S3 object. Bucket: {}, Key: {}, Version: {}",
+            bucket, key, version_id.empty() ? "Latest" : version_id);
+    }
 
     ProfileEvents::increment(ProfileEvents::S3GetObject);
     if (client_ptr->isClientForDisk())
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index 7d0852d270c7..410f3b8562ab 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -1458,7 +1458,13 @@ template bool readDateTextFallback<bool>(LocalDate &, ReadBuffer &, const char *
 
 
 template <typename ReturnType, bool dt64_mode>
-ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters, const char * allowed_time_delimiters)
+ReturnType readDateTimeTextFallback(
+    time_t & datetime,
+    ReadBuffer & buf,
+    const DateLUTImpl & date_lut,
+    const char * allowed_date_delimiters,
+    const char * allowed_time_delimiters,
+    bool saturate_on_overflow)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -1567,10 +1573,39 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
             second = (s[6] - '0') * 10 + (s[7] - '0');
         }
 
-        if (unlikely(year == 0))
-            datetime = 0;
+        if constexpr (throw_exception)
+        {
+            if (unlikely(year == 0))
+                datetime = 0;
+            else
+                datetime = makeDateTime(date_lut, year, month, day, hour, minute, second);
+        }
         else
-            datetime = makeDateTime(date_lut, year, month, day, hour, minute, second);
+        {
+            if (saturate_on_overflow)
+            {
+                /// Use saturating version - makeDateTime saturates out-of-range years
+                if (unlikely(year == 0))
+                    datetime = 0;
+                else
+                    datetime = makeDateTime(date_lut, year, month, day, hour, minute, second);
+            }
+            else
+            {
+                /// Use non-saturating version - return false for out-of-range values
+                auto datetime_maybe = tryToMakeDateTime(date_lut, year, month, day, hour, minute, second);
+                if (!datetime_maybe)
+                    return false;
+
+                if constexpr (!dt64_mode)
+                {
+                    if (*datetime_maybe < 0 || *datetime_maybe > static_cast<Int64>(UINT32_MAX))
+                        return false;
+                }
+
+                datetime = *datetime_maybe;
+            }
+        }
     }
     else
     {
@@ -1605,10 +1640,10 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
     return ReturnType(true);
 }
 
-template void readDateTimeTextFallback<void, false>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
-template void readDateTimeTextFallback<void, true>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
-template bool readDateTimeTextFallback<bool, false>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
-template bool readDateTimeTextFallback<bool, true>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
+template void readDateTimeTextFallback<void, false>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *, bool);
+template void readDateTimeTextFallback<void, true>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *, bool);
+template bool readDateTimeTextFallback<bool, false>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *, bool);
+template bool readDateTimeTextFallback<bool, true>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *, bool);
 
 template <typename ReturnType, bool t64_mode>
 ReturnType readTimeTextFallback(time_t & time, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters, const char * allowed_time_delimiters)
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 63d951547e86..fc2864545fa1 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -609,21 +609,52 @@ inline void convertToDayNum(DayNum & date, ExtendedDayNum & from)
         date = from;
 }
 
+inline bool tryToConvertToDayNum(DayNum & date, ExtendedDayNum & from)
+{
+    if (unlikely(from < 0 || from > 0xFFFF))
+        return false;
+
+    date = from;
+    return true;
+}
+
 template <typename ReturnType = void>
-inline ReturnType readDateTextImpl(DayNum & date, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_delimiters = nullptr)
+inline ReturnType readDateTextImpl(DayNum & date, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_delimiters = nullptr, bool saturate_on_overflow = true)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
     LocalDate local_date;
 
     if constexpr (throw_exception)
+    {
         readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters);
-    else if (!readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters))
-        return false;
+        ExtendedDayNum ret = makeDayNum(date_lut, local_date.year(), local_date.month(), local_date.day());
+        convertToDayNum(date, ret);
+    }
+    else
+    {
+        if (!readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters))
+            return false;
 
-    ExtendedDayNum ret = makeDayNum(date_lut, local_date.year(), local_date.month(), local_date.day());
-    convertToDayNum(date, ret);
-    return ReturnType(true);
+        if (saturate_on_overflow)
+        {
+            /// Use saturating versions - makeDayNum saturates out-of-range years, convertToDayNum saturates to 0 or 0xFFFF
+            ExtendedDayNum ret = makeDayNum(date_lut, local_date.year(), local_date.month(), local_date.day());
+            convertToDayNum(date, ret);
+        }
+        else
+        {
+            /// Use non-saturating versions - return false for out-of-range values
+            auto ret = tryToMakeDayNum(date_lut, local_date.year(), local_date.month(), local_date.day());
+            if (!ret)
+                return false;
+
+            if (!tryToConvertToDayNum(date, *ret))
+                return false;
+        }
+
+        return true;
+    }
 }
 
 template <typename ReturnType = void>
@@ -664,9 +695,9 @@ inline bool tryReadDateText(LocalDate & date, ReadBuffer & buf, const char * all
     return readDateTextImpl<bool>(date, buf, allowed_delimiters);
 }
 
-inline bool tryReadDateText(DayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_delimiters = nullptr)
+inline bool tryReadDateText(DayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_delimiters = nullptr, bool saturate_on_overflow = true)
 {
-    return readDateTextImpl<bool>(date, buf, time_zone, allowed_delimiters);
+    return readDateTextImpl<bool>(date, buf, time_zone, allowed_delimiters, saturate_on_overflow);
 }
 
 inline bool tryReadDateText(ExtendedDayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_delimiters = nullptr)
@@ -794,7 +825,7 @@ inline T parseFromStringWithoutAssertEOF(std::string_view str)
 }
 
 template <typename ReturnType = void, bool dt64_mode = false>
-ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr);
+ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr, bool saturate_on_overflow = true);
 
 template <typename ReturnType = void, bool t64_mode = false>
 ReturnType readTimeTextFallback(time_t & time, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr);
@@ -803,7 +834,7 @@ ReturnType readTimeTextFallback(time_t & time, ReadBuffer & buf, const DateLUTIm
   * As an exception, also supported parsing of unix timestamp in form of decimal number.
   */
 template <typename ReturnType = void, bool dt64_mode = false>
-inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr, bool saturate_on_overflow = true)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -868,10 +899,40 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
                 second = (s[17] - '0') * 10 + (s[18] - '0');
             }
 
-            if (unlikely(year == 0))
-                datetime = 0;
+            if constexpr (throw_exception)
+            {
+                if (unlikely(year == 0))
+                    datetime = 0;
+                else
+                    datetime = makeDateTime(date_lut, year, month, day, hour, minute, second);
+            }
             else
-                datetime = makeDateTime(date_lut, year, month, day, hour, minute, second);
+            {
+                if (saturate_on_overflow)
+                {
+                    /// Use saturating version - makeDateTime saturates out-of-range years
+                    if (unlikely(year == 0))
+                        datetime = 0;
+                    else
+                        datetime = makeDateTime(date_lut, year, month, day, hour, minute, second);
+                }
+                else
+                {
+                    /// Use non-saturating version - return false for out-of-range values
+                    auto datetime_maybe = tryToMakeDateTime(date_lut, year, month, day, hour, minute, second);
+                    if (!datetime_maybe)
+                        return false;
+
+                    /// For usual DateTime check if value is within supported range
+                    if constexpr (!dt64_mode)
+                    {
+                        if (*datetime_maybe < 0 || *datetime_maybe > static_cast<Int64>(UINT32_MAX))
+                            return false;
+                    }
+
+                    datetime = *datetime_maybe;
+                }
+            }
 
             if (dt_long)
                 buf.position() += date_time_broken_down_length;
@@ -883,7 +944,7 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
         /// Why not readIntTextUnsafe? Because for needs of AdFox, parsing of unix timestamp with leading zeros is supported: 000...NNNN.
         return readIntTextImpl<time_t, ReturnType, ReadIntTextCheckOverflow::CHECK_OVERFLOW>(datetime, buf);
     }
-    return readDateTimeTextFallback<ReturnType, dt64_mode>(datetime, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+    return readDateTimeTextFallback<ReturnType, dt64_mode>(datetime, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters, saturate_on_overflow);
 }
 
 /** In hhh:mm:ss format, according to specified time zone.
@@ -1071,7 +1132,7 @@ inline ReturnType readTimeTextImpl(time_t & time, ReadBuffer & buf, const DateLU
 }
 
 template <typename ReturnType>
-inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr, bool saturate_on_overflow = true)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -1085,7 +1146,7 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         {
             try
             {
-                readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+                readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters, saturate_on_overflow);
             }
             catch (const DB::Exception &)
             {
@@ -1095,8 +1156,7 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         }
         else
         {
-            auto ok = readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
-            if (!ok && (buf.eof() || *buf.position() != '.'))
+            if (!readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters, saturate_on_overflow))
                 return ReturnType(false);
         }
     }
@@ -1331,14 +1391,14 @@ inline bool tryReadTimeText(time_t & time, ReadBuffer & buf, const DateLUTImpl &
     return readTimeTextImpl<bool>(time, buf, time_zone, allowed_date_delimiters, allowed_time_delimiters);
 }
 
-inline bool tryReadDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline bool tryReadDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr, bool saturate_on_overflow = true)
 {
-    return readDateTimeTextImpl<bool>(datetime, buf, time_zone, allowed_date_delimiters, allowed_time_delimiters);
+    return readDateTimeTextImpl<bool>(datetime, buf, time_zone, allowed_date_delimiters, allowed_time_delimiters, saturate_on_overflow);
 }
 
-inline bool tryReadDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline bool tryReadDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr, bool saturate_on_overflow = true)
 {
-    return readDateTimeTextImpl<bool>(datetime64, scale, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+    return readDateTimeTextImpl<bool>(datetime64, scale, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters, saturate_on_overflow);
 }
 
 inline bool tryReadTime64Text(Time64 & time64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
diff --git a/src/IO/ReadWriteBufferFromHTTP.cpp b/src/IO/ReadWriteBufferFromHTTP.cpp
index d1554262f7e9..eb1ed86eee29 100644
--- a/src/IO/ReadWriteBufferFromHTTP.cpp
+++ b/src/IO/ReadWriteBufferFromHTTP.cpp
@@ -417,12 +417,12 @@ std::unique_ptr<ReadBuffer> ReadWriteBufferFromHTTP::initialize()
         /// Having `200 OK` instead of `206 Partial Content` is acceptable in case we retried with range.begin == 0.
         if (getOffset() != 0)
         {
-            /// Retry 200OK
+            /// Retry 200 OK
             if (response.getStatus() == Poco::Net::HTTPResponse::HTTPStatus::HTTP_OK)
             {
                 String explanation = fmt::format(
                     "Cannot read with range: [{}, {}] (response status: {}, reason: {}), will retry",
-                    *read_range.begin, read_range.end ? toString(*read_range.end) : "-",
+                    getOffset(), read_range.end ? toString(*read_range.end) : "-",
                     toString(response.getStatus()), response.getReason());
 
                 /// it is retriable error
@@ -436,7 +436,7 @@ std::unique_ptr<ReadBuffer> ReadWriteBufferFromHTTP::initialize()
             throw Exception(
                 ErrorCodes::HTTP_RANGE_NOT_SATISFIABLE,
                 "Cannot read with range: [{}, {}] (response status: {}, reason: {})",
-                *read_range.begin,
+                getOffset(),
                 read_range.end ? toString(*read_range.end) : "-",
                 toString(response.getStatus()),
                 response.getReason());
diff --git a/src/IO/S3/Client.cpp b/src/IO/S3/Client.cpp
index d00b852bfa82..831ce12e4277 100644
--- a/src/IO/S3/Client.cpp
+++ b/src/IO/S3/Client.cpp
@@ -19,6 +19,7 @@
 #include <aws/core/utils/logging/ErrorMacros.h>
 
 #include <Poco/Net/NetException.h>
+#include <Poco/Exception.h>
 
 #include <IO/Expect404ResponseScope.h>
 #include <IO/S3/Requests.h>
@@ -50,7 +51,12 @@ namespace ProfileEvents
     extern const Event S3ReadRequestRetryableErrors;
 
     extern const Event DiskS3WriteRequestsErrors;
+    extern const Event DiskS3WriteRequestAttempts;
+    extern const Event DiskS3WriteRequestRetryableErrors;
+
     extern const Event DiskS3ReadRequestsErrors;
+    extern const Event DiskS3ReadRequestAttempts;
+    extern const Event DiskS3ReadRequestRetryableErrors;
 
     extern const Event S3Clients;
     extern const Event TinyS3Clients;
@@ -79,6 +85,7 @@ namespace S3
 
 Client::RetryStrategy::RetryStrategy(const PocoHTTPClientConfiguration::RetryStrategy & config_)
     : config(config_)
+    , log(getLogger("S3ClientRetryStrategy"))
 {
     chassert(config.max_delay_ms <= (1.0 + config.jitter_factor) * config.initial_delay_ms * (1ul << 31l));
     chassert(config.jitter_factor >= 0 && config.jitter_factor <= 1);
@@ -128,7 +135,7 @@ long Client::RetryStrategy::CalculateDelayBeforeNextRetry(const Aws::Client::AWS
     else
         res = std::min<uint64_t>(config.initial_delay_ms * backoffLimitedPow, config.max_delay_ms);
 
-    LOG_TEST(getLogger("RetryStrategy"), "Next retry in {} ms", res);
+    LOG_TEST(log, "Next retry in {} ms", res);
     return res;
 }
 
@@ -138,6 +145,37 @@ long Client::RetryStrategy::GetMaxAttempts() const
     return config.max_retries + 1;
 }
 
+void Client::RetryStrategy::RequestBookkeeping(const Aws::Client::HttpResponseOutcome & httpResponseOutcome)
+{
+    if (!httpResponseOutcome.IsSuccess())
+    {
+        const auto & error = httpResponseOutcome.GetError();
+        if (error.ShouldRetry())
+            LOG_TRACE(
+                log,
+                "Attempt {}/{} failed with retryable error: {}, {}",
+                httpResponseOutcome.GetRetryCount() + 1,
+                GetMaxAttempts(),
+                static_cast<size_t>(error.GetResponseCode()),
+                error.GetMessage());
+    }
+}
+
+void Client::RetryStrategy::RequestBookkeeping(
+    const Aws::Client::HttpResponseOutcome & httpResponseOutcome, const Aws::Client::AWSError<Aws::Client::CoreErrors> & lastError)
+{
+    if (httpResponseOutcome.IsSuccess())
+        LOG_TRACE(
+            log,
+            "Attempt {}/{} succeeded with response code {}, last error: {}, {}",
+            httpResponseOutcome.GetRetryCount() + 1,
+            GetMaxAttempts(),
+            static_cast<size_t>(httpResponseOutcome.GetResult()->GetResponseCode()),
+            static_cast<size_t>(lastError.GetResponseCode()),
+            lastError.GetMessage());
+    RequestBookkeeping(httpResponseOutcome);
+}
+
 namespace
 {
 
@@ -188,7 +226,12 @@ std::unique_ptr<Client> Client::create(
 
 std::unique_ptr<Client> Client::clone() const
 {
-    return std::unique_ptr<Client>(new Client(*this, client_configuration));
+    return cloneWithConfigurationOverride(this->client_configuration);
+}
+
+std::unique_ptr<Client> Client::cloneWithConfigurationOverride(const PocoHTTPClientConfiguration & client_configuration_override) const
+{
+    return std::unique_ptr<Client>(new Client(*this, client_configuration_override));
 }
 
 namespace
@@ -249,15 +292,7 @@ Client::Client(
 
     LOG_TRACE(log, "API mode of the S3 client: {}", api_mode);
 
-    LOG_TRACE(
-        log,
-        "Slowing down threads on retryable errors is {}",
-        client_configuration.s3_slow_all_threads_after_retryable_error ? "enabled" : "disabled");
-
-    LOG_TRACE(
-        log,
-        "Slowing down threads on network errors is {}",
-        client_configuration.s3_slow_all_threads_after_network_error ? "enabled" : "disabled");
+    logConfiguration();
 
     detect_region = provider_type == ProviderType::AWS && explicit_region == Aws::Region::AWS_GLOBAL;
 
@@ -279,6 +314,7 @@ Client::Client(
     , explicit_region(other.explicit_region)
     , detect_region(other.detect_region)
     , provider_type(other.provider_type)
+    , api_mode(other.api_mode)
     , max_redirects(other.max_redirects)
     , sse_kms_config(other.sse_kms_config)
     , log(getLogger("S3Client"))
@@ -286,6 +322,8 @@ Client::Client(
     cache = std::make_shared<ClientCache>(*other.cache);
     ClientCacheRegistry::instance().registerClient(cache);
 
+    logConfiguration();
+
     ProfileEvents::increment(ProfileEvents::TinyS3Clients);
 }
 
@@ -416,7 +454,7 @@ Model::HeadObjectOutcome Client::HeadObject(HeadObjectRequest & request) const
     auto bucket_uri = getURIForBucket(bucket);
     if (!bucket_uri)
     {
-        if (auto maybe_error = updateURIForBucketForHead(bucket); maybe_error.has_value())
+        if (auto maybe_error = updateURIForBucketForHead(bucket, request.GetKey()); maybe_error.has_value())
             return *maybe_error;
 
         if (auto region = getRegionForBucket(bucket); !region.empty())
@@ -456,37 +494,37 @@ Model::HeadObjectOutcome Client::HeadObject(HeadObjectRequest & request) const
 Model::ListObjectsV2Outcome Client::ListObjectsV2(ListObjectsV2Request & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ true>(
-        request, [this](const Model::ListObjectsV2Request & req) { return ListObjectsV2(req); });
+        request, [this](Model::ListObjectsV2Request & req) { return ListObjectsV2(req); });
 }
 
 Model::ListObjectsOutcome Client::ListObjects(ListObjectsRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ true>(
-        request, [this](const Model::ListObjectsRequest & req) { return ListObjects(req); });
+        request, [this](Model::ListObjectsRequest & req) { return ListObjects(req); });
 }
 
 Model::GetObjectOutcome Client::GetObject(GetObjectRequest & request) const
 {
     return processRequestResult(
-        doRequest(request, [this](const Model::GetObjectRequest & req) { return GetObject(req); }));
+        doRequest(request, [this](Model::GetObjectRequest & req) { return GetObject(req); }));
 }
 
 Model::AbortMultipartUploadOutcome Client::AbortMultipartUpload(AbortMultipartUploadRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::AbortMultipartUploadRequest & req) { return AbortMultipartUpload(req); });
+        request, [this](Model::AbortMultipartUploadRequest & req) { return AbortMultipartUpload(req); });
 }
 
 Model::CreateMultipartUploadOutcome Client::CreateMultipartUpload(CreateMultipartUploadRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::CreateMultipartUploadRequest & req) { return CreateMultipartUpload(req); });
+        request, [this](Model::CreateMultipartUploadRequest & req) { return CreateMultipartUpload(req); });
 }
 
 Model::CompleteMultipartUploadOutcome Client::CompleteMultipartUpload(CompleteMultipartUploadRequest & request) const
 {
     auto outcome = doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::CompleteMultipartUploadRequest & req) { return CompleteMultipartUpload(req); });
+        request, [this](Model::CompleteMultipartUploadRequest & req) { return CompleteMultipartUpload(req); });
 
     const auto & key = request.GetKey();
     const auto & bucket = request.GetBucket();
@@ -533,42 +571,42 @@ Model::CompleteMultipartUploadOutcome Client::CompleteMultipartUpload(CompleteMu
 Model::CopyObjectOutcome Client::CopyObject(CopyObjectRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::CopyObjectRequest & req) { return CopyObject(req); });
+        request, [this](Model::CopyObjectRequest & req) { return CopyObject(req); });
 }
 
 Model::PutObjectOutcome Client::PutObject(PutObjectRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::PutObjectRequest & req) { return PutObject(req); });
+        request, [this](Model::PutObjectRequest & req) { return PutObject(req); });
 }
 
 Model::UploadPartOutcome Client::UploadPart(UploadPartRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::UploadPartRequest & req) { return UploadPart(req); });
+        request, [this](Model::UploadPartRequest & req) { return UploadPart(req); });
 }
 
 Model::UploadPartCopyOutcome Client::UploadPartCopy(UploadPartCopyRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::UploadPartCopyRequest & req) { return UploadPartCopy(req); });
+        request, [this](Model::UploadPartCopyRequest & req) { return UploadPartCopy(req); });
 }
 
 Model::DeleteObjectOutcome Client::DeleteObject(DeleteObjectRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::DeleteObjectRequest & req) { Expect404ResponseScope scope; return DeleteObject(req); });
+        request, [this](Model::DeleteObjectRequest & req) { Expect404ResponseScope scope; return DeleteObject(req); });
 }
 
 Model::DeleteObjectsOutcome Client::DeleteObjects(DeleteObjectsRequest & request) const
 {
     return doRequestWithRetryNetworkErrors</*IsReadMethod*/ false>(
-        request, [this](const Model::DeleteObjectsRequest & req) { Expect404ResponseScope scope; return DeleteObjects(req); });
+        request, [this](Model::DeleteObjectsRequest & req) { Expect404ResponseScope scope; return DeleteObjects(req); });
 }
 
 Client::ComposeObjectOutcome Client::ComposeObject(ComposeObjectRequest & request) const
 {
-    auto request_fn = [this](const ComposeObjectRequest & req)
+    auto request_fn = [this](ComposeObjectRequest & req)
     {
         auto & endpoint_provider = const_cast<Client &>(*this).accessEndpointProvider();
         AWS_OPERATION_CHECK_PTR(endpoint_provider, ComposeObject, Aws::Client::CoreErrors, Aws::Client::CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
@@ -597,7 +635,7 @@ Client::ComposeObjectOutcome Client::ComposeObject(ComposeObjectRequest & reques
 }
 
 template <typename RequestType, typename RequestFn>
-std::invoke_result_t<RequestFn, RequestType>
+std::invoke_result_t<RequestFn, RequestType &>
 Client::doRequest(RequestType & request, RequestFn request_fn) const
 {
     addAdditionalAMZHeadersToCanonicalHeadersList(request, client_configuration.extra_headers);
@@ -621,7 +659,6 @@ Client::doRequest(RequestType & request, RequestFn request_fn) const
     if (auto uri = getURIForBucket(bucket); uri.has_value())
         request.overrideURI(std::move(*uri));
 
-
     bool found_new_endpoint = false;
     // if we found correct endpoint after 301 responses, update the cache for future requests
     SCOPE_EXIT(
@@ -655,19 +692,35 @@ Client::doRequest(RequestType & request, RequestFn request_fn) const
             continue;
         }
 
-        if (error.GetResponseCode() != Aws::Http::HttpResponseCode::MOVED_PERMANENTLY)
+        /// IllegalLocationConstraintException may indicate that we are working with an opt-in region (e.g. me-south-1)
+        /// In that case, we need to update the region and try again
+        bool is_illegal_constraint_exception = error.GetExceptionName() == "IllegalLocationConstraintException";
+        if (error.GetResponseCode() != Aws::Http::HttpResponseCode::MOVED_PERMANENTLY && !is_illegal_constraint_exception)
             return result;
 
         // maybe we detect a correct region
-        if (!detect_region)
+        bool new_region_detected = false;
+        if (!detect_region || is_illegal_constraint_exception)
         {
             if (auto region = GetErrorMarshaller()->ExtractRegion(error); !region.empty() && region != explicit_region)
             {
+                LOG_INFO(log, "Detected new region: {}", region);
                 request.overrideRegion(region);
                 insertRegionOverride(bucket, region);
+                new_region_detected = true;
             }
         }
 
+        /// special handling for opt-in regions
+        if (new_region_detected && is_illegal_constraint_exception && initial_endpoint.substr(11) == "amazonaws.com")
+        {
+            S3::URI new_uri(initial_endpoint);
+            new_uri.addRegionToURI(request.getRegionOverride());
+            found_new_endpoint = true;
+            request.overrideURI(new_uri);
+            continue;
+        }
+
         // we possibly got new location, need to try with that one
         auto new_uri = getURIFromError(error);
         if (!new_uri)
@@ -692,79 +745,100 @@ Client::doRequest(RequestType & request, RequestFn request_fn) const
 }
 
 template <bool IsReadMethod, typename RequestType, typename RequestFn>
-std::invoke_result_t<RequestFn, RequestType>
+std::invoke_result_t<RequestFn, RequestType &>
 Client::doRequestWithRetryNetworkErrors(RequestType & request, RequestFn request_fn) const
 {
+    /// S3 does retries network errors actually.
+    /// But it does matter when errors occur.
+    /// This code retries a specific case when
+    /// network error happens when XML document is being read from the response body.
+    /// Hence, the response body is a stream, network errors are possible at reading.
+    /// S3 doesn't retry them.
+
+    /// Not all requests can be retried in that way.
+    /// Requests that read out response body to build the result are possible to retry.
+    /// Requests that expose the response stream as an answer are not retried with that code. E.g. GetObject.
+
     addAdditionalAMZHeadersToCanonicalHeadersList(request, client_configuration.extra_headers);
-    auto with_retries = [this, request_fn_ = std::move(request_fn)] (const RequestType & request_)
+    auto with_retries = [this, request_fn_ = std::move(request_fn)] (RequestType & request_)
     {
         chassert(client_configuration.retryStrategy);
         const Int64 max_attempts = client_configuration.retry_strategy.max_retries + 1;
-        chassert(max_attempts > 0);
-        std::exception_ptr last_exception = nullptr;
-        for (Int64 attempt_no = 0; attempt_no < max_attempts; ++attempt_no)
+
+        Int64 attempt_no = 1;
+        std::invoke_result_t<RequestFn, RequestType &> outcome;
+
+        auto net_exception_handler = [&]() -> bool /// return true if we should retry
         {
-            if (!isClientForDisk())
-                incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestAttempts, ProfileEvents::S3WriteRequestAttempts);
+            incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestsErrors, ProfileEvents::S3WriteRequestsErrors);
+            if (isClientForDisk())
+                incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestsErrors, ProfileEvents::DiskS3WriteRequestsErrors);
+
+            tryLogCurrentException(log, fmt::format("Network error on S3 request, attempt {} of {}", attempt_no, max_attempts));
+
+            outcome = Aws::Client::AWSError<Aws::Client::CoreErrors>(
+                Aws::Client::CoreErrors::NETWORK_CONNECTION,
+                /*name*/ "",
+                /*message*/ fmt::format("All {} retry attempts failed. Last exception: {}", max_attempts, getCurrentExceptionMessage(false)),
+                /*retryable*/ true);
+
+            // network exceptions are always retryable, we could just return true here
+            // but we have to check cancellation points for query, ShouldRetry method does it already
+            return client_configuration.retryStrategy->ShouldRetry(outcome.GetError(), /*attemptedRetries*/ -1);
+        };
+
+        for (attempt_no = 1; attempt_no <= max_attempts; ++attempt_no)
+        {
+            incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestAttempts, ProfileEvents::S3WriteRequestAttempts);
+            if (isClientForDisk())
+                incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestAttempts, ProfileEvents::DiskS3WriteRequestAttempts);
+
+            if (attempt_no > 1)
+            {
+                incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestRetryableErrors, ProfileEvents::S3WriteRequestRetryableErrors);
+                if (isClientForDisk())
+                    incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestRetryableErrors, ProfileEvents::DiskS3WriteRequestRetryableErrors);
+
+                // use previously attempt number to calculate delay
+                updateNextTimeToRetryAfterRetryableError(outcome.GetError(), attempt_no - 1);
+
+                // update ClickHouse-specific attempt number in the request
+                // to help choose the right timeouts on the HTTP client which depends on retry attempt number
+                auto clickhouse_request_attempt = getClickhouseAttemptNumber(request_);
+                setClickhouseAttemptNumber(request_, clickhouse_request_attempt + attempt_no);
+            }
 
             /// Slowing down due to a previously encountered retryable error, possibly from another thread.
             slowDownAfterRetryableError();
 
             try
             {
-                /// S3 does retries network errors actually.
-                /// But it does matter when errors occur.
-                /// This code retries a specific case when
-                /// network error happens when XML document is being read from the response body.
-                /// Hence, the response body is a stream, network errors are possible at reading.
-                /// S3 doesn't retry them.
-
-                /// Not all requests can be retried in that way.
-                /// Requests that read out response body to build the result are possible to retry.
-                /// Requests that expose the response stream as an answer are not retried with that code. E.g. GetObject.
-                auto outcome = request_fn_(request_);
-
-                if (!outcome.IsSuccess()
-                    /// AWS SDK's built-in per-thread retry logic is disabled.
-                    && client_configuration.s3_slow_all_threads_after_retryable_error
-                    && attempt_no + 1 < max_attempts
-                    /// Retry attempts are managed by the outer loop, so the attemptedRetries argument can be ignored.
-                    && client_configuration.retryStrategy->ShouldRetry(outcome.GetError(), /*attemptedRetries*/ -1))
-                {
-                    if (!isClientForDisk())
-                        incrementProfileEvents<IsReadMethod>(
-                            ProfileEvents::S3ReadRequestRetryableErrors, ProfileEvents::S3WriteRequestRetryableErrors);
-
-                    updateNextTimeToRetryAfterRetryableError(outcome.GetError(), attempt_no);
-                    continue;
-                }
-                return outcome;
-            }
-            catch (Poco::Net::NetException &)
-            {
-                /// This includes "connection reset", "malformed message", and possibly other exceptions.
-
-                if (isClientForDisk())
-                    incrementProfileEvents<IsReadMethod>(ProfileEvents::DiskS3ReadRequestsErrors, ProfileEvents::DiskS3WriteRequestsErrors);
-                else
-                    incrementProfileEvents<IsReadMethod>(ProfileEvents::S3ReadRequestsErrors, ProfileEvents::S3WriteRequestsErrors);
+                outcome = request_fn_(request_);
 
-                tryLogCurrentException(log, "Will retry");
-                last_exception = std::current_exception();
+                if (outcome.IsSuccess())
+                    break;
 
-                auto error = Aws::Client::AWSError<Aws::Client::CoreErrors>(Aws::Client::CoreErrors::NETWORK_CONNECTION, /*retry*/ true);
+                // do not increment S3ReadRequestsErrors/S3WriteRequestsErrors here, it has been accounted in IO/S3/PocoHTTPClient.cpp
 
-                /// Check if query is canceled.
                 /// Retry attempts are managed by the outer loop, so the attemptedRetries argument can be ignored.
-                if (!client_configuration.retryStrategy->ShouldRetry(error, /*attemptedRetries*/ -1))
+                if (!client_configuration.retryStrategy->ShouldRetry(outcome.GetError(), /*attemptedRetries*/ -1))
+                    break;
+            }
+            catch (Poco::Net::NetException &)
+            {
+                /// This includes "connection reset", "malformed message", and possibly other exceptions.
+                if (!net_exception_handler())
+                    break;
+            }
+            catch (Poco::TimeoutException &)
+            {
+                /// This includes "Timeout"
+                if (!net_exception_handler())
                     break;
-
-                updateNextTimeToRetryAfterRetryableError(error, attempt_no);
             }
         }
 
-        chassert(last_exception);
-        std::rethrow_exception(last_exception);
+        return outcome;
     };
 
     return doRequest(request, with_retries);
@@ -805,7 +879,7 @@ void Client::updateNextTimeToRetryAfterRetryableError(Aws::Client::AWSError<Aws:
     {
         if (next_time_to_retry_after_retryable_error.compare_exchange_weak(stored_next_time, next_time_ms))
         {
-            LOG_TRACE(log, "Updated next retry time to {} ms forward", sleep_ms);
+            LOG_TRACE(log, "Updated next retry time to {} ms forward after retryable error with code {}", sleep_ms, error.GetResponseCode());
             break;
         }
     }
@@ -840,6 +914,31 @@ void Client::slowDownAfterRetryableError() const
     }
 }
 
+void Client::logConfiguration() const
+{
+    if (client_configuration.for_disk_s3)
+    {
+        LOG_TRACE(
+            log,
+            "S3 client for disk '{}' initialized with s3_retry_attempts: {}",
+            client_configuration.opt_disk_name.value_or(""),
+            client_configuration.retry_strategy.max_retries);
+        LOG_TRACE(
+            log,
+            "S3 client for disk '{}': slowing down threads on retryable errors is {}",
+            client_configuration.opt_disk_name.value_or(""),
+            client_configuration.s3_slow_all_threads_after_retryable_error ? "enabled" : "disabled");
+    }
+    else
+    {
+        LOG_TRACE(log, "S3 client initialized with s3_retry_attempts: {}", client_configuration.retry_strategy.max_retries);
+        LOG_TRACE(
+            log,
+            "S3 client: slowing down threads on retryable errors is {}",
+            client_configuration.s3_slow_all_threads_after_retryable_error ? "enabled" : "disabled");
+    }
+}
+
 bool Client::supportsMultiPartCopy() const
 {
     return provider_type != ProviderType::GCS;
@@ -922,12 +1021,15 @@ std::optional<S3::URI> Client::getURIFromError(const Aws::S3::S3Error & error) c
 }
 
 // Do a list request because head requests don't have body in response
-std::optional<Aws::S3::S3Error> Client::updateURIForBucketForHead(const std::string & bucket) const
+// S3 Tables don't support ListObjects, so made dirty workaroung - changed on GetObject
+std::optional<Aws::S3::S3Error> Client::updateURIForBucketForHead(const std::string & bucket, const std::string & key) const
 {
-    ListObjectsV2Request req;
+    GetObjectRequest req;
     req.SetBucket(bucket);
-    req.SetMaxKeys(1);
-    auto result = ListObjectsV2(req);
+    req.SetKey(key);
+    req.SetRange("bytes=0-1");
+    auto result = GetObject(req);
+
     if (result.IsSuccess())
         return std::nullopt;
     return result.GetError();
@@ -1107,7 +1209,7 @@ std::unique_ptr<S3::Client> ClientFactory::create( // NOLINT
     if (client_configuration.s3_slow_all_threads_after_retryable_error)
     {
         auto configuration = client_configuration.retry_strategy;
-        configuration.max_retries = 0;
+        configuration.max_retries = 1;
         client_configuration.retryStrategy = std::make_shared<Client::RetryStrategy>(configuration);
     }
     else
@@ -1136,6 +1238,7 @@ PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
     bool s3_slow_all_threads_after_retryable_error,
     bool enable_s3_requests_logging,
     bool for_disk_s3,
+    std::optional<std::string> opt_disk_name,
     const ThrottlerPtr & get_request_throttler,
     const ThrottlerPtr & put_request_throttler,
     const String & protocol)
@@ -1157,6 +1260,7 @@ PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
         s3_slow_all_threads_after_retryable_error,
         enable_s3_requests_logging,
         for_disk_s3,
+        opt_disk_name,
         context->getGlobalContext()->getSettingsRef()[Setting::s3_use_adaptive_timeouts],
         get_request_throttler,
         put_request_throttler,
diff --git a/src/IO/S3/Client.h b/src/IO/S3/Client.h
index 9f3ae3e06d74..2701a3094cbc 100644
--- a/src/IO/S3/Client.h
+++ b/src/IO/S3/Client.h
@@ -132,6 +132,8 @@ class Client : private Aws::S3::S3Client
 
     std::unique_ptr<Client> clone() const;
 
+    std::unique_ptr<Client> cloneWithConfigurationOverride(const PocoHTTPClientConfiguration & client_configuration_override) const;
+
     Client & operator=(const Client &) = delete;
 
     Client(Client && other) = delete;
@@ -165,6 +167,11 @@ class Client : private Aws::S3::S3Client
         /// NOLINTNEXTLINE(google-runtime-int)
         long GetMaxAttempts() const override;
 
+        void RequestBookkeeping(const Aws::Client::HttpResponseOutcome & httpResponseOutcome) override;
+        void RequestBookkeeping(
+            const Aws::Client::HttpResponseOutcome & httpResponseOutcome,
+            const Aws::Client::AWSError<Aws::Client::CoreErrors> & lastError) override;
+
         /// Sometimes [1] GCS may suggest to use Rewrite over CopyObject, i.e.:
         ///
         ///     AWSError 'InternalError': Copy spanning locations and/or storage classes could not complete within 30 seconds. Please use the Rewrite method in the JSON API (https://cloud.google.com/storage/docs/json_api/v1/objects/rewrite) instead.
@@ -177,6 +184,7 @@ class Client : private Aws::S3::S3Client
 
     private:
         PocoHTTPClientConfiguration::RetryStrategy config;
+        LoggerPtr log;
     };
 
     /// SSE-KMS headers MUST be signed, so they need to be added before the SDK signs the message
@@ -270,16 +278,16 @@ class Client : private Aws::S3::S3Client
     ComposeObjectOutcome ComposeObject(ComposeObjectRequest & request) const;
 
     template <typename RequestType, typename RequestFn>
-    std::invoke_result_t<RequestFn, RequestType>
+    std::invoke_result_t<RequestFn, RequestType &>
     doRequest(RequestType & request, RequestFn request_fn) const;
 
     template <bool IsReadMethod, typename RequestType, typename RequestFn>
-    std::invoke_result_t<RequestFn, RequestType>
+    std::invoke_result_t<RequestFn, RequestType &>
     doRequestWithRetryNetworkErrors(RequestType & request, RequestFn request_fn) const;
 
     void updateURIForBucket(const std::string & bucket, S3::URI new_uri) const;
     std::optional<S3::URI> getURIFromError(const Aws::S3::S3Error & error) const;
-    std::optional<Aws::S3::S3Error> updateURIForBucketForHead(const std::string & bucket) const;
+    std::optional<Aws::S3::S3Error> updateURIForBucketForHead(const std::string & bucket, const std::string & key) const;
 
     std::optional<S3::URI> getURIForBucket(const std::string & bucket) const;
 
@@ -295,6 +303,7 @@ class Client : private Aws::S3::S3Client
     void updateNextTimeToRetryAfterRetryableError(Aws::Client::AWSError<Aws::Client::CoreErrors> error, Int64 attempt_no) const;
     void slowDownAfterRetryableError() const;
 
+    void logConfiguration() const;
     String initial_endpoint;
     std::shared_ptr<Aws::Auth::AWSCredentialsProvider> credentials_provider;
     PocoHTTPClientConfiguration client_configuration;
@@ -350,6 +359,7 @@ class ClientFactory
         bool s3_slow_all_threads_after_retryable_error,
         bool enable_s3_requests_logging,
         bool for_disk_s3,
+        std::optional<std::string> opt_disk_name,
         const ThrottlerPtr & get_request_throttler,
         const ThrottlerPtr & put_request_throttler,
         const String & protocol = "https");
diff --git a/src/IO/S3/Credentials.cpp b/src/IO/S3/Credentials.cpp
index a76a2b9375f2..aed33b800c87 100644
--- a/src/IO/S3/Credentials.cpp
+++ b/src/IO/S3/Credentials.cpp
@@ -742,6 +742,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
                 configuration.s3_slow_all_threads_after_retryable_error,
                 configuration.enable_s3_requests_logging,
                 configuration.for_disk_s3,
+                configuration.opt_disk_name,
                 configuration.get_request_throttler,
                 configuration.put_request_throttler);
             AddProvider(std::make_shared<AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider>(aws_client_configuration, credentials_configuration.expiration_window_seconds, credentials_configuration.kms_role_arn));
@@ -759,6 +760,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
                 configuration.s3_slow_all_threads_after_retryable_error,
                 configuration.enable_s3_requests_logging,
                 configuration.for_disk_s3,
+                configuration.opt_disk_name,
                 configuration.get_request_throttler,
                 configuration.put_request_throttler);
             AddProvider(std::make_shared<SSOCredentialsProvider>(
@@ -811,6 +813,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
                 configuration.s3_slow_all_threads_after_retryable_error,
                 configuration.enable_s3_requests_logging,
                 configuration.for_disk_s3,
+                configuration.opt_disk_name,
                 configuration.get_request_throttler,
                 configuration.put_request_throttler,
                 Aws::Http::SchemeMapper::ToString(Aws::Http::Scheme::HTTP));
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index a928f26db6f6..7b36c5195a34 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -6,8 +6,8 @@
 #if USE_AWS_S3
 
 #include <IO/S3/PocoHTTPClient.h>
+#include <IO/S3/Requests.h>
 
-#include <utility>
 #include <algorithm>
 #include <functional>
 
@@ -104,6 +104,7 @@ PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
     bool s3_slow_all_threads_after_retryable_error_,
     bool enable_s3_requests_logging_,
     bool for_disk_s3_,
+    std::optional<std::string> opt_disk_name_,
     bool s3_use_adaptive_timeouts_,
     const ThrottlerPtr & get_request_throttler_,
     const ThrottlerPtr & put_request_throttler_,
@@ -117,6 +118,7 @@ PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
     , s3_slow_all_threads_after_retryable_error(s3_slow_all_threads_after_retryable_error_)
     , enable_s3_requests_logging(enable_s3_requests_logging_)
     , for_disk_s3(for_disk_s3_)
+    , opt_disk_name(opt_disk_name_)
     , get_request_throttler(get_request_throttler_)
     , put_request_throttler(put_request_throttler_)
     , s3_use_adaptive_timeouts(s3_use_adaptive_timeouts_)
@@ -382,30 +384,6 @@ void PocoHTTPClient::observeLatency(const Aws::Http::HttpRequest & request, S3La
     }
 }
 
-String extractAttemptFromInfo(const Aws::String & request_info)
-{
-    static auto key = Aws::String("attempt=");
-
-    auto key_begin = request_info.find(key, 0);
-    if (key_begin == Aws::String::npos)
-        return "1";
-
-    auto val_begin = key_begin + key.size();
-    auto val_end = request_info.find(';', val_begin);
-    if (val_end == Aws::String::npos)
-        val_end = request_info.size();
-
-    return request_info.substr(val_begin, val_end-val_begin);
-}
-
-String getOrEmpty(const Aws::Http::HeaderValueCollection & map, const String & key)
-{
-    auto it = map.find(key);
-    if (it == map.end())
-        return {};
-    return it->second;
-}
-
 ConnectionTimeouts PocoHTTPClient::getTimeouts(const String & method, bool first_attempt, bool first_byte) const
 {
     if (!s3_use_adaptive_timeouts)
@@ -442,12 +420,12 @@ String getMethod(const Aws::Http::HttpRequest & request)
     }
 }
 
-PocoHTTPClient::S3LatencyType PocoHTTPClient::getFirstByteLatencyType(const String & sdk_attempt, const String & ch_attempt)
+PocoHTTPClient::S3LatencyType PocoHTTPClient::getFirstByteLatencyType(size_t sdk_attempt, size_t ch_attempt)
 {
     S3LatencyType result = S3LatencyType::FirstByteAttempt1;
-    if (sdk_attempt != "1" || ch_attempt != "1")
+    if (sdk_attempt != 1 || ch_attempt != 1)
     {
-        if ((sdk_attempt == "1" && ch_attempt == "2") || (sdk_attempt == "2" && ch_attempt == "1"))
+        if ((sdk_attempt == 1 && ch_attempt == 2) || (sdk_attempt == 2 && ch_attempt == 1))
             result = S3LatencyType::FirstByteAttempt2;
         else
             result = S3LatencyType::FirstByteAttemptN;
@@ -466,12 +444,20 @@ void PocoHTTPClient::makeRequestInternalImpl(
     auto uri = request.GetUri().GetURIString();
     auto method = getMethod(request);
 
-    auto sdk_attempt = extractAttemptFromInfo(getOrEmpty(request.GetHeaders(), Aws::Http::SDK_REQUEST_HEADER));
-    auto ch_attempt = extractAttemptFromInfo(getOrEmpty(request.GetHeaders(), "clickhouse-request"));
-    bool first_attempt = ch_attempt == "1" && sdk_attempt == "1";
-
-    if (enable_s3_requests_logging)
-        LOG_TEST(log, "Make request to: {}, aws sdk attempt: {}, clickhouse attempt: {}", uri, sdk_attempt, ch_attempt);
+    auto sdk_attempt = getSDKAttemptNumber(request);
+    auto ch_attempt = getClickhouseAttemptNumber(request);
+    bool first_attempt = ch_attempt == 1 && sdk_attempt == 1;
+
+    if (!first_attempt)
+        LOG_DEBUG(
+            log,
+            "Retrying S3 request to: {}, aws sdk attempt: {}, clickhouse attempt: {}, kind: {}",
+            uri, sdk_attempt, ch_attempt, getMetricKind(request) == S3MetricKind::Read ? "Read" : "Write");
+    else // if (enable_s3_requests_logging)
+        LOG_TEST(
+            log,
+            "Make S3 request to: {}, aws sdk attempt: {}, clickhouse attempt: {}, kind: {}",
+            uri, sdk_attempt, ch_attempt, getMetricKind(request) == S3MetricKind::Read ? "Read" : "Write");
 
     switch (request.GetMethod())
     {
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index fd093a104a2f..42c515897994 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -46,7 +46,7 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
 {
     struct RetryStrategy
     {
-        unsigned int max_retries = 10;
+        unsigned int max_retries = 500;
         unsigned int initial_delay_ms = 25;
         unsigned int max_delay_ms = 5000;
         double jitter_factor = 0;
@@ -60,6 +60,7 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
     bool s3_slow_all_threads_after_retryable_error;
     bool enable_s3_requests_logging;
     bool for_disk_s3;
+    std::optional<std::string> opt_disk_name;
     ThrottlerPtr get_request_throttler;
     ThrottlerPtr put_request_throttler;
 
@@ -93,6 +94,7 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
         bool s3_slow_all_threads_after_retryable_error_,
         bool enable_s3_requests_logging_,
         bool for_disk_s3_,
+        std::optional<std::string> opt_disk_name_,
         bool s3_use_adaptive_timeouts_,
         const ThrottlerPtr & get_request_throttler_,
         const ThrottlerPtr & put_request_throttler_,
@@ -194,7 +196,7 @@ class PocoHTTPClient : public Aws::Http::HttpClient
         Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
         Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const;
 
-    static S3LatencyType getFirstByteLatencyType(const String & sdk_attempt, const String & ch_attempt);
+    static S3LatencyType getFirstByteLatencyType(size_t sdk_attempt, size_t ch_attempt);
 
 protected:
     virtual void makeRequestInternal(
diff --git a/src/IO/S3/Requests.cpp b/src/IO/S3/Requests.cpp
index 50ed2e21bfc8..79030f501e40 100644
--- a/src/IO/S3/Requests.cpp
+++ b/src/IO/S3/Requests.cpp
@@ -6,6 +6,9 @@
 #include <aws/core/endpoint/EndpointParameter.h>
 #include <aws/core/utils/xml/XmlSerializer.h>
 
+#include <string_view>
+#include <fmt/format.h>
+
 namespace DB::S3
 {
 
@@ -166,6 +169,61 @@ void ComposeObjectRequest::SetContentType(Aws::String value)
     content_type = std::move(value);
 }
 
+
+size_t getAttemptFromInfo(const Aws::String & request_info)
+{
+    static auto key = Aws::String("attempt=");
+
+    auto key_begin = request_info.find(key, 0);
+    if (key_begin == Aws::String::npos)
+        return 1;
+
+    auto val_begin = key_begin + key.size();
+    auto val_end = request_info.find(';', val_begin);
+    if (val_end == Aws::String::npos)
+        val_end = request_info.size();
+
+    if (val_begin == val_end)
+        return 1;
+
+    auto value = request_info.substr(val_begin, val_end - val_begin);
+    try
+    {
+        return std::stol(value, nullptr, 10);
+    }
+    catch (...)
+    {
+        return 1;
+    }
+}
+
+String getOrEmpty(const Aws::Http::HeaderValueCollection & map, const String & key)
+{
+    auto it = map.find(key);
+    if (it == map.end())
+        return {};
+    return it->second;
+}
+
+void setClickhouseAttemptNumber(Aws::AmazonWebServiceRequest & request, size_t attempt)
+{
+    request.SetAdditionalCustomHeaderValue("clickhouse-request", fmt::format("attempt={}", attempt));
+}
+
+size_t getClickhouseAttemptNumber(const Aws::AmazonWebServiceRequest & request)
+{
+    return getAttemptFromInfo(getOrEmpty(request.GetHeaders(), "clickhouse-request"));
+}
+
+size_t getClickhouseAttemptNumber(const Aws::Http::HttpRequest & request)
+{
+    return getAttemptFromInfo(getOrEmpty(request.GetHeaders(), "clickhouse-request"));
+}
+
+size_t getSDKAttemptNumber(const Aws::Http::HttpRequest & request)
+{
+       return getAttemptFromInfo(getOrEmpty(request.GetHeaders(), Aws::Http::SDK_REQUEST_HEADER));
+}
 }
 
 #endif
diff --git a/src/IO/S3/Requests.h b/src/IO/S3/Requests.h
index 3b03356a8fbb..6685a1694077 100644
--- a/src/IO/S3/Requests.h
+++ b/src/IO/S3/Requests.h
@@ -201,6 +201,12 @@ class ComposeObjectRequest : public ExtendedRequest<Aws::S3::S3Request>
     Aws::String content_type;
 };
 
+size_t getSDKAttemptNumber(const Aws::Http::HttpRequest & request);
+
+size_t getClickhouseAttemptNumber(const Aws::AmazonWebServiceRequest & request);
+size_t getClickhouseAttemptNumber(const Aws::Http::HttpRequest & request);
+void setClickhouseAttemptNumber(Aws::AmazonWebServiceRequest & request, size_t attempt);
+
 }
 
 #endif
diff --git a/src/IO/S3/URI.cpp b/src/IO/S3/URI.cpp
index f5848fac75df..480160a86c5f 100644
--- a/src/IO/S3/URI.cpp
+++ b/src/IO/S3/URI.cpp
@@ -158,10 +158,72 @@ URI::URI(const std::string & uri_, bool allow_archive_path_syntax)
     validateKey(key, uri);
 }
 
+bool URI::isAWSRegion(std::string_view region)
+{
+    /// List from https://docs.aws.amazon.com/general/latest/gr/s3.html
+    static const std::unordered_set<std::string_view> regions = {
+        "us-east-2",
+        "us-east-1",
+        "us-west-1",
+        "us-west-2",
+        "af-south-1",
+        "ap-east-1",
+        "ap-south-2",
+        "ap-southeast-3",
+        "ap-southeast-5",
+        "ap-southeast-4",
+        "ap-south-1",
+        "ap-northeast-3",
+        "ap-northeast-2",
+        "ap-southeast-1",
+        "ap-southeast-2",
+        "ap-east-2",
+        "ap-southeast-7",
+        "ap-northeast-1",
+        "ca-central-1",
+        "ca-west-1",
+        "eu-central-1",
+        "eu-west-1",
+        "eu-west-2",
+        "eu-south-1",
+        "eu-west-3",
+        "eu-south-2",
+        "eu-north-1",
+        "eu-central-2",
+        "il-central-1",
+        "mx-central-1",
+        "me-south-1",
+        "me-central-1",
+        "sa-east-1",
+        "us-gov-east-1",
+        "us-gov-west-1"
+    };
+
+    /// 's3-us-west-2' is a legacy region format for S3 storage, equals to 'us-west-2'
+    /// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#VirtualHostingBackwardsCompatibility
+    if (region.substr(0, 3) == "s3-")
+        region = region.substr(3);
+
+    return regions.contains(region);
+}
+
 void URI::addRegionToURI(const std::string &region)
 {
     if (auto pos = endpoint.find(".amazonaws.com"); pos != std::string::npos)
+    {
+        if (pos > 0)
+        { /// Check if region is already in endpoint to avoid add it second time
+            auto prev_pos = endpoint.find_last_of("/.", pos - 1);
+            if (prev_pos == std::string::npos)
+                prev_pos = 0;
+            else
+                ++prev_pos;
+            std::string_view endpoint_region = std::string_view(endpoint).substr(prev_pos, pos - prev_pos);
+            if (isAWSRegion(endpoint_region))
+                return;
+        }
         endpoint = endpoint.substr(0, pos) + "." + region + endpoint.substr(pos);
+    }
 }
 
 void URI::validateBucket(const String & bucket, const Poco::URI & uri)
diff --git a/src/IO/S3/URI.h b/src/IO/S3/URI.h
index 9220a8209045..8af05c177807 100644
--- a/src/IO/S3/URI.h
+++ b/src/IO/S3/URI.h
@@ -41,6 +41,10 @@ struct URI
 
     static void validateBucket(const std::string & bucket, const Poco::URI & uri);
     static void validateKey(const std::string & key, const Poco::URI & uri);
+
+    /// Returns true if 'region' string is an AWS S3 region
+    /// https://docs.aws.amazon.com/general/latest/gr/s3.html
+    static bool isAWSRegion(std::string_view region);
 };
 
 }
diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp
index 32adeaae5b47..25c1c3126e41 100644
--- a/src/IO/S3/copyS3File.cpp
+++ b/src/IO/S3/copyS3File.cpp
@@ -117,7 +117,7 @@ namespace
         size_t num_parts;
         size_t normal_part_size;
         String multipart_upload_id;
-        std::atomic<bool> multipart_upload_aborted = false;
+        std::atomic<bool> upload_part_failed = false;
         Strings part_tags;
 
         std::list<UploadPartTask> TSA_GUARDED_BY(bg_tasks_mutex) bg_tasks;
@@ -177,8 +177,6 @@ namespace
 
         void completeMultipartUpload()
         {
-            if (multipart_upload_aborted)
-                return;
 
             LOG_TRACE(log, "Completing multipart upload. Bucket: {}, Key: {}, Upload_id: {}, Parts: {}", dest_bucket, dest_key, multipart_upload_id, part_tags.size());
 
@@ -246,8 +244,6 @@ namespace
                 blob_storage_log->addEvent(BlobStorageLogElement::EventType::MultiPartUploadAbort,
                                            dest_bucket, dest_key, /* local_path_ */ {}, /* data_size */ 0,
                                            outcome.IsSuccess() ? nullptr : &outcome.GetError());
-
-            multipart_upload_aborted = true;
         }
 
         void checkObjectAfterUpload()
@@ -269,8 +265,8 @@ namespace
             {
                 for (size_t part_number = 1; position < end_position; ++part_number)
                 {
-                    if (multipart_upload_aborted)
-                        break; /// No more part uploads.
+                    if (upload_part_failed)
+                        break;
 
                     size_t next_position = std::min(position + normal_part_size, end_position);
                     size_t part_size = next_position - position; /// `part_size` is either `normal_part_size` or smaller if it's the final part.
@@ -288,9 +284,13 @@ namespace
             catch (...)
             {
                 tryLogCurrentException(log, fmt::format("While performing multipart upload of {}", dest_key));
-                // Multipart upload failed because it wasn't possible to schedule all the tasks.
-                // To avoid execution of already scheduled tasks we abort MultipartUpload.
-                abortMultipartUpload();
+                // Multipart upload failed because not all tasks could be scheduled.
+                // waitForAllBackgroundTasks will rethrow the actual exception.
+                {
+                    std::lock_guard lock(bg_tasks_mutex);
+                    if (!bg_exception)
+                        bg_exception = std::current_exception();
+                }
                 waitForAllBackgroundTasks();
                 throw;
             }
@@ -399,12 +399,10 @@ namespace
                         }
                         catch (...)
                         {
+                            tryLogCurrentException(log, fmt::format("While writing part #{}", task->part_number));
                             std::lock_guard lock(bg_tasks_mutex);
                             if (!bg_exception)
-                            {
-                                tryLogCurrentException(log, fmt::format("While writing part #{}", task->part_number));
                                 bg_exception = std::current_exception(); /// The exception will be rethrown after all background tasks stop working.
-                            }
                         }
                         task_finish_notify();
                     }, Priority{});
@@ -428,8 +426,8 @@ namespace
 
         void processUploadTask(UploadPartTask & task)
         {
-            if (multipart_upload_aborted)
-                return; /// Already aborted.
+            if (upload_part_failed)
+                return; /// Skipped: another upload task failed.
 
             auto request = makeUploadPartRequest(task.part_number, task.part_offset, task.part_size);
             auto tag = processUploadPartRequest(*request);
@@ -452,15 +450,14 @@ namespace
 
             std::unique_lock lock(bg_tasks_mutex);
             /// Suppress warnings because bg_tasks_mutex is actually hold, but tsa annotations do not understand std::unique_lock
-            bg_tasks_condvar.wait(lock, [this]() {return TSA_SUPPRESS_WARNING_FOR_READ(num_added_bg_tasks) == TSA_SUPPRESS_WARNING_FOR_READ(num_finished_bg_tasks); });
+            bg_tasks_condvar.wait(
+                lock,
+                [this]()
+                { return TSA_SUPPRESS_WARNING_FOR_READ(num_added_bg_tasks) == TSA_SUPPRESS_WARNING_FOR_READ(num_finished_bg_tasks); });
 
             auto exception = TSA_SUPPRESS_WARNING_FOR_READ(bg_exception);
             if (exception)
             {
-                /// abortMultipartUpload() might be called already, see processUploadPartRequest().
-                /// However if there were concurrent uploads at that time, those part uploads might or might not succeed.
-                /// As a result, it might be necessary to abort a given multipart upload multiple times in order to completely free
-                /// all storage consumed by all parts.
                 abortMultipartUpload();
 
                 std::rethrow_exception(exception);
@@ -643,7 +640,7 @@ namespace
 
             if (!outcome.IsSuccess())
             {
-                abortMultipartUpload();
+                upload_part_failed = true;
                 ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
                 throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
             }
@@ -861,7 +858,7 @@ namespace
             auto outcome = client_ptr->UploadPartCopy(req);
             if (!outcome.IsSuccess())
             {
-                abortMultipartUpload();
+                upload_part_failed = true;
                 throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
             }
 
@@ -899,7 +896,7 @@ void copyDataToS3File(
 
 
 void copyS3File(
-    const std::shared_ptr<const S3::Client> & src_s3_client,
+    std::shared_ptr<const S3::Client> src_s3_client,
     const String & src_bucket,
     const String & src_key,
     size_t src_offset,
diff --git a/src/IO/S3/copyS3File.h b/src/IO/S3/copyS3File.h
index 760498b6fa7a..994f8a7b1d84 100644
--- a/src/IO/S3/copyS3File.h
+++ b/src/IO/S3/copyS3File.h
@@ -31,7 +31,7 @@ using CreateReadBuffer = std::function<std::unique_ptr<SeekableReadBuffer>()>;
 ///
 /// read_settings - is used for throttling in case of native copy is not possible
 void copyS3File(
-    const std::shared_ptr<const S3::Client> & src_s3_client,
+    std::shared_ptr<const S3::Client> src_s3_client,
     const String & src_bucket,
     const String & src_key,
     size_t src_offset,
diff --git a/src/IO/S3/getObjectInfo.cpp b/src/IO/S3/getObjectInfo.cpp
index 0ccf4a71302b..b85743e4c5fe 100644
--- a/src/IO/S3/getObjectInfo.cpp
+++ b/src/IO/S3/getObjectInfo.cpp
@@ -1,6 +1,7 @@
 #include <optional>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/Expect404ResponseScope.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 
 #if USE_AWS_S3
 
@@ -15,6 +16,7 @@ namespace ProfileEvents
     extern const Event S3GetObject;
     extern const Event S3GetObjectAttributes;
     extern const Event S3HeadObject;
+    extern const Event S3HeadObjectMicroseconds;
     extern const Event DiskS3GetObject;
     extern const Event DiskS3GetObjectAttributes;
     extern const Event DiskS3HeadObject;
@@ -32,6 +34,7 @@ namespace
         ProfileEvents::increment(ProfileEvents::S3HeadObject);
         if (client.isClientForDisk())
             ProfileEvents::increment(ProfileEvents::DiskS3HeadObject);
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::S3HeadObjectMicroseconds);
 
         S3::HeadObjectRequest req;
         req.SetBucket(bucket);
@@ -72,42 +75,56 @@ bool isNotFoundError(Aws::S3::S3Errors error)
         || error == Aws::S3::S3Errors::NO_SUCH_BUCKET;
 }
 
+ObjectInfo getObjectInfoIfExists(
+    const S3::Client & client,
+    const String & bucket,
+    const String & key,
+    const String & version_id,
+    bool with_metadata)
+{
+    Expect404ResponseScope scope; // 404 is not an error
+
+    auto [object_info, error] = tryGetObjectInfo(client, bucket, key, version_id, with_metadata);
+    if (object_info)
+        return *object_info;
+
+    if (isNotFoundError(error.GetErrorType()))
+        return {};
+
+    throw S3Exception(
+        error.GetErrorType(),
+        "Failed to get object info: {}. HTTP response code: {}",
+        error.GetMessage(),
+        static_cast<size_t>(error.GetResponseCode()));
+}
+
 ObjectInfo getObjectInfo(
     const S3::Client & client,
     const String & bucket,
     const String & key,
     const String & version_id,
-    bool with_metadata,
-    bool throw_on_error)
+    bool with_metadata)
 {
-    std::optional<Expect404ResponseScope> scope; // 404 is not an error
-    if (!throw_on_error)
-        scope.emplace();
+    Expect404ResponseScope scope; // 404 is not an error
 
     auto [object_info, error] = tryGetObjectInfo(client, bucket, key, version_id, with_metadata);
     if (object_info)
-    {
         return *object_info;
-    }
-    if (throw_on_error)
-    {
-        throw S3Exception(
-            error.GetErrorType(),
-            "Failed to get object info: {}. HTTP response code: {}",
-            error.GetMessage(),
-            static_cast<size_t>(error.GetResponseCode()));
-    }
-    return {};
+
+    throw S3Exception(
+        error.GetErrorType(),
+        "Failed to get object info: {}. HTTP response code: {}",
+        error.GetMessage(),
+        static_cast<size_t>(error.GetResponseCode()));
 }
 
 size_t getObjectSize(
     const S3::Client & client,
     const String & bucket,
     const String & key,
-    const String & version_id,
-    bool throw_on_error)
+    const String & version_id)
 {
-    return getObjectInfo(client, bucket, key, version_id, {}, throw_on_error).size;
+    return getObjectInfo(client, bucket, key, version_id, /*with_metadata=*/ false).size;
 }
 
 bool objectExists(
diff --git a/src/IO/S3/getObjectInfo.h b/src/IO/S3/getObjectInfo.h
index 30d4c627d379..b3cd77be97bc 100644
--- a/src/IO/S3/getObjectInfo.h
+++ b/src/IO/S3/getObjectInfo.h
@@ -20,20 +20,26 @@ struct ObjectInfo
     std::map<String, String> metadata = {}; /// Set only if getObjectInfo() is called with `with_metadata = true`.
 };
 
+/// Ignore if object does not exist
+ObjectInfo getObjectInfoIfExists(
+    const S3::Client & client,
+    const String & bucket,
+    const String & key,
+    const String & version_id = {},
+    bool with_metadata = false);
+
 ObjectInfo getObjectInfo(
     const S3::Client & client,
     const String & bucket,
     const String & key,
     const String & version_id = {},
-    bool with_metadata = false,
-    bool throw_on_error = true);
+    bool with_metadata = false);
 
 size_t getObjectSize(
     const S3::Client & client,
     const String & bucket,
     const String & key,
-    const String & version_id = {},
-    bool throw_on_error = true);
+    const String & version_id = {});
 
 bool objectExists(
     const S3::Client & client,
diff --git a/src/IO/S3/tests/gtest_aws_s3_client.cpp b/src/IO/S3/tests/gtest_aws_s3_client.cpp
index a25b5e60e8c6..9640b62dc7f2 100644
--- a/src/IO/S3/tests/gtest_aws_s3_client.cpp
+++ b/src/IO/S3/tests/gtest_aws_s3_client.cpp
@@ -141,6 +141,7 @@ void testServerSideEncryption(
         s3_slow_all_threads_after_retryable_error,
         enable_s3_requests_logging,
         /* for_disk_s3 = */ false,
+        /* opt_disk_name = */ {},
         /* get_request_throttler = */ {},
         /* put_request_throttler = */ {},
         uri.uri.getScheme());
@@ -416,6 +417,7 @@ TEST(IOTestAwsS3Client, AssumeRole)
         s3_slow_all_threads_after_retryable_error,
         enable_s3_requests_logging,
         /* for_disk_s3 = */ false,
+        /* opt_disk_name = */ {},
         /* get_request_throttler = */ {},
         /* put_request_throttler = */ {},
         "http");
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index f12de6a7b546..cc321ba7af8c 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -19,16 +19,6 @@
 #include <IO/S3/Requests.h>
 
 
-namespace ProfileEvents
-{
-    extern const Event S3GetObjectAttributes;
-    extern const Event S3GetObjectMetadata;
-    extern const Event S3HeadObject;
-    extern const Event DiskS3GetObjectAttributes;
-    extern const Event DiskS3GetObjectMetadata;
-    extern const Event DiskS3HeadObject;
-}
-
 namespace DB
 {
 
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 79fe7a8650b1..3f095307ae64 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -47,6 +47,9 @@ class S3Exception : public Exception
 
     bool isRetryableError() const;
 
+    S3Exception * clone() const override { return new S3Exception(*this); }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
+
 private:
     Aws::S3::S3Errors code;
 };
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index 9f4746fde70c..c7eb5724e374 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -1,6 +1,7 @@
 #include <Poco/Net/NetException.h>
 
 #include <base/scope_guard.h>
+#include <Common/scope_guard_safe.h>
 
 #include <IO/WriteBufferFromPocoSocket.h>
 
@@ -47,7 +48,7 @@ ssize_t WriteBufferFromPocoSocket::socketSendBytesImpl(const char * ptr, size_t
     {
         socket.setBlocking(false);
         /// Set socket to blocking mode at the end.
-        SCOPE_EXIT(socket.setBlocking(true));
+        SCOPE_EXIT_SAFE(socket.setBlocking(true));
         bool secure = socket.secure();
         res = socket.impl()->sendBytes(ptr, static_cast<int>(size));
 
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index cb92ab49e2c2..5b2c7ed5a9c7 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -13,8 +13,8 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
-    extern const int CANNOT_PARSE_DATETIME;
+extern const int LOGICAL_ERROR;
+extern const int CANNOT_PARSE_DATETIME;
 }
 
 
@@ -753,31 +753,55 @@ ReturnType parseDateTimeBestEffortImpl(
         }
     };
 
-    if constexpr (strict)
+    if constexpr (!strict || std::is_same_v<ReturnType, void>)
     {
-        if constexpr (is_64)
+        if (has_time_zone_offset)
         {
-            if (year < 1900)
-                return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime64: year {} is less than minimum supported year 1900", year);
+            res = utc_time_zone.makeDateTime(year, month, day_of_month, hour, minute, second);
+            adjust_time_zone();
         }
         else
         {
-            if (year < 1970)
-                return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: year {} is less than minimum supported year 1970", year);
+            res = local_time_zone.makeDateTime(year, month, day_of_month, hour, minute, second);
         }
-    }
 
-    if (has_time_zone_offset)
-    {
-        res = utc_time_zone.makeDateTime(year, month, day_of_month, hour, minute, second);
-        adjust_time_zone();
+        if constexpr (std::is_same_v<ReturnType, bool>)
+            return true;
     }
     else
     {
-        res = local_time_zone.makeDateTime(year, month, day_of_month, hour, minute, second);
-    }
+        if (has_time_zone_offset)
+        {
+            auto res_maybe = utc_time_zone.tryToMakeDateTime(year, month, day_of_month, hour, minute, second);
+            if (!res_maybe)
+                return false;
 
-    return ReturnType(true);
+            /// For usual DateTime check if value is within supported range
+            if constexpr (!is_64)
+            {
+                if (*res_maybe < 0 || *res_maybe > UINT32_MAX)
+                    return false;
+            }
+            res = *res_maybe;
+            adjust_time_zone();
+        }
+        else
+        {
+            auto res_maybe = local_time_zone.tryToMakeDateTime(year, month, day_of_month, hour, minute, second);
+            if (!res_maybe)
+                return false;
+
+            /// For usual DateTime check if value is within supported range
+            if constexpr (!is_64)
+            {
+                if (*res_maybe < 0 || *res_maybe > UINT32_MAX)
+                    return false;
+            }
+            res = *res_maybe;
+        }
+
+        return true;
+    }
 }
 
 template <typename ReturnType, bool is_us_style, bool strict = false>
diff --git a/src/IO/tests/gtest_readbuffer_s3.cpp b/src/IO/tests/gtest_readbuffer_s3.cpp
index 5bbcfd6bc834..4ee1d810de8d 100644
--- a/src/IO/tests/gtest_readbuffer_s3.cpp
+++ b/src/IO/tests/gtest_readbuffer_s3.cpp
@@ -63,6 +63,7 @@ struct ClientFake : DB::S3::Client
                   false,
                   {},
                   {},
+                  {},
                   "http"),
               Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
               DB::S3::ClientSettings())
diff --git a/src/IO/tests/gtest_writebuffer_s3.cpp b/src/IO/tests/gtest_writebuffer_s3.cpp
index 88a2df5c40ea..444c19457dd8 100644
--- a/src/IO/tests/gtest_writebuffer_s3.cpp
+++ b/src/IO/tests/gtest_writebuffer_s3.cpp
@@ -249,6 +249,7 @@ struct Client : DB::S3::Client
             /* s3_slow_all_threads_after_retryable_error = */ true,
             /* enable_s3_requests_logging = */ true,
             /* for_disk_s3 = */ false,
+            /* opt_disk_name = */ {},
             /* get_request_throttler = */ {},
             /* put_request_throttler = */ {});
     }
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 7a7a4d476d8a..300a43f3d779 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -1006,12 +1006,17 @@ ColumnsWithTypeAndName ActionsDAG::evaluatePartialResult(
                     bool has_all_arguments = true;
                     for (size_t i = 0; i < arguments.size(); ++i)
                     {
-                        arguments[i] = node_to_column[node->children[i]];
+                        const auto * child = node->children[i];
+                        if (auto it = node_to_column.find(child); it != node_to_column.end())
+                            arguments[i] = it->second;
+                        else
+                            arguments[i] = ColumnWithTypeAndName{nullptr, child->result_type, child->result_name};
+
                         if (!arguments[i].column)
                             has_all_arguments = false;
+
                         if (!has_all_arguments && throw_on_error)
-                            throw Exception(ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK,
-                                            "Not found column {}", node->children[i]->result_name);
+                            throw Exception(ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK, "Not found column {}", child->result_name);
                     }
 
                     if (node->type == ActionsDAG::ActionType::INPUT && throw_on_error)
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 8a58eb892020..546264a0de4b 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -62,7 +62,6 @@ namespace DB
 namespace Setting
 {
     extern const SettingsBool allow_experimental_analyzer;
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool force_grouping_standard_compatibility;
     extern const SettingsUInt64 max_ast_elements;
     extern const SettingsBool transform_null_in;
@@ -462,7 +461,9 @@ FutureSetPtr makeExplicitSet(
 
     DataTypes set_element_types = {left_arg_type};
     const auto * left_tuple_type = typeid_cast<const DataTypeTuple *>(left_arg_type.get());
-    if (left_tuple_type && left_tuple_type->getElements().size() != 1)
+
+    /// Do not unpack if empty tuple or single element tuple.
+    if (left_tuple_type && left_tuple_type->getElements().size() > 1)
         set_element_types = left_tuple_type->getElements();
 
     auto set_element_keys = Set::getElementTypes(set_element_types, context->getSettingsRef()[Setting::transform_null_in]);
@@ -922,6 +923,9 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     if (node.name == "lambda")
         throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION, "Unexpected lambda expression");
 
+    if (node.name == "__aliasMarker")
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker is internal and supported only with the analyzer");
+
     /// Function arrayJoin.
     if (node.name == "arrayJoin")
     {
@@ -1377,9 +1381,7 @@ void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
     DataTypePtr type;
     if (literal.custom_type)
         type = literal.custom_type;
-    else if (
-        data.getContext()->getSettingsRef()[Setting::allow_experimental_variant_type]
-        && data.getContext()->getSettingsRef()[Setting::use_variant_as_common_type])
+    else if (data.getContext()->getSettingsRef()[Setting::use_variant_as_common_type])
         type = applyVisitor(FieldToDataType<LeastSupertypeOnError::Variant>(), literal.value);
     else
         type = applyVisitor(FieldToDataType(), literal.value);
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index 99bd2f4b7a93..f4b03364c073 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -226,13 +226,13 @@ static inline T ALWAYS_INLINE packFixed(
 /** Serialize keys into a continuous chunk of memory.
   */
 static inline StringRef ALWAYS_INLINE serializeKeysToPoolContiguous( /// NOLINT
-    size_t i, size_t keys_size, const ColumnRawPtrs & key_columns, Arena & pool)
+    size_t i, size_t keys_size, const ColumnRawPtrs & key_columns, Arena & pool, const IColumn::SerializationSettings * settings)
 {
     const char * begin = nullptr;
 
     size_t sum_size = 0;
     for (size_t j = 0; j < keys_size; ++j)
-        sum_size += key_columns[j]->serializeValueIntoArena(i, pool, begin).size;
+        sum_size += key_columns[j]->serializeValueIntoArena(i, pool, begin, settings).size;
 
     return {begin, sum_size};
 }
diff --git a/src/Interpreters/AggregationMethod.cpp b/src/Interpreters/AggregationMethod.cpp
index 7cd9d02db047..d45049ed3654 100644
--- a/src/Interpreters/AggregationMethod.cpp
+++ b/src/Interpreters/AggregationMethod.cpp
@@ -1,11 +1,15 @@
-#include <Interpreters/AggregationMethod.h>
 #include <Interpreters/AggregatedData.h>
+#include <Interpreters/AggregationMethod.h>
+#include <IO/ReadBufferFromString.h>
 
 namespace DB
 {
 template <typename FieldType, typename TData, bool consecutive_keys_optimization, bool nullable>
 void AggregationMethodOneNumber<FieldType, TData, consecutive_keys_optimization, nullable>::insertKeyIntoColumns(
-    const AggregationMethodOneNumber::Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/)
+    const AggregationMethodOneNumber::Key & key,
+    std::vector<IColumn *> & key_columns,
+    const Sizes & /*key_sizes*/,
+    const IColumn::SerializationSettings *)
 {
     ColumnFixedSizeHelper * column;
     if constexpr (nullable)
@@ -48,7 +52,8 @@ template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUIn
 template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel>;
 
 template <typename TData, bool nullable>
-void AggregationMethodStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+void AggregationMethodStringNoCache<TData, nullable>::insertKeyIntoColumns(
+    StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
 {
     if constexpr (nullable)
     {
@@ -67,7 +72,8 @@ template struct AggregationMethodStringNoCache<AggregatedDataWithNullableShortSt
 template struct AggregationMethodStringNoCache<AggregatedDataWithNullableShortStringKeyTwoLevel, true>;
 
 template <typename TData>
-void AggregationMethodFixedString<TData>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+void AggregationMethodFixedString<TData>::insertKeyIntoColumns(
+    StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
 {
     assert_cast<ColumnFixedString &>(*key_columns[0]).insertData(key.data, key.size);
 }
@@ -77,7 +83,7 @@ template struct AggregationMethodFixedString<AggregatedDataWithNullableStringKey
 
 
 template <typename TData, bool nullable>
-void AggregationMethodFixedStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+void AggregationMethodFixedStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
 {
     if constexpr (nullable)
         assert_cast<ColumnNullable &>(*key_columns[0]).insertData(key.data, key.size);
@@ -92,7 +98,10 @@ template struct AggregationMethodFixedStringNoCache<AggregatedDataWithNullableSh
 
 template <typename SingleColumnMethod>
 void AggregationMethodSingleLowCardinalityColumn<SingleColumnMethod>::insertKeyIntoColumns(
-    const Key & key, std::vector<IColumn *> & key_columns_low_cardinality, const Sizes & /*key_sizes*/)
+    const Key & key,
+    std::vector<IColumn *> & key_columns_low_cardinality,
+    const Sizes & /*key_sizes*/,
+    const IColumn::SerializationSettings *)
 {
     auto * col = assert_cast<ColumnLowCardinality *>(key_columns_low_cardinality[0]);
 
@@ -114,7 +123,8 @@ template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodFix
 
 
 template <typename TData, bool has_nullable_keys, bool has_low_cardinality, bool consecutive_keys_optimization>
-void AggregationMethodKeysFixed<TData, has_nullable_keys, has_low_cardinality,consecutive_keys_optimization>::insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
+void AggregationMethodKeysFixed<TData, has_nullable_keys, has_low_cardinality, consecutive_keys_optimization>::insertKeyIntoColumns(
+    const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes, const IColumn::SerializationSettings *)
 {
     size_t keys_size = key_columns.size();
 
@@ -189,11 +199,12 @@ template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, fa
 
 
 template <typename TData, bool nullable, bool prealloc>
-void AggregationMethodSerialized<TData, nullable, prealloc>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+void AggregationMethodSerialized<TData, nullable, prealloc>::insertKeyIntoColumns(
+    StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings)
 {
-    const auto * pos = key.data;
+    ReadBufferFromString buf({key.data, key.size});
     for (auto & column : key_columns)
-        pos = column->deserializeAndInsertFromArena(pos);
+        column->deserializeAndInsertFromArena(buf, settings);
 }
 
 template struct AggregationMethodSerialized<AggregatedDataWithStringKey>;
diff --git a/src/Interpreters/AggregationMethod.h b/src/Interpreters/AggregationMethod.h
index a4ca3cdc4159..e885c65f9775 100644
--- a/src/Interpreters/AggregationMethod.h
+++ b/src/Interpreters/AggregationMethod.h
@@ -48,7 +48,7 @@ struct AggregationMethodOneNumber
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
     // Insert the key from the hash table into columns.
-    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/);
+    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/, const IColumn::SerializationSettings * settings);
 };
 
 /// For the case where there is one string key.
@@ -81,7 +81,7 @@ struct AggregationMethodString
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
-    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
     {
         static_cast<ColumnString *>(key_columns[0])->insertData(key.data, key.size);
     }
@@ -117,7 +117,7 @@ struct AggregationMethodStringNoCache
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
-    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &);
+    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings);
 };
 
 /// For the case where there is one fixed-length string key.
@@ -150,7 +150,7 @@ struct AggregationMethodFixedString
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
-    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &);
+    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings);
 };
 
 /// Same as above but without cache
@@ -183,7 +183,7 @@ struct AggregationMethodFixedStringNoCache
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
-    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &);
+    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings);
 };
 
 /// Single low cardinality column.
@@ -214,8 +214,11 @@ struct AggregationMethodSingleLowCardinalityColumn : public SingleColumnMethod
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
-    static void insertKeyIntoColumns(const Key & key,
-         std::vector<IColumn *> & key_columns_low_cardinality, const Sizes & /*key_sizes*/);
+    static void insertKeyIntoColumns(
+        const Key & key,
+        std::vector<IColumn *> & key_columns_low_cardinality,
+        const Sizes & /*key_sizes*/,
+        const IColumn::SerializationSettings * settings);
 };
 
 /// For the case where all keys are of fixed length, and they fit in N (for example, 128) bits.
@@ -259,7 +262,8 @@ struct AggregationMethodKeysFixed
         return State::shuffleKeyColumns(key_columns, key_sizes);
     }
 
-    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes);
+    static void insertKeyIntoColumns(
+        const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes, const IColumn::SerializationSettings * settings);
 };
 
 /** Aggregates by concatenating serialized key values.
@@ -298,7 +302,7 @@ struct AggregationMethodSerialized
 
     std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
 
-    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &);
+    static void insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings);
 };
 
 template <typename TData>
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index e919430076dc..139b0f6860bb 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -209,7 +209,8 @@ Aggregator::Params::Params(
     bool only_merge_, // true for projections
     bool optimize_group_by_constant_keys_,
     float min_hit_rate_to_use_consecutive_keys_optimization_,
-    const StatsCollectingParams & stats_collecting_params_)
+    const StatsCollectingParams & stats_collecting_params_,
+    bool serialize_string_with_zero_byte_)
     : keys(keys_)
     , keys_size(keys.size())
     , aggregates(aggregates_)
@@ -232,6 +233,7 @@ Aggregator::Params::Params(
     , optimize_group_by_constant_keys(optimize_group_by_constant_keys_)
     , min_hit_rate_to_use_consecutive_keys_optimization(min_hit_rate_to_use_consecutive_keys_optimization_)
     , stats_collecting_params(stats_collecting_params_)
+    , serialize_string_with_zero_byte(serialize_string_with_zero_byte_)
 {
 }
 
@@ -276,7 +278,8 @@ Aggregator::Params::Params(
     bool overflow_row_,
     size_t max_threads_,
     size_t max_block_size_,
-    float min_hit_rate_to_use_consecutive_keys_optimization_)
+    float min_hit_rate_to_use_consecutive_keys_optimization_,
+    bool serialize_string_with_zero_byte_)
     : keys(keys_)
     , keys_size(keys.size())
     , aggregates(aggregates_)
@@ -286,6 +289,7 @@ Aggregator::Params::Params(
     , max_block_size(max_block_size_)
     , only_merge(true)
     , min_hit_rate_to_use_consecutive_keys_optimization(min_hit_rate_to_use_consecutive_keys_optimization_)
+    , serialize_string_with_zero_byte(serialize_string_with_zero_byte_)
 {
 }
 
@@ -538,6 +542,7 @@ Aggregator::Aggregator(const Block & header_, const Params & params_)
 
     HashMethodContext::Settings cache_settings;
     cache_settings.max_threads = params.max_threads;
+    cache_settings.serialize_string_with_zero_byte = params.serialize_string_with_zero_byte;
     aggregation_state_cache = AggregatedDataVariants::createCache(method_chosen, cache_settings);
 
 #if USE_EMBEDDED_COMPILER
@@ -1762,7 +1767,7 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, si
     auto & out_stream = [this, max_temp_file_size]() -> TemporaryBlockStreamHolder &
     {
         std::lock_guard lk(tmp_files_mutex);
-        return tmp_files.emplace_back(std::make_shared<const Block>(getHeader(false)), tmp_data.get(), max_temp_file_size);
+        return tmp_files.emplace_back(std::make_shared<const Block>(getHeader(false)), tmp_data, max_temp_file_size);
     }();
 
     ProfileEvents::increment(ProfileEvents::ExternalAggregationWritePart);
@@ -2048,7 +2053,9 @@ Aggregator::convertToBlockImpl(Method & method, Table & data, Arena * arena, Are
                 init_out_cols();
 
             const auto & key_sizes_ref = shuffled_key_sizes ? *shuffled_key_sizes : key_sizes;
-            method.insertKeyIntoColumns(key, out_cols->raw_key_columns, key_sizes_ref);
+            IColumn::SerializationSettings serialization_settings{
+                .serialize_string_with_zero_byte = params.serialize_string_with_zero_byte};
+            method.insertKeyIntoColumns(key, out_cols->raw_key_columns, key_sizes_ref, &serialization_settings);
 
             if constexpr (is_final)
             {
@@ -2314,7 +2321,9 @@ Aggregator::ConvertToBlockResVariant Aggregator::convertToBlockImplFinal(
                 init_out_cols();
 
             const auto & key_sizes_ref = shuffled_key_sizes ? *shuffled_key_sizes : key_sizes;
-            method.insertKeyIntoColumns(key, out_cols->raw_key_columns, key_sizes_ref);
+            IColumn::SerializationSettings serialization_settings{
+                .serialize_string_with_zero_byte = params.serialize_string_with_zero_byte};
+            method.insertKeyIntoColumns(key, out_cols->raw_key_columns, key_sizes_ref, &serialization_settings);
             places.emplace_back(mapped);
 
             /// Mark the cell as destroyed so it will not be destroyed in destructor.
@@ -2387,7 +2396,9 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
                 init_out_cols();
 
             const auto & key_sizes_ref = shuffled_key_sizes ? *shuffled_key_sizes : key_sizes;
-            method.insertKeyIntoColumns(key, out_cols->raw_key_columns, key_sizes_ref);
+            IColumn::SerializationSettings serialization_settings{
+                .serialize_string_with_zero_byte = params.serialize_string_with_zero_byte};
+            method.insertKeyIntoColumns(key, out_cols->raw_key_columns, key_sizes_ref, &serialization_settings);
 
             /// reserved, so push_back does not throw exceptions
             for (size_t i = 0; i < params.aggregates_size; ++i)
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index b4ae4943a366..8e50243fe404 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -117,6 +117,8 @@ class Aggregator final
         const float min_hit_rate_to_use_consecutive_keys_optimization = 0.;
         StatsCollectingParams stats_collecting_params;
 
+        bool serialize_string_with_zero_byte = false;
+
         static size_t getMaxBytesBeforeExternalGroupBy(size_t max_bytes_before_external_group_by, double max_bytes_ratio_before_external_group_by);
 
         Params(
@@ -139,7 +141,8 @@ class Aggregator final
             bool only_merge_, // true for projections
             bool optimize_group_by_constant_keys_,
             float min_hit_rate_to_use_consecutive_keys_optimization_,
-            const StatsCollectingParams & stats_collecting_params_);
+            const StatsCollectingParams & stats_collecting_params_,
+            bool serialize_string_with_zero_byte_);
 
         /// Only parameters that matter during merge.
         Params(
@@ -148,7 +151,8 @@ class Aggregator final
             bool overflow_row_,
             size_t max_threads_,
             size_t max_block_size_,
-            float min_hit_rate_to_use_consecutive_keys_optimization_);
+            float min_hit_rate_to_use_consecutive_keys_optimization_,
+            bool serialize_string_with_zero_byte_);
 
         Params cloneWithKeys(const Names & keys_, bool only_merge_ = false)
         {
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.cpp b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
index 38c9ef89adc4..8e370a5bc208 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.cpp
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
@@ -116,7 +116,6 @@ void ApplyWithSubqueryVisitor::visit(ASTTableExpression & table, const Data & da
 void ApplyWithSubqueryVisitor::visit(ASTFunction & func, const Data & data)
 {
     /// Special CTE case, where the right argument of IN is alias (ASTIdentifier) from WITH clause.
-
     if (checkFunctionIsInOrGlobalInOperator(func))
     {
         auto & ast = func.arguments->children.at(1);
@@ -150,6 +149,24 @@ void ApplyWithSubqueryVisitor::visit(ASTFunction & func, const Data & data)
             }
         }
     }
+    /// Rewrite dictionary name in dictGet*()
+    else if (functionIsDictGet(func.name) && !func.arguments->children.empty())
+    {
+        auto & dict_name_arg = func.arguments->children.at(0);
+        if (const auto * identifier = dict_name_arg->as<ASTIdentifier>(); identifier && identifier->isShort())
+        {
+            auto name = identifier->shortName();
+
+            auto literal_it = data.literals.find(name);
+            if (literal_it != data.literals.end())
+            {
+                auto old_alias = dict_name_arg->tryGetAlias();
+                dict_name_arg = literal_it->second->clone();
+                /// Always reset the alias name, otherwise the aliases will not match after AddDefaultDatabaseVisitor
+                dict_name_arg->setAlias(old_alias);
+            }
+        }
+    }
 }
 
 }
diff --git a/src/Interpreters/AsynchronousInsertQueue.cpp b/src/Interpreters/AsynchronousInsertQueue.cpp
index 397b12cdf0c4..c50904547f03 100644
--- a/src/Interpreters/AsynchronousInsertQueue.cpp
+++ b/src/Interpreters/AsynchronousInsertQueue.cpp
@@ -797,7 +797,7 @@ String serializeQuery(const IAST & query, size_t max_length)
 {
     return query.hasSecretParts()
         ? query.formatForLogging(max_length)
-        : wipeSensitiveDataAndCutToLength(query.formatWithSecretsOneLine(), max_length);
+        : wipeSensitiveDataAndCutToLength(query.formatWithSecretsOneLine(), max_length, true);
 }
 
 }
@@ -826,8 +826,8 @@ try
     /// 'resetParser' doesn't work for parallel parsing.
     key.settings->set("input_format_parallel_parsing", false);
     /// It maybe insert into distributed table.
-    /// It doesn't make sense to make insert into destination tables asynchronous.
-    key.settings->set("async_insert", false);
+    /// We want the remote part to decide if the insert will be async or not.
+    key.settings->setDefaultValue("async_insert");
 
     insert_context->makeQueryContext();
 
diff --git a/src/Interpreters/Cache/EvictionCandidates.cpp b/src/Interpreters/Cache/EvictionCandidates.cpp
index 79e53f4f7d9d..2efadcc84dde 100644
--- a/src/Interpreters/Cache/EvictionCandidates.cpp
+++ b/src/Interpreters/Cache/EvictionCandidates.cpp
@@ -86,6 +86,7 @@ void EvictionCandidates::add(
     it->second.candidates.push_back(candidate);
     candidate->setEvictingFlag(locked_key, lock);
     ++candidates_size;
+    candidates_bytes += candidate->size();
 }
 
 void EvictionCandidates::removeQueueEntries(const CachePriorityGuard::Lock & lock)
diff --git a/src/Interpreters/Cache/EvictionCandidates.h b/src/Interpreters/Cache/EvictionCandidates.h
index e750955bf382..fc3c3242e5db 100644
--- a/src/Interpreters/Cache/EvictionCandidates.h
+++ b/src/Interpreters/Cache/EvictionCandidates.h
@@ -58,6 +58,7 @@ class EvictionCandidates : private boost::noncopyable
     FailedCandidates getFailedCandidates() const { return failed_candidates; }
 
     size_t size() const { return candidates_size; }
+    size_t bytes() const { return candidates_bytes; }
 
     auto begin() const { return candidates.begin(); }
 
@@ -73,6 +74,7 @@ class EvictionCandidates : private boost::noncopyable
 
     std::unordered_map<FileCacheKey, KeyCandidates> candidates;
     size_t candidates_size = 0;
+    size_t candidates_bytes = 0;
     FailedCandidates failed_candidates;
 
     std::vector<FinalizeEvictionFunc> on_finalize;
diff --git a/src/Interpreters/Cache/FileCache.cpp b/src/Interpreters/Cache/FileCache.cpp
index c7bccf62897b..796bb4aa9103 100644
--- a/src/Interpreters/Cache/FileCache.cpp
+++ b/src/Interpreters/Cache/FileCache.cpp
@@ -31,19 +31,25 @@ namespace ProfileEvents
     extern const Event FilesystemCacheLoadMetadataMicroseconds;
     extern const Event FilesystemCacheLockCacheMicroseconds;
     extern const Event FilesystemCacheReserveMicroseconds;
+    extern const Event FilesystemCacheReserveAttempts;
     extern const Event FilesystemCacheGetOrSetMicroseconds;
     extern const Event FilesystemCacheGetMicroseconds;
     extern const Event FilesystemCacheFailToReserveSpaceBecauseOfLockContention;
     extern const Event FilesystemCacheFreeSpaceKeepingThreadRun;
     extern const Event FilesystemCacheFreeSpaceKeepingThreadWorkMilliseconds;
     extern const Event FilesystemCacheFailToReserveSpaceBecauseOfCacheResize;
+    extern const Event FilesystemCacheBackgroundEvictedFileSegments;
+    extern const Event FilesystemCacheBackgroundEvictedBytes;
 }
 
 namespace CurrentMetrics
 {
     extern const Metric FilesystemCacheDownloadQueueElements;
+    extern const Metric FilesystemCacheReserveThreads;
+    extern const Metric FilesystemCacheSizeLimit;
 }
 
+
 namespace DB
 {
 
@@ -121,6 +127,7 @@ FileCache::FileCache(const std::string & cache_name, const FileCacheSettings & s
     , keep_current_size_to_max_ratio(1 - settings[FileCacheSetting::keep_free_space_size_ratio])
     , keep_current_elements_to_max_ratio(1 - settings[FileCacheSetting::keep_free_space_elements_ratio])
     , keep_up_free_space_remove_batch(settings[FileCacheSetting::keep_free_space_remove_batch])
+    , name(cache_name)
     , log(getLogger("FileCache(" + cache_name + ")"))
     , metadata(settings[FileCacheSetting::path],
                settings[FileCacheSetting::background_download_queue_size_limit],
@@ -159,6 +166,8 @@ FileCache::FileCache(const std::string & cache_name, const FileCacheSettings & s
 
     if (settings[FileCacheSetting::enable_filesystem_query_cache_limit])
         query_limit = std::make_unique<FileCacheQueryLimit>();
+
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSizeLimit, settings[FileCacheSetting::max_size]);
 }
 
 const FileCache::UserInfo & FileCache::getCommonUser()
@@ -941,7 +950,9 @@ bool FileCache::tryReserve(
     size_t lock_wait_timeout_milliseconds,
     std::string & failure_reason)
 {
+    CurrentMetrics::Increment increment(CurrentMetrics::FilesystemCacheReserveThreads);
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FilesystemCacheReserveMicroseconds);
+    ProfileEvents::increment(ProfileEvents::FilesystemCacheReserveAttempts);
 
     assertInitialized();
 
@@ -956,6 +967,11 @@ bool FileCache::tryReserve(
         return false;
     }
 
+    cache_reserve_active_threads.fetch_add(1, std::memory_order_relaxed);
+    SCOPE_EXIT({
+        cache_reserve_active_threads.fetch_sub(1, std::memory_order_relaxed);
+    });
+
     auto cache_lock = tryLockCache(std::chrono::milliseconds(lock_wait_timeout_milliseconds));
     if (!cache_lock)
     {
@@ -1021,7 +1037,14 @@ bool FileCache::tryReserve(
     if (query_priority)
     {
         if (!query_priority->collectCandidatesForEviction(
-                size, required_elements_num, reserve_stat, eviction_candidates, {}, user.user_id, cache_lock))
+                size,
+                required_elements_num,
+                reserve_stat,
+                eviction_candidates,
+                {},
+                /* continue_from_last_eviction_pos */false,
+                user.user_id,
+                cache_lock))
         {
             const auto & stat = reserve_stat.total_stat;
             failure_reason = fmt::format(
@@ -1041,8 +1064,19 @@ bool FileCache::tryReserve(
         reserve_stat.stat_by_kind.clear();
     }
 
+    bool continue_from_last_eviction_pos = cache_reserve_active_threads.load(std::memory_order_relaxed) > 1;
+    if (!continue_from_last_eviction_pos)
+        main_priority->resetEvictionPos(cache_lock);
+
     if (!main_priority->collectCandidatesForEviction(
-            size, required_elements_num, reserve_stat, eviction_candidates, queue_iterator, user.user_id, cache_lock))
+            size,
+            required_elements_num,
+            reserve_stat,
+            eviction_candidates,
+            queue_iterator,
+            continue_from_last_eviction_pos,
+            user.user_id,
+            cache_lock))
     {
         const auto & stat = reserve_stat.total_stat;
         failure_reason = fmt::format(
@@ -1130,6 +1164,11 @@ bool FileCache::tryReserve(
     if (main_priority->getSize(cache_lock) > (1ull << 63))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache became inconsistent. There must be a bug");
 
+    if (cache_reserve_active_threads.load(std::memory_order_relaxed) == 1)
+    {
+        main_priority->resetEvictionPos(cache_lock);
+    }
+
     cache_lock.unlock();
     if (!file_segment.getKeyMetadata()->createBaseDirectory())
     {
@@ -1187,7 +1226,12 @@ void FileCache::freeSpaceRatioKeepingThreadFunc()
         /// (we use batches to make sure we do not block cache for too long,
         /// by default the batch size is quite small).
         desired_size_status = main_priority->collectCandidatesForEviction(
-            desired_size, desired_elements_num, keep_up_free_space_remove_batch, stat, eviction_candidates, lock);
+            desired_size,
+            desired_elements_num,
+            keep_up_free_space_remove_batch,
+            stat,
+            eviction_candidates,
+            lock);
 
 #ifdef DEBUG_OR_SANITIZER_BUILD
         /// Let's make sure that we correctly processed the limits.
@@ -1229,6 +1273,9 @@ void FileCache::freeSpaceRatioKeepingThreadFunc()
             /// e.g. to update the in-memory state.
             lock.lock();
             eviction_candidates.finalize(nullptr, lock);
+
+            ProfileEvents::increment(ProfileEvents::FilesystemCacheBackgroundEvictedFileSegments, eviction_candidates.size());
+            ProfileEvents::increment(ProfileEvents::FilesystemCacheBackgroundEvictedBytes, eviction_candidates.bytes());
         }
     }
     catch (...)
diff --git a/src/Interpreters/Cache/FileCache.h b/src/Interpreters/Cache/FileCache.h
index 19e1810241a2..3a92430429a8 100644
--- a/src/Interpreters/Cache/FileCache.h
+++ b/src/Interpreters/Cache/FileCache.h
@@ -209,6 +209,8 @@ class FileCache : private boost::noncopyable
 
     void freeSpaceRatioKeepingThreadFunc();
 
+    const String & getName() const { return name; }
+
 private:
     using KeyAndOffset = FileCacheKeyAndOffset;
 
@@ -228,6 +230,7 @@ class FileCache : private boost::noncopyable
     const double keep_current_elements_to_max_ratio;
     const size_t keep_up_free_space_remove_batch;
 
+    String name;
     LoggerPtr log;
 
     std::exception_ptr init_exception;
@@ -238,6 +241,8 @@ class FileCache : private boost::noncopyable
     std::atomic<bool> shutdown = false;
     std::atomic<bool> cache_is_being_resized = false;
 
+    std::atomic<size_t> cache_reserve_active_threads = 0;
+
     std::mutex apply_settings_mutex;
 
     CacheMetadata metadata;
diff --git a/src/Interpreters/Cache/FileCacheFactory.cpp b/src/Interpreters/Cache/FileCacheFactory.cpp
index 6088c1bdce04..f741c89e5793 100644
--- a/src/Interpreters/Cache/FileCacheFactory.cpp
+++ b/src/Interpreters/Cache/FileCacheFactory.cpp
@@ -52,6 +52,15 @@ FileCacheFactory::CacheByName FileCacheFactory::getAll()
     return caches_by_name;
 }
 
+FileCacheFactory::Caches FileCacheFactory::getUniqueInstances()
+{
+    std::lock_guard lock(mutex);
+    Caches caches;
+    for (const auto & [_, cache_data] : caches_by_name)
+        caches.insert(cache_data);
+    return caches;
+}
+
 FileCachePtr FileCacheFactory::get(const std::string & cache_name)
 {
     std::lock_guard lock(mutex);
diff --git a/src/Interpreters/Cache/FileCacheFactory.h b/src/Interpreters/Cache/FileCacheFactory.h
index 8aae5ae74047..03d89ab76fbb 100644
--- a/src/Interpreters/Cache/FileCacheFactory.h
+++ b/src/Interpreters/Cache/FileCacheFactory.h
@@ -5,6 +5,7 @@
 
 #include <boost/noncopyable.hpp>
 #include <unordered_map>
+#include <unordered_set>
 #include <mutex>
 
 namespace DB
@@ -36,6 +37,7 @@ class FileCacheFactory final : private boost::noncopyable
 
     using FileCacheDataPtr = std::shared_ptr<FileCacheData>;
     using CacheByName = std::unordered_map<std::string, FileCacheDataPtr>;
+    using Caches = std::unordered_set<FileCacheDataPtr>;
 
     static FileCacheFactory & instance();
 
@@ -52,6 +54,7 @@ class FileCacheFactory final : private boost::noncopyable
         const std::string & config_path);
 
     CacheByName getAll();
+    Caches getUniqueInstances();
 
     FileCacheDataPtr getByName(const std::string & cache_name);
 
diff --git a/src/Interpreters/Cache/FileCache_fwd.h b/src/Interpreters/Cache/FileCache_fwd.h
index 0460bc07a40e..eda5d5a71972 100644
--- a/src/Interpreters/Cache/FileCache_fwd.h
+++ b/src/Interpreters/Cache/FileCache_fwd.h
@@ -16,7 +16,7 @@ static constexpr int FILECACHE_DEFAULT_HITS_THRESHOLD = 0; /// Disabled.
 static constexpr size_t FILECACHE_BYPASS_THRESHOLD = 256 * 1024 * 1024;
 static constexpr double FILECACHE_DEFAULT_FREE_SPACE_SIZE_RATIO = 0; /// Disabled.
 static constexpr double FILECACHE_DEFAULT_FREE_SPACE_ELEMENTS_RATIO = 0; /// Disabled.
-static constexpr int FILECACHE_DEFAULT_FREE_SPACE_REMOVE_BATCH = 10;
+static constexpr int FILECACHE_DEFAULT_FREE_SPACE_REMOVE_BATCH = 100;
 static constexpr auto FILECACHE_DEFAULT_CONFIG_PATH = "filesystem_caches";
 
 static constexpr auto FILECACHE_DEFAULT_CACHE_POLICY = FileCachePolicy::SLRU;
diff --git a/src/Interpreters/Cache/IFileCachePriority.cpp b/src/Interpreters/Cache/IFileCachePriority.cpp
index 280af0c942a2..97b864641568 100644
--- a/src/Interpreters/Cache/IFileCachePriority.cpp
+++ b/src/Interpreters/Cache/IFileCachePriority.cpp
@@ -2,10 +2,6 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 
-namespace CurrentMetrics
-{
-    extern const Metric FilesystemCacheSizeLimit;
-}
 
 namespace DB
 {
@@ -18,7 +14,6 @@ namespace ErrorCodes
 IFileCachePriority::IFileCachePriority(size_t max_size_, size_t max_elements_)
     : max_size(max_size_), max_elements(max_elements_)
 {
-    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSizeLimit, max_size_);
 }
 
 IFileCachePriority::Entry::Entry(
diff --git a/src/Interpreters/Cache/IFileCachePriority.h b/src/Interpreters/Cache/IFileCachePriority.h
index 984b9163dc83..e5675aa76d86 100644
--- a/src/Interpreters/Cache/IFileCachePriority.h
+++ b/src/Interpreters/Cache/IFileCachePriority.h
@@ -159,9 +159,12 @@ class IFileCachePriority : private boost::noncopyable
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
         IteratorPtr reservee,
+        bool continue_from_last_eviction_pos,
         const UserID & user_id,
         const CachePriorityGuard::Lock &) = 0;
 
+    virtual void resetEvictionPos(const CachePriorityGuard::Lock & lock) = 0;
+
     /// Collect eviction candidates sufficient to have `desired_size`
     /// and `desired_elements_num` as current cache state.
     /// Collect no more than `max_candidates_to_evict` elements.
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.cpp b/src/Interpreters/Cache/LRUFileCachePriority.cpp
index 3c12dd59fd40..861f37f7e4d3 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/LRUFileCachePriority.cpp
@@ -18,6 +18,7 @@ namespace ProfileEvents
     extern const Event FilesystemCacheEvictionSkippedFileSegments;
     extern const Event FilesystemCacheEvictionTries;
     extern const Event FilesystemCacheEvictionSkippedEvictingFileSegments;
+    extern const Event FilesystemCacheEvictionReusedIterator;
 }
 
 namespace DB
@@ -36,6 +37,7 @@ LRUFileCachePriority::LRUFileCachePriority(
     : IFileCachePriority(max_size_, max_elements_)
     , description(description_)
     , log(getLogger("LRUFileCachePriority" + (description.empty() ? "" : "(" + description + ")")))
+    , eviction_pos(queue.end())
 {
     if (state_)
         state = state_;
@@ -100,6 +102,13 @@ LRUFileCachePriority::LRUIterator LRUFileCachePriority::add(EntryPtr entry, cons
     return LRUIterator(this, iterator);
 }
 
+void LRUFileCachePriority::increasePriority(LRUQueue::iterator it, const CachePriorityGuard::Lock &)
+{
+    if (eviction_pos == it)
+        eviction_pos = std::next(it);
+    queue.splice(queue.end(), queue, it);
+}
+
 LRUFileCachePriority::LRUQueue::iterator
 LRUFileCachePriority::remove(LRUQueue::iterator it, const CachePriorityGuard::Lock &)
 {
@@ -115,6 +124,8 @@ LRUFileCachePriority::remove(LRUQueue::iterator it, const CachePriorityGuard::Lo
         log, "Removed entry from LRU queue, key: {}, offset: {}, size: {}",
         entry.key, entry.offset, entry.size.load());
 
+    if (eviction_pos == it)
+        eviction_pos = std::next(it);
     return queue.erase(it);
 }
 
@@ -166,8 +177,20 @@ bool LRUFileCachePriority::LRUIterator::operator ==(const LRUIterator & other) c
 
 void LRUFileCachePriority::iterate(IterateFunc func, const CachePriorityGuard::Lock & lock)
 {
-    for (auto it = queue.begin(); it != queue.end();)
+    iterateImpl(queue.begin(), func, lock);
+}
+
+LRUFileCachePriority::LRUQueue::iterator
+LRUFileCachePriority::iterateImpl(LRUQueue::iterator start_pos, IterateFunc func, const CachePriorityGuard::Lock & lock)
+{
+    const size_t max_elements_to_iterate = queue.size();
+    auto it = start_pos;
+
+    for (size_t iterated_elements = 0; iterated_elements < max_elements_to_iterate; ++iterated_elements)
     {
+        if (it == queue.end())
+            it = queue.begin();
+
         const auto & entry = **it;
 
         if (entry.size == 0)
@@ -223,7 +246,7 @@ void LRUFileCachePriority::iterate(IterateFunc func, const CachePriorityGuard::L
         {
             case IterationResult::BREAK:
             {
-                return;
+                return it;
             }
             case IterationResult::CONTINUE:
             {
@@ -237,6 +260,7 @@ void LRUFileCachePriority::iterate(IterateFunc func, const CachePriorityGuard::L
             }
         }
     }
+    return queue.end();
 }
 
 bool LRUFileCachePriority::canFit( /// NOLINT
@@ -270,6 +294,7 @@ bool LRUFileCachePriority::collectCandidatesForEviction(
     FileCacheReserveStat & stat,
     EvictionCandidates & res,
     IFileCachePriority::IteratorPtr /* reservee */,
+    bool continue_from_last_eviction_pos,
     const UserID &,
     const CachePriorityGuard::Lock & lock)
 {
@@ -283,7 +308,7 @@ bool LRUFileCachePriority::collectCandidatesForEviction(
         return canFit(size, elements, stat.total_stat.releasable_size, stat.total_stat.releasable_count, lock);
     };
 
-    iterateForEviction(res, stat, can_fit, lock);
+    iterateForEviction(res, stat, can_fit, continue_from_last_eviction_pos, lock);
 
     if (can_fit())
     {
@@ -349,7 +374,7 @@ IFileCachePriority::CollectStatus LRUFileCachePriority::collectCandidatesForEvic
         }
         return false;
     };
-    iterateForEviction(res, stat, stop_condition, lock);
+    iterateForEviction(res, stat, stop_condition, false, lock);
     chassert(status != CollectStatus::SUCCESS || stop_condition());
     return status;
 }
@@ -358,6 +383,7 @@ void LRUFileCachePriority::iterateForEviction(
     EvictionCandidates & res,
     FileCacheReserveStat & stat,
     StopConditionFunc stop_condition,
+    bool continue_from_last_eviction_pos,
     const CachePriorityGuard::Lock & lock)
 {
     if (stop_condition())
@@ -365,7 +391,7 @@ void LRUFileCachePriority::iterateForEviction(
 
     ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionTries);
 
-    IterateFunc iterate_func = [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
+    auto iterate_func = [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
     {
         const auto & file_segment = segment_metadata->file_segment;
         chassert(file_segment->assertCorrectness());
@@ -380,14 +406,27 @@ void LRUFileCachePriority::iterateForEviction(
             ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionSkippedFileSegments);
             stat.update(segment_metadata->size(), file_segment->getKind(), false);
         }
-
-        return IterationResult::CONTINUE;
     };
 
-    iterate([&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
+    auto start_pos = queue.begin();
+    if (continue_from_last_eviction_pos && eviction_pos != queue.end() && start_pos != eviction_pos)
     {
-        return stop_condition() ? IterationResult::BREAK : iterate_func(locked_key, segment_metadata);
+        ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionReusedIterator);
+        start_pos = eviction_pos;
+    }
+
+    auto iteration_pos = iterateImpl(
+        start_pos,
+        [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
+    {
+        if (stop_condition())
+            return IterationResult::BREAK;
+        iterate_func(locked_key, segment_metadata);
+        return stop_condition() ? IterationResult::BREAK : IterationResult::CONTINUE;
     }, lock);
+
+    if (continue_from_last_eviction_pos)
+        eviction_pos = iteration_pos;
 }
 
 LRUFileCachePriority::LRUIterator LRUFileCachePriority::move(
@@ -415,6 +454,8 @@ LRUFileCachePriority::LRUIterator LRUFileCachePriority::move(
     }
 #endif
 
+    if (other.eviction_pos == it.iterator)
+        other.eviction_pos = std::next(it.iterator);
     queue.splice(queue.end(), other.queue, it.iterator);
 
     updateSize(entry.size);
@@ -534,7 +575,7 @@ void LRUFileCachePriority::LRUIterator::decrementSize(size_t size)
 size_t LRUFileCachePriority::LRUIterator::increasePriority(const CachePriorityGuard::Lock & lock)
 {
     assertValid();
-    cache_priority->queue.splice(cache_priority->queue.end(), cache_priority->queue, iterator);
+    cache_priority->increasePriority(iterator, lock);
     cache_priority->check(lock);
     return ++((*iterator)->hits);
 }
@@ -547,6 +588,7 @@ void LRUFileCachePriority::LRUIterator::assertValid() const
 
 void LRUFileCachePriority::shuffle(const CachePriorityGuard::Lock &)
 {
+    chassert(eviction_pos == queue.end());
     std::vector<LRUQueue::iterator> its;
     its.reserve(queue.size());
     for (auto it = queue.begin(); it != queue.end(); ++it)
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.h b/src/Interpreters/Cache/LRUFileCachePriority.h
index b6b1182c9fb6..eb7dddccc35e 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.h
+++ b/src/Interpreters/Cache/LRUFileCachePriority.h
@@ -60,6 +60,7 @@ class LRUFileCachePriority : public IFileCachePriority
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
         IFileCachePriority::IteratorPtr reservee,
+        bool continue_from_last_eviction_pos,
         const UserID & user_id,
         const CachePriorityGuard::Lock &) override;
 
@@ -87,6 +88,14 @@ class LRUFileCachePriority : public IFileCachePriority
 
     FileCachePriorityPtr copy() const { return std::make_unique<LRUFileCachePriority>(max_size, max_elements, description, state); }
 
+    void resetEvictionPos(const CachePriorityGuard::Lock &) override { eviction_pos = queue.end(); }
+
+    /// Used only for unit test.
+    size_t getEvictionPos()
+    {
+        return std::distance(queue.begin(), eviction_pos);
+    }
+
 private:
     class LRUIterator;
     using LRUQueue = std::list<EntryPtr>;
@@ -96,6 +105,7 @@ class LRUFileCachePriority : public IFileCachePriority
     const std::string description;
     LoggerPtr log;
     StatePtr state;
+    LRUQueue::iterator eviction_pos;
 
     void updateElementsCount(int64_t num);
     void updateSize(int64_t size);
@@ -112,6 +122,7 @@ class LRUFileCachePriority : public IFileCachePriority
     LRUQueue::iterator remove(LRUQueue::iterator it, const CachePriorityGuard::Lock &);
 
     void iterate(IterateFunc func, const CachePriorityGuard::Lock &) override;
+    LRUQueue::iterator iterateImpl(LRUQueue::iterator start_pos, IterateFunc func, const CachePriorityGuard::Lock &);
 
     LRUIterator move(LRUIterator & it, LRUFileCachePriority & other, const CachePriorityGuard::Lock &);
     LRUIterator add(EntryPtr entry, const CachePriorityGuard::Lock &);
@@ -121,8 +132,11 @@ class LRUFileCachePriority : public IFileCachePriority
         EvictionCandidates & res,
         FileCacheReserveStat & stat,
         StopConditionFunc stop_condition,
+        bool continue_from_last_eviction_pos,
         const CachePriorityGuard::Lock &);
 
+    void increasePriority(LRUQueue::iterator it, const CachePriorityGuard::Lock &);
+
     void holdImpl(
         size_t size,
         size_t elements,
diff --git a/src/Interpreters/Cache/Metadata.h b/src/Interpreters/Cache/Metadata.h
index 769d318bf9b5..ad2515669baf 100644
--- a/src/Interpreters/Cache/Metadata.h
+++ b/src/Interpreters/Cache/Metadata.h
@@ -41,17 +41,21 @@ struct FileSegmentMetadata : private boost::noncopyable
 
     bool isEvictingOrRemoved(const CachePriorityGuard::Lock & lock) const
     {
+        if (removed)
+            return true;
         auto iterator = getQueueIterator();
-        if (!iterator || removed)
-            return false;
+        if (!iterator)
+            return false; /// Iterator is set only on first space reservation attempt.
         return iterator->getEntry()->isEvicting(lock);
     }
 
     bool isEvictingOrRemoved(const LockedKey & lock) const
     {
+        if (removed)
+            return true;
         auto iterator = getQueueIterator();
-        if (!iterator || removed)
-            return false;
+        if (!iterator)
+            return false; /// Iterator is set only on first space reservation attempt.
         return iterator->getEntry()->isEvicting(lock);
     }
 
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.cpp b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
index 23ad45569ac2..74fde8302d02 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
@@ -166,12 +166,19 @@ void SLRUFileCachePriority::iterate(IterateFunc func, const CachePriorityGuard::
     probationary_queue.iterate(func, lock);
 }
 
+void SLRUFileCachePriority::resetEvictionPos(const CachePriorityGuard::Lock & lock)
+{
+    protected_queue.resetEvictionPos(lock);
+    probationary_queue.resetEvictionPos(lock);
+}
+
 bool SLRUFileCachePriority::collectCandidatesForEviction(
     size_t size,
     size_t elements,
     FileCacheReserveStat & stat,
     EvictionCandidates & res,
     IFileCachePriority::IteratorPtr reservee,
+    bool continue_from_last_eviction_pos,
     const UserID & user_id,
     const CachePriorityGuard::Lock & lock)
 {
@@ -179,7 +186,7 @@ bool SLRUFileCachePriority::collectCandidatesForEviction(
     /// for a corresponding file segment, so it will be directly put into probationary queue.
     if (!reservee)
     {
-        return probationary_queue.collectCandidatesForEviction(size, elements, stat, res, reservee, user_id, lock);
+        return probationary_queue.collectCandidatesForEviction(size, elements, stat, res, reservee, continue_from_last_eviction_pos, user_id, lock);
     }
 
     auto * slru_iterator = assert_cast<SLRUIterator *>(reservee.get());
@@ -191,7 +198,7 @@ bool SLRUFileCachePriority::collectCandidatesForEviction(
     if (!slru_iterator->is_protected)
     {
         chassert(slru_iterator->lru_iterator.cache_priority == &probationary_queue);
-        success = probationary_queue.collectCandidatesForEviction(size, elements, stat, res, reservee, user_id, lock);
+        success = probationary_queue.collectCandidatesForEviction(size, elements, stat, res, reservee, continue_from_last_eviction_pos, user_id, lock);
     }
     else
     {
@@ -199,7 +206,7 @@ bool SLRUFileCachePriority::collectCandidatesForEviction(
         /// Entry is in protected queue.
         /// Check if we have enough space in protected queue to fit a new size of entry.
         /// `size` is the increment to the current entry.size we want to increase.
-        success = collectCandidatesForEvictionInProtected(size, elements, stat, res, reservee, user_id, lock);
+        success = collectCandidatesForEvictionInProtected(size, elements, stat, res, reservee, continue_from_last_eviction_pos, user_id, lock);
     }
 
     /// We eviction_candidates (res) set is non-empty and
@@ -225,6 +232,7 @@ bool SLRUFileCachePriority::collectCandidatesForEvictionInProtected(
     FileCacheReserveStat & stat,
     EvictionCandidates & res,
     IFileCachePriority::IteratorPtr reservee,
+    bool continue_from_last_eviction_pos,
     const UserID & user_id,
     const CachePriorityGuard::Lock & lock)
 {
@@ -238,7 +246,7 @@ bool SLRUFileCachePriority::collectCandidatesForEvictionInProtected(
 
     auto downgrade_candidates = std::make_shared<EvictionCandidates>();
     FileCacheReserveStat downgrade_stat;
-    if (!protected_queue.collectCandidatesForEviction(size, elements, downgrade_stat, *downgrade_candidates, reservee, user_id, lock))
+    if (!protected_queue.collectCandidatesForEviction(size, elements, downgrade_stat, *downgrade_candidates, reservee, continue_from_last_eviction_pos, user_id, lock))
     {
         return false;
     }
@@ -252,7 +260,7 @@ bool SLRUFileCachePriority::collectCandidatesForEvictionInProtected(
 
     if (!probationary_queue.collectCandidatesForEviction(
             downgrade_stat.total_stat.releasable_size, downgrade_stat.total_stat.releasable_count,
-            stat, res, reservee, user_id, lock))
+            stat, res, reservee, continue_from_last_eviction_pos, user_id, lock))
     {
         return false;
     }
@@ -422,7 +430,7 @@ void SLRUFileCachePriority::increasePriority(SLRUIterator & iterator, const Cach
         /// queue to probationary queue.
         ///
         if (!collectCandidatesForEvictionInProtected(
-                entry->size, /* elements */1, stat, eviction_candidates, nullptr, FileCache::getInternalUser().user_id, lock))
+                entry->size, /* elements */1, stat, eviction_candidates, nullptr, false, FileCache::getInternalUser().user_id, lock))
         {
             /// "downgrade" candidates cannot be moved to probationary queue,
             /// so entry cannot be moved to protected queue as well.
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.h b/src/Interpreters/Cache/SLRUFileCachePriority.h
index 7795d134df1e..3c8ab9da861b 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.h
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.h
@@ -59,6 +59,7 @@ class SLRUFileCachePriority : public IFileCachePriority
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
         IFileCachePriority::IteratorPtr reservee,
+        bool continue_from_last_eviction_pos,
         const UserID & user_id,
         const CachePriorityGuard::Lock &) override;
 
@@ -70,6 +71,8 @@ class SLRUFileCachePriority : public IFileCachePriority
         EvictionCandidates & res,
         const CachePriorityGuard::Lock &) override;
 
+    void resetEvictionPos(const CachePriorityGuard::Lock &) override;
+
     void iterate(IterateFunc func, const CachePriorityGuard::Lock &) override;
 
     void shuffle(const CachePriorityGuard::Lock &) override;
@@ -104,6 +107,7 @@ class SLRUFileCachePriority : public IFileCachePriority
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
         IFileCachePriority::IteratorPtr reservee,
+        bool continue_from_last_eviction_pos,
         const UserID & user_id,
         const CachePriorityGuard::Lock & lock);
 
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index c360e723641a..025f84bdd4f9 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -139,6 +139,7 @@ class ClientInfo
         NOT_A_BACKGROUND_OPERATION = 0,
         MERGE = 1,
         MUTATION = 2,
+        EXPORT_PART = 3,
     };
 
     /// It's ClientInfo and context created for background operation (not real query)
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index a0e4e4999b72..e067cf87b067 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -732,9 +732,9 @@ void Cluster::initMisc()
     }
 }
 
-std::unique_ptr<Cluster> Cluster::getClusterWithReplicasAsShards(const Settings & settings, size_t max_replicas_from_shard) const
+std::unique_ptr<Cluster> Cluster::getClusterWithReplicasAsShards(const Settings & settings, size_t max_replicas_from_shard, size_t max_hosts) const
 {
-    return std::unique_ptr<Cluster>{ new Cluster(ReplicasAsShardsTag{}, *this, settings, max_replicas_from_shard)};
+    return std::unique_ptr<Cluster>{ new Cluster(ReplicasAsShardsTag{}, *this, settings, max_replicas_from_shard, max_hosts)};
 }
 
 std::unique_ptr<Cluster> Cluster::getClusterWithSingleShard(size_t index) const
@@ -783,7 +783,7 @@ void shuffleReplicas(std::vector<Cluster::Address> & replicas, const Settings &
 
 }
 
-Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Settings & settings, size_t max_replicas_from_shard)
+Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Settings & settings, size_t max_replicas_from_shard, size_t max_hosts)
 {
     if (from.addresses_with_failover.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cluster is empty");
@@ -805,6 +805,7 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
 
                 if (address.is_local)
                     info.local_addresses.push_back(address);
+                addresses_with_failover.emplace_back(Addresses({address}));
 
                 auto pool = ConnectionPoolFactory::instance().get(
                     static_cast<unsigned>(settings[Setting::distributed_connections_pool_size]),
@@ -828,9 +829,6 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
                 info.per_replica_pools = {std::move(pool)};
                 info.default_database = address.default_database;
 
-                addresses_with_failover.emplace_back(Addresses{address});
-
-                slot_to_shard.insert(std::end(slot_to_shard), info.weight, shards_info.size());
                 shards_info.emplace_back(std::move(info));
             }
         };
@@ -852,10 +850,37 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
     secret = from.secret;
     name = from.name;
 
+    constrainShardInfoAndAddressesToMaxHosts(max_hosts);
+
+    for (size_t i = 0; i < shards_info.size(); ++i)
+        slot_to_shard.insert(std::end(slot_to_shard), shards_info[i].weight, i);
+
     initMisc();
 }
 
 
+void Cluster::constrainShardInfoAndAddressesToMaxHosts(size_t max_hosts)
+{
+    if (max_hosts == 0 || shards_info.size() <= max_hosts)
+        return;
+
+    pcg64_fast gen{randomSeed()};
+    std::shuffle(shards_info.begin(), shards_info.end(), gen);
+    shards_info.resize(max_hosts);
+
+    AddressesWithFailover addresses_with_failover_;
+
+    UInt32 shard_num = 0;
+    for (auto & shard_info : shards_info)
+    {
+        addresses_with_failover_.push_back(addresses_with_failover[shard_info.shard_num - 1]);
+        shard_info.shard_num = ++shard_num;
+    }
+
+    addresses_with_failover.swap(addresses_with_failover_);
+}
+
+
 Cluster::Cluster(Cluster::SubclusterTag, const Cluster & from, const std::vector<size_t> & indices)
 {
     for (size_t index : indices)
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index b5a4c51c11db..f9b581034ef7 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -270,7 +270,7 @@ class Cluster
     std::unique_ptr<Cluster> getClusterWithMultipleShards(const std::vector<size_t> & indices) const;
 
     /// Get a new Cluster that contains all servers (all shards with all replicas) from existing cluster as independent shards.
-    std::unique_ptr<Cluster> getClusterWithReplicasAsShards(const Settings & settings, size_t max_replicas_from_shard = 0) const;
+    std::unique_ptr<Cluster> getClusterWithReplicasAsShards(const Settings & settings, size_t max_replicas_from_shard = 0, size_t max_hosts = 0) const;
 
     /// Returns false if cluster configuration doesn't allow to use it for cross-replication.
     /// NOTE: true does not mean, that it's actually a cross-replication cluster.
@@ -296,7 +296,7 @@ class Cluster
 
     /// For getClusterWithReplicasAsShards implementation
     struct ReplicasAsShardsTag {};
-    Cluster(ReplicasAsShardsTag, const Cluster & from, const Settings & settings, size_t max_replicas_from_shard);
+    Cluster(ReplicasAsShardsTag, const Cluster & from, const Settings & settings, size_t max_replicas_from_shard, size_t max_hosts);
 
     void addShard(
         const Settings & settings,
@@ -308,6 +308,9 @@ class Cluster
         ShardInfoInsertPathForInternalReplication insert_paths = {},
         bool internal_replication = false);
 
+    /// Reduce size of cluster to max_hosts
+    void constrainShardInfoAndAddressesToMaxHosts(size_t max_hosts);
+
     /// Inter-server secret
     String secret;
 
diff --git a/src/Interpreters/ClusterDiscovery.cpp b/src/Interpreters/ClusterDiscovery.cpp
index 033f1379543c..6c328a3f7beb 100644
--- a/src/Interpreters/ClusterDiscovery.cpp
+++ b/src/Interpreters/ClusterDiscovery.cpp
@@ -108,6 +108,13 @@ class ClusterDiscovery::Flags
         cv.notify_one();
     }
 
+    void wakeup()
+    {
+        std::unique_lock<std::mutex> lk(mu);
+        any_need_update = true;
+        cv.notify_one();
+    }
+
 private:
     std::condition_variable cv;
     std::mutex mu;
@@ -391,7 +398,9 @@ bool ClusterDiscovery::upsertCluster(ClusterInfo & cluster_info)
         return true;
     };
 
-    if (!cluster_info.current_node_is_observer && !contains(node_uuids, current_node_name))
+    if (!cluster_info.current_node_is_observer
+        && context->isSwarmModeEnabled()
+        && !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);
@@ -455,12 +464,30 @@ void ClusterDiscovery::registerInZk(zkutil::ZooKeeperPtr & zk, ClusterInfo & inf
         return;
     }
 
+    if (!context->isSwarmModeEnabled())
+    {
+        LOG_DEBUG(log, "STOP SWARM MODE called, skip self-registering current node {} in 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);
 }
 
+void ClusterDiscovery::unregisterFromZk(zkutil::ZooKeeperPtr & zk, ClusterInfo & info)
+{
+    if (info.current_node_is_observer)
+        return;
+
+    String node_path = getShardsListPath(info.zk_root) / current_node_name;
+    LOG_DEBUG(log, "Removing current node {} from cluster {}", current_node_name, info.name);
+
+    zk->remove(node_path);
+    LOG_DEBUG(log, "Current node {} removed from cluster {}", current_node_name, info.name);
+}
+
 void ClusterDiscovery::initialUpdate()
 {
     LOG_DEBUG(log, "Initializing");
@@ -506,6 +533,18 @@ void ClusterDiscovery::initialUpdate()
     is_initialized = true;
 }
 
+void ClusterDiscovery::registerAll()
+{
+    register_change_flag = RegisterChangeFlag::RCF_REGISTER_ALL;
+    clusters_to_update->wakeup();
+}
+
+void ClusterDiscovery::unregisterAll()
+{
+    register_change_flag = RegisterChangeFlag::RCF_UNREGISTER_ALL;
+    clusters_to_update->wakeup();
+}
+
 void ClusterDiscovery::findDynamicClusters(
     std::unordered_map<String, ClusterDiscovery::ClusterInfo> & info,
     std::unordered_set<size_t> * unchanged_roots)
@@ -729,6 +768,27 @@ bool ClusterDiscovery::runMainThread(std::function<void()> up_to_date_callback)
         {
             up_to_date_callback();
         }
+
+        RegisterChangeFlag flag = register_change_flag.exchange(RegisterChangeFlag::RCF_NONE);
+
+        if (flag == RegisterChangeFlag::RCF_REGISTER_ALL)
+        {
+            LOG_DEBUG(log, "Register in all dynamic clusters");
+            for (auto & [_, info] : clusters_info)
+            {
+                auto zk = context->getDefaultOrAuxiliaryZooKeeper(info.zk_name);
+                registerInZk(zk, info);
+            }
+        }
+        else if (flag == RegisterChangeFlag::RCF_UNREGISTER_ALL)
+        {
+            LOG_DEBUG(log, "Unregister in all dynamic clusters");
+            for (auto & [_, info] : clusters_info)
+            {
+                auto zk = context->getDefaultOrAuxiliaryZooKeeper(info.zk_name);
+                unregisterFromZk(zk, info);
+            }
+        }
     }
     LOG_DEBUG(log, "Worker thread stopped");
     return finished;
diff --git a/src/Interpreters/ClusterDiscovery.h b/src/Interpreters/ClusterDiscovery.h
index c0e4af3b86f3..2d3bbe489f4e 100644
--- a/src/Interpreters/ClusterDiscovery.h
+++ b/src/Interpreters/ClusterDiscovery.h
@@ -38,6 +38,9 @@ class ClusterDiscovery
 
     ~ClusterDiscovery();
 
+    void registerAll();
+    void unregisterAll();
+
 private:
     struct NodeInfo
     {
@@ -125,6 +128,7 @@ class ClusterDiscovery
     void initialUpdate();
 
     void registerInZk(zkutil::ZooKeeperPtr & zk, ClusterInfo & info);
+    void unregisterFromZk(zkutil::ZooKeeperPtr & zk, ClusterInfo & info);
 
     Strings getNodeNames(zkutil::ZooKeeperPtr & zk,
                          const String & zk_root,
@@ -207,6 +211,15 @@ class ClusterDiscovery
     std::shared_ptr<std::vector<std::shared_ptr<MulticlusterDiscovery>>> multicluster_discovery_paths;
 
     MultiVersion<Macros>::Version macros;
+
+    enum RegisterChangeFlag
+    {
+        RCF_NONE,
+        RCF_REGISTER_ALL,
+        RCF_UNREGISTER_ALL,
+    };
+
+    std::atomic<RegisterChangeFlag> register_change_flag = RegisterChangeFlag::RCF_NONE;
 };
 
 }
diff --git a/src/Interpreters/ClusterFunctionReadTask.cpp b/src/Interpreters/ClusterFunctionReadTask.cpp
index 9a91f8549cfa..23bd3a73843d 100644
--- a/src/Interpreters/ClusterFunctionReadTask.cpp
+++ b/src/Interpreters/ClusterFunctionReadTask.cpp
@@ -7,7 +7,10 @@
 #include <IO/ReadHelpers.h>
 #include <Interpreters/ActionsDAG.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
+#include <Common/Exception.h>
 #include <Common/logger_useful.h>
+#include <Formats/FormatFactory.h>
+#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 
 namespace DB
 {
@@ -19,9 +22,11 @@ namespace ErrorCodes
 namespace Setting
 {
     extern const SettingsBool cluster_function_process_archive_on_multiple_nodes;
+    extern const SettingsBool allow_experimental_iceberg_read_optimization;
 }
 
 ClusterFunctionReadTaskResponse::ClusterFunctionReadTaskResponse(ObjectInfoPtr object, const ContextPtr & context)
+    : iceberg_read_optimization_enabled(context->getSettingsRef()[Setting::allow_experimental_iceberg_read_optimization])
 {
     if (!object)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "`object` cannot be null");
@@ -29,8 +34,17 @@ ClusterFunctionReadTaskResponse::ClusterFunctionReadTaskResponse(ObjectInfoPtr o
     if (object->data_lake_metadata.has_value())
         data_lake_metadata = object->data_lake_metadata.value();
 
-    const bool send_over_whole_archive = !context->getSettingsRef()[Setting::cluster_function_process_archive_on_multiple_nodes];
-    path = send_over_whole_archive ? object->getPathOrPathToArchiveIfArchive() : object->getPath();
+    file_meta_info = object->file_meta_info;
+
+    if (object->getCommand().isValid())
+        path = object->getCommand().toString();
+    else
+    {
+        const bool send_over_whole_archive = !context->getSettingsRef()[Setting::cluster_function_process_archive_on_multiple_nodes];
+        path = send_over_whole_archive ? object->getPathOrPathToArchiveIfArchive() : object->getPath();
+        absolute_path = object->getAbsolutePath();
+        file_bucket_info = object->file_bucket_info;
+    }
 }
 
 ClusterFunctionReadTaskResponse::ClusterFunctionReadTaskResponse(const std::string & path_)
@@ -45,6 +59,12 @@ ObjectInfoPtr ClusterFunctionReadTaskResponse::getObjectInfo() const
 
     auto object = std::make_shared<ObjectInfo>(path);
     object->data_lake_metadata = data_lake_metadata;
+    object->file_meta_info = file_meta_info;
+    if (absolute_path.has_value() && !absolute_path.value().empty())
+        object->absolute_path = absolute_path;
+
+    object->file_bucket_info = file_bucket_info;
+
     return object;
 }
 
@@ -61,6 +81,30 @@ void ClusterFunctionReadTaskResponse::serialize(WriteBuffer & out, size_t protoc
         else
             ActionsDAG().serialize(out, registry);
     }
+
+    if (protocol_version >= DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_FILE_BUCKETS_INFO)
+    {
+        if (file_bucket_info)
+        {
+            /// Write format name so we can create appropriate file bucket info during deserialization.
+            writeStringBinary(file_bucket_info->getFormatName(), out);
+            file_bucket_info->serialize(out);
+        }
+        else
+        {
+            /// Write empty string as format name if file_bucket_info is not set.
+            writeStringBinary("", out);
+        }
+    }
+
+    if (protocol_version >= DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_DATA_LAKE_COLUMNS_METADATA)
+    {
+        /// This info is not used when optimization is disabled, so there is no need to send it.
+        if (iceberg_read_optimization_enabled && file_meta_info.has_value())
+            file_meta_info.value()->serialize(out);
+        else
+            DataFileMetaInfo().serialize(out);
+    }
 }
 
 void ClusterFunctionReadTaskResponse::deserialize(ReadBuffer & in)
@@ -87,6 +131,25 @@ void ClusterFunctionReadTaskResponse::deserialize(ReadBuffer & in)
             data_lake_metadata.transform = std::move(transform);
         }
     }
+
+    if (protocol_version >= DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_FILE_BUCKETS_INFO)
+    {
+        String format;
+        readStringBinary(format, in);
+        if (!format.empty())
+        {
+            file_bucket_info = FormatFactory::instance().getFileBucketInfo(format);
+            file_bucket_info->deserialize(in);
+        }
+    }
+
+    if (protocol_version >= DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION_WITH_DATA_LAKE_COLUMNS_METADATA)
+    {
+        auto info = std::make_shared<DataFileMetaInfo>(DataFileMetaInfo::deserialize(in));
+
+        if (!path.empty() && !info->empty())
+            file_meta_info = info;
+    }
 }
 
 }
diff --git a/src/Interpreters/ClusterFunctionReadTask.h b/src/Interpreters/ClusterFunctionReadTask.h
index 21e3238e0fb9..7e6af60424f8 100644
--- a/src/Interpreters/ClusterFunctionReadTask.h
+++ b/src/Interpreters/ClusterFunctionReadTask.h
@@ -1,5 +1,8 @@
 #pragma once
 #include <Core/Types.h>
+#include <Storages/ObjectStorage/DataLakes/DataLakeObjectMetadata.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.h>
 #include <Storages/ObjectStorage/IObjectIterator.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeObjectMetadata.h>
 
@@ -18,8 +21,18 @@ struct ClusterFunctionReadTaskResponse
 
     /// Data path (object path, in case of object storage).
     String path;
+
+    /// Absolute path (including storage type prefix).
+    std::optional<String> absolute_path;
+
+    FileBucketInfoPtr file_bucket_info;
+
     /// Object metadata path, in case of data lake object.
     DataLakeObjectMetadata data_lake_metadata;
+    /// File's columns info
+    std::optional<DataFileMetaInfoPtr> file_meta_info;
+
+    const bool iceberg_read_optimization_enabled = false;
 
     /// Convert received response into ObjectInfo.
     ObjectInfoPtr getObjectInfo() const;
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index f57fae899df5..8259d57fa7f0 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -67,7 +67,8 @@ ASTPtr rewriteSelectQuery(
     const ASTPtr & query,
     const std::string & remote_database,
     const std::string & remote_table,
-    ASTPtr table_function_ptr)
+    ASTPtr table_function_ptr,
+    ASTPtr additional_filter)
 {
     auto modified_query_ast = query->clone();
 
@@ -80,8 +81,33 @@ ASTPtr rewriteSelectQuery(
 
     if (!context->getSettingsRef()[Setting::allow_experimental_analyzer])
     {
+        // Apply additional filter if provided
+        if (additional_filter)
+        {
+            if (select_query.where())
+            {
+                /// WHERE <old> AND <filter>
+                select_query.setExpression(
+                    ASTSelectQuery::Expression::WHERE,
+                    makeASTFunction("and", select_query.where(), additional_filter->clone()));
+            }
+            else
+            {
+                /// No WHERE – simply set it
+                select_query.setExpression(
+                    ASTSelectQuery::Expression::WHERE, additional_filter->clone());
+            }
+        }
+
         if (table_function_ptr)
-            select_query.addTableFunction(table_function_ptr);
+        {
+            select_query.addTableFunction(table_function_ptr->clone());
+
+            // Reset semantic table information for all column identifiers to prevent
+            // RestoreQualifiedNamesVisitor from adding wrong table names
+            ResetSemanticTableVisitor::Data data;
+            ResetSemanticTableVisitor(data).visit(modified_query_ast);
+        }
         else
             select_query.replaceDatabaseAndTable(remote_database, remote_table);
 
@@ -93,6 +119,7 @@ ASTPtr rewriteSelectQuery(
             data.distributed_table = DatabaseAndTableWithAlias(*getTableExpression(query->as<ASTSelectQuery &>(), 0));
             data.remote_table.database = remote_database;
             data.remote_table.table = remote_table;
+
             RestoreQualifiedNamesVisitor(data).visit(modified_query_ast);
         }
     }
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.h b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
index b61f7a0012af..47646a80e1aa 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
@@ -41,7 +41,8 @@ ASTPtr rewriteSelectQuery(
     const ASTPtr & query,
     const std::string & remote_database,
     const std::string & remote_table,
-    ASTPtr table_function_ptr = nullptr);
+    ASTPtr table_function_ptr = nullptr,
+    ASTPtr additional_filter = nullptr);
 
 using ColumnsDescriptionByShardNum = std::unordered_map<UInt32, ColumnsDescription>;
 using AdditionalShardFilterGenerator = std::function<ASTPtr(uint64_t)>;
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index 4d15eb28c8fd..5ed4c2862d01 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -15,6 +15,7 @@
 #include <Parsers/ASTInsertQuery.h>
 #include <Planner/Utils.h>
 #include <Processors/QueryPlan/ParallelReplicasLocalPlan.h>
+#include <Processors/QueryPlan/DistributedCreateLocalPlan.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromLocalReplica.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
@@ -333,7 +334,8 @@ void executeQuery(
     const std::string & sharding_key_column_name,
     const DistributedSettings & distributed_settings,
     AdditionalShardFilterGenerator shard_filter_generator,
-    bool is_remote_function)
+    bool is_remote_function,
+    std::span<const SelectQueryInfo> additional_query_infos)
 {
     const Settings & settings = context->getSettingsRef();
 
@@ -361,6 +363,7 @@ void executeQuery(
     new_context->increaseDistributedDepth();
 
     const size_t shards = cluster->getShardCount();
+    const bool has_additional_query_infos = !additional_query_infos.empty();
 
     if (context->getSettingsRef()[Setting::allow_experimental_analyzer])
     {
@@ -464,11 +467,35 @@ void executeQuery(
             not_optimized_cluster->getName());
 
         read_from_remote->setStepDescription("Read from remote replica");
+        read_from_remote->setIsRemoteFunction(is_remote_function);
         plan->addStep(std::move(read_from_remote));
         plan->addInterpreterContext(new_context);
         plans.emplace_back(std::move(plan));
     }
 
+    if (has_additional_query_infos)
+    {
+        if (!header)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Header is not initialized for local hybrid plan creation");
+
+        const Block & header_block = *header;
+        for (const auto & additional_query_info : additional_query_infos)
+        {
+            auto additional_plan = createLocalPlan(
+                additional_query_info.query,
+                header_block,
+                context,
+                processed_stage,
+                0,  /// shard_num is not applicable for local hybrid plans
+                1,  /// shard_count is not applicable for local hybrid plans
+                false,
+                false,
+                "");
+
+            plans.emplace_back(std::move(additional_plan));
+        }
+    }
+
     if (plans.empty())
         return;
 
@@ -484,6 +511,8 @@ void executeQuery(
         input_headers.emplace_back(plan->getCurrentHeader());
 
     auto union_step = std::make_unique<UnionStep>(std::move(input_headers));
+    if (has_additional_query_infos)
+        union_step->setStepDescription("Hybrid");
     query_plan.unitePlans(std::move(union_step), std::move(plans));
 }
 
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 0142e57a9120..8f1b8be42182 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -5,6 +5,7 @@
 #include <Parsers/IAST_fwd.h>
 
 #include <optional>
+#include <span>
 
 namespace DB
 {
@@ -88,7 +89,8 @@ void executeQuery(
     const std::string & sharding_key_column_name,
     const DistributedSettings & distributed_settings,
     AdditionalShardFilterGenerator shard_filter_generator,
-    bool is_remote_function);
+    bool is_remote_function,
+    std::span<const SelectQueryInfo> additional_query_infos = {});
 
 std::optional<QueryPipeline> executeInsertSelectWithParallelReplicas(
     const ASTInsertQuery & query_ast,
diff --git a/src/Interpreters/ConcurrentHashJoin.cpp b/src/Interpreters/ConcurrentHashJoin.cpp
index 55f3ac445731..2f5ea35ed60d 100644
--- a/src/Interpreters/ConcurrentHashJoin.cpp
+++ b/src/Interpreters/ConcurrentHashJoin.cpp
@@ -320,17 +320,23 @@ class ConcurrentHashJoinResult : public IJoinResult
         if (!current_result)
         {
             if (next_block >= dispatched_blocks.size())
-                return {Block(), true};
+                return {Block(), nullptr, true};
 
             current_result = hash_joins[next_block]->data->joinScatteredBlock(std::move(dispatched_blocks[next_block]));
-            ++next_block;
         }
 
         auto data = current_result->next();
         if (data.is_last)
+        {
+            if (data.next_block)
+                dispatched_blocks[next_block] = std::move(*data.next_block);
+            else
+                ++next_block;
             current_result.reset();
+        }
+
         bool is_last = next_block >= dispatched_blocks.size() && data.is_last;
-        return {std::move(data.block), is_last};
+        return {std::move(data.block), nullptr, is_last};
     }
 };
 
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 80d77f74d5f4..455ffe68508c 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -35,6 +35,7 @@
 #include <Storages/MarkCache.h>
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MovesList.h>
+#include <Storages/MergeTree/ExportList.h>
 #include <Storages/MergeTree/ReplicatedFetchList.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
@@ -157,6 +158,8 @@ namespace ProfileEvents
     extern const Event BackupThrottlerSleepMicroseconds;
     extern const Event MergesThrottlerBytes;
     extern const Event MergesThrottlerSleepMicroseconds;
+    extern const Event ExportsThrottlerBytes;
+    extern const Event ExportsThrottlerSleepMicroseconds;
     extern const Event MutationsThrottlerBytes;
     extern const Event MutationsThrottlerSleepMicroseconds;
     extern const Event QueryLocalReadThrottlerBytes;
@@ -169,6 +172,26 @@ namespace ProfileEvents
     extern const Event QueryRemoteWriteThrottlerSleepMicroseconds;
     extern const Event QueryBackupThrottlerBytes;
     extern const Event QueryBackupThrottlerSleepMicroseconds;
+
+    extern const Event MergeMutateBackgroundExecutorTaskExecuteStepMicroseconds;
+    extern const Event MergeMutateBackgroundExecutorTaskCancelMicroseconds;
+    extern const Event MergeMutateBackgroundExecutorTaskResetMicroseconds;
+    extern const Event MergeMutateBackgroundExecutorWaitMicroseconds;
+
+    extern const Event MoveBackgroundExecutorTaskExecuteStepMicroseconds;
+    extern const Event MoveBackgroundExecutorTaskCancelMicroseconds;
+    extern const Event MoveBackgroundExecutorTaskResetMicroseconds;
+    extern const Event MoveBackgroundExecutorWaitMicroseconds;
+
+    extern const Event FetchBackgroundExecutorTaskExecuteStepMicroseconds;
+    extern const Event FetchBackgroundExecutorTaskCancelMicroseconds;
+    extern const Event FetchBackgroundExecutorTaskResetMicroseconds;
+    extern const Event FetchBackgroundExecutorWaitMicroseconds;
+
+    extern const Event CommonBackgroundExecutorTaskExecuteStepMicroseconds;
+    extern const Event CommonBackgroundExecutorTaskCancelMicroseconds;
+    extern const Event CommonBackgroundExecutorTaskResetMicroseconds;
+    extern const Event CommonBackgroundExecutorWaitMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -224,6 +247,7 @@ namespace CurrentMetrics
     extern const Metric UncompressedCacheCells;
     extern const Metric IndexUncompressedCacheBytes;
     extern const Metric IndexUncompressedCacheCells;
+    extern const Metric IsSwarmModeEnabled;
 }
 
 
@@ -324,6 +348,7 @@ namespace ServerSetting
     extern const ServerSettingsUInt64 max_local_write_bandwidth_for_server;
     extern const ServerSettingsUInt64 max_merges_bandwidth_for_server;
     extern const ServerSettingsUInt64 max_mutations_bandwidth_for_server;
+    extern const ServerSettingsUInt64 max_exports_bandwidth_for_server;
     extern const ServerSettingsUInt64 max_remote_read_network_bandwidth_for_server;
     extern const ServerSettingsUInt64 max_remote_write_network_bandwidth_for_server;
     extern const ServerSettingsUInt64 max_replicated_fetches_network_bandwidth_for_server;
@@ -340,6 +365,11 @@ namespace ServerSetting
     extern const ServerSettingsUInt64 iceberg_catalog_threadpool_pool_size;
     extern const ServerSettingsUInt64 iceberg_catalog_threadpool_queue_size;
     extern const ServerSettingsBool dictionaries_lazy_load;
+    extern const ServerSettingsInt32 os_threads_nice_value_zookeeper_client_send_receive;
+    extern const ServerSettingsUInt64 max_table_num_to_throw;
+    extern const ServerSettingsUInt64 max_view_num_to_throw;
+    extern const ServerSettingsUInt64 max_dictionary_num_to_throw;
+    extern const ServerSettingsUInt64 max_database_num_to_throw;
 }
 
 namespace ErrorCodes
@@ -503,6 +533,7 @@ struct ContextSharedPart : boost::noncopyable
     GlobalOvercommitTracker global_overcommit_tracker;
     MergeList merge_list;                                       /// The list of executable merge (for (Replicated)?MergeTree)
     MovesList moves_list;                                       /// The list of executing moves (for (Replicated)?MergeTree)
+    ExportsList exports_list;                                   /// The list of executing exports (for (Replicated)?MergeTree)
     ReplicatedFetchList replicated_fetch_list;
     RefreshSet refresh_set;                                 /// The list of active refreshes (for MaterializedView)
     ConfigurationPtr users_config TSA_GUARDED_BY(mutex);                              /// Config with the users, profiles and quotas sections.
@@ -544,6 +575,8 @@ struct ContextSharedPart : boost::noncopyable
     mutable ThrottlerPtr mutations_throttler;               /// A server-wide throttler for mutations
     mutable ThrottlerPtr merges_throttler;                  /// A server-wide throttler for merges
 
+    mutable ThrottlerPtr exports_throttler;                /// A server-wide throttler for exports
+
     MultiVersion<Macros> macros;                            /// Substitutions extracted from config.
     std::unique_ptr<DDLWorker> ddl_worker TSA_GUARDED_BY(mutex); /// Process ddl commands from zk.
     LoadTaskPtr ddl_worker_startup_task;                         /// To postpone `ddl_worker->startup()` after all tables startup
@@ -620,6 +653,7 @@ struct ContextSharedPart : boost::noncopyable
     std::map<String, UInt16> server_ports;
 
     std::atomic<bool> shutdown_called = false;
+    std::atomic<bool> swarm_mode_enabled = true;
 
     Stopwatch uptime_watch TSA_GUARDED_BY(mutex);
 
@@ -788,6 +822,8 @@ struct ContextSharedPart : boost::noncopyable
       */
     void shutdown() TSA_NO_THREAD_SAFETY_ANALYSIS
     {
+        swarm_mode_enabled = false;
+        CurrentMetrics::set(CurrentMetrics::IsSwarmModeEnabled, 0);
         bool is_shutdown_called = shutdown_called.exchange(true);
         if (is_shutdown_called)
             return;
@@ -862,9 +898,8 @@ struct ContextSharedPart : boost::noncopyable
         /// Background operations in cache use background schedule pool.
         /// Deactivate them before destructing it.
         LOG_TRACE(log, "Shutting down caches");
-        const auto & caches = FileCacheFactory::instance().getAll();
-        for (const auto & [_, cache] : caches)
-            cache->cache->deactivateBackgroundOperations();
+        for (const auto & cache_data : FileCacheFactory::instance().getUniqueInstances())
+            cache_data->cache->deactivateBackgroundOperations();
         FileCacheFactory::instance().clear();
 
         {
@@ -937,7 +972,13 @@ struct ContextSharedPart : boost::noncopyable
 
             /// Stop trace collector if any
             trace_collector.reset();
+        }
+
+        {
             /// Stop zookeeper connection
+            std::lock_guard lock(zookeeper_mutex);
+            if (zookeeper)
+                zookeeper->finalize("shutdown");
             zookeeper.reset();
         }
 
@@ -1051,6 +1092,9 @@ struct ContextSharedPart : boost::noncopyable
 
         if (auto bandwidth = server_settings[ServerSetting::max_merges_bandwidth_for_server])
             merges_throttler = std::make_shared<Throttler>(bandwidth, ProfileEvents::MergesThrottlerBytes, ProfileEvents::MergesThrottlerSleepMicroseconds);
+
+        if (auto bandwidth = server_settings[ServerSetting::max_exports_bandwidth_for_server])
+            exports_throttler = std::make_shared<Throttler>(bandwidth, ProfileEvents::ExportsThrottlerBytes, ProfileEvents::ExportsThrottlerSleepMicroseconds);
     }
 };
 
@@ -1208,6 +1252,8 @@ MergeList & Context::getMergeList() { return shared->merge_list; }
 const MergeList & Context::getMergeList() const { return shared->merge_list; }
 MovesList & Context::getMovesList() { return shared->moves_list; }
 const MovesList & Context::getMovesList() const { return shared->moves_list; }
+ExportsList & Context::getExportsList() { return shared->exports_list; }
+const ExportsList & Context::getExportsList() const { return shared->exports_list; }
 ReplicatedFetchList & Context::getReplicatedFetchList() { return shared->replicated_fetch_list; }
 const ReplicatedFetchList & Context::getReplicatedFetchList() const { return shared->replicated_fetch_list; }
 RefreshSet & Context::getRefreshSet() { return shared->refresh_set; }
@@ -1305,16 +1351,65 @@ std::unordered_map<Context::WarningType, PreformattedMessage> Context::getWarnin
     {
         SharedLockGuard lock(shared->mutex);
         common_warnings = shared->warnings;
-        if (CurrentMetrics::get(CurrentMetrics::AttachedTable) > static_cast<Int64>(shared->max_table_num_to_warn))
-            common_warnings[Context::WarningType::MAX_ATTACHED_TABLES] = PreformattedMessage::create("The number of attached tables is more than {}.", shared->max_table_num_to_warn.load());
-        if (CurrentMetrics::get(CurrentMetrics::AttachedView) > static_cast<Int64>(shared->max_view_num_to_warn))
-            common_warnings[Context::WarningType::MAX_ATTACHED_VIEWS] =  PreformattedMessage::create("The number of attached views is more than {}.", shared->max_view_num_to_warn.load());
-        if (CurrentMetrics::get(CurrentMetrics::AttachedDictionary) > static_cast<Int64>(shared->max_dictionary_num_to_warn))
-            common_warnings[Context::WarningType::MAX_ATTACHED_DICTIONARIES] =  PreformattedMessage::create("The number of attached dictionaries is more than {}.", shared->max_dictionary_num_to_warn.load());
-        if (CurrentMetrics::get(CurrentMetrics::AttachedDatabase) > static_cast<Int64>(shared->max_database_num_to_warn))
-            common_warnings[Context::WarningType::MAX_ATTACHED_DATABASES] = PreformattedMessage::create("The number of attached databases is more than {}.", shared->max_database_num_to_warn.load());
-        if (CurrentMetrics::get(CurrentMetrics::PartsActive) > static_cast<Int64>(shared->max_part_num_to_warn))
-            common_warnings[Context::WarningType::MAX_ACTIVE_PARTS] = PreformattedMessage::create("The number of active parts is more than {}.", shared->max_part_num_to_warn.load());
+
+        auto attached_tables = CurrentMetrics::get(CurrentMetrics::AttachedTable);
+        auto attached_views = CurrentMetrics::get(CurrentMetrics::AttachedView);
+        auto attached_dictionaries = CurrentMetrics::get(CurrentMetrics::AttachedDictionary);
+        auto attached_databases = CurrentMetrics::get(CurrentMetrics::AttachedDatabase);
+        auto active_parts = CurrentMetrics::get(CurrentMetrics::PartsActive);
+
+        if (attached_tables > static_cast<Int64>(shared->max_table_num_to_warn))
+        {
+            if (auto limit = shared->server_settings[ServerSetting::max_table_num_to_throw]; limit > shared->max_table_num_to_warn.load())
+                common_warnings[Context::WarningType::MAX_ATTACHED_TABLES] = PreformattedMessage::create(
+                    "The number of attached tables ({}) exceeds the warning limit of {}. You will not be able to create new tables once the limit of {} is reached.",
+                    attached_tables, shared->max_table_num_to_warn.load(), limit.value);
+            else
+                common_warnings[Context::WarningType::MAX_ATTACHED_TABLES] = PreformattedMessage::create(
+                    "The number of attached tables ({}) exceeds the warning limit of {}.",
+                    attached_tables, shared->max_table_num_to_warn.load());
+        }
+
+        if (attached_views > static_cast<Int64>(shared->max_view_num_to_warn))
+        {
+            if (auto limit = shared->server_settings[ServerSetting::max_view_num_to_throw]; limit > shared->max_view_num_to_warn.load())
+                common_warnings[Context::WarningType::MAX_ATTACHED_VIEWS] =  PreformattedMessage::create(
+                    "The number of attached views ({}) exceeds the warning limit of {}. You will not be able to create new views once the limit of {} is reached.",
+                    attached_views, shared->max_view_num_to_warn.load(), limit.value);
+            else
+                common_warnings[Context::WarningType::MAX_ATTACHED_VIEWS] =  PreformattedMessage::create(
+                    "The number of attached views ({}) exceeds the warning limit of {}.",
+                    attached_views, shared->max_view_num_to_warn.load());
+        }
+
+        if (attached_dictionaries > static_cast<Int64>(shared->max_dictionary_num_to_warn))
+        {
+            if (auto limit = shared->server_settings[ServerSetting::max_dictionary_num_to_throw]; limit > shared->max_dictionary_num_to_warn.load())
+                common_warnings[Context::WarningType::MAX_ATTACHED_DICTIONARIES] =  PreformattedMessage::create(
+                    "The number of attached dictionaries ({}) exceeds the warning limit of {}. You will not be able to create new dictionaries once the limit of {} is reached.",
+                    attached_dictionaries, shared->max_dictionary_num_to_warn.load(), limit.value);
+            else
+                common_warnings[Context::WarningType::MAX_ATTACHED_DICTIONARIES] =  PreformattedMessage::create(
+                    "The number of attached dictionaries ({}) exceeds the warning limit of {}.",
+                    attached_dictionaries, shared->max_dictionary_num_to_warn.load());
+        }
+
+        if (attached_databases > static_cast<Int64>(shared->max_database_num_to_warn))
+        {
+            if (auto limit = shared->server_settings[ServerSetting::max_database_num_to_throw]; limit > shared->max_database_num_to_warn.load())
+                common_warnings[Context::WarningType::MAX_ATTACHED_DATABASES] = PreformattedMessage::create(
+                    "The number of attached databases ({}) exceeds the warning limit of {}. You will not be able to create new databases once the limit of {} is reached.",
+                    attached_databases, shared->max_database_num_to_warn.load(), limit.value);
+            else
+                common_warnings[Context::WarningType::MAX_ATTACHED_DATABASES] = PreformattedMessage::create(
+                    "The number of attached databases ({}) exceeds the warning limit of {}.",
+                    attached_databases, shared->max_database_num_to_warn.load());
+        }
+
+        if (active_parts > static_cast<Int64>(shared->max_part_num_to_warn))
+            common_warnings[Context::WarningType::MAX_ACTIVE_PARTS] = PreformattedMessage::create(
+                "The number of active parts ({}) exceeds the warning limit of {}.",
+                active_parts, shared->max_part_num_to_warn.load());
     }
     /// Make setting's name ordered
     auto obsolete_settings = settings->getChangedAndObsoleteNames();
@@ -2978,8 +3073,11 @@ void Context::setCurrentQueryId(const String & query_id)
 
     client_info.current_query_id = query_id_to_set;
 
-    if (client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+    if (client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY
+        && (getApplicationType() != ApplicationType::SERVER || client_info.initial_query_id.empty()))
+    {
         client_info.initial_query_id = client_info.current_query_id;
+    }
 }
 
 void Context::setBackgroundOperationTypeForContext(ClientInfo::BackgroundOperationType background_operation)
@@ -3117,6 +3215,13 @@ void Context::makeQueryContextForMutate(const MergeTreeSettings & merge_tree_set
         = merge_tree_settings[MergeTreeSetting::mutation_workload].value.empty() ? getMutationWorkload() : merge_tree_settings[MergeTreeSetting::mutation_workload];
 }
 
+void Context::makeQueryContextForExportPart()
+{
+    makeQueryContext();
+    classifier.reset(); // It is assumed that there are no active queries running using this classifier, otherwise this will lead to crashes
+    // Export part operations don't have a specific workload setting, so we leave the default workload
+}
+
 void Context::makeSessionContext()
 {
     session_context = shared_from_this();
@@ -4148,6 +4253,11 @@ ThrottlerPtr Context::getMergesThrottler() const
     return shared->merges_throttler;
 }
 
+ThrottlerPtr Context::getExportsThrottler() const
+{
+    return shared->exports_throttler;
+}
+
 void Context::reloadRemoteThrottlerConfig(size_t read_bandwidth, size_t write_bandwidth) const
 {
     if (read_bandwidth)
@@ -4825,7 +4935,6 @@ std::shared_ptr<Cluster> Context::getCluster(const std::string & cluster_name) c
     throw Exception(ErrorCodes::CLUSTER_DOESNT_EXIST, "Requested cluster '{}' not found", cluster_name);
 }
 
-
 std::shared_ptr<Cluster> Context::tryGetCluster(const std::string & cluster_name) const
 {
     std::shared_ptr<Cluster> res = nullptr;
@@ -4844,6 +4953,21 @@ std::shared_ptr<Cluster> Context::tryGetCluster(const std::string & cluster_name
     return res;
 }
 
+void Context::unregisterInAutodiscoveryClusters()
+{
+    std::lock_guard lock(shared->clusters_mutex);
+    if (!shared->cluster_discovery)
+        return;
+    shared->cluster_discovery->unregisterAll();
+}
+
+void Context::registerInAutodiscoveryClusters()
+{
+    std::lock_guard lock(shared->clusters_mutex);
+    if (!shared->cluster_discovery)
+        return;
+    shared->cluster_discovery->registerAll();
+}
 
 void Context::reloadClusterConfig() const
 {
@@ -4978,9 +5102,15 @@ void Context::handleCrash() const
     if (!shared)
         return;
 
-    SharedLockGuard lock2(shared->mutex);
-    if (shared->system_logs)
-        shared->system_logs->handleCrash();
+    std::optional<SystemLogs> system_logs;
+    {
+        SharedLockGuard lock2(shared->mutex);
+        if (!shared->system_logs)
+            return;
+        system_logs.emplace(*shared->system_logs);
+    }
+
+    system_logs->handleCrash();
 }
 
 bool Context::hasTraceCollector() const
@@ -5233,6 +5363,16 @@ std::shared_ptr<BlobStorageLog> Context::getBlobStorageLog() const
     return shared->system_logs->blob_storage_log;
 }
 
+std::shared_ptr<IcebergMetadataLog> Context::getIcebergMetadataLog() const
+{
+    SharedLockGuard lock(shared->mutex);
+
+    if (!shared->system_logs)
+        return {};
+
+    return shared->system_logs->iceberg_metadata_log;
+}
+
 std::shared_ptr<DeadLetterQueue> Context::getDeadLetterQueue() const
 {
     SharedLockGuard lock(shared->mutex);
@@ -5260,6 +5400,7 @@ std::optional<Context::Dashboards> Context::getDashboards() const
     return shared->dashboards;
 }
 
+
 namespace
 {
 
@@ -5743,12 +5884,35 @@ void Context::stopServers(const ServerType & server_type) const
     shared->stop_servers_callback(server_type);
 }
 
-
 void Context::shutdown() TSA_NO_THREAD_SAFETY_ANALYSIS
 {
     shared->shutdown();
 }
 
+bool Context::stopSwarmMode()
+{
+    bool expected_is_enabled = true;
+    bool is_stopped_now = shared->swarm_mode_enabled.compare_exchange_strong(expected_is_enabled, false);
+    if (is_stopped_now)
+        CurrentMetrics::set(CurrentMetrics::IsSwarmModeEnabled, 0);
+    // return true if stop successful
+    return is_stopped_now;
+}
+
+bool Context::startSwarmMode()
+{
+    bool expected_is_enabled = false;
+    bool is_started_now = shared->swarm_mode_enabled.compare_exchange_strong(expected_is_enabled, true);
+    if (is_started_now)
+        CurrentMetrics::set(CurrentMetrics::IsSwarmModeEnabled, 1);
+    // return true if start successful
+    return is_started_now;
+}
+
+bool Context::isSwarmModeEnabled() const
+{
+    return shared->swarm_mode_enabled;
+}
 
 Context::ApplicationType Context::getApplicationType() const
 {
@@ -6440,6 +6604,10 @@ void Context::initializeBackgroundExecutorsIfNeeded()
         /*max_tasks_count*/background_pool_max_tasks_count,
         CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
         CurrentMetrics::BackgroundMergesAndMutationsPoolSize,
+        ProfileEvents::MergeMutateBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::MergeMutateBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::MergeMutateBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::MergeMutateBackgroundExecutorWaitMicroseconds,
         background_merges_mutations_scheduling_policy
     );
     LOG_INFO(shared->log, "Initialized background executor for merges and mutations with num_threads={}, num_tasks={}, scheduling_policy={}",
@@ -6451,7 +6619,11 @@ void Context::initializeBackgroundExecutorsIfNeeded()
         background_move_pool_size,
         background_move_pool_size,
         CurrentMetrics::BackgroundMovePoolTask,
-        CurrentMetrics::BackgroundMovePoolSize
+        CurrentMetrics::BackgroundMovePoolSize,
+        ProfileEvents::MoveBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::MoveBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::MoveBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::MoveBackgroundExecutorWaitMicroseconds
     );
     LOG_INFO(shared->log, "Initialized background executor for move operations with num_threads={}, num_tasks={}", background_move_pool_size, background_move_pool_size);
 
@@ -6461,7 +6633,11 @@ void Context::initializeBackgroundExecutorsIfNeeded()
         background_fetches_pool_size,
         background_fetches_pool_size,
         CurrentMetrics::BackgroundFetchesPoolTask,
-        CurrentMetrics::BackgroundFetchesPoolSize
+        CurrentMetrics::BackgroundFetchesPoolSize,
+        ProfileEvents::FetchBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::FetchBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::FetchBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::FetchBackgroundExecutorWaitMicroseconds
     );
     LOG_INFO(shared->log, "Initialized background executor for fetches with num_threads={}, num_tasks={}", background_fetches_pool_size, background_fetches_pool_size);
 
@@ -6471,7 +6647,11 @@ void Context::initializeBackgroundExecutorsIfNeeded()
         background_common_pool_size,
         background_common_pool_size,
         CurrentMetrics::BackgroundCommonPoolTask,
-        CurrentMetrics::BackgroundCommonPoolSize
+        CurrentMetrics::BackgroundCommonPoolSize,
+        ProfileEvents::CommonBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorWaitMicroseconds
     );
     LOG_INFO(shared->log, "Initialized background executor for common operations (e.g. clearing old parts) with num_threads={}, num_tasks={}", background_common_pool_size, background_common_pool_size);
 
@@ -6766,14 +6946,15 @@ void Context::setClientProtocolVersion(UInt64 version)
     client_protocol_version = version;
 }
 
-void Context::setPartitionIdToMaxBlock(PartitionIdToMaxBlockPtr partitions)
+void Context::setPartitionIdToMaxBlock(const UUID & table_uuid, PartitionIdToMaxBlockPtr partitions)
 {
-    partition_id_to_max_block = std::move(partitions);
+    partition_id_to_max_block[table_uuid] = std::move(partitions);
 }
 
-PartitionIdToMaxBlockPtr Context::getPartitionIdToMaxBlock() const
+PartitionIdToMaxBlockPtr Context::getPartitionIdToMaxBlock(const UUID & table_uuid) const
 {
-    return partition_id_to_max_block;
+    auto it = partition_id_to_max_block.find(table_uuid);
+    return it != partition_id_to_max_block.end() ? it->second : nullptr;
 }
 
 const ServerSettings & Context::getServerSettings() const
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 8b4569b36cbf..28a228fdf843 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -89,6 +89,7 @@ class AsynchronousMetrics;
 class BackgroundSchedulePool;
 class MergeList;
 class MovesList;
+class ExportsList;
 class ReplicatedFetchList;
 class RefreshSet;
 class Cluster;
@@ -123,6 +124,7 @@ class AsynchronousMetricLog;
 class OpenTelemetrySpanLog;
 class ZooKeeperLog;
 class ZooKeeperConnectionLog;
+class IcebergMetadataLog;
 class SessionLog;
 class BackupsWorker;
 class TransactionsInfoLog;
@@ -376,7 +378,8 @@ class ContextData
     UInt64 client_protocol_version = 0;
 
     /// Max block numbers in partitions to read from MergeTree tables.
-    PartitionIdToMaxBlockPtr partition_id_to_max_block;
+    /// Saved separately for each table uuid used in the query.
+    std::unordered_map<UUID, PartitionIdToMaxBlockPtr> partition_id_to_max_block;
 
 public:
     /// Record entities accessed by current query, and store this information in system.query_log.
@@ -1132,6 +1135,7 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
     void makeQueryContext();
     void makeQueryContextForMerge(const MergeTreeSettings & merge_tree_settings);
     void makeQueryContextForMutate(const MergeTreeSettings & merge_tree_settings);
+    void makeQueryContextForExportPart();
     void makeSessionContext();
     void makeGlobalContext();
 
@@ -1164,6 +1168,9 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
     MovesList & getMovesList();
     const MovesList & getMovesList() const;
 
+    ExportsList & getExportsList();
+    const ExportsList & getExportsList() const;
+
     ReplicatedFetchList & getReplicatedFetchList();
     const ReplicatedFetchList & getReplicatedFetchList() const;
 
@@ -1317,6 +1324,8 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
     size_t getClustersVersion() const;
 
     void startClusterDiscovery();
+    void registerInAutodiscoveryClusters();
+    void unregisterInAutodiscoveryClusters();
 
     /// Sets custom cluster, but doesn't update configuration
     void setCluster(const String & cluster_name, const std::shared_ptr<Cluster> & cluster);
@@ -1361,6 +1370,7 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
     std::shared_ptr<QueryMetricLog> getQueryMetricLog() const;
     std::shared_ptr<DeadLetterQueue> getDeadLetterQueue() const;
     std::shared_ptr<ZooKeeperConnectionLog> getZooKeeperConnectionLog() const;
+    std::shared_ptr<IcebergMetadataLog> getIcebergMetadataLog() const;
 
     SystemLogs getSystemLogs() const;
 
@@ -1431,6 +1441,15 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
 
     void shutdown();
 
+    /// Stop some works to allow graceful shutdown later.
+    /// Returns true if stop successful.
+    bool stopSwarmMode();
+    /// Resume some works if we change our mind.
+    /// Returns true if start successful.
+    bool startSwarmMode();
+    /// Return current swarm mode state.
+    bool isSwarmModeEnabled() const;
+
     bool isInternalQuery() const { return is_internal_query; }
     void setInternalQuery(bool internal) { is_internal_query = internal; }
 
@@ -1574,8 +1593,8 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
     void setPreparedSetsCache(const PreparedSetsCachePtr & cache);
     PreparedSetsCachePtr getPreparedSetsCache() const;
 
-    void setPartitionIdToMaxBlock(PartitionIdToMaxBlockPtr partitions);
-    PartitionIdToMaxBlockPtr getPartitionIdToMaxBlock() const;
+    void setPartitionIdToMaxBlock(const UUID & table_uuid, PartitionIdToMaxBlockPtr partitions);
+    PartitionIdToMaxBlockPtr getPartitionIdToMaxBlock(const UUID & table_uuid) const;
 
     const ServerSettings & getServerSettings() const;
 
@@ -1657,6 +1676,7 @@ class Context: public ContextData, public std::enable_shared_from_this<Context>
 
     ThrottlerPtr getMutationsThrottler() const;
     ThrottlerPtr getMergesThrottler() const;
+    ThrottlerPtr getExportsThrottler() const;
 
     void reloadRemoteThrottlerConfig(size_t read_bandwidth, size_t write_bandwidth) const;
     void reloadLocalThrottlerConfig(size_t read_bandwidth, size_t write_bandwidth) const;
diff --git a/src/Interpreters/DDLGuard.h b/src/Interpreters/DDLGuard.h
new file mode 100644
index 000000000000..e42a908ecc1e
--- /dev/null
+++ b/src/Interpreters/DDLGuard.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <Common/SharedMutex.h>
+#include <mutex>
+
+
+namespace DB
+{
+
+/// Allows executing DDL query only in one thread.
+/// Puts an element into the map, locks tables's mutex, counts how much threads run parallel query on the table,
+/// when counter is 0 erases element in the destructor.
+/// If the element already exists in the map, waits when ddl query will be finished in other thread.
+class DDLGuard
+{
+public:
+    struct Entry
+    {
+      std::unique_ptr<std::mutex> mutex;
+      UInt32 counter;
+    };
+
+    /// Element name -> (mutex, counter).
+    /// NOTE: using std::map here (and not std::unordered_map) to avoid iterator invalidation on insertion.
+    using Map = std::map<String, Entry>;
+
+    DDLGuard(
+        Map & map_,
+        SharedMutex & db_mutex_,
+        std::unique_lock<std::mutex> guards_lock_,
+        const String & elem,
+        const String & database_name);
+    ~DDLGuard();
+
+    /// Unlocks table name, keeps holding read lock for database name
+    void releaseTableLock() noexcept;
+
+private:
+    Map & map;
+    SharedMutex & db_mutex;
+    Map::iterator it;
+    std::unique_lock<std::mutex> guards_lock;
+    std::unique_lock<std::mutex> table_lock;
+    bool table_lock_removed = false;
+    bool is_database_guard = false;
+};
+
+using DDLGuardPtr = std::unique_ptr<DDLGuard>;
+
+}
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 836ebc3e840a..beebea7dd5ac 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -1,24 +1,26 @@
-#include <Interpreters/DDLTask.h>
-#include <base/sort.h>
-#include <Common/DNSResolver.h>
-#include <Common/OpenTelemetryTraceContext.h>
-#include <Common/isLocalAddress.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Core/ServerSettings.h>
+#include <Core/ServerUUID.h>
 #include <Core/Settings.h>
 #include <Databases/DatabaseReplicated.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/Context.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
-#include <Poco/Net/NetException.h>
-#include <Common/logger_useful.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DDLTask.h>
+#include <Interpreters/DDLWorker.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
+#include <Parsers/ASTQueryWithTableAndOutput.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
-#include <Parsers/ASTQueryWithTableAndOutput.h>
-
+#include <base/sort.h>
+#include <Poco/Net/NetException.h>
+#include <Common/DNSResolver.h>
+#include <Common/OpenTelemetryTraceContext.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/isLocalAddress.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -31,7 +33,7 @@ namespace Setting
     extern const SettingsUInt64 max_parser_depth;
     extern const SettingsUInt64 max_parser_backtracks;
     extern const SettingsUInt64 max_query_size;
-}
+    }
 
 namespace ErrorCodes
 {
@@ -52,10 +54,17 @@ HostID HostID::fromString(const String & host_port_str)
 
 
 bool HostID::isLocalAddress(UInt16 clickhouse_port) const
+{
+    auto address = DNSResolver::instance().resolveAddress(host_name, port);
+    return DB::isLocalAddress(address, clickhouse_port);
+}
+
+bool HostID::isLoopbackHost() const
 {
     try
     {
-        return DB::isLocalAddress(DNSResolver::instance().resolveAddress(host_name, port), clickhouse_port);
+        auto address = DNSResolver::instance().resolveAddress(host_name, port);
+        return address.host().isLoopback();
     }
     catch (const DB::NetException &)
     {
@@ -270,10 +279,7 @@ bool DDLTask::findCurrentHostID(ContextPtr global_context, LoggerPtr log, const
 
     if (config_host_name)
     {
-        bool is_local_port = (maybe_secure_port && HostID(*config_host_name, *maybe_secure_port).isLocalAddress(*maybe_secure_port)) ||
-                             HostID(*config_host_name, port).isLocalAddress(port);
-
-        if (!is_local_port)
+        if (!isSelfHostname(log, *config_host_name, maybe_secure_port, port))
             throw Exception(
                 ErrorCodes::DNS_ERROR,
                 "{} is not a local address. Check parameter 'host_name' in the configuration",
@@ -298,12 +304,28 @@ bool DDLTask::findCurrentHostID(ContextPtr global_context, LoggerPtr log, const
 
         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(port);
-
-            if (!is_local_port)
+            if (!isSelfHostID(log, host, maybe_secure_port, port))
                 continue;
+
+            if (host.isLoopbackHost())
+            {
+                String current_host_id_str = host.toString();
+                String active_id = toString(ServerUUID::get());
+                String active_path = fs::path(global_context->getDDLWorker().getReplicasDir()) / current_host_id_str / "active";
+                String content;
+                Coordination::Stat stat;
+                if (!zookeeper->tryGet(active_path, content, &stat))
+                {
+                    LOG_TRACE(log, "HostID {} is a loopback host which has not been claimed by any replica", current_host_id_str);
+                    continue;
+                }
+
+                if (content != active_id)
+                {
+                    LOG_TRACE(log, "HostID {} is a loopback host which is claimed by another replica {}", current_host_id_str, content);
+                    continue;
+                }
+            }
         }
         catch (const Exception & e)
         {
@@ -506,6 +528,49 @@ String DDLTask::getShardID() const
     return res;
 }
 
+bool DDLTask::isSelfHostID(LoggerPtr log, const HostID & checking_host_id, std::optional<UInt16> maybe_self_secure_port, UInt16 self_port)
+{
+    try
+    {
+        return (maybe_self_secure_port && checking_host_id.isLocalAddress(*maybe_self_secure_port))
+            || checking_host_id.isLocalAddress(self_port);
+    }
+    catch (const DB::NetException & e)
+    {
+        /// Avoid "Host not found" exceptions
+        LOG_WARNING(log, "Unable to check if host {} is a local address, exception: {}", checking_host_id.host_name, e.displayText());
+        return false;
+    }
+    catch (const Poco::Net::NetException & e)
+    {
+        /// Avoid "Host not found" exceptions
+        LOG_WARNING(log, "Unable to check if host {} is a local address, exception: {}", checking_host_id.host_name, e.displayText());
+        return false;
+    }
+}
+
+bool DDLTask::isSelfHostname(
+    LoggerPtr log, const String & checking_host_name, std::optional<UInt16> maybe_self_secure_port, UInt16 self_port)
+{
+    try
+    {
+        return (maybe_self_secure_port && HostID(checking_host_name, *maybe_self_secure_port).isLocalAddress(*maybe_self_secure_port))
+            || HostID(checking_host_name, self_port).isLocalAddress(self_port);
+    }
+    catch (const DB::NetException & e)
+    {
+        /// Avoid "Host not found" exceptions
+        LOG_WARNING(log, "Unable to check if host {} is a local address, exception: {}", checking_host_name, e.displayText());
+        return false;
+    }
+    catch (const Poco::Net::NetException & e)
+    {
+        /// Avoid "Host not found" exceptions
+        LOG_WARNING(log, "Unable to check if host {} is a local address, exception: {}", checking_host_name, e.displayText());
+        return false;
+    }
+}
+
 DatabaseReplicatedTask::DatabaseReplicatedTask(const String & name, const String & path, DatabaseReplicated * database_)
     : DDLTaskBase(name, path)
     , database(database_)
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index 18c798c5f182..d0bcb5887bf9 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -61,6 +61,7 @@ struct HostID
     }
 
     bool isLocalAddress(UInt16 clickhouse_port) const;
+    bool isLoopbackHost() const;
 
     static String applyToString(const HostID & host_id)
     {
@@ -157,6 +158,11 @@ struct DDLTask : public DDLTaskBase
 
     String getShardID() const override;
 
+    static bool
+    isSelfHostID(LoggerPtr log, const HostID & checking_host_id, std::optional<UInt16> maybe_self_secure_port, UInt16 self_port);
+    static bool
+    isSelfHostname(LoggerPtr log, const String & checking_host_name, std::optional<UInt16> maybe_self_secure_port, UInt16 self_port);
+
 private:
     bool tryFindHostInCluster();
     bool tryFindHostInClusterViaResolving(ContextPtr context);
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index f218bcaed1fb..a0b48e0d1cfb 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -1,14 +1,16 @@
 
+#include <Core/ServerSettings.h>
 #include <Core/ServerUUID.h>
 #include <Core/Settings.h>
+#include <IO/NullWriteBuffer.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/DDLWorker.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ZooKeeperLog.h>
 #include <Interpreters/executeQuery.h>
 #include <Parsers/ASTAlterQuery.h>
@@ -19,7 +21,6 @@
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ASTQueryWithTableAndOutput.h>
 #include <Parsers/ParserQuery.h>
-#include <IO/NullWriteBuffer.h>
 #include <Storages/IStorage.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Poco/Timestamp.h>
@@ -751,7 +752,8 @@ bool DDLWorker::taskShouldBeExecutedOnLeader(const ASTPtr & ast_ddl, const Stora
             alter->isFreezeAlter() ||
             alter->isUnlockSnapshot() ||
             alter->isMovePartitionToDiskOrVolumeAlter() ||
-            alter->isCommentAlter())
+            alter->isCommentAlter() ||
+            alter->isExportPartAlter())
             return false;
     }
 
@@ -1314,27 +1316,6 @@ void DDLWorker::markReplicasActive(bool reinitialized)
         active_node_holders.clear();
     }
 
-    for (auto it = active_node_holders.begin(); it != active_node_holders.end();)
-    {
-        auto & zk = it->second.first;
-        if (zk->expired())
-        {
-            const auto & host_id = it->first;
-            String active_path = fs::path(replicas_dir) / host_id / "active";
-            LOG_DEBUG(log, "Zookeeper of active_path {} expired, removing the holder", active_path);
-
-            auto & active_node_holder = it->second.second;
-            if (active_node_holder)
-                active_node_holder->setAlreadyRemoved();
-            it = active_node_holders.erase(it);
-        }
-        else
-        {
-            ++it;
-        }
-    }
-
-
     const auto maybe_secure_port = context->getTCPPortSecure();
     const auto port = context->getTCPPort();
 
@@ -1343,16 +1324,10 @@ void DDLWorker::markReplicasActive(bool reinitialized)
     NameSet local_host_ids;
     for (const auto & host_id : host_ids)
     {
-        if (active_node_holders.contains(host_id))
-            continue;
-
         try
         {
             HostID host = HostID::fromString(host_id);
-            /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
-            bool is_local_host = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port)) || host.isLocalAddress(port);
-
-            if (is_local_host)
+            if (DDLTask::isSelfHostID(log, host, maybe_secure_port, port))
                 local_host_ids.emplace(host_id);
         }
         catch (const Exception & e)
@@ -1366,22 +1341,80 @@ void DDLWorker::markReplicasActive(bool reinitialized)
     {
         auto it = active_node_holders.find(host_id);
         if (it != active_node_holders.end())
-        {
             continue;
-        }
 
         String active_path = fs::path(replicas_dir) / host_id / "active";
         String active_id = toString(ServerUUID::get());
 
         LOG_TRACE(log, "Trying to mark a replica active: active_path={}, active_id={}", active_path, active_id);
+        if (HostID::fromString(host_id).isLoopbackHost())
+        {
+            String content;
+            Coordination::Stat stat;
+            if (zookeeper->tryGet(active_path, content, &stat))
+            {
+                // For a loopback host, many replicas might try to claim it as their own host.
+                // If the host is claimed by a replica, we skip it.
+                // Loopback host is supposed to be used in test environment.
+                if (content != active_id)
+                {
+                    LOG_TRACE(log, "HostID {} is a loopback host which is claimed by another replica {}", host_id, content);
+                    continue;
+                }
 
-        zookeeper->deleteEphemeralNodeIfContentMatches(active_path, active_id);
-
+                auto code = zookeeper->tryRemove(active_path, stat.version);
+                if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
+                    throw Coordination::Exception::fromPath(code, active_path);
+            }
+        }
+        else
+        {
+            zookeeper->deleteEphemeralNodeIfContentMatches(active_path, active_id);
+        }
         zookeeper->create(active_path, active_id, zkutil::CreateMode::Ephemeral);
         auto active_node_holder_zookeeper = zookeeper;
         auto active_node_holder = zkutil::EphemeralNodeHolder::existing(active_path, *active_node_holder_zookeeper);
         active_node_holders[host_id] = {active_node_holder_zookeeper, active_node_holder};
     }
+
+    if (active_node_holders.empty())
+    {
+        for (const auto & it : context->getClusters())
+        {
+            const auto & cluster = it.second;
+            if (!cluster->getHostIDs().empty())
+            {
+                LOG_WARNING(log, "There are clusters with host ids but no local host found for this replica.");
+                break;
+            }
+        }
+    }
+}
+
+void DDLWorker::cleanupStaleReplicas(Int64 current_time_seconds, const ZooKeeperPtr & zookeeper)
+{
+    auto replicas = zookeeper->getChildren(replicas_dir);
+    static constexpr Int64 REPLICA_MAX_INACTIVE_SECONDS = 86400;
+    for (const auto & replica : replicas)
+    {
+        auto replica_path = fs::path(replicas_dir) / replica;
+        auto responses = zookeeper->tryGet({replica_path, fs::path(replica_path) / "active"});
+        /// Replica not active
+        if (responses[1].error == Coordination::Error::ZNONODE)
+        {
+            auto stat = responses[0].stat;
+            /// Replica was not active for too long, let's cleanup to avoid polluting Keeper with
+            /// removed replicas
+            if (stat.mtime / 1000 + REPLICA_MAX_INACTIVE_SECONDS < current_time_seconds)
+            {
+                LOG_INFO(log, "Replica {} is stale, removing it", replica);
+                auto code = zookeeper->tryRemove(replica_path, -1);
+                if (code != Coordination::Error::ZOK)
+                    LOG_WARNING(log, "Cannot remove stale replica {}, code {}", replica, Coordination::errorMessage(code));
+            }
+        }
+    }
+
 }
 
 void DDLWorker::runCleanupThread()
@@ -1411,6 +1444,7 @@ void DDLWorker::runCleanupThread()
                 continue;
 
             cleanupQueue(current_time_seconds, zookeeper);
+            cleanupStaleReplicas(current_time_seconds, zookeeper);
             last_cleanup_time_seconds = current_time_seconds;
         }
         catch (...)
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 6717040fa033..abf0a9f84098 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -157,6 +157,7 @@ class DDLWorker
 
     /// Checks and cleanups queue's nodes
     void cleanupQueue(Int64 current_time_seconds, const ZooKeeperPtr & zookeeper);
+    void cleanupStaleReplicas(Int64 current_time_seconds, const ZooKeeperPtr & zookeeper);
     virtual bool canRemoveQueueEntry(const String & entry_name, const Coordination::Stat & stat);
 
     /// Init task node
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index ed8786630b01..be910cf3de23 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -1,42 +1,46 @@
-#include <algorithm>
-#include <string>
-#include <mutex>
-#include <utility>
 #include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/TableNameHints.h>
-#include <Interpreters/loadMetadata.h>
-#include <Interpreters/executeQuery.h>
-#include <Interpreters/InterpreterCreateQuery.h>
-#include <Storages/IStorage.h>
-#include <Databases/IDatabase.h>
+
+#include <Access/ContextAccess.h>
+
+#include <Common/assert_cast.h>
+#include <Common/checkStackSize.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
+#include <Common/noexcept_scope.h>
+#include <Common/quoteString.h>
+#include <Common/ThreadPool.h>
+#include <Common/threadPoolCallbackRunner.h>
+#include <Core/BackgroundSchedulePool.h>
+#include <Core/ServerSettings.h>
+#include <Core/Settings.h>
 #include <Databases/DatabaseMemory.h>
 #include <Databases/DatabaseOnDisk.h>
+#include <Databases/IDatabase.h>
 #include <Disks/IDisk.h>
-#include <Storages/MemorySettings.h>
-#include <Storages/StorageMemory.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Core/BackgroundSchedulePool.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/loadMetadata.h>
+#include <Interpreters/TableNameHints.h>
 #include <IO/ReadHelpers.h>
+#include <IO/SharedThreadPools.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Core/ServerSettings.h>
-#include <Core/Settings.h>
-#include <IO/SharedThreadPools.h>
-#include <Common/Exception.h>
-#include <Common/quoteString.h>
-#include <Common/assert_cast.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/logger_useful.h>
-#include <Common/ThreadPool.h>
-#include <Common/filesystemHelpers.h>
-#include <Common/noexcept_scope.h>
-#include <Common/checkStackSize.h>
-#include <Common/threadPoolCallbackRunner.h>
-#include <base/scope_guard.h>
+#include <Storages/IStorage.h>
+#include <Storages/MemorySettings.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/StorageMemory.h>
+
+#include <algorithm>
+#include <mutex>
+#include <string>
+#include <utility>
 
 #include <base/isSharedPtrUnique.h>
+#include <base/scope_guard.h>
 #include <boost/range/adaptor/map.hpp>
 #include <fmt/ranges.h>
 
@@ -95,18 +99,31 @@ namespace MergeTreeSetting
 class DatabaseNameHints : public IHints<>
 {
 public:
-    explicit DatabaseNameHints(const DatabaseCatalog & database_catalog_)
+    explicit DatabaseNameHints(
+        const DatabaseCatalog & database_catalog_
+    )
         : database_catalog(database_catalog_)
-    {
-    }
+    {}
+
     Names getAllRegisteredNames() const override
     {
+        auto context = CurrentThread::getQueryContext();
+        if (!context)
+            return {};
+
+        const auto access = context->getAccess();
+        const bool need_to_check_access_for_databases = !access->isGranted(AccessType::SHOW_DATABASES);
+
         Names result;
-        auto databases_list = database_catalog.getDatabases();
+        auto databases_list = database_catalog.getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true});
         for (const auto & database_name : databases_list | boost::adaptors::map_keys)
         {
+            if (need_to_check_access_for_databases && !access->isGranted(AccessType::SHOW_DATABASES, database_name))
+                continue;
+
             if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
                 continue;
+
             result.emplace_back(database_name);
         }
         return result;
@@ -186,7 +203,7 @@ TemporaryTableHolder::~TemporaryTableHolder()
         try
         {
             auto table = getTable();
-            table->flushAndShutdown();
+            table->flushAndShutdown(/*is_drop=*/ true);
             temporary_tables->dropTable(getContext(), "_tmp_" + toString(id));
         }
         catch (...)
@@ -324,7 +341,10 @@ void DatabaseCatalog::shutdownImpl(std::function<void()> shutdown_system_logs)
         auto it = std::find_if(elem.map.begin(), elem.map.end(), not_empty_mapping);
         return it != elem.map.end();
     }) == uuid_map.end());
+
     databases.clear();
+    databases_without_datalake_catalogs.clear();
+
     referential_dependencies.clear();
     loading_dependencies.clear();
     view_dependencies.clear();
@@ -372,7 +392,7 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
             assert(!db_and_table.first && !db_and_table.second);
             if (exception)
             {
-                TableNameHints hints(this->tryGetDatabase(table_id.getDatabaseName()), getContext());
+                TableNameHints hints(this->tryGetDatabase(table_id.getDatabaseName()), context_);
                 std::vector<String> names = hints.getHints(table_id.getTableName());
                 if (names.empty())
                     exception->emplace(Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_id.getNameForLogs()));
@@ -472,7 +492,7 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
 
     if (!table && exception && !exception->has_value())
     {
-        TableNameHints hints(this->tryGetDatabase(table_id.getDatabaseName()), getContext());
+        TableNameHints hints(this->tryGetDatabase(table_id.getDatabaseName()), context_);
         std::vector<String> names = hints.getHints(table_id.getTableName());
         if (names.empty())
         {
@@ -559,6 +579,18 @@ void DatabaseCatalog::assertDatabaseExists(const String & database_name) const
     }
 }
 
+bool DatabaseCatalog::hasDatalakeCatalogs() const
+{
+    std::lock_guard lock{databases_mutex};
+    return databases.size() != databases_without_datalake_catalogs.size();
+}
+
+bool DatabaseCatalog::isDatalakeCatalog(const String & database_name) const
+{
+    std::lock_guard lock{databases_mutex};
+    return databases.contains(database_name) && !databases_without_datalake_catalogs.contains(database_name);
+}
+
 void DatabaseCatalog::assertDatabaseDoesntExist(const String & database_name) const
 {
     std::lock_guard lock{databases_mutex};
@@ -577,6 +609,9 @@ void DatabaseCatalog::attachDatabase(const String & database_name, const Databas
     std::lock_guard lock{databases_mutex};
     assertDatabaseDoesntExistUnlocked(database_name);
     databases.emplace(database_name, database);
+    if (!database->isDatalakeCatalog())
+        databases_without_datalake_catalogs.emplace(database_name, database);
+
     NOEXCEPT_SCOPE({
         UUID db_uuid = database->getUUID();
         if (db_uuid != UUIDHelpers::Nil)
@@ -601,8 +636,9 @@ DatabasePtr DatabaseCatalog::detachDatabase(ContextPtr local_context, const Stri
             if (db_uuid != UUIDHelpers::Nil)
                 removeUUIDMapping(db_uuid);
             databases.erase(database_name);
-
         }
+        if (auto it = databases_without_datalake_catalogs.find(database_name); it != databases_without_datalake_catalogs.end())
+            databases_without_datalake_catalogs.erase(it);
     }
     if (!db)
     {
@@ -668,7 +704,13 @@ void DatabaseCatalog::updateDatabaseName(const String & old_name, const String &
     databases.erase(it);
     databases.emplace(new_name, db);
 
-    /// Update dependencies.
+    auto no_catalogs_it = databases_without_datalake_catalogs.find(old_name);
+    if (no_catalogs_it != databases_without_datalake_catalogs.end())
+    {
+        databases_without_datalake_catalogs.erase(no_catalogs_it);
+        databases_without_datalake_catalogs.emplace(new_name, db);
+    }
+
     for (const auto & table_name : tables_in_database)
     {
         auto removed_ref_deps = referential_dependencies.removeDependencies(StorageID{old_name, table_name}, /* remove_isolated_tables= */ true);
@@ -789,10 +831,13 @@ bool DatabaseCatalog::isDatabaseExist(const String & database_name) const
     return databases.end() != databases.find(database_name);
 }
 
-Databases DatabaseCatalog::getDatabases() const
+Databases DatabaseCatalog::getDatabases(GetDatabasesOptions options) const
 {
     std::lock_guard lock{databases_mutex};
-    return databases;
+    if (options.with_datalake_catalogs)
+        return databases;
+
+    return databases_without_datalake_catalogs;
 }
 
 bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, ContextPtr context_) const
@@ -972,15 +1017,24 @@ std::vector<StorageID> DatabaseCatalog::getDependentViews(const StorageID & sour
     return view_dependencies.getDependencies(source_table_id);
 }
 
-DDLGuardPtr DatabaseCatalog::getDDLGuard(const String & database, const String & table)
+DDLGuardPtr DatabaseCatalog::getDDLGuard(const String & database, const String & table, const IDatabase * expected_database)
 {
     if (database.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot obtain lock for empty database");
-    std::unique_lock lock(ddl_guards_mutex);
-    /// TSA does not support unique_lock
-    auto db_guard_iter = TSA_SUPPRESS_WARNING_FOR_WRITE(ddl_guards).try_emplace(database).first;
-    DatabaseGuard & db_guard = db_guard_iter->second;
-    return std::make_unique<DDLGuard>(db_guard.table_guards, db_guard.database_ddl_mutex, std::move(lock), table, database);
+
+    DDLGuardPtr guard;
+    {
+        std::unique_lock lock(ddl_guards_mutex);
+        /// TSA does not support unique_lock
+        auto db_guard_iter = TSA_SUPPRESS_WARNING_FOR_WRITE(ddl_guards).try_emplace(database).first;
+        DatabaseGuard & db_guard = db_guard_iter->second;
+        guard = std::make_unique<DDLGuard>(db_guard.table_guards, db_guard.database_ddl_mutex, std::move(lock), table, database);
+    }
+
+    if (expected_database && expected_database != tryGetDatabase(database).get())
+        throw Exception(ErrorCodes::UNFINISHED, "The database {} was dropped or renamed concurrently", database);
+
+    return guard;
 }
 
 DatabaseCatalog::DatabaseGuard & DatabaseCatalog::getDatabaseGuard(const String & database)
@@ -1058,7 +1112,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
     std::map<String, std::pair<StorageID, DiskPtr>> dropped_metadata;
     String path = fs::path("metadata_dropped") / "";
 
-    auto db_map = getDatabases();
+    auto db_map = getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true});
     std::set<DiskPtr> metadata_disk_list;
     for (const auto & [_, db] : db_map)
     {
@@ -1948,7 +2002,7 @@ void DatabaseCatalog::reloadDisksTask()
         disks.swap(disks_to_reload);
     }
 
-    for (auto & database : getDatabases())
+    for (auto & database : getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         // WARNING: In case of `async_load_databases = true` getTablesIterator() call wait for all table in the database to be loaded.
         // WARNING: It means that no database will be able to update configuration until all databases are fully loaded.
@@ -2103,7 +2157,8 @@ std::pair<String, String> TableNameHints::getExtendedHintForTable(const String &
 {
     /// load all available databases from the DatabaseCatalog instance
     auto & database_catalog = DatabaseCatalog::instance();
-    auto all_databases = database_catalog.getDatabases();
+    /// NOTE Skip datalake catalogs to avoid unnecessary access to remote catalogs (can be expensive)
+    auto all_databases = database_catalog.getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
 
     for (const auto & [db_name, db] : all_databases)
     {
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index e695f7c22521..ee426b888688 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -3,6 +3,7 @@
 #include <Core/UUID.h>
 #include <Databases/TablesDependencyGraph.h>
 #include <Interpreters/Context_fwd.h>
+#include <Interpreters/DDLGuard.h>
 #include <Interpreters/StorageID.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
@@ -37,45 +38,6 @@ using Databases = std::map<String, std::shared_ptr<IDatabase>>;
 using DiskPtr = std::shared_ptr<IDisk>;
 using TableNamesSet = std::unordered_set<QualifiedTableName>;
 
-/// Allows executing DDL query only in one thread.
-/// Puts an element into the map, locks tables's mutex, counts how much threads run parallel query on the table,
-/// when counter is 0 erases element in the destructor.
-/// If the element already exists in the map, waits when ddl query will be finished in other thread.
-class DDLGuard
-{
-public:
-    struct Entry
-    {
-        std::unique_ptr<std::mutex> mutex;
-        UInt32 counter;
-    };
-
-    /// Element name -> (mutex, counter).
-    /// NOTE: using std::map here (and not std::unordered_map) to avoid iterator invalidation on insertion.
-    using Map = std::map<String, Entry>;
-
-    DDLGuard(
-        Map & map_,
-        SharedMutex & db_mutex_,
-        std::unique_lock<std::mutex> guards_lock_,
-        const String & elem,
-        const String & database_name);
-    ~DDLGuard();
-
-    /// Unlocks table name, keeps holding read lock for database name
-    void releaseTableLock() noexcept;
-
-private:
-    Map & map;
-    SharedMutex & db_mutex;
-    Map::iterator it;
-    std::unique_lock<std::mutex> guards_lock;
-    std::unique_lock<std::mutex> table_lock;
-    bool table_lock_removed = false;
-    bool is_database_guard = false;
-};
-
-using DDLGuardPtr = std::unique_ptr<DDLGuard>;
 
 class FutureSetFromSubquery;
 using FutureSetFromSubqueryPtr = std::shared_ptr<FutureSetFromSubquery>;
@@ -121,6 +83,11 @@ using TemporaryTablesMapping = std::map<String, TemporaryTableHolderPtr>;
 
 class BackgroundSchedulePoolTaskHolder;
 
+struct GetDatabasesOptions
+{
+    bool with_datalake_catalogs{false};
+};
+
 /// For some reason Context is required to get Storage from Database object
 class DatabaseCatalog : boost::noncopyable, WithMutableContext
 {
@@ -145,7 +112,7 @@ class DatabaseCatalog : boost::noncopyable, WithMutableContext
     void loadMarkedAsDroppedTables();
 
     /// Get an object that protects the table from concurrently executing multiple DDL operations.
-    DDLGuardPtr getDDLGuard(const String & database, const String & table);
+    DDLGuardPtr getDDLGuard(const String & database, const String & table, const IDatabase * expected_database);
     /// Get an object that protects the database from concurrent DDL queries all tables in the database
     std::unique_lock<SharedMutex> getExclusiveDDLGuardForDatabase(const String & database);
 
@@ -171,7 +138,13 @@ class DatabaseCatalog : boost::noncopyable, WithMutableContext
     DatabasePtr getDatabase(const UUID & uuid) const;
     DatabasePtr tryGetDatabase(const UUID & uuid) const;
     bool isDatabaseExist(const String & database_name) const;
-    Databases getDatabases() const;
+    /// Datalake catalogs are implement at IDatabase level in ClickHouse.
+    /// In general case Datalake catalog is a some remote service which contains iceberg/delta tables.
+    /// Sometimes this service charges money for requests. With this flag we explicitly protect ourself
+    /// to not accidentally query external non-free service for some trivial things like
+    /// autocompletion hints or system.tables query. We have a setting which allow to show
+    /// these databases everywhere, but user must explicitly specify it.
+    Databases getDatabases(GetDatabasesOptions options) const;
 
     /// Same as getDatabase(const String & database_name), but if database_name is empty, current database of local_context is used
     DatabasePtr getDatabase(const String & database_name, ContextPtr local_context) const;
@@ -272,6 +245,8 @@ class DatabaseCatalog : boost::noncopyable, WithMutableContext
     bool canPerformReplicatedDDLQueries() const;
 
     void updateMetadataFile(const DatabasePtr & database);
+    bool hasDatalakeCatalogs() const;
+    bool isDatalakeCatalog(const String & database_name) const;
 
 private:
     // The global instance of database catalog. unique_ptr is to allow
@@ -319,6 +294,7 @@ class DatabaseCatalog : boost::noncopyable, WithMutableContext
     mutable std::mutex databases_mutex;
 
     Databases databases TSA_GUARDED_BY(databases_mutex);
+    Databases databases_without_datalake_catalogs TSA_GUARDED_BY(databases_mutex);
     UUIDToStorageMap uuid_map;
 
     /// Referential dependencies between tables: table "A" depends on table "B"
diff --git a/src/Interpreters/GraceHashJoin.cpp b/src/Interpreters/GraceHashJoin.cpp
index 05d5c50a309e..f957b218c4c9 100644
--- a/src/Interpreters/GraceHashJoin.cpp
+++ b/src/Interpreters/GraceHashJoin.cpp
@@ -387,8 +387,8 @@ void GraceHashJoin::addBuckets(const size_t bucket_count)
     for (size_t i = 0; i < bucket_count; ++i)
         try
         {
-            TemporaryBlockStreamHolder left_file(left_sample_block, tmp_data.get());
-            TemporaryBlockStreamHolder right_file(std::make_shared<const Block>(prepareRightBlock(*right_sample_block)), tmp_data.get());
+            TemporaryBlockStreamHolder left_file(left_sample_block, tmp_data);
+            TemporaryBlockStreamHolder right_file(std::make_shared<const Block>(prepareRightBlock(*right_sample_block)), tmp_data);
 
             BucketPtr new_bucket = std::make_shared<FileBucket>(current_size + i, std::move(left_file), std::move(right_file), log);
             tmp_buckets.emplace_back(std::move(new_bucket));
diff --git a/src/Interpreters/HashJoin/AddedColumns.h b/src/Interpreters/HashJoin/AddedColumns.h
index eed9156420fa..5155f7e4d007 100644
--- a/src/Interpreters/HashJoin/AddedColumns.h
+++ b/src/Interpreters/HashJoin/AddedColumns.h
@@ -265,14 +265,4 @@ class AddedColumns
     }
 };
 
-/// Adapter class to pass into addFoundRowAll
-/// In joinRightColumnsWithAdditionalFilter we don't want to add rows directly into AddedColumns,
-/// because they need to be filtered by additional_filter_expression.
-class PreSelectedRows : public std::vector<const RowRef *>
-{
-public:
-    void appendFromBlock(const RowRef * row_ref, bool /* has_default */) { this->emplace_back(row_ref); }
-    static constexpr bool isLazy() { return false; }
-};
-
 }
diff --git a/src/Interpreters/HashJoin/HashJoin.cpp b/src/Interpreters/HashJoin/HashJoin.cpp
index 962a1be6f443..a5bb8677ad26 100644
--- a/src/Interpreters/HashJoin/HashJoin.cpp
+++ b/src/Interpreters/HashJoin/HashJoin.cpp
@@ -668,7 +668,7 @@ bool HashJoin::addBlockToJoin(const Block & block, ScatteredBlock::Selector sele
             || (max_rows_in_join && getTotalRowCount() + block_to_save.rows() >= max_rows_in_join)))
     {
         if (!tmp_stream)
-            tmp_stream.emplace(std::make_shared<const Block>(right_sample_block), tmp_data.get());
+            tmp_stream.emplace(std::make_shared<const Block>(right_sample_block), tmp_data);
 
         chassert(rows == block.rows()); /// We don't run parallel_hash for cross join
         tmp_stream.value()->write(block_to_save);
@@ -774,7 +774,7 @@ bool HashJoin::addBlockToJoin(const Block & block, ScatteredBlock::Selector sele
                             all_values_unique);
 
                         if (flag_per_row)
-                            used_flags->reinit<kind_, strictness_, std::is_same_v<std::decay_t<decltype(map)>, MapsAll>>(&stored_columns->columns);
+                            used_flags->reinit<kind_, strictness_, std::is_same_v<std::decay_t<decltype(map)>, MapsAll>>(&stored_columns->columns, stored_columns->selector);
                     });
             }
 
@@ -1036,7 +1036,7 @@ IJoinResult::JoinResultBlock CrossJoinResult::next()
 
     bool is_last = left_row >= rows_total;
     res = res.cloneWithColumns(std::move(dst_columns));
-    return {res, is_last};
+    return {res, nullptr, is_last};
 }
 
 JoinResultPtr HashJoin::joinBlockImplCross(Block block) const
@@ -1811,7 +1811,7 @@ void HashJoin::onBuildPhaseFinish()
         }
     }
 
-    if (all_values_unique && strictness == JoinStrictness::All && isInnerOrLeft(kind))
+    if (all_values_unique && strictness == JoinStrictness::All && isInnerOrLeft(kind) && data->maps.size() == 1)
     {
         strictness = JoinStrictness::RightAny;
         all_join_was_promoted_to_right_any = true;
diff --git a/src/Interpreters/HashJoin/HashJoinMethods.h b/src/Interpreters/HashJoin/HashJoinMethods.h
index 63709239dc36..4241c4e129ee 100644
--- a/src/Interpreters/HashJoin/HashJoinMethods.h
+++ b/src/Interpreters/HashJoin/HashJoinMethods.h
@@ -114,7 +114,7 @@ class HashJoinMethods
         bool & all_values_unique);
 
     template <typename AddedColumns>
-    static void switchJoinRightColumns(
+    static size_t switchJoinRightColumns(
         const std::vector<const MapsTemplate *> & mapv,
         AddedColumns & added_columns,
         const ScatteredBlock::Selector & selector,
@@ -122,7 +122,7 @@ class HashJoinMethods
         JoinStuff::JoinUsedFlags & used_flags);
 
     template <typename KeyGetter, typename Map, typename AddedColumns>
-    static void joinRightColumnsSwitchNullability(
+    static size_t joinRightColumnsSwitchNullability(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
@@ -130,7 +130,7 @@ class HashJoinMethods
         JoinStuff::JoinUsedFlags & used_flags);
 
     template <typename KeyGetter, typename Map, bool need_filter, typename AddedColumns>
-    static void joinRightColumnsSwitchMultipleDisjuncts(
+    static size_t joinRightColumnsSwitchMultipleDisjuncts(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
@@ -147,7 +147,7 @@ class HashJoinMethods
         JoinCommon::JoinMask::Kind join_mask_kind,
         typename AddedColumns,
         typename Selector>
-    static void joinRightColumns(
+    static size_t joinRightColumns(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
@@ -161,7 +161,7 @@ class HashJoinMethods
         bool check_null_map,
         typename AddedColumns,
         typename Selector>
-    static void joinRightColumnsSwitchJoinMaskKind(
+    static size_t joinRightColumnsSwitchJoinMaskKind(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
@@ -176,7 +176,7 @@ class HashJoinMethods
         JoinCommon::JoinMask::Kind join_mask_kind,
         typename AddedColumns,
         typename Selector>
-    static void joinRightColumns(
+    static size_t joinRightColumns(
         KeyGetter & key_getter,
         const Map * map,
         AddedColumns & added_columns,
@@ -184,23 +184,16 @@ class HashJoinMethods
         const Selector & selector);
 
     template <typename KeyGetter, typename Map, bool need_filter, bool check_null_map, typename AddedColumns, typename Selector>
-    static void joinRightColumnsSwitchJoinMaskKind(
+    static size_t joinRightColumnsSwitchJoinMaskKind(
         KeyGetter & key_getter,
         const Map * map,
         AddedColumns & added_columns,
         JoinStuff::JoinUsedFlags & used_flags,
         const Selector & selector);
 
-    template <typename AddedColumns, typename Selector>
-    static ColumnPtr buildAdditionalFilter(
-        const Selector & selector,
-        const std::vector<const RowRef *> & selected_rows,
-        const std::vector<size_t> & row_replicate_offset,
-        AddedColumns & added_columns);
-
     /// First to collect all matched rows refs by join keys, then filter out rows which are not true in additional filter expression.
     template <typename KeyGetter, typename Map, typename AddedColumns>
-    static void joinRightColumnsWithAddtitionalFilter(
+    static size_t joinRightColumnsWithAddtitionalFilter(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
diff --git a/src/Interpreters/HashJoin/HashJoinMethodsImpl.h b/src/Interpreters/HashJoin/HashJoinMethodsImpl.h
index 34cf52055382..ee4e90f8da04 100644
--- a/src/Interpreters/HashJoin/HashJoinMethodsImpl.h
+++ b/src/Interpreters/HashJoin/HashJoinMethodsImpl.h
@@ -109,11 +109,20 @@ JoinResultPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinBlockImpl(
     else
         added_columns.reserve(join_features.need_replication);
 
-    switchJoinRightColumns(maps_, added_columns, block.getSelector(), join.data->type, *join.used_flags);
+    size_t processed_rows = switchJoinRightColumns(maps_, added_columns, block.getSelector(), join.data->type, *join.used_flags);
     /// Do not hold memory for join_on_keys anymore
     added_columns.join_on_keys.clear();
 
-    return std::make_unique<HashJoinResult>(
+    std::optional<ScatteredBlock> next_scattered_block;
+    if (0 < processed_rows && processed_rows < block.rows())
+    {
+        auto [raw_block, raw_selector] = std::move(block).detachData();
+        auto split_selector = raw_selector.split(processed_rows);
+        block = ScatteredBlock(raw_block, std::move(split_selector.first));
+        next_scattered_block = ScatteredBlock(std::move(raw_block), std::move(split_selector.second));
+    }
+
+    auto join_result = std::make_unique<HashJoinResult>(
         std::move(added_columns.lazy_output),
         std::move(added_columns.columns),
         std::move(added_columns.offsets_to_replicate),
@@ -130,6 +139,10 @@ JoinResultPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinBlockImpl(
             join_features.need_filter,
             is_join_get
         });
+
+    if (next_scattered_block)
+        join_result->setNextBlock(std::move(next_scattered_block.value()));
+    return join_result;
 }
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
@@ -213,7 +226,7 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::insertFromBlockImplTypeCas
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 template <typename AddedColumns>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::switchJoinRightColumns(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::switchJoinRightColumns(
     const std::vector<const MapsTemplate *> & mapv,
     AddedColumns & added_columns,
     const ScatteredBlock::Selector & selector,
@@ -263,7 +276,7 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::switchJoinRightColumns(
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 template <typename KeyGetter, typename Map, typename AddedColumns>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchNullability(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchNullability(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
     AddedColumns & added_columns,
@@ -271,16 +284,16 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchNull
     JoinStuff::JoinUsedFlags & used_flags)
 {
     if (added_columns.need_filter)
-        joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, true>(
+        return joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, true>(
             std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, selector, used_flags);
     else
-        joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, false>(
+        return joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, false>(
             std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, selector, used_flags);
 }
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 template <typename KeyGetter, typename Map, bool need_filter, typename AddedColumns>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMultipleDisjuncts(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMultipleDisjuncts(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
     AddedColumns & added_columns,
@@ -293,7 +306,7 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMult
         if (added_columns.additional_filter_expression)
         {
             const bool mark_per_row_used = join_features.right || join_features.full || mapv.size() > 1;
-            joinRightColumnsWithAddtitionalFilter<KeyGetter, Map>(
+            return joinRightColumnsWithAddtitionalFilter<KeyGetter, Map>(
                 std::forward<std::vector<KeyGetter>>(key_getter_vector),
                 mapv,
                 added_columns,
@@ -301,8 +314,6 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMult
                 selector,
                 need_filter,
                 mark_per_row_used);
-
-            return;
         }
     }
 
@@ -314,20 +325,20 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMult
         if (mapv.size() > 1 || added_columns.join_on_keys.empty())
         {
             if (std::ranges::any_of(added_columns.join_on_keys, [](const auto & elem) { return elem.null_map; }))
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
                     std::move(key_getter_vector), mapv, added_columns, used_flags, selector.getRange());
             else
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
                     std::move(key_getter_vector), mapv, added_columns, used_flags, selector.getRange());
         }
         else
         {
             chassert(key_getter_vector.size() == 1);
             if (added_columns.join_on_keys.at(0).null_map)
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
                     key_getter_vector.at(0), mapv.at(0), added_columns, used_flags, selector.getRange());
             else
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
                     key_getter_vector.at(0), mapv.at(0), added_columns, used_flags, selector.getRange());
         }
     }
@@ -336,20 +347,20 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMult
         if (mapv.size() > 1 || added_columns.join_on_keys.empty())
         {
             if (std::ranges::any_of(added_columns.join_on_keys, [](const auto & elem) { return elem.null_map; }))
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
                     std::move(key_getter_vector), mapv, added_columns, used_flags, selector.getIndexes());
             else
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
                     std::move(key_getter_vector), mapv, added_columns, used_flags, selector.getIndexes());
         }
         else
         {
             chassert(key_getter_vector.size() == 1);
             if (added_columns.join_on_keys.at(0).null_map)
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/true>(
                     key_getter_vector.at(0), mapv.at(0), added_columns, used_flags, selector.getIndexes());
             else
-                joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
+                return joinRightColumnsSwitchJoinMaskKind<KeyGetter, Map, need_filter, /*check_null_map=*/false>(
                     key_getter_vector.at(0), mapv.at(0), added_columns, used_flags, selector.getIndexes());
         }
     }
@@ -459,7 +470,7 @@ template <
     JoinCommon::JoinMask::Kind join_mask_kind,
     typename AddedColumns,
     typename Selector>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
     KeyGetter & key_getter, const Map * map, AddedColumns & added_columns, JoinStuff::JoinUsedFlags & used_flags, const Selector & selector)
 {
     static constexpr bool flag_per_row = false; // Always false in single map case
@@ -532,11 +543,12 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
     }
 
     added_columns.applyLazyDefaults();
+    return 0;
 }
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 template <typename KeyGetter, typename Map, bool need_filter, bool check_null_map, typename AddedColumns, typename Selector>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchJoinMaskKind(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchJoinMaskKind(
     KeyGetter & key_getter, const Map * map, AddedColumns & added_columns, JoinStuff::JoinUsedFlags & used_flags, const Selector & selector)
 {
     switch (added_columns.join_on_keys.at(0).join_mask_column.getKind())
@@ -564,7 +576,7 @@ template <
     JoinCommon::JoinMask::Kind join_mask_kind,
     typename AddedColumns,
     typename Selector>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
     AddedColumns & added_columns,
@@ -587,10 +599,16 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
     Arena pool;
 
     if constexpr (join_features.need_replication)
-        added_columns.offsets_to_replicate = IColumn::Offsets(rows);
+    {
+        added_columns.offsets_to_replicate.clear();
+        added_columns.offsets_to_replicate.reserve(rows);
+    }
+
+    size_t max_joined_rows = added_columns.max_joined_block_rows > 0 ? added_columns.max_joined_block_rows : std::numeric_limits<size_t>::max();
 
     IColumn::Offset current_offset = 0;
-    for (size_t i = 0; i < rows; ++i)
+    size_t i = 0;
+    for (; i < rows && current_offset < max_joined_rows; ++i)
     {
         size_t ind = 0;
         if constexpr (std::is_same_v<std::decay_t<Selector>, ScatteredBlock::Indexes>)
@@ -640,12 +658,11 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
         }
 
         if constexpr (join_features.need_replication)
-        {
-            added_columns.offsets_to_replicate[i] = current_offset;
-        }
+            added_columns.offsets_to_replicate.push_back(current_offset);
     }
 
     added_columns.applyLazyDefaults();
+    return i;
 }
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
@@ -656,7 +673,7 @@ template <
     bool check_null_map,
     typename AddedColumns,
     typename Selector>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchJoinMaskKind(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchJoinMaskKind(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
     AddedColumns & added_columns,
@@ -666,28 +683,27 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchJoin
     using Kind = JoinCommon::JoinMask::Kind;
     if (std::ranges::all_of(added_columns.join_on_keys, [](const auto & elem) { return elem.join_mask_column.getKind() == Kind::AllTrue; }))
     {
-        joinRightColumns<KeyGetter, Map, need_filter, check_null_map, Kind::AllTrue>(
+        return joinRightColumns<KeyGetter, Map, need_filter, check_null_map, Kind::AllTrue>(
             std::move(key_getter_vector), mapv, added_columns, used_flags, selector);
     }
     else if (std::ranges::all_of(added_columns.join_on_keys, [](const auto & elem) { return elem.join_mask_column.getKind() == Kind::AllFalse; }))
     {
-        joinRightColumns<KeyGetter, Map, need_filter, check_null_map, Kind::AllFalse>(
+        return joinRightColumns<KeyGetter, Map, need_filter, check_null_map, Kind::AllFalse>(
             std::move(key_getter_vector), mapv, added_columns, used_flags, selector);
     }
     else
     {
-        joinRightColumns<KeyGetter, Map, need_filter, check_null_map, Kind::Unknown>(
+        return joinRightColumns<KeyGetter, Map, need_filter, check_null_map, Kind::Unknown>(
             std::move(key_getter_vector), mapv, added_columns, used_flags, selector);
     }
 }
 
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 template <typename AddedColumns, typename Selector>
-ColumnPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::buildAdditionalFilter(
+static ColumnPtr buildAdditionalFilter(
     const Selector & selector,
-    const std::vector<const RowRef *> & selected_rows,
-    const std::vector<size_t> & row_replicate_offset,
-    AddedColumns & added_columns)
+    const PODArray<const RowRef *> & selected_rows,
+    const IColumn::Offsets & row_replicate_offset,
+    const AddedColumns & added_columns)
 {
     ColumnPtr result_column;
     do
@@ -723,7 +739,6 @@ ColumnPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::buildAdditionalFilter
         {
             if (rhs_pos_it != added_columns.additional_filter_required_rhs_pos.end() && pos == rhs_pos_it->first)
             {
-
                 const auto & req_col = *req_cols_it;
                 required_columns.emplace_back(nullptr, req_col.type, req_col.name);
 
@@ -749,14 +764,13 @@ ColumnPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::buildAdditionalFilter
                         col_name);
 
                 auto new_col = src_col->column->cloneEmpty();
-                size_t prev_left_offset = 0;
                 for (size_t i = 0; i < row_replicate_offset.size(); ++i)
                 {
-                    const size_t & left_offset = row_replicate_offset[i];
-                    size_t rows = left_offset - prev_left_offset;
+                    size_t rows = row_replicate_offset[i] - row_replicate_offset[i - 1];
                     if (rows)
+                    {
                         new_col->insertManyFrom(*src_col->column, selector[i], rows);
-                    prev_left_offset = left_offset;
+                    }
                 }
                 required_columns.push_back({std::move(new_col), src_col->type, col_name});
             }
@@ -801,7 +815,7 @@ ColumnPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::buildAdditionalFilter
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 template <typename KeyGetter, typename Map, typename AddedColumns>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtitionalFilter(
+size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtitionalFilter(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
     AddedColumns & added_columns,
@@ -811,7 +825,7 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtit
     bool flag_per_row [[maybe_unused]])
 {
     constexpr JoinFeatures<KIND, STRICTNESS, MapsTemplate> join_features;
-    const size_t left_block_rows = selector.size();
+    size_t left_block_rows = selector.size();
     if (need_filter)
     {
         added_columns.filter = IColumn::Filter(left_block_rows, 0);
@@ -823,21 +837,38 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtit
     if constexpr (join_features.need_replication)
         added_columns.offsets_to_replicate = IColumn::Offsets(left_block_rows);
 
-    std::vector<size_t> row_replicate_offset;
-    row_replicate_offset.reserve(left_block_rows);
-
     using FindResult = typename KeyGetter::FindResult;
-    PreSelectedRows selected_rows;
+
+    /// Adapter class to pass into addFoundRowAll
+    /// We don't want to add rows directly into AddedColumns, because they need to be filtered by additional_filter_expression.
+    class PreSelectedRows
+    {
+    public:
+        explicit PreSelectedRows(PODArray<const RowRef *> & container_) : container(container_) {}
+        void appendFromBlock(const RowRef * row_ref, bool /* has_default */) { container.push_back(row_ref); }
+        static constexpr bool isLazy() { return false; }
+
+        PODArray<const RowRef *> & container;
+    };
+
+    PODArray<const RowRef *> selected_rows;
     selected_rows.reserve(left_block_rows);
     std::vector<FindResult> find_results;
     find_results.reserve(left_block_rows);
     IColumn::Offset total_added_rows = 0;
-    IColumn::Offset current_added_rows = 0;
+
+    IColumn::Offsets row_replicate_offset;
+    row_replicate_offset.reserve(left_block_rows);
+
+    size_t max_joined_rows = added_columns.max_joined_block_rows;
+    if (max_joined_rows == 0)
+        max_joined_rows = std::numeric_limits<size_t>::max();
 
     {
         pool = std::make_unique<Arena>();
-        current_added_rows = 0;
-        for (size_t ind : selector)
+        IColumn::Offset current_added_rows = 0;
+
+        for (auto ind : selector)
         {
             KnownRowsHolder<true> all_flag_known_rows;
             KnownRowsHolder<false> single_flag_know_rows;
@@ -857,31 +888,39 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtit
                     find_results.push_back(find_result);
                     /// We don't add missing in addFoundRowAll here. we will add it after filter is applied.
                     /// it's different from `joinRightColumns`.
+                    PreSelectedRows selected_rows_view{selected_rows};
                     if (flag_per_row)
-                        addFoundRowAll<Map, false, true>(mapped, selected_rows, current_added_rows, all_flag_known_rows, nullptr);
+                        addFoundRowAll<Map, false, true>(mapped, selected_rows_view, current_added_rows, all_flag_known_rows, nullptr);
                     else
-                        addFoundRowAll<Map, false, false>(mapped, selected_rows, current_added_rows, single_flag_know_rows, nullptr);
+                        addFoundRowAll<Map, false, false>(mapped, selected_rows_view, current_added_rows, single_flag_know_rows, nullptr);
                 }
+
             }
             row_replicate_offset.push_back(current_added_rows);
+
+
+            if (current_added_rows >= max_joined_rows)
+                break;
         }
-    }
 
-    if (selected_rows.size() != current_added_rows)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Sizes are mismatched. selected_rows.size:{}, current_added_rows:{}, row_replicate_offset.size:{}",
-            selected_rows.size(),
-            current_added_rows,
-            row_replicate_offset.size());
+        if (selected_rows.size() != current_added_rows)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Sizes are mismatched. selected_rows.size:{}, current_added_rows:{}, row_replicate_offset.size:{}",
+                selected_rows.size(),
+                current_added_rows,
+                row_replicate_offset.size());
+    }
 
-    auto filter_col = buildAdditionalFilter(selector, selected_rows, row_replicate_offset, added_columns);
+    left_block_rows = row_replicate_offset.size();
 
     {
+        auto filter_col = buildAdditionalFilter(selector, selected_rows, row_replicate_offset, added_columns);
+
         const PaddedPODArray<UInt8> & filter_flags = assert_cast<const ColumnUInt8 &>(*filter_col).getData();
 
         size_t prev_replicated_row = 0;
-        auto selected_right_row_it = selected_rows.begin();
+        auto * selected_right_row_it = selected_rows.begin();
         size_t find_result_index = 0;
         for (size_t i = 0, n = row_replicate_offset.size(); i < n; ++i)
         {
@@ -1013,10 +1052,11 @@ void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtit
 
     if constexpr (join_features.need_replication)
     {
-        added_columns.offsets_to_replicate.resize_assume_reserved(left_block_rows);
-        added_columns.filter.resize_assume_reserved(left_block_rows);
+        added_columns.offsets_to_replicate.resize(left_block_rows);
+        added_columns.filter.resize(left_block_rows);
     }
     added_columns.applyLazyDefaults();
+    return left_block_rows;
 }
 
 }
diff --git a/src/Interpreters/HashJoin/HashJoinResult.cpp b/src/Interpreters/HashJoin/HashJoinResult.cpp
index b6d7d2c7e50b..4b855d258def 100644
--- a/src/Interpreters/HashJoin/HashJoinResult.cpp
+++ b/src/Interpreters/HashJoin/HashJoinResult.cpp
@@ -246,10 +246,17 @@ static size_t getAvgBytesPerRow(const Block & block)
     return block.allocatedBytes() / std::max<size_t>(1, block.rows());
 }
 
+void HashJoinResult::setNextBlock(ScatteredBlock && block)
+{
+    next_scattered_block.emplace(std::move(block));
+}
+
 IJoinResult::JoinResultBlock HashJoinResult::next()
 {
+    ScatteredBlock * next_block_ptr = next_scattered_block ? &next_scattered_block.value() : nullptr;
+
     if (!scattered_block)
-        return {};
+        return {Block(), next_block_ptr, true};
 
     size_t avg_bytes_per_row = properties.avg_joined_bytes_per_row + getAvgBytesPerRow(scattered_block->getSourceBlock());
     auto num_lhs_rows = numLeftRowsForNextBlock(next_row, offsets, properties.max_joined_block_rows, properties.max_joined_block_bytes, avg_bytes_per_row);
@@ -268,7 +275,7 @@ IJoinResult::JoinResultBlock HashJoinResult::next()
             std::span<UInt64>{matched_rows});
 
         scattered_block.reset();
-        return {std::move(block), true};
+        return {std::move(block), next_block_ptr, true};
     }
 
     const size_t prev_offset = next_row ? offsets[next_row - 1] : 0;
@@ -326,6 +333,7 @@ IJoinResult::JoinResultBlock HashJoinResult::next()
     }
 
     const auto row_ref_start = next_row_ref;
+    const auto start_row = next_row;
 
     next_row += num_lhs_rows;
     next_row_ref += num_refs;
@@ -346,12 +354,30 @@ IJoinResult::JoinResultBlock HashJoinResult::next()
 
     bool is_last = next_row >= offsets.size();
 
-    MutableColumns next_columns;
-    if (!is_last)
+    MutableColumns rhs_columns; /// Columns from the right table
+    if (!lazy_output.row_refs.empty())
     {
-        next_columns.reserve(columns.size());
+        rhs_columns.reserve(columns.size());
         for (auto & column : columns)
-            next_columns.push_back(column->cloneEmpty());
+            rhs_columns.push_back(column->cloneEmpty());
+    }
+    else
+    {
+        if (start_row == 0 && is_last)
+        {
+            rhs_columns = std::move(columns);
+        }
+        else
+        {
+            /// The result columns should contain only data for the current block.
+            /// Copy data from the original columns to preserve columns size in the block.
+            rhs_columns.reserve(columns.size());
+            for (auto & column : columns)
+                rhs_columns.push_back(column->cut(start_row, num_rhs_rows)->assumeMutable());
+
+            if (is_last)
+                columns.clear();
+        }
     }
 
     auto block = generateBlock(
@@ -360,17 +386,16 @@ IJoinResult::JoinResultBlock HashJoinResult::next()
         num_rhs_rows,
         row_ref_start,
         next_row_ref,
-        std::move(columns),
+        std::move(rhs_columns),
         properties,
         partial_offsets,
         partial_filter,
         partial_matched_rows);
 
-    columns = std::move(next_columns);
     if (is_last)
         scattered_block.reset();
 
-    return {std::move(block), is_last};
+    return {std::move(block), next_block_ptr, is_last};
 }
 
 }
diff --git a/src/Interpreters/HashJoin/HashJoinResult.h b/src/Interpreters/HashJoin/HashJoinResult.h
index 6206d97e4d4c..82c60a87360c 100644
--- a/src/Interpreters/HashJoin/HashJoinResult.h
+++ b/src/Interpreters/HashJoin/HashJoinResult.h
@@ -35,11 +35,15 @@ class HashJoinResult : public IJoinResult
 
     JoinResultBlock next() override;
 
+    void setNextBlock(ScatteredBlock && block);
+
 private:
     const LazyOutput lazy_output;
     const Properties properties;
 
     std::optional<ScatteredBlock> scattered_block;
+    /// Next unprocessed block
+    std::optional<ScatteredBlock> next_scattered_block;
 
     MutableColumns columns;
     const IColumn::Offsets offsets;
diff --git a/src/Interpreters/HashJoin/JoinUsedFlags.h b/src/Interpreters/HashJoin/JoinUsedFlags.h
index 1ad3a6616e1f..a0e695609cac 100644
--- a/src/Interpreters/HashJoin/JoinUsedFlags.h
+++ b/src/Interpreters/HashJoin/JoinUsedFlags.h
@@ -45,13 +45,21 @@ class JoinUsedFlags
     }
 
     template <JoinKind KIND, JoinStrictness STRICTNESS, bool prefer_use_maps_all>
-    void reinit(const Columns * columns)
+    void reinit(const Columns * columns, const ScatteredBlock::Selector & selector)
     {
         if constexpr (MapGetter<KIND, STRICTNESS, prefer_use_maps_all>::flagged)
         {
             assert(per_row_flags[columns].size() <= columns->at(0)->size());
             need_flags = true;
             per_row_flags[columns] = std::vector<std::atomic_bool>(columns->at(0)->size());
+
+            /// Mark all rows outside of selector as used.
+            /// We should not emit them in RIGHT/FULL JOIN result,
+            /// since they belongs to another shard, which will handle flags for these rows
+            for (auto & flag : per_row_flags[columns])
+                flag.store(true);
+            for (size_t index : selector)
+                per_row_flags[columns][index].store(false);
         }
     }
 
diff --git a/src/Interpreters/IInterpreter.cpp b/src/Interpreters/IInterpreter.cpp
index dc375c0a908d..be42c0ca91af 100644
--- a/src/Interpreters/IInterpreter.cpp
+++ b/src/Interpreters/IInterpreter.cpp
@@ -1,9 +1,10 @@
 #include <Core/Settings.h>
-#include <Common/quoteString.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/QueryLog.h>
-#include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
+#include <Storages/StorageMergeTree.h>
+#include <Common/quoteString.h>
 
 namespace DB
 {
@@ -48,10 +49,13 @@ void IInterpreter::checkStorageSupportsTransactionsIfNeeded(const StoragePtr & s
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Storage {} (table {}) does not support transactions",
                         storage->getName(), storage->getStorageID().getNameForLogs());
 
-    /// Do not allow transactions with replicated tables anyway (unless it's a readonly SELECT query)
+    if (is_readonly_query)
+        return;
+
+    /// Do not allow transactions with replicated tables or MergeTree tables anyway (unless it's a readonly SELECT query)
     /// because it may try to process transaction on MergeTreeData-level,
     /// but then fail with a logical error or something on Storage{Replicated,Shared}MergeTree-level.
-    if (!is_readonly_query && storage->supportsReplication())
+    if (storage->supportsReplication() || dynamic_cast<StorageMergeTree *>(storage.get()) != nullptr)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} (table {}) does not support transactions",
                         storage->getName(), storage->getStorageID().getNameForLogs());
 }
diff --git a/src/Interpreters/IJoin.cpp b/src/Interpreters/IJoin.cpp
index 4fe2b2a7186c..7299f6c7307c 100644
--- a/src/Interpreters/IJoin.cpp
+++ b/src/Interpreters/IJoin.cpp
@@ -10,7 +10,7 @@ class JoinResultFromBlock : public IJoinResult
 
     JoinResultBlock next() override
     {
-        return {std::move(block), true};
+        return {std::move(block), nullptr, true};
     }
 
 private:
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index 5df10c3463a7..05d5cb6c6d41 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -55,6 +55,9 @@ class IJoinResult
     struct JoinResultBlock
     {
         Block block;
+        /// Pointer to next block to process, if any.
+        /// Should be used once we got last result and is_last is true.
+        ScatteredBlock * next_block = nullptr;
         bool is_last = true;
     };
 
diff --git a/src/Interpreters/IcebergMetadataLog.cpp b/src/Interpreters/IcebergMetadataLog.cpp
new file mode 100644
index 000000000000..7f36e95b1bdf
--- /dev/null
+++ b/src/Interpreters/IcebergMetadataLog.cpp
@@ -0,0 +1,120 @@
+#include <Access/ContextAccess.h>
+#include <Core/Settings.h>
+#include <Core/SettingsTierType.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/IcebergMetadataLog.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Processors/LimitTransform.h>
+#include <Processors/Port.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/ReadFromSystemNumbersStep.h>
+#include <Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.h>
+#include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/SelectQueryInfo.h>
+#include <base/Decimal.h>
+#include <Common/DateLUTImpl.h>
+#include <Common/typeid_cast.h>
+
+namespace DB
+{
+
+namespace Setting
+{
+extern const SettingsIcebergMetadataLogLevel iceberg_metadata_log_level;
+}
+
+namespace ErrorCodes
+{
+extern const int CANNOT_CLOCK_GETTIME;
+}
+
+namespace
+{
+
+const DataTypePtr rowType = makeNullable(std::make_shared<DataTypeUInt64>());
+
+auto iceberg_pruning_status_datatype = std::make_shared<DataTypeEnum8>(DataTypeEnum8::Values{
+    {"NotPruned", static_cast<Int8>(Iceberg::PruningReturnStatus::NOT_PRUNED)},
+    {"PartitionPruned", static_cast<Int8>(Iceberg::PruningReturnStatus::PARTITION_PRUNED)},
+    {"MinMaxIndexPruned", static_cast<Int8>(Iceberg::PruningReturnStatus::MIN_MAX_INDEX_PRUNED)}});
+
+const DataTypePtr iceberg_pruning_status_datatype_nullable = makeNullable(iceberg_pruning_status_datatype);
+}
+
+ColumnsDescription IcebergMetadataLogElement::getColumnsDescription()
+{
+    auto iceberg_metadata_log_entry_datatype = std::make_shared<DataTypeEnum8>(DataTypeEnum8::Values{
+        {"None", static_cast<Int8>(IcebergMetadataLogLevel::None)},
+        {"Metadata", static_cast<Int8>(IcebergMetadataLogLevel::Metadata)},
+        {"ManifestListMetadata", static_cast<Int8>(IcebergMetadataLogLevel::ManifestListMetadata)},
+        {"ManifestListEntry", static_cast<Int8>(IcebergMetadataLogLevel::ManifestListEntry)},
+        {"ManifestFileMetadata", static_cast<Int8>(IcebergMetadataLogLevel::ManifestFileMetadata)},
+        {"ManifestFileEntry", static_cast<Int8>(IcebergMetadataLogLevel::ManifestFileEntry)}});
+
+    return ColumnsDescription{
+        {"event_date", std::make_shared<DataTypeDate>(), "Date of the entry."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "Event time."},
+        {"query_id", std::make_shared<DataTypeString>(), "Query id."},
+        {"content_type", std::move(iceberg_metadata_log_entry_datatype), "Content type."},
+        {"table_path", std::make_shared<DataTypeString>(), "Table path."},
+        {"file_path", std::make_shared<DataTypeString>(), "File path."},
+        {"content", std::make_shared<DataTypeString>(), "Content in a JSON format (json file content, avro metadata or avro entry)."},
+        {"row_in_file", rowType, "Row in file."},
+        {"pruning_status", iceberg_pruning_status_datatype_nullable, "Status of partition pruning or min-max index pruning for the file."}};
+}
+
+void IcebergMetadataLogElement::appendToBlock(MutableColumns & columns) const
+{
+    size_t column_index = 0;
+    auto event_time_seconds = current_time / 1000000;
+    columns[column_index++]->insert(DateLUT::instance().toDayNum(event_time_seconds).toUnderType());
+    columns[column_index++]->insert(current_time);
+    columns[column_index++]->insert(query_id);
+    columns[column_index++]->insert(content_type);
+    columns[column_index++]->insert(table_path);
+    columns[column_index++]->insert(file_path);
+    columns[column_index++]->insert(metadata_content);
+    columns[column_index++]->insert(row_in_file ? *row_in_file : rowType->getDefault());
+    columns[column_index++]->insert(pruning_status ? *pruning_status : iceberg_pruning_status_datatype_nullable->getDefault());
+}
+
+void insertRowToLogTable(
+    const ContextPtr & local_context,
+    std::function<String()> get_row,
+    IcebergMetadataLogLevel row_log_level,
+    const String & table_path,
+    const String & file_path,
+    std::optional<UInt64> row_in_file,
+    std::optional<Iceberg::PruningReturnStatus> pruning_status)
+{
+    IcebergMetadataLogLevel set_log_level = local_context->getSettingsRef()[Setting::iceberg_metadata_log_level].value;
+    if (set_log_level < row_log_level)
+        return;
+    timespec spec{};
+    if (clock_gettime(CLOCK_REALTIME, &spec))
+        throw ErrnoException(ErrorCodes::CANNOT_CLOCK_GETTIME, "Cannot clock_gettime");
+
+    Context::getGlobalContextInstance()->getIcebergMetadataLog()->add(
+        DB::IcebergMetadataLogElement{
+            .current_time = spec.tv_sec,
+            .query_id = local_context->getCurrentQueryId(),
+            .content_type = row_log_level,
+            .table_path = table_path,
+            .file_path = file_path,
+            .metadata_content = get_row(),
+            .row_in_file = row_in_file,
+            .pruning_status = pruning_status});
+}
+}
diff --git a/src/Interpreters/IcebergMetadataLog.h b/src/Interpreters/IcebergMetadataLog.h
new file mode 100644
index 000000000000..8c48c563bbd3
--- /dev/null
+++ b/src/Interpreters/IcebergMetadataLog.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <Interpreters/SystemLog.h>
+#include <Storages/ColumnsDescription.h>
+#include <Poco/JSON/Object.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h>
+
+namespace DB
+{
+
+struct IcebergMetadataLogElement
+{
+    time_t current_time{};
+    String query_id;
+    IcebergMetadataLogLevel content_type = IcebergMetadataLogLevel::None;
+    String table_path;
+    String file_path;
+    String metadata_content;
+    std::optional<UInt64> row_in_file;
+    std::optional<Iceberg::PruningReturnStatus> pruning_status;
+
+    static std::string name() { return "IcebergMetadataLog"; }
+
+    static ColumnsDescription getColumnsDescription();
+    static NamesAndAliases getNamesAndAliases() { return {}; }
+    void appendToBlock(MutableColumns & columns) const;
+};
+
+/// Here `get_row` function is used instead `row` string to calculate string only when required.
+/// Inside `insertRowToLogTable` code can exit immediately after `iceberg_metadata_log_level` setting check.
+void insertRowToLogTable(
+    const ContextPtr & local_context,
+    std::function<String()> get_row,
+    IcebergMetadataLogLevel row_log_level,
+    const String & table_path,
+    const String & file_path,
+    std::optional<UInt64> row_in_file,
+    std::optional<Iceberg::PruningReturnStatus> pruning_status);
+
+class IcebergMetadataLog : public SystemLog<IcebergMetadataLogElement>
+{
+    using SystemLog<IcebergMetadataLogElement>::SystemLog;
+};
+
+}
diff --git a/src/Interpreters/InsertDependenciesBuilder.cpp b/src/Interpreters/InsertDependenciesBuilder.cpp
index c1a9d898c54f..d37382333256 100644
--- a/src/Interpreters/InsertDependenciesBuilder.cpp
+++ b/src/Interpreters/InsertDependenciesBuilder.cpp
@@ -964,7 +964,11 @@ bool InsertDependenciesBuilder::observePath(const DependencyPath & path)
         select_contexts[root_view] = select_context;
         insert_contexts[root_view] = insert_context;
         input_headers[root_view] = init_header;
-        thread_groups[root_view] = CurrentThread::getGroup();
+        /// For background tasks (i.e. Buffer flush) there may not be any group
+        if (auto thread_group = CurrentThread::getGroup())
+            thread_groups[root_view] = thread_group;
+        else
+            thread_groups[root_view] = ThreadGroup::createForMaterializedView(init_context);
         views_error_registry->init(root_view);
         dependent_views[root_view] = {};
     };
@@ -990,7 +994,7 @@ bool InsertDependenciesBuilder::observePath(const DependencyPath & path)
 
         inner_tables[current] = materialized_view->getTargetTableId();
         source_tables[current] = parent;
-        thread_groups[current] = ThreadGroup::createForMaterializedView();
+        thread_groups[current] = ThreadGroup::createForMaterializedView(init_context);
         view_types[current] = QueryViewsLogElement::ViewType::MATERIALIZED;
         views_error_registry->init(current);
 
@@ -1019,7 +1023,7 @@ bool InsertDependenciesBuilder::observePath(const DependencyPath & path)
         inner_tables[current] = current;
         select_queries[current] = live_view->getInnerQuery();
         input_headers[current] = output_headers.at(path.parent(2));
-        thread_groups[current] = ThreadGroup::createForMaterializedView();
+        thread_groups[current] = ThreadGroup::createForMaterializedView(init_context);
         view_types[current] = QueryViewsLogElement::ViewType::LIVE;
         views_error_registry->init(current);
 
@@ -1051,7 +1055,7 @@ bool InsertDependenciesBuilder::observePath(const DependencyPath & path)
         inner_tables[current] = current;
         select_queries[current] = window_view->getMergeableQuery();
         input_headers[current] = output_headers.at(path.parent(2));
-        thread_groups[current] = ThreadGroup::createForMaterializedView();
+        thread_groups[current] = ThreadGroup::createForMaterializedView(init_context);
         view_types[current] = QueryViewsLogElement::ViewType::WINDOW;
         views_error_registry->init(current);
 
@@ -1433,7 +1437,7 @@ void InsertDependenciesBuilder::logQueryView(StorageID view_id, std::exception_p
     const auto & view_type = view_types.at(view_id);
     const auto & inner_table_id = inner_tables.at(view_id);
 
-    UInt64 elapsed_ms = thread_group->getThreadsTotalElapsedMs();
+    UInt64 elapsed_ms = thread_group->getGroupElapsedMs();
 
     UInt64 min_query_duration = settings[Setting::log_queries_min_query_duration_ms].totalMilliseconds();
     if (min_query_duration && elapsed_ms <= min_query_duration)
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 841e9b768d44..b639f0c34208 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -131,9 +131,9 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
-        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, database.get());
         guard->releaseTableLock();
-        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {});
+        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {}, std::move(guard));
     }
 
     if (!table)
@@ -539,6 +539,20 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_DELETE | AccessType::INSERT, database, table);
             break;
         }
+        case ASTAlterCommand::EXPORT_PART:
+        {
+            required_access.emplace_back(AccessType::ALTER_EXPORT_PART, database, table);
+            /// For table functions, access control is handled by the table function itself
+            if (!command.to_table_function)
+                required_access.emplace_back(AccessType::INSERT, command.to_database, command.to_table);
+            break;
+        }
+        case ASTAlterCommand::EXPORT_PARTITION:
+        {
+            required_access.emplace_back(AccessType::ALTER_EXPORT_PARTITION, database, table);
+            required_access.emplace_back(AccessType::INSERT, command.to_database, command.to_table);
+            break;
+        }
         case ASTAlterCommand::FETCH_PARTITION:
         {
             required_access.emplace_back(AccessType::ALTER_FETCH_PARTITION, database, table);
diff --git a/src/Interpreters/InterpreterCheckQuery.cpp b/src/Interpreters/InterpreterCheckQuery.cpp
index 2a9682905a8c..6391608f4902 100644
--- a/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/src/Interpreters/InterpreterCheckQuery.cpp
@@ -395,7 +395,7 @@ InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, ContextP
 static Strings getAllDatabases(const ContextPtr & context)
 {
     Strings res;
-    const auto & databases = DatabaseCatalog::instance().getDatabases();
+    const auto & databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
     res.reserve(databases.size());
     for (const auto & [database_name, _] : databases)
     {
diff --git a/src/Interpreters/InterpreterCreateIndexQuery.cpp b/src/Interpreters/InterpreterCreateIndexQuery.cpp
index 6ab6ded5f0cc..cce6a31b3916 100644
--- a/src/Interpreters/InterpreterCreateIndexQuery.cpp
+++ b/src/Interpreters/InterpreterCreateIndexQuery.cpp
@@ -75,9 +75,9 @@ BlockIO InterpreterCreateIndexQuery::execute()
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
-        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, database.get());
         guard->releaseTableLock();
-        return database->tryEnqueueReplicatedDDL(query_ptr, current_context, {});
+        return database->tryEnqueueReplicatedDDL(query_ptr, current_context, {}, std::move(guard));
     }
 
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, current_context);
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 2e2fca56c48c..273b76768fcb 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -193,7 +193,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 {
     String database_name = create.getDatabase();
 
-    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, "");
+    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, "", nullptr);
 
     /// Database can be created before or it can be created concurrently in another thread, while we were waiting in DDLGuard
     if (DatabaseCatalog::instance().isDatabaseExist(database_name))
@@ -206,7 +206,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
     auto db_num_limit = getContext()->getGlobalContext()->getServerSettings()[ServerSetting::max_database_num_to_throw].value;
     if (db_num_limit > 0 && !internal)
     {
-        size_t db_count = DatabaseCatalog::instance().getDatabases().size();
+        size_t db_count = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true}).size();
         std::initializer_list<std::string_view> system_databases =
         {
             DatabaseCatalog::TEMPORARY_DATABASE,
@@ -1529,10 +1529,10 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         auto database = DatabaseCatalog::instance().tryGetDatabase(database_name);
         if (database && database->shouldReplicateQuery(getContext(), query_ptr))
         {
-            auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable());
+            auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable(), database.get());
             create.setDatabase(database_name);
             guard->releaseTableLock();
-            return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), QueryFlags{ .internal = internal, .distributed_backup_restore = is_restore_from_backup });
+            return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), QueryFlags{ .internal = internal, .distributed_backup_restore = is_restore_from_backup }, std::move(guard));
         }
 
         if (!create.cluster.empty())
@@ -1544,7 +1544,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         /// For short syntax of ATTACH query we have to lock table name here, before reading metadata
         /// and hold it until table is attached
         if (likely(need_ddl_guard))
-            ddl_guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable());
+            ddl_guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable(), database.get());
 
         bool if_not_exists = create.if_not_exists;
 
@@ -1722,10 +1722,10 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     if (database && database->shouldReplicateQuery(getContext(), query_ptr))
     {
         chassert(!ddl_guard);
-        auto guard = DatabaseCatalog::instance().getDDLGuard(create.getDatabase(), create.getTable());
+        auto guard = DatabaseCatalog::instance().getDDLGuard(create.getDatabase(), create.getTable(), database.get());
         assertOrSetUUID(create, database);
         guard->releaseTableLock();
-        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), QueryFlags{ .internal = internal, .distributed_backup_restore = is_restore_from_backup });
+        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), QueryFlags{ .internal = internal, .distributed_backup_restore = is_restore_from_backup }, std::move(guard));
     }
 
     if (!create.cluster.empty())
@@ -1786,7 +1786,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
     }
 
     if (!ddl_guard && likely(need_ddl_guard))
-        ddl_guard = DatabaseCatalog::instance().getDDLGuard(create.getDatabase(), create.getTable());
+        ddl_guard = DatabaseCatalog::instance().getDDLGuard(create.getDatabase(), create.getTable(), nullptr);
 
     String data_path;
     DatabasePtr database;
@@ -1937,8 +1937,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         auto table_function_ast = create.as_table_function->ptr();
         auto table_function = TableFunctionFactory::instance().get(table_function_ast, getContext());
 
-        if (!table_function->canBeUsedToCreateTable())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function '{}' cannot be used to create a table", table_function->getName());
+        table_function->validateUseToCreateTable();
 
         /// In case of CREATE AS table_function() query we should use global context
         /// in storage creation because there will be no query context on server startup
@@ -2498,8 +2497,10 @@ void InterpreterCreateQuery::processSQLSecurityOption(ContextMutablePtr context_
     if (sql_security.definer && !skip_check_permissions)
     {
         auto definer_name = sql_security.definer->toString();
-        auto & access_control = context_->getAccessControl();
+        if (definer_name != current_user_name)
+            context_->checkAccess(AccessType::SET_DEFINER, definer_name);
 
+        auto & access_control = context_->getAccessControl();
         const auto user = access_control.read<User>(definer_name);
         if (access_control.isEphemeral(access_control.getID<User>(definer_name)))
         {
@@ -2511,9 +2512,6 @@ void InterpreterCreateQuery::processSQLSecurityOption(ContextMutablePtr context_
             new_user->authentication_methods.emplace_back(AuthenticationType::NO_AUTHENTICATION);
             access_control.insertOrReplace(new_user);
         }
-
-        if (definer_name != current_user_name)
-            context_->checkAccess(AccessType::SET_DEFINER, definer_name);
     }
 
     if (sql_security.type == SQLSecurityType::NONE && !skip_check_permissions)
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 0b36f6db458b..53cacbb28fca 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -80,9 +80,9 @@ BlockIO InterpreterDeleteQuery::execute()
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
-        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, database.get());
         guard->releaseTableLock();
-        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {});
+        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {}, std::move(guard));
     }
 
     auto table_lock = table->lockForShare(getContext()->getCurrentQueryId(), settings[Setting::lock_acquire_timeout]);
diff --git a/src/Interpreters/InterpreterDropIndexQuery.cpp b/src/Interpreters/InterpreterDropIndexQuery.cpp
index 9e04f6bdfc06..4584fd8ad968 100644
--- a/src/Interpreters/InterpreterDropIndexQuery.cpp
+++ b/src/Interpreters/InterpreterDropIndexQuery.cpp
@@ -45,9 +45,9 @@ BlockIO InterpreterDropIndexQuery::execute()
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
-        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, database.get());
         guard->releaseTableLock();
-        return database->tryEnqueueReplicatedDDL(query_ptr, current_context, {});
+        return database->tryEnqueueReplicatedDDL(query_ptr, current_context, {}, std::move(guard));
     }
 
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, current_context);
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 026c19ded3fa..377cf03f0613 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -143,7 +143,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(const ContextPtr & context_, AS
         throw Exception(ErrorCodes::UNKNOWN_TABLE, "Temporary table {} doesn't exist", backQuoteIfNeed(table_id.table_name));
     }
 
-    auto ddl_guard = (!query.no_ddl_lock ? DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name) : nullptr);
+    auto ddl_guard = (!query.no_ddl_lock ? DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, nullptr) : nullptr);
 
     /// If table was already dropped by anyone, an exception will be thrown
     auto [database, table] = query.if_exists ? DatabaseCatalog::instance().tryGetDatabaseAndTable(table_id, context_)
@@ -227,7 +227,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(const ContextPtr & context_, AS
 
             query_to_send.if_empty = false;
 
-            return database->tryEnqueueReplicatedDDL(new_query_ptr, context_, {});
+            return database->tryEnqueueReplicatedDDL(new_query_ptr, context_, {}, std::move(ddl_guard));
         }
 
         if (query.kind == ASTDropQuery::Kind::Detach)
@@ -412,7 +412,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
         return {};
 
     const auto & database_name = query.getDatabase();
-    auto ddl_guard = DatabaseCatalog::instance().getDDLGuard(database_name, "");
+    auto ddl_guard = DatabaseCatalog::instance().getDDLGuard(database_name, "", nullptr);
 
     database = tryGetDatabase(database_name, query.if_exists);
     if (!database)
@@ -695,7 +695,7 @@ AccessRightsElements InterpreterDropQuery::getRequiredAccessForDDLOnCluster() co
 void InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context,
                                             const StorageID & target_table_id, bool sync, bool ignore_sync_setting, bool need_ddl_guard)
 {
-    auto ddl_guard = (need_ddl_guard ? DatabaseCatalog::instance().getDDLGuard(target_table_id.database_name, target_table_id.table_name) : nullptr);
+    auto ddl_guard = (need_ddl_guard ? DatabaseCatalog::instance().getDDLGuard(target_table_id.database_name, target_table_id.table_name, nullptr) : nullptr);
     if (DatabaseCatalog::instance().tryGetTable(target_table_id, current_context))
     {
         /// We create and execute `drop` query for internal table.
@@ -711,6 +711,11 @@ void InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind kind, ContextPtr
         /// and not allowed to drop inner table explicitly. Allowing to drop inner table without explicit grant
         /// looks like expected behaviour and we have tests for it.
         auto drop_context = Context::createCopy(global_context);
+
+        /// We need to propagate settings related to drop size limits,
+        ///  otherwise we will not be able to drop large inner tables.
+        drop_context->setSettings(current_context->getSettingsRef());
+
         if (ignore_sync_setting)
             drop_context->setSetting("database_atomic_wait_for_drop_and_detach_synchronously", false);
         drop_context->setQueryKind(ClientInfo::QueryKind::SECONDARY_QUERY);
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 353b2db18ae7..e3037843e6c7 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -9,6 +9,8 @@
 #include <Core/ServerSettings.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <IO/ReadBuffer.h>
+#include <Interpreters/ApplyWithAliasVisitor.h>
+#include <Interpreters/ApplyWithSubqueryVisitor.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
@@ -31,6 +33,7 @@
 #include <Processors/Transforms/CountingTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/DeduplicationTokenTransforms.h>
+#include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Transforms/PlanSquashingTransform.h>
 #include <Processors/Transforms/ApplySquashingTransform.h>
 #include <Processors/Transforms/getSourceFromASTInsertQuery.h>
@@ -79,6 +82,7 @@ namespace Setting
     extern const SettingsBool async_query_sending_for_remote;
     extern const SettingsBool async_socket_for_remote;
     extern const SettingsUInt64 max_distributed_depth;
+    extern const SettingsBool enable_global_with_statement;
 }
 
 namespace MergeTreeSetting
@@ -435,7 +439,8 @@ QueryPipeline InterpreterInsertQuery::addInsertToSelectPipeline(ASTInsertQuery &
 
     pipeline.resize(1);
 
-    if (shouldAddSquashingForStorage(table, getContext()) && !no_squash && !async_insert)
+    bool should_squash = shouldAddSquashingForStorage(table, getContext()) && !no_squash && !async_insert;
+    if (should_squash)
     {
         pipeline.addSimpleTransform(
             [&](const SharedHeader & in_header) -> ProcessorPtr
@@ -485,7 +490,7 @@ QueryPipeline InterpreterInsertQuery::addInsertToSelectPipeline(ASTInsertQuery &
 
     pipeline.resize(sink_streams_size);
 
-    if (shouldAddSquashingForStorage(table, getContext()) && !no_squash && !async_insert)
+    if (should_squash)
     {
         pipeline.addSimpleTransform(
             [&](const SharedHeader & in_header) -> ProcessorPtr
@@ -628,8 +633,6 @@ static bool isInsertSelectTrivialEnoughForDistributedExecution(const ASTInsertQu
         /// TODO: replace with QueryTree analysis after switching to analyzer completely
         return (!select_query->distinct
             && !select_query->limit_with_ties
-            && !select_query->prewhere()
-            && !select_query->where()
             && !select_query->groupBy()
             && !select_query->having()
             && !select_query->orderBy()
@@ -724,7 +727,7 @@ QueryPipeline InterpreterInsertQuery::buildInsertPipeline(ASTInsertQuery & query
 
     QueryPipeline pipeline = QueryPipeline(std::move(chain));
 
-    pipeline.setNumThreads(max_insert_threads);
+    pipeline.setNumThreads(max_threads);
     pipeline.setConcurrencyControl(settings[Setting::use_concurrency_control]);
 
     if (query.hasInlinedData() && !async_insert)
@@ -758,6 +761,10 @@ InterpreterInsertQuery::distributedWriteIntoReplicatedMergeTreeFromClusterStorag
     {
         if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
         {
+            if (local_context->getSettingsRef()[Setting::enable_global_with_statement])
+                ApplyWithAliasVisitor::visit(select.list_of_selects->children.at(0));
+            ApplyWithSubqueryVisitor(local_context).visit(select.list_of_selects->children.at(0));
+
             JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
             if (joined_tables.tablesCount() == 1)
                 src_storage = joined_tables.getLeftTableStorage();
@@ -770,6 +777,9 @@ InterpreterInsertQuery::distributedWriteIntoReplicatedMergeTreeFromClusterStorag
     if (!src_storage_cluster)
         return {};
 
+    if (src_storage_cluster->getOriginalClusterName().empty())
+        return {};
+
     if (!isInsertSelectTrivialEnoughForDistributedExecution(query))
         return {};
 
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index 51ea9051ddfc..4054b1e7211a 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -19,6 +19,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Core/ServerSettings.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/ISource.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
@@ -37,11 +38,17 @@ namespace Setting
     extern const SettingsUInt64 max_parser_depth;
 }
 
+namespace ServerSetting
+{
+    extern const ServerSettingsBool enable_experimental_export_merge_tree_partition_feature;
+}
+
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int ACCESS_DENIED;
     extern const int NOT_IMPLEMENTED;
+    extern const int SUPPORT_IS_DISABLED;
 }
 
 
@@ -250,6 +257,82 @@ BlockIO InterpreterKillQueryQuery::execute()
 
         break;
     }
+    case ASTKillQueryQuery::Type::ExportPartition:
+    {
+        if (!getContext()->getServerSettings()[ServerSetting::enable_experimental_export_merge_tree_partition_feature])
+        {
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                "Exporting merge tree partition is experimental. Set the server setting `enable_experimental_export_merge_tree_partition_feature` to enable it");
+        }
+
+        Block exports_block = getSelectResult(
+            "source_database, source_table, transaction_id, destination_database, destination_table, partition_id",
+            "system.replicated_partition_exports");
+        if (exports_block.empty())
+            return res_io;
+
+        const ColumnString & src_db_col = typeid_cast<const ColumnString &>(*exports_block.getByName("source_database").column);
+        const ColumnString & src_table_col = typeid_cast<const ColumnString &>(*exports_block.getByName("source_table").column);
+        const ColumnString & dst_db_col = typeid_cast<const ColumnString &>(*exports_block.getByName("destination_database").column);
+        const ColumnString & dst_table_col = typeid_cast<const ColumnString &>(*exports_block.getByName("destination_table").column);
+        const ColumnString & tx_col = typeid_cast<const ColumnString &>(*exports_block.getByName("transaction_id").column);
+
+        auto header = exports_block.cloneEmpty();
+        header.insert(0, {ColumnString::create(), std::make_shared<DataTypeString>(), "kill_status"});
+
+        MutableColumns res_columns = header.cloneEmptyColumns();
+        AccessRightsElements required_access_rights;
+        auto access = getContext()->getAccess();
+        bool access_denied = false;
+
+        for (size_t i = 0; i < exports_block.rows(); ++i)
+        {
+            const auto src_database = src_db_col.getDataAt(i).toString();
+            const auto src_table = src_table_col.getDataAt(i).toString();
+            const auto dst_database = dst_db_col.getDataAt(i).toView();
+            const auto dst_table = dst_table_col.getDataAt(i).toView();
+
+            const auto table_id = StorageID{src_database, src_table};
+            const auto transaction_id = tx_col.getDataAt(i).toString();
+
+            CancellationCode code = CancellationCode::Unknown;
+            if (!query.test)
+            {
+                auto storage = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
+                if (!storage)
+                    code = CancellationCode::NotFound;
+                else
+                {
+                    ASTAlterCommand alter_command{};
+                    alter_command.type = ASTAlterCommand::EXPORT_PARTITION;
+                    alter_command.move_destination_type = DataDestinationType::TABLE;
+                    alter_command.from_database = src_database;
+                    alter_command.from_table = src_table;
+                    alter_command.to_database = dst_database;
+                    alter_command.to_table = dst_table;
+
+                    required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(
+                        alter_command, table_id.database_name, table_id.table_name);
+                    if (!access->isGranted(required_access_rights))
+                    {
+                        access_denied = true;
+                        continue;
+                    }
+                    code = storage->killExportPartition(transaction_id);
+                }
+            }
+
+            insertResultRow(i, code, exports_block, header, res_columns);
+        }
+
+        if (res_columns[0]->empty() && access_denied)
+            throw Exception(ErrorCodes::ACCESS_DENIED, "Not allowed to kill export partition. "
+                "To execute this query, it's necessary to have the grant {}", required_access_rights.toString());
+
+        res_io.pipeline = QueryPipeline(Pipe(std::make_shared<SourceFromSingleChunk>(std::make_shared<const Block>(header.cloneWithColumns(std::move(res_columns))))));
+
+        break;
+    }
     case ASTKillQueryQuery::Type::Mutation:
     {
         Block mutations_block = getSelectResult("database, table, mutation_id, command", "system.mutations");
@@ -462,6 +545,9 @@ AccessRightsElements InterpreterKillQueryQuery::getRequiredAccessForDDLOnCluster
                 | AccessType::ALTER_MATERIALIZE_COLUMN
                 | AccessType::ALTER_MATERIALIZE_TTL
             );
+    /// todo arthur think about this
+    else if (query.type == ASTKillQueryQuery::Type::ExportPartition)
+        required_access.emplace_back(AccessType::ALTER_EXPORT_PARTITION);
     return required_access;
 }
 
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 097de8a0f041..05db47057ebf 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -74,7 +74,7 @@ BlockIO InterpreterRenameQuery::execute()
 
     /// Must do it in consistent order.
     for (auto & table_guard : table_guards)
-        table_guard.second = database_catalog.getDDLGuard(table_guard.first.database_name, table_guard.first.table_name);
+        table_guard.second = database_catalog.getDDLGuard(table_guard.first.database_name, table_guard.first.table_name, nullptr);
 
     if (rename.database)
         return executeToDatabase(rename, descriptions);
@@ -126,7 +126,7 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
             UniqueTableName to(elem.to_database_name, elem.to_table_name);
             ddl_guards[from]->releaseTableLock();
             ddl_guards[to]->releaseTableLock();
-            return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {});
+            return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {}, std::move(ddl_guards[from]));
         }
 
         StorageID from_table_id{elem.from_database_name, elem.from_table_name};
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index e0ffd41fcdd3..d728868c2dea 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -71,6 +71,7 @@
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/QueryPlan/WindowStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/ObjectFilterStep.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Transforms/AggregatingTransform.h>
@@ -83,6 +84,7 @@
 #include <Storages/StorageValues.h>
 #include <Storages/StorageView.h>
 #include <Storages/ReadInOrderOptimizer.h>
+#include <Storages/IStorageCluster.h>
 
 #include <Columns/Collator.h>
 #include <Columns/ColumnAggregateFunction.h>
@@ -195,6 +197,8 @@ namespace Setting
     extern const SettingsUInt64 max_rows_to_transfer;
     extern const SettingsOverflowMode transfer_overflow_mode;
     extern const SettingsString implicit_table_at_top_level;
+    extern const SettingsBool use_hive_partitioning;
+    extern const SettingsBool serialize_string_in_memory_with_zero_byte;
 }
 
 namespace ServerSetting
@@ -1976,6 +1980,22 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
 
         if (expressions.second_stage || from_aggregation_stage)
         {
+            if (settings[Setting::use_hive_partitioning]
+                && !expressions.first_stage
+                && expressions.hasWhere())
+            {
+                if (typeid_cast<ReadFromCluster *>(query_plan.getRootNode()->step.get()))
+                {
+                    auto object_filter_step = std::make_unique<ObjectFilterStep>(
+                        query_plan.getCurrentHeader(),
+                        expressions.before_where->dag.clone(),
+                        getSelectQuery().where()->getColumnName());
+
+                    object_filter_step->setStepDescription("WHERE");
+                    query_plan.addStep(std::move(object_filter_step));
+                }
+            }
+
             if (from_aggregation_stage)
             {
                 /// No need to aggregate anything, since this was done on remote shards.
@@ -2181,7 +2201,8 @@ static void executeMergeAggregatedImpl(
         overflow_row,
         settings[Setting::max_threads],
         settings[Setting::max_block_size],
-        settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization]);
+        settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization],
+        settings[Setting::serialize_string_in_memory_with_zero_byte]);
     auto grouping_sets_params = getAggregatorGroupingSetsParams(aggregation_keys_list, keys);
 
     auto merging_aggregated = std::make_unique<MergingAggregatedStep>(
@@ -2805,8 +2826,8 @@ static Aggregator::Params getAggregatorParams(
         /* only_merge */ false,
         settings[Setting::optimize_group_by_constant_keys],
         settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization],
-        stats_collecting_params
-    };
+        stats_collecting_params,
+        settings[Setting::serialize_string_in_memory_with_zero_byte]};
 }
 
 void InterpreterSelectQuery::executeAggregation(
diff --git a/src/Interpreters/InterpreterShowColumnsQuery.cpp b/src/Interpreters/InterpreterShowColumnsQuery.cpp
index 1ca074fecaf9..1df668ee8b51 100644
--- a/src/Interpreters/InterpreterShowColumnsQuery.cpp
+++ b/src/Interpreters/InterpreterShowColumnsQuery.cpp
@@ -76,8 +76,8 @@ WITH map(
         'String',      '{}',
         'FixedString', '{}') AS native_to_mysql_mapping,
         )",
-        remap_string_as_text ? "TEXT" : "BLOB",
-        remap_fixed_string_as_text ? "TEXT" : "BLOB");
+            remap_string_as_text ? "TEXT" : "BLOB",
+            remap_fixed_string_as_text ? "TEXT" : "BLOB");
 
         rewritten_query += R"(
         splitByRegexp('\(|\)', type_) AS split,
@@ -127,7 +127,8 @@ SELECT
     '' AS privileges )";
     }
 
-    rewritten_query += fmt::format(R"(
+    rewritten_query += fmt::format(
+        R"(
 -- need to rename columns of the base table to avoid "CYCLIC_ALIASES" errors
 FROM (SELECT name AS name_,
              database AS database_,
@@ -141,7 +142,9 @@ FROM (SELECT name AS name_,
       FROM system.columns)
 WHERE
     database_ = '{}'
-    AND table_ = '{}' )", database, table);
+    AND table_ = '{}' )",
+        database,
+        table);
 
     if (!query.like.empty())
     {
@@ -152,7 +155,7 @@ WHERE
             rewritten_query += "ILIKE ";
         else
             rewritten_query += "LIKE ";
-        rewritten_query += fmt::format("'{}'", query.like);
+        rewritten_query += quoteString(query.like);
     }
     else if (query.where_expression)
         rewritten_query += fmt::format(" AND ({})", query.where_expression->formatWithSecretsOneLine());
diff --git a/src/Interpreters/InterpreterShowFunctionsQuery.cpp b/src/Interpreters/InterpreterShowFunctionsQuery.cpp
index 96a730f65278..3004634144d0 100644
--- a/src/Interpreters/InterpreterShowFunctionsQuery.cpp
+++ b/src/Interpreters/InterpreterShowFunctionsQuery.cpp
@@ -5,6 +5,7 @@
 #include <Interpreters/InterpreterShowFunctionsQuery.h>
 #include <Interpreters/executeQuery.h>
 #include <Parsers/ASTShowFunctionsQuery.h>
+#include <Common/quoteString.h>
 
 namespace DB
 {
@@ -38,7 +39,7 @@ FROM {}.{})",
     {
         rewritten_query += " WHERE name ";
         rewritten_query += query.case_insensitive_like ? "ILIKE " : "LIKE ";
-        rewritten_query += fmt::format("'{}'", query.like);
+        rewritten_query += quoteString(query.like);
     }
 
     return rewritten_query;
diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp
index 8a159ffdcbb3..634fa9515f03 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.cpp
+++ b/src/Interpreters/InterpreterShowTablesQuery.cpp
@@ -14,6 +14,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <Common/Macros.h>
 #include <Common/typeid_cast.h>
+#include <Core/Settings.h>
 
 
 namespace DB
@@ -229,8 +230,20 @@ BlockIO InterpreterShowTablesQuery::execute()
 
         return res;
     }
+    auto rewritten_query = getRewrittenQuery();
+    String database = getContext()->resolveDatabase(query.getFrom());
+    if (query.databases || DatabaseCatalog::instance().isDatalakeCatalog(database))
+    {
+        auto context_copy = Context::createCopy(getContext());
+        /// HACK To always show them in explicit "SHOW TABLES" and "SHOW DATABASES" queries
+        context_copy->setSetting("show_data_lake_catalogs_in_system_tables", true);
+        return executeQuery(rewritten_query, context_copy, QueryFlags{ .internal = true }).second;
+    }
+    else
+    {
+        return executeQuery(rewritten_query, getContext(), QueryFlags{ .internal = true }).second;
+    }
 
-    return executeQuery(getRewrittenQuery(), getContext(), QueryFlags{ .internal = true }).second;
 }
 
 /// (*) Sorting is strictly speaking not necessary but 1. it is convenient for users, 2. SQL currently does not allow to
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 5a6f07f46d74..6327f3d65298 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -41,12 +41,14 @@
 #include <Interpreters/TraceLog.h>
 #include <Interpreters/TransactionLog.h>
 #include <Interpreters/TransactionsInfoLog.h>
+#include <Interpreters/IcebergMetadataLog.h>
 #include <Interpreters/ZooKeeperLog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTSystemQuery.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Storages/Cache/ObjectStorageListObjectsCache.h>
 #include <Storages/Freeze.h>
 #include <Storages/MaterializedView/RefreshTask.h>
 #include <Storages/ObjectStorage/Azure/Configuration.h>
@@ -80,6 +82,10 @@
 #include <Formats/ProtobufSchemas.h>
 #endif
 
+#if USE_PARQUET
+#include <Processors/Formats/Impl/ParquetFileMetaDataCache.h>
+#endif
+
 #if USE_AWS_S3
 #include <IO/S3/Client.h>
 #endif
@@ -241,7 +247,7 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
     }
     else
     {
-        for (auto & elem : DatabaseCatalog::instance().getDatabases())
+        for (auto & elem : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
         {
             startStopActionInDatabase(action_type, start, elem.first, elem.second, getContext(), log);
         }
@@ -435,6 +441,22 @@ BlockIO InterpreterSystemQuery::execute()
             getContext()->clearQueryResultCache(query.query_result_cache_tag);
             break;
         }
+        case Type::DROP_OBJECT_STORAGE_LIST_OBJECTS_CACHE:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_OBJECT_STORAGE_LIST_OBJECTS_CACHE);
+            ObjectStorageListObjectsCache::instance().clear();
+            break;
+        }
+        case Type::DROP_PARQUET_METADATA_CACHE:
+        {
+#if USE_PARQUET
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_PARQUET_METADATA_CACHE);
+            ParquetFileMetaDataCache::instance()->clear();
+            break;
+#else
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "The server was compiled without the support for Parquet");
+#endif
+        }
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
 #if USE_EMBEDDED_COMPILER
             getContext()->checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
@@ -460,8 +482,7 @@ BlockIO InterpreterSystemQuery::execute()
 
             if (query.filesystem_cache_name.empty())
             {
-                auto caches = FileCacheFactory::instance().getAll();
-                for (const auto & [_, cache_data] : caches)
+                for (const auto & cache_data : FileCacheFactory::instance().getUniqueInstances())
                 {
                     if (!cache_data->cache->isInitialized())
                         continue;
@@ -522,11 +543,10 @@ BlockIO InterpreterSystemQuery::execute()
 
             if (query.filesystem_cache_name.empty())
             {
-                auto caches = FileCacheFactory::instance().getAll();
-                for (const auto & [cache_name, cache_data] : caches)
+                for (const auto & cache_data : FileCacheFactory::instance().getUniqueInstances())
                 {
                     auto file_segments = cache_data->cache->sync();
-                    fill_data(cache_name, cache_data->cache, file_segments);
+                    fill_data(cache_data->cache->getName(), cache_data->cache, file_segments);
                 }
             }
             else
@@ -701,6 +721,20 @@ BlockIO InterpreterSystemQuery::execute()
         case Type::START_MOVES:
             startStopAction(ActionLocks::PartsMove, true);
             break;
+        case Type::STOP_SWARM_MODE:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_SWARM);
+            if (getContext()->stopSwarmMode())
+                getContext()->unregisterInAutodiscoveryClusters();
+            break;
+        }
+        case Type::START_SWARM_MODE:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_SWARM);
+            if (getContext()->startSwarmMode())
+                getContext()->registerInAutodiscoveryClusters();
+            break;
+        }
         case Type::STOP_FETCHES:
             startStopAction(ActionLocks::PartsFetch, false);
             break;
@@ -812,7 +846,7 @@ BlockIO InterpreterSystemQuery::execute()
         {
             getContext()->checkAccess(AccessType::SYSTEM_FLUSH_LOGS);
             auto system_logs = getContext()->getSystemLogs();
-            system_logs.flush(true, query.logs);
+            system_logs.flush(query.logs);
             break;
         }
         case Type::STOP_LISTEN:
@@ -977,7 +1011,7 @@ void InterpreterSystemQuery::restoreDatabaseReplica(ASTSystemQuery & query)
 StoragePtr InterpreterSystemQuery::doRestartReplica(const StorageID & replica, ContextMutablePtr system_context, bool throw_on_error)
 {
     LOG_TRACE(log, "Restarting replica {}", replica);
-    auto table_ddl_guard = DatabaseCatalog::instance().getDDLGuard(replica.getDatabaseName(), replica.getTableName());
+    auto table_ddl_guard = DatabaseCatalog::instance().getDDLGuard(replica.getDatabaseName(), replica.getTableName(), nullptr);
 
     auto restart_replica_lock = DatabaseCatalog::instance().tryGetLockForRestartReplica(replica.getDatabaseName());
     if (!restart_replica_lock)
@@ -1076,7 +1110,7 @@ void InterpreterSystemQuery::restartReplicas(ContextMutablePtr system_context)
     bool access_is_granted_globally = access->isGranted(AccessType::SYSTEM_RESTART_REPLICA);
     bool show_tables_is_granted_globally = access->isGranted(AccessType::SHOW_TABLES);
 
-    for (auto & elem : catalog.getDatabases())
+    for (auto & elem : catalog.getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         if (!elem.second->canContainMergeTreeTables())
             continue;
@@ -1132,13 +1166,13 @@ void InterpreterSystemQuery::dropReplica(ASTSystemQuery & query)
     {
         getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA, query.getDatabase());
         DatabasePtr database = DatabaseCatalog::instance().getDatabase(query.getDatabase());
-        for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
+        for (auto iterator = database->getLightweightTablesIterator(getContext()); iterator->isValid(); iterator->next())
             dropReplicaImpl(query, iterator->table());
         LOG_TRACE(log, "Dropped replica {} from database {}", query.replica, backQuoteIfNeed(database->getDatabaseName()));
     }
     else if (query.is_drop_whole_replica)
     {
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
         auto access = getContext()->getAccess();
         bool access_is_granted_globally = access->isGranted(AccessType::SYSTEM_DROP_REPLICA);
 
@@ -1179,7 +1213,7 @@ void InterpreterSystemQuery::dropReplica(ASTSystemQuery & query)
         String remote_replica_path = fs::path(query.replica_zk_path)  / "replicas" / query.replica;
 
         /// This check is actually redundant, but it may prevent from some user mistakes
-        for (auto & elem : DatabaseCatalog::instance().getDatabases())
+        for (auto & elem : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
         {
             DatabasePtr & database = elem.second;
             for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
@@ -1273,7 +1307,7 @@ void InterpreterSystemQuery::dropDatabaseReplica(ASTSystemQuery & query)
     }
     else if (query.is_drop_whole_replica)
     {
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
         auto access = getContext()->getAccess();
         bool access_is_granted_globally = access->isGranted(AccessType::SYSTEM_DROP_REPLICA);
 
@@ -1299,7 +1333,7 @@ void InterpreterSystemQuery::dropDatabaseReplica(ASTSystemQuery & query)
         getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA);
 
         /// This check is actually redundant, but it may prevent from some user mistakes
-        for (auto & elem : DatabaseCatalog::instance().getDatabases())
+        for (auto & elem : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
             if (auto * replicated = dynamic_cast<DatabaseReplicated *>(elem.second.get()))
                 check_not_local_replica(replicated, query);
 
@@ -1417,7 +1451,7 @@ void InterpreterSystemQuery::loadOrUnloadPrimaryKeysImpl(bool load)
         getContext()->checkAccess(load ? AccessType::SYSTEM_LOAD_PRIMARY_KEY : AccessType::SYSTEM_UNLOAD_PRIMARY_KEY);
         LOG_TRACE(log, "{} primary keys for all tables", load ? "Loading" : "Unloading");
 
-        for (auto & database : DatabaseCatalog::instance().getDatabases())
+        for (auto & database : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
         {
             for (auto it = database.second->getTablesIterator(getContext()); it->isValid(); it->next())
             {
@@ -1433,7 +1467,7 @@ void InterpreterSystemQuery::loadOrUnloadPrimaryKeysImpl(bool load)
 void InterpreterSystemQuery::syncReplicatedDatabase(ASTSystemQuery & query)
 {
     const auto database_name = query.getDatabase();
-    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, "");
+    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, "", nullptr);
     auto database = DatabaseCatalog::instance().getDatabase(database_name);
 
     if (auto * ptr = typeid_cast<DatabaseReplicated *>(database.get()))
@@ -1574,6 +1608,8 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         case Type::DROP_PAGE_CACHE:
         case Type::DROP_SCHEMA_CACHE:
         case Type::DROP_FORMAT_SCHEMA_CACHE:
+        case Type::DROP_OBJECT_STORAGE_LIST_OBJECTS_CACHE:
+        case Type::DROP_PARQUET_METADATA_CACHE:
         case Type::DROP_S3_CLIENT_CACHE:
         {
             required_access.emplace_back(AccessType::SYSTEM_DROP_CACHE);
@@ -1642,6 +1678,12 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
                 required_access.emplace_back(AccessType::SYSTEM_MOVES, query.getDatabase(), query.getTable());
             break;
         }
+        case Type::STOP_SWARM_MODE:
+        case Type::START_SWARM_MODE:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_SWARM);
+            break;
+        }
         case Type::STOP_PULLING_REPLICATION_LOG:
         case Type::START_PULLING_REPLICATION_LOG:
         {
diff --git a/src/Interpreters/InterpreterUndropQuery.cpp b/src/Interpreters/InterpreterUndropQuery.cpp
index 1a1a7558bc83..0e6f3d68fde8 100644
--- a/src/Interpreters/InterpreterUndropQuery.cpp
+++ b/src/Interpreters/InterpreterUndropQuery.cpp
@@ -52,7 +52,7 @@ BlockIO InterpreterUndropQuery::executeToTable(ASTUndropQuery & query)
         query.setDatabase(table_id.database_name);
     }
 
-    auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+    auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, nullptr);
 
     auto database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->getEngineName() == "Replicated")
diff --git a/src/Interpreters/InterpreterUpdateQuery.cpp b/src/Interpreters/InterpreterUpdateQuery.cpp
index 07412b80c123..23572be20757 100644
--- a/src/Interpreters/InterpreterUpdateQuery.cpp
+++ b/src/Interpreters/InterpreterUpdateQuery.cpp
@@ -18,6 +18,7 @@
 #include <Storages/MutationCommands.h>
 #include <Core/Settings.h>
 #include <Core/ServerSettings.h>
+#include <Interpreters/executeDDLQueryOnCluster.h>
 
 
 namespace DB
@@ -73,14 +74,24 @@ BlockIO InterpreterUpdateQuery::execute()
     if (!settings[Setting::enable_lightweight_update])
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Lightweight updates are not allowed. Set 'enable_lightweight_update = 1' to allow them");
 
+    FunctionNameNormalizer::visit(query_ptr.get());
+    auto & update_query = query_ptr->as<ASTUpdateQuery &>();
+
+    AccessRightsElements required_access;
+    required_access.emplace_back(AccessType::ALTER_UPDATE, update_query.getDatabase(), update_query.getTable());
+
+    if (!update_query.cluster.empty())
+    {
+        DDLQueryOnClusterParams params;
+        params.access_to_check = std::move(required_access);
+        return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+    }
+
     if (getContext()->getGlobalContext()->getServerSettings()[ServerSetting::disable_insertion_and_mutation])
         throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Update queries are prohibited");
 
-    FunctionNameNormalizer::visit(query_ptr.get());
-    auto & update_query = query_ptr->as<ASTUpdateQuery &>();
+    getContext()->checkAccess(required_access);
     auto table_id = getContext()->resolveStorageID(update_query, Context::ResolveOrdinary);
-
-    getContext()->checkAccess(AccessType::ALTER_UPDATE, table_id);
     update_query.setDatabase(table_id.database_name);
 
     /// First check table storage for validations.
@@ -94,9 +105,9 @@ BlockIO InterpreterUpdateQuery::execute()
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
-        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
+        auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name, database.get());
         guard->releaseTableLock();
-        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {});
+        return database->tryEnqueueReplicatedDDL(query_ptr, getContext(), {}, std::move(guard));
     }
 
     MutationCommands commands;
diff --git a/src/Interpreters/InterserverIOHandler.h b/src/Interpreters/InterserverIOHandler.h
index 61e585d243af..c693ae82355a 100644
--- a/src/Interpreters/InterserverIOHandler.h
+++ b/src/Interpreters/InterserverIOHandler.h
@@ -3,6 +3,7 @@
 #include <Common/ActionBlocker.h>
 #include <Common/Exception.h>
 #include <Common/SharedMutex.h>
+#include <IO/ReadBuffer.h>
 #include <base/types.h>
 
 #include <map>
@@ -34,7 +35,7 @@ class InterserverIOEndpoint
 {
 public:
     virtual std::string getId(const std::string & path) const = 0;
-    virtual void processQuery(const HTMLForm & params, ReadBuffer & body, WriteBuffer & out, HTTPServerResponse & response) = 0;
+    virtual void processQuery(const HTMLForm & params, ReadBufferPtr body, WriteBuffer & out, HTTPServerResponse & response) = 0;
     virtual ~InterserverIOEndpoint() = default;
 
     /// You need to stop the data transfer if blocker is activated.
diff --git a/src/Interpreters/JoinUtils.cpp b/src/Interpreters/JoinUtils.cpp
index 84a9dea15331..7af15e834671 100644
--- a/src/Interpreters/JoinUtils.cpp
+++ b/src/Interpreters/JoinUtils.cpp
@@ -234,7 +234,7 @@ void removeColumnNullability(ColumnWithTypeAndName & column)
 
         if (column.column && column.column->isNullable())
         {
-            column.column = column.column->convertToFullColumnIfConst();
+            column.column = column.column->convertToFullIfNeeded();
             const auto * nullable_col = checkAndGetColumn<ColumnNullable>(column.column.get());
             if (!nullable_col)
             {
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 389701333a2a..d484dc8a6561 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -722,12 +722,12 @@ class MergeJoinResult : public IJoinResult
         if (!not_processed)
         {
             merge_join.joinBlock(block, not_processed);
-            return {std::move(block), !not_processed.has_value()};
+            return {std::move(block), nullptr, !not_processed.has_value()};
         }
 
         block = not_processed->block;
         merge_join.joinBlock(block, not_processed);
-        return {std::move(block), !not_processed.has_value()};
+        return {std::move(block), nullptr, !not_processed.has_value()};
     }
 };
 
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 245477825791..3a37e9e8fa14 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -6,6 +6,7 @@
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/MutationsNonDeterministicHelpers.h>
+#include <Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/StorageMergeTree.h>
@@ -528,12 +529,13 @@ static void validateUpdateColumns(
                 {
                     throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN,
                                     "Updated column {} affects MATERIALIZED column {}, which is a key column. "
-                                    "Cannot UPDATE it.", backQuote(column_name), backQuote(materialized));
+                                    "Cannot UPDATE it", backQuote(column_name), backQuote(materialized));
                 }
             }
         }
 
-        if (!storage_columns.tryGetColumn(GetColumnsOptions::Ordinary, column_name))
+        auto ordinary_storage_column = storage_columns.tryGetColumn(GetColumnsOptions::Ordinary, column_name);
+        if (!ordinary_storage_column)
         {
             /// Allow to override value of lightweight delete filter virtual column
             if (column_name == RowExistsColumn::name)
@@ -550,6 +552,16 @@ static void validateUpdateColumns(
                 throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no column {} in table", backQuote(column_name));
             }
         }
+        else
+        {
+            /// Check if we have a subcolumn of this column as a key column.
+            for (const auto & key_column : key_columns)
+            {
+                auto column = storage_columns.getColumnOrSubcolumn(GetColumnsOptions::All, key_column);
+                if (column.isSubcolumn() && column_name == column.getNameInStorage())
+                    throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN, "Cannot UPDATE column {} because its subcolumn {} is a key column", backQuote(column_name), backQuote(key_column));
+            }
+        }
     }
 }
 
@@ -665,6 +677,8 @@ void MutationsInterpreter::prepare(bool dry_run)
             if (column.default_desc.kind == ColumnDefaultKind::Materialized && available_columns_set.contains(column.name))
             {
                 auto query = column.default_desc.expression->clone();
+                /// Replace all subcolumns to the getSubcolumn() to get only top level columns as required source columns.
+                replaceSubcolumnsToGetSubcolumnFunctionInQuery(query, all_columns);
                 auto syntax_result = TreeRewriter(context).analyze(query, all_columns);
                 for (const auto & dependency : syntax_result->requiredSourceColumns())
                     if (updated_columns.contains(dependency))
@@ -844,10 +858,15 @@ void MutationsInterpreter::prepare(bool dry_run)
                     {
                         auto type_literal = std::make_shared<ASTLiteral>(column.type->getName());
 
-                        auto materialized_column = makeASTFunction("_CAST",
+                        ASTPtr materialized_column = makeASTFunction("_CAST",
                             column.default_desc.expression->clone(),
                             type_literal);
 
+                        /// We need to replace all subcolumns used in materialized expression to getSubcolumn() function,
+                        /// because otherwise subcolumns are extracted before the source column is updated and we get
+                        /// old subcolumns values.
+                        replaceSubcolumnsToGetSubcolumnFunctionInQuery(materialized_column, all_columns);
+
                         stages.back().column_to_updated.emplace(
                             column.name,
                             materialized_column);
@@ -1320,6 +1339,19 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
     }
 }
 
+std::optional<ActionsDAG> MutationsInterpreter::createFilterDAGForStage(const Stage & stage)
+{
+    const auto & names = stage.filter_column_names;
+    if (names.empty())
+        return std::nullopt;
+
+    ActionsDAG::NodeRawConstPtrs nodes(names.size());
+    for (size_t i = 0; i < names.size(); ++i)
+        nodes[i] = &stage.expressions_chain.steps[i]->actions()->dag.findInOutputs(names[i]);
+
+    return ActionsDAG::buildFilterActionsDAG(nodes);
+}
+
 void MutationsInterpreter::Source::read(
     Stage & first_stage,
     QueryPlan & plan,
@@ -1347,20 +1379,6 @@ void MutationsInterpreter::Source::read(
 
     if (data)
     {
-        const auto & steps = first_stage.expressions_chain.steps;
-        const auto & names = first_stage.filter_column_names;
-        size_t num_filters = names.size();
-
-        std::optional<ActionsDAG> filter;
-        if (!first_stage.filter_column_names.empty())
-        {
-            ActionsDAG::NodeRawConstPtrs nodes(num_filters);
-            for (size_t i = 0; i < num_filters; ++i)
-                nodes[i] = &steps[i]->actions()->dag.findInOutputs(names[i]);
-
-            filter = ActionsDAG::buildFilterActionsDAG(nodes);
-        }
-
         createReadFromPartStep(
             MergeTreeSequentialSourceType::Mutation,
             plan,
@@ -1372,7 +1390,7 @@ void MutationsInterpreter::Source::read(
             required_columns,
             nullptr,
             mutation_settings.apply_deleted_mask,
-            std::move(filter),
+            createFilterDAGForStage(first_stage),
             false,
             false,
             context_,
@@ -1381,6 +1399,7 @@ void MutationsInterpreter::Source::read(
     else
     {
         auto select = std::make_shared<ASTSelectQuery>();
+        std::shared_ptr<const ActionsDAG> filter_actions_dag;
 
         select->setExpression(ASTSelectQuery::Expression::SELECT, std::make_shared<ASTExpressionList>());
         for (const auto & column_name : first_stage.output_columns)
@@ -1393,8 +1412,11 @@ void MutationsInterpreter::Source::read(
         if (!first_stage.filters.empty())
         {
             ASTPtr where_expression;
+
             if (first_stage.filters.size() == 1)
+            {
                 where_expression = first_stage.filters[0];
+            }
             else
             {
                 auto coalesced_predicates = std::make_shared<ASTFunction>();
@@ -1404,11 +1426,18 @@ void MutationsInterpreter::Source::read(
                 coalesced_predicates->arguments->children = first_stage.filters;
                 where_expression = std::move(coalesced_predicates);
             }
+
             select->setExpression(ASTSelectQuery::Expression::WHERE, std::move(where_expression));
+
+            if (auto filter = createFilterDAGForStage(first_stage))
+                filter_actions_dag = std::make_shared<ActionsDAG>(std::move(*filter));
+            else
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to create filter DAG for stage with non-empty filters");
         }
 
         SelectQueryInfo query_info;
         query_info.query = std::move(select);
+        query_info.filter_actions_dag = std::move(filter_actions_dag);
 
         size_t max_block_size = context_->getSettingsRef()[Setting::max_block_size];
         Names extracted_column_names;
@@ -1448,7 +1477,7 @@ void MutationsInterpreter::initQueryPlan(Stage & first_stage, QueryPlan & plan)
     plan.setConcurrencyControl(false);
 
     source.read(first_stage, plan, metadata_snapshot, context, settings);
-    addCreatingSetsStep(plan, first_stage.analyzer->getPreparedSets(), context);
+    addDelayedCreatingSetsStep(plan, first_stage.analyzer->getPreparedSets(), context);
 }
 
 QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::vector<Stage> & prepared_stages, QueryPlan & plan) const
@@ -1479,7 +1508,7 @@ QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::v
             }
         }
 
-        addCreatingSetsStep(plan, stage.analyzer->getPreparedSets(), context);
+        addDelayedCreatingSetsStep(plan, stage.analyzer->getPreparedSets(), context);
     }
 
     QueryPlanOptimizationSettings do_not_optimize_plan_settings(context);
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index 67e762f2b5b7..ad3b44398fa2 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -176,8 +176,8 @@ class MutationsInterpreter
     void initQueryPlan(Stage & first_stage, QueryPlan & query_plan);
     void prepareMutationStages(std::vector<Stage> &prepared_stages, bool dry_run);
     QueryPipelineBuilder addStreamsForLaterStages(const std::vector<Stage> & prepared_stages, QueryPlan & plan) const;
-
     std::optional<SortDescription> getStorageSortDescriptionIfPossible(const Block & header) const;
+    static std::optional<ActionsDAG> createFilterDAGForStage(const Stage & stage);
 
     ASTPtr getPartitionAndPredicateExpressionForMutationCommand(const MutationCommand & command) const;
 
diff --git a/src/Interpreters/PartLog.cpp b/src/Interpreters/PartLog.cpp
index 02c6f6e573b0..95596cd1dc08 100644
--- a/src/Interpreters/PartLog.cpp
+++ b/src/Interpreters/PartLog.cpp
@@ -69,6 +69,7 @@ ColumnsDescription PartLogElement::getColumnsDescription()
             {"MovePart",      static_cast<Int8>(MOVE_PART)},
             {"MergePartsStart", static_cast<Int8>(MERGE_PARTS_START)},
             {"MutatePartStart", static_cast<Int8>(MUTATE_PART_START)},
+            {"ExportPart",      static_cast<Int8>(EXPORT_PART)},
         }
     );
 
@@ -109,7 +110,8 @@ ColumnsDescription PartLogElement::getColumnsDescription()
             "RemovePart — Removing or detaching a data part using [DETACH PARTITION](/sql-reference/statements/alter/partition#detach-partitionpart)."
             "MutatePartStart — Mutating of a data part has started, "
             "MutatePart — Mutating of a data part has finished, "
-            "MovePart — Moving the data part from the one disk to another one."},
+            "MovePart — Moving the data part from the one disk to another one."
+            "ExportPart — Exporting the data part from a MergeTree table into a target table that represents external storage (e.g., object storage or a data lake).."},
         {"merge_reason", std::move(merge_reason_datatype),
             "The reason for the event with type MERGE_PARTS. Can have one of the following values: "
             "NotAMerge — The current event has the type other than MERGE_PARTS, "
@@ -132,6 +134,7 @@ ColumnsDescription PartLogElement::getColumnsDescription()
         {"part_type", std::make_shared<DataTypeString>(), "The type of the part. Possible values: Wide and Compact."},
         {"disk_name", std::make_shared<DataTypeString>(), "The disk name data part lies on."},
         {"path_on_disk", std::make_shared<DataTypeString>(), "Absolute path to the folder with data part files."},
+        {"remote_file_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "In case of an export operation to remote storages, the file paths a given export generated"},
 
         {"rows", std::make_shared<DataTypeUInt64>(), "The number of rows in the data part."},
         {"size_in_bytes", std::make_shared<DataTypeUInt64>(), "Size of the data part on disk in bytes."},
@@ -185,6 +188,12 @@ void PartLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(disk_name);
     columns[i++]->insert(path_on_disk);
 
+    Array remote_file_paths_array;
+    remote_file_paths_array.reserve(remote_file_paths.size());
+    for (const auto & remote_file_path : remote_file_paths)
+        remote_file_paths_array.push_back(remote_file_path);
+    columns[i++]->insert(remote_file_paths_array);
+
     columns[i++]->insert(rows);
     columns[i++]->insert(bytes_compressed_on_disk);
 
diff --git a/src/Interpreters/PartLog.h b/src/Interpreters/PartLog.h
index 44d2fb413c5f..a2571448720f 100644
--- a/src/Interpreters/PartLog.h
+++ b/src/Interpreters/PartLog.h
@@ -30,6 +30,7 @@ struct PartLogElement
         MOVE_PART = 6,
         MERGE_PARTS_START = 7,
         MUTATE_PART_START = 8,
+        EXPORT_PART = 9,
     };
 
     /// Copy of MergeAlgorithm since values are written to disk.
@@ -70,6 +71,7 @@ struct PartLogElement
     String partition;
     String disk_name;
     String path_on_disk;
+    std::vector<String> remote_file_paths;
 
     MergeTreeDataPartType part_type;
 
diff --git a/src/Interpreters/PreparedSets.cpp b/src/Interpreters/PreparedSets.cpp
index 3eedfb308820..1f2680eee375 100644
--- a/src/Interpreters/PreparedSets.cpp
+++ b/src/Interpreters/PreparedSets.cpp
@@ -172,6 +172,12 @@ FutureSetFromSubquery::FutureSetFromSubquery(
 FutureSetFromSubquery::~FutureSetFromSubquery() = default;
 
 SetPtr FutureSetFromSubquery::get() const
+{
+    std::lock_guard lock(mutex);
+    return get_unsafe();
+}
+
+SetPtr FutureSetFromSubquery::get_unsafe() const
 {
     if (set_and_key->set != nullptr && set_and_key->set->isCreated())
         return set_and_key->set;
@@ -181,20 +187,32 @@ SetPtr FutureSetFromSubquery::get() const
 
 void FutureSetFromSubquery::setQueryPlan(std::unique_ptr<QueryPlan> source_)
 {
+    std::lock_guard lock(mutex);
     source = std::move(source_);
     set_and_key->set->setHeader(source->getCurrentHeader()->getColumnsWithTypeAndName());
 }
 
-void FutureSetFromSubquery::setExternalTable(StoragePtr external_table_) { external_table = std::move(external_table_); }
+void FutureSetFromSubquery::setExternalTable(StoragePtr external_table_)
+{
+    std::lock_guard lock(mutex);
+    external_table = std::move(external_table_);
+}
 
 DataTypes FutureSetFromSubquery::getTypes() const
 {
+    std::lock_guard lock(mutex);
     return set_and_key->set->getElementsTypes();
 }
 
 FutureSet::Hash FutureSetFromSubquery::getHash() const { return hash; }
 
 std::unique_ptr<QueryPlan> FutureSetFromSubquery::build(const SizeLimits & network_transfer_limits, const PreparedSetsCachePtr & prepared_sets_cache)
+{
+    std::lock_guard lock(mutex);
+    return build_unsafe(network_transfer_limits, prepared_sets_cache);
+}
+
+std::unique_ptr<QueryPlan> FutureSetFromSubquery::build_unsafe(const SizeLimits & network_transfer_limits, const PreparedSetsCachePtr & prepared_sets_cache)
 {
     if (set_and_key->set->isCreated())
         return nullptr;
@@ -217,6 +235,8 @@ std::unique_ptr<QueryPlan> FutureSetFromSubquery::build(const SizeLimits & netwo
 
 void FutureSetFromSubquery::buildSetInplace(const ContextPtr & context)
 {
+    std::lock_guard lock(mutex);
+
     if (external_table_set)
         external_table_set->buildSetInplace(context);
 
@@ -224,7 +244,7 @@ void FutureSetFromSubquery::buildSetInplace(const ContextPtr & context)
     SizeLimits network_transfer_limits(settings[Setting::max_rows_to_transfer], settings[Setting::max_bytes_to_transfer], settings[Setting::transfer_overflow_mode]);
     auto prepared_sets_cache = context->getPreparedSetsCache();
 
-    auto plan = build(network_transfer_limits, prepared_sets_cache);
+    auto plan = build_unsafe(network_transfer_limits, prepared_sets_cache);
 
     if (!plan)
         return;
@@ -242,7 +262,9 @@ SetPtr FutureSetFromSubquery::buildOrderedSetInplace(const ContextPtr & context)
     if (!context->getSettingsRef()[Setting::use_index_for_in_with_subqueries])
         return nullptr;
 
-    if (auto set = get())
+    std::lock_guard lock(mutex);
+
+    if (auto set = get_unsafe())
     {
         if (set->hasExplicitSetElements())
             return set;
@@ -264,7 +286,7 @@ SetPtr FutureSetFromSubquery::buildOrderedSetInplace(const ContextPtr & context)
     SizeLimits network_transfer_limits(settings[Setting::max_rows_to_transfer], settings[Setting::max_bytes_to_transfer], settings[Setting::transfer_overflow_mode]);
     auto prepared_sets_cache = context->getPreparedSetsCache();
 
-    auto plan = build(network_transfer_limits, prepared_sets_cache);
+    auto plan = build_unsafe(network_transfer_limits, prepared_sets_cache);
     if (!plan)
         return nullptr;
 
diff --git a/src/Interpreters/PreparedSets.h b/src/Interpreters/PreparedSets.h
index cfd7435833f8..3f7ef9752edd 100644
--- a/src/Interpreters/PreparedSets.h
+++ b/src/Interpreters/PreparedSets.h
@@ -170,6 +170,11 @@ class FutureSetFromSubquery final : public FutureSet
     QueryPlan * getQueryPlan() { return source.get(); }
 
 private:
+    SetPtr get_unsafe() const;
+    std::unique_ptr<QueryPlan> build_unsafe(
+        const SizeLimits & network_transfer_limits,
+        const PreparedSetsCachePtr & prepared_sets_cache);
+
     Hash hash;
     ASTPtr ast;
     SetAndKeyPtr set_and_key;
@@ -178,6 +183,8 @@ class FutureSetFromSubquery final : public FutureSet
 
     std::unique_ptr<QueryPlan> source;
     QueryTreeNodePtr query_tree;
+
+    mutable std::mutex mutex;
 };
 
 using FutureSetFromSubqueryPtr = std::shared_ptr<FutureSetFromSubquery>;
diff --git a/src/Interpreters/ReplaceQueryParameterVisitor.cpp b/src/Interpreters/ReplaceQueryParameterVisitor.cpp
index 240da7a9af65..19e3216066fc 100644
--- a/src/Interpreters/ReplaceQueryParameterVisitor.cpp
+++ b/src/Interpreters/ReplaceQueryParameterVisitor.cpp
@@ -16,6 +16,7 @@
 #include <Common/checkStackSize.h>
 #include <Parsers/Access/ASTCreateUserQuery.h>
 #include <Parsers/Access/ASTUserNameWithHost.h>
+#include <Analyzer/Utils.h>
 
 
 namespace DB
@@ -47,8 +48,12 @@ void ReplaceQueryParameterVisitor::visit(ASTPtr & ast)
             visitChildren(describe_query->table_expression);
         else if (auto * create_user_query = dynamic_cast<ASTCreateUserQuery *>(ast.get()))
         {
-            ASTPtr names = create_user_query->names;
-            visitChildren(names);
+            if (create_user_query->names)
+            {
+                ASTPtr names = create_user_query->names;
+                visitChildren(names);
+            }
+            visitChildren(ast);
         }
         else
             visitChildren(ast);
@@ -81,6 +86,28 @@ const String & ReplaceQueryParameterVisitor::getParamValue(const String & name)
     return search->second;
 }
 
+namespace
+{
+
+/// Return true if we cannot use cast from Field for this type and need to use cast from String
+bool needCastFromString(const DataTypePtr & type)
+{
+    if (type->getCustomSerialization())
+        return true;
+
+    bool result = false;
+    auto check = [&](const IDataType & t)
+    {
+        result |= isVariant(t) || isDynamic(t) || isObject(t);
+    };
+
+    check(*type);
+    type->forEachChild(check);
+    return result;
+}
+
+}
+
 void ReplaceQueryParameterVisitor::visitQueryParameter(ASTPtr & ast)
 {
     const auto & ast_param = ast->as<ASTQueryParameter &>();
@@ -115,12 +142,19 @@ void ReplaceQueryParameterVisitor::visitQueryParameter(ASTPtr & ast)
             value, type_name, ast_param.name, read_buffer.count(), value.size(), value.substr(0, read_buffer.count()));
 
     Field literal;
-    /// If data type has custom serialization, we should use CAST from String,
-    /// because CAST from field may not work correctly (for example for type IPv6).
-    if (data_type->getCustomSerialization())
-        literal = value;
+
+    /// For some data types we should use CAST from String,
+    /// because CAST from field may not work correctly (for example for type IPv6, JSON, Dynamic, etc).
+    if (needCastFromString(data_type))
+    {
+        WriteBufferFromOwnString value_buf;
+        serialization->serializeText(temp_column, 0, value_buf, format_settings);
+        literal = value_buf.str();
+    }
     else
+    {
         literal = temp_column[0];
+    }
 
     /// If it's a String, substitute it in the form of a string literal without CAST
     /// to enable substitutions in simple queries that don't support expressions
diff --git a/src/Interpreters/ReplicatedDatabaseQueryStatusSource.cpp b/src/Interpreters/ReplicatedDatabaseQueryStatusSource.cpp
index f28e6ea2f873..b3bd2624c2f0 100644
--- a/src/Interpreters/ReplicatedDatabaseQueryStatusSource.cpp
+++ b/src/Interpreters/ReplicatedDatabaseQueryStatusSource.cpp
@@ -21,9 +21,10 @@ extern const int LOGICAL_ERROR;
 }
 
 ReplicatedDatabaseQueryStatusSource::ReplicatedDatabaseQueryStatusSource(
-    const String & zk_node_path, const String & zk_replicas_path, ContextPtr context_, const Strings & hosts_to_wait)
+    const String & zk_node_path, const String & zk_replicas_path, ContextPtr context_, const Strings & hosts_to_wait, DDLGuardPtr && database_guard_)
     : DistributedQueryStatusSource(
           zk_node_path, zk_replicas_path, std::make_shared<const Block>(getSampleBlock()), context_, hosts_to_wait, "ReplicatedDatabaseQueryStatusSource")
+    , database_guard(std::move(database_guard_))
 {
 }
 
diff --git a/src/Interpreters/ReplicatedDatabaseQueryStatusSource.h b/src/Interpreters/ReplicatedDatabaseQueryStatusSource.h
index 226706d3d431..1c536115fe67 100644
--- a/src/Interpreters/ReplicatedDatabaseQueryStatusSource.h
+++ b/src/Interpreters/ReplicatedDatabaseQueryStatusSource.h
@@ -11,7 +11,7 @@ class ReplicatedDatabaseQueryStatusSource final : public DistributedQueryStatusS
 {
 public:
     ReplicatedDatabaseQueryStatusSource(
-        const String & zk_node_path, const String & zk_replicas_path, ContextPtr context_, const Strings & hosts_to_wait);
+        const String & zk_node_path, const String & zk_replicas_path, ContextPtr context_, const Strings & hosts_to_wait, DDLGuardPtr && database_guard_);
 
     String getName() const override { return "ReplicatedDatabaseQueryStatus"; }
 
@@ -26,6 +26,8 @@ class ReplicatedDatabaseQueryStatusSource final : public DistributedQueryStatusS
 
 private:
     static Block getSampleBlock();
+    /// A kind of read lock for the database which prevents dropping the database (and its metadata from zk that we use for getting the query status)
+    DDLGuardPtr database_guard;
 
 
 };
diff --git a/src/Interpreters/ServerAsynchronousMetrics.cpp b/src/Interpreters/ServerAsynchronousMetrics.cpp
index 930b0fcb4752..0e3713d66c94 100644
--- a/src/Interpreters/ServerAsynchronousMetrics.cpp
+++ b/src/Interpreters/ServerAsynchronousMetrics.cpp
@@ -73,12 +73,11 @@ ServerAsynchronousMetrics::~ServerAsynchronousMetrics()
 void ServerAsynchronousMetrics::updateImpl(TimePoint update_time, TimePoint current_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values)
 {
     {
-        auto caches = FileCacheFactory::instance().getAll();
         size_t total_bytes = 0;
         size_t max_bytes = 0;
         size_t total_files = 0;
 
-        for (const auto & [_, cache_data] : caches)
+        for (const auto & cache_data : FileCacheFactory::instance().getUniqueInstances())
         {
             total_bytes += cache_data->cache->getUsedCacheSize();
             max_bytes += cache_data->cache->getMaxCacheSize();
@@ -197,7 +196,7 @@ void ServerAsynchronousMetrics::updateImpl(TimePoint update_time, TimePoint curr
     }
 
     {
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
 
         size_t max_queue_size = 0;
         size_t max_inserts_in_queue = 0;
@@ -372,7 +371,7 @@ void ServerAsynchronousMetrics::updateMutationAndDetachedPartsStats()
     DetachedPartsStats current_values{};
     MutationStats current_mutation_stats{};
 
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         if (!db.second->canContainMergeTreeTables())
             continue;
diff --git a/src/Interpreters/SortedBlocksWriter.cpp b/src/Interpreters/SortedBlocksWriter.cpp
index 4a969cd50f1c..9f798a295d1a 100644
--- a/src/Interpreters/SortedBlocksWriter.cpp
+++ b/src/Interpreters/SortedBlocksWriter.cpp
@@ -40,7 +40,7 @@ void updateProfileEvents(TemporaryDataBuffer::Stat stat)
 
 TemporaryBlockStreamHolder flushBlockToFile(const TemporaryDataOnDiskScopePtr & tmp_data, const Block & block)
 {
-    TemporaryBlockStreamHolder stream_holder(std::make_shared<const Block>(block.cloneEmpty()), tmp_data.get());
+    TemporaryBlockStreamHolder stream_holder(std::make_shared<const Block>(block.cloneEmpty()), tmp_data);
     stream_holder->write(block);
 
     auto stat = stream_holder.finishWriting();
@@ -52,7 +52,7 @@ TemporaryBlockStreamHolder flushBlockToFile(const TemporaryDataOnDiskScopePtr &
 
 TemporaryBlockStreamHolder flushToFile(const TemporaryDataOnDiskScopePtr & tmp_data, const Block & header, QueryPipelineBuilder pipeline)
 {
-    TemporaryBlockStreamHolder stream_holder(std::make_shared<const Block>(header), tmp_data.get());
+    TemporaryBlockStreamHolder stream_holder(std::make_shared<const Block>(header), tmp_data);
 
     auto exec_pipeline = QueryPipelineBuilder::getPipeline(std::move(pipeline));
     PullingPipelineExecutor executor(exec_pipeline);
@@ -176,6 +176,7 @@ TemporaryBlockStreamHolder SortedBlocksWriter::flush(const BlocksList & blocks)
             sort_description,
             rows_in_block,
             /*max_block_size_bytes=*/0,
+            /*max_dynamic_subcolumns=*/std::nullopt,
             SortingQueueStrategy::Default);
 
         pipeline.addTransform(std::move(transform));
@@ -268,6 +269,7 @@ SortedBlocksWriter::PremergedFiles SortedBlocksWriter::premerge()
                             sort_description,
                             rows_in_block,
                             /*max_block_size_bytes=*/0,
+                            /*max_dynamic_subcolumns=*/std::nullopt,
                             SortingQueueStrategy::Default);
 
                         pipeline.addTransform(std::move(transform));
@@ -303,6 +305,7 @@ SortedBlocksWriter::SortedFiles SortedBlocksWriter::finishMerge(std::function<vo
             sort_description,
             rows_in_block,
             /*max_block_size_bytes=*/0,
+            /*max_dynamic_subcolumns=*/std::nullopt,
             SortingQueueStrategy::Default);
 
         pipeline.addTransform(std::move(transform));
@@ -375,6 +378,7 @@ Block SortedBlocksBuffer::mergeBlocks(Blocks && blocks) const
                 sort_description,
                 num_rows,
                 /*max_block_size_bytes=*/0,
+                /*max_dynamic_subcolumns=*/std::nullopt,
                 SortingQueueStrategy::Default);
 
             builder.addTransform(std::move(transform));
diff --git a/src/Interpreters/Squashing.cpp b/src/Interpreters/Squashing.cpp
index 4336e7e46424..9b6d3a4e5ffd 100644
--- a/src/Interpreters/Squashing.cpp
+++ b/src/Interpreters/Squashing.cpp
@@ -165,9 +165,9 @@ Chunk Squashing::squash(std::vector<Chunk> && input_chunks, Chunk::ChunkInfoColl
     {
         if (!have_same_serialization[i])
         {
-            mutable_columns[i] = recursiveRemoveSparse(std::move(mutable_columns[i]))->assumeMutable();
+            mutable_columns[i] = recursiveRemoveSparse(std::move(mutable_columns[i]))->convertToFullColumnIfConst()->assumeMutable();
             for (auto & column : source_columns_list[i])
-                column = recursiveRemoveSparse(column);
+                column = recursiveRemoveSparse(column)->convertToFullColumnIfConst();
         }
 
         /// We know all the data we will insert in advance and can make all necessary pre-allocations.
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index 2b93a159a872..6bc15a515eba 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -1,7 +1,10 @@
 #include <Interpreters/SystemLog.h>
+#include <Common/Exception.h>
 #include <Daemon/BaseDaemon.h>
 
 #include <base/scope_guard.h>
+#include <base/sleep.h>
+#include <Common/FailPoint.h>
 #include <Common/Logger.h>
 #include <Common/SystemLogBase.h>
 #include <Common/logger_useful.h>
@@ -30,6 +33,7 @@
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/QueryMetricLog.h>
 #include <Interpreters/QueryThreadLog.h>
+#include <Interpreters/IcebergMetadataLog.h>
 #include <Interpreters/QueryViewsLog.h>
 #include <Interpreters/ObjectStorageQueueLog.h>
 #include <Interpreters/DeadLetterQueue.h>
@@ -67,6 +71,11 @@ namespace ProfileEvents
 namespace DB
 {
 
+namespace FailPoints
+{
+    extern const char sleep_in_logs_flush[];
+}
+
 namespace ServerSetting
 {
     extern const ServerSettingsBool prepare_system_log_tables_on_startup;
@@ -446,7 +455,7 @@ constexpr String getLowerCaseAndRemoveUnderscores(const String & name)
 }
 }
 
-void SystemLogs::flush(bool should_prepare_tables_anyway, const Strings & names)
+void SystemLogs::flushImpl(const Strings & names, bool should_prepare_tables_anyway, bool ignore_errors)
 {
     std::vector<std::pair<ISystemLog *, ISystemLog::Index>> logs_to_wait;
 
@@ -500,12 +509,31 @@ void SystemLogs::flush(bool should_prepare_tables_anyway, const Strings & names)
 
     /// We must wait for the async flushes to finish
     for (const auto & [log, index] : logs_to_wait)
-        log->flush(index, should_prepare_tables_anyway);
+    {
+        if (!ignore_errors)
+            log->flush(index, should_prepare_tables_anyway);
+        else
+        {
+            try
+            {
+                log->flush(index, should_prepare_tables_anyway);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+    }
+}
+
+void SystemLogs::flush(const Strings & names)
+{
+    flushImpl(names, /*should_prepare_tables_anyway=*/ true, /*ignore_errors=*/ false);
 }
 
 void SystemLogs::flushAndShutdown()
 {
-    flush(/* should_prepare_tables_anyway */ false, {});
+    flushImpl(/*names=*/ {}, /*should_prepare_tables_anyway=*/ false, /*ignore_errors=*/ true);
     shutdown();
 }
 
@@ -592,6 +620,11 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
         LOG_TRACE(log, "Flushing system log, {} entries to flush up to offset {}",
             to_flush.size(), to_flush_end);
 
+        fiu_do_on(FailPoints::sleep_in_logs_flush,
+        {
+            sleepForSeconds(30);
+        });
+
         /// We check for existence of the table and create it as needed at every
         /// flush. This is done to allow user to drop the table at any moment
         /// (new empty table will be created automatically). BTW, flush method
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index 3865460f36e2..2c88f4141120 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -35,6 +35,7 @@
     M(QueryMetricLog,        query_metric_log,     "Contains history of memory and metric values from table system.events for individual queries, periodically flushed to disk.") \
     M(DeadLetterQueue,       dead_letter_queue,    "Contains messages that came from a streaming engine (e.g. Kafka) and were parsed unsuccessfully.") \
     M(ZooKeeperConnectionLog, zookeeper_connection_log, "Contains history of ZooKeeper connections.") \
+    M(IcebergMetadataLog,    iceberg_metadata_log, "Contains content of Iceberg metadata files.") \
 
 #define LIST_OF_CLOUD_SYSTEM_LOGS(M) \
     M(DistributedCacheLog, distributed_cache_log, "Contains the history of all interactions with distributed cache.") \
@@ -89,7 +90,7 @@ class SystemLogs
     SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config);
     SystemLogs(const SystemLogs & other) = default;
 
-    void flush(bool should_prepare_tables_anyway, const Strings & names);
+    void flush(const Strings & names);
     void flushAndShutdown();
     void shutdown();
     void handleCrash();
@@ -105,6 +106,8 @@ class SystemLogs
 
 private:
     std::vector<ISystemLog *> getAllLogs() const;
+
+    void flushImpl(const Strings & names, bool should_prepare_tables_anyway, bool ignore_errors);
 };
 
 struct SystemLogSettings
diff --git a/src/Interpreters/TemporaryDataOnDisk.cpp b/src/Interpreters/TemporaryDataOnDisk.cpp
index 0e04725eb489..f38f823b0432 100644
--- a/src/Interpreters/TemporaryDataOnDisk.cpp
+++ b/src/Interpreters/TemporaryDataOnDisk.cpp
@@ -219,7 +219,7 @@ bool TemporaryDataReadBuffer::nextImpl()
     return true;
 }
 
-TemporaryDataBuffer::TemporaryDataBuffer(TemporaryDataOnDiskScope * parent_, size_t reserve_size)
+TemporaryDataBuffer::TemporaryDataBuffer(std::shared_ptr<TemporaryDataOnDiskScope> parent_, size_t reserve_size)
     : WriteBuffer(nullptr, 0)
     , parent(parent_)
     , file_holder(parent->file_provider(reserve_size))
@@ -313,6 +313,15 @@ void TemporaryDataBuffer::updateAllocAndCheck()
     stat.uncompressed_size = new_uncompressed_size;
 }
 
+
+void TemporaryDataBuffer::freeAlloc()
+{
+    if (parent)
+        parent->deltaAllocAndCheck(-stat.compressed_size, -stat.uncompressed_size);
+    stat.compressed_size = 0;
+    stat.uncompressed_size = 0;
+}
+
 void TemporaryDataOnDiskScope::deltaAllocAndCheck(ssize_t compressed_delta, ssize_t uncompressed_delta)
 {
     if (parent)
@@ -334,7 +343,7 @@ void TemporaryDataOnDiskScope::deltaAllocAndCheck(ssize_t compressed_delta, ssiz
     stat.uncompressed_size += uncompressed_delta;
 }
 
-TemporaryBlockStreamHolder::TemporaryBlockStreamHolder(SharedHeader header_, TemporaryDataOnDiskScope * parent_, size_t reserve_size)
+TemporaryBlockStreamHolder::TemporaryBlockStreamHolder(SharedHeader header_, std::shared_ptr<TemporaryDataOnDiskScope> parent_, size_t reserve_size)
     : WrapperGuard(std::make_unique<TemporaryDataBuffer>(parent_, reserve_size), DBMS_TCP_PROTOCOL_VERSION, header_)
 {
     /// Constant columns must be avoided since they are not supported in (de/)serialization, but we have to keep lazy columns
@@ -363,5 +372,6 @@ TemporaryDataBuffer::~TemporaryDataBuffer()
 {
     if (!finalized)
         cancel();
+    freeAlloc();
 }
 }
diff --git a/src/Interpreters/TemporaryDataOnDisk.h b/src/Interpreters/TemporaryDataOnDisk.h
index ea5482ce0973..a254f4ada3dd 100644
--- a/src/Interpreters/TemporaryDataOnDisk.h
+++ b/src/Interpreters/TemporaryDataOnDisk.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <atomic>
+#include <memory>
 #include <mutex>
 #include <boost/noncopyable.hpp>
 
@@ -184,7 +185,7 @@ class TemporaryDataBuffer : public WriteBuffer
         size_t uncompressed_size = 0;
     };
 
-    explicit TemporaryDataBuffer(TemporaryDataOnDiskScope * parent_, size_t reserve_size = 0);
+    explicit TemporaryDataBuffer(std::shared_ptr<TemporaryDataOnDiskScope> parent_, size_t reserve_size = 0);
     ~TemporaryDataBuffer() override;
 
     void nextImpl() override;
@@ -198,8 +199,9 @@ class TemporaryDataBuffer : public WriteBuffer
 
 private:
     void updateAllocAndCheck();
+    void freeAlloc();
 
-    TemporaryDataOnDiskScope * parent;
+    std::shared_ptr<TemporaryDataOnDiskScope> parent;
     std::unique_ptr<TemporaryFileHolder> file_holder;
     WrapperGuard<CompressedWriteBuffer, WriteBuffer> out_compressed_buf;
     std::once_flag write_finished;
@@ -214,7 +216,7 @@ using TemporaryBlockStreamReaderHolder = WrapperGuard<NativeReader, ReadBuffer>;
 class TemporaryBlockStreamHolder : public WrapperGuard<NativeWriter, TemporaryDataBuffer>
 {
 public:
-    TemporaryBlockStreamHolder(SharedHeader header_, TemporaryDataOnDiskScope * parent_, size_t reserve_size = 0);
+    TemporaryBlockStreamHolder(SharedHeader header_, std::shared_ptr<TemporaryDataOnDiskScope> parent_, size_t reserve_size = 0);
 
     TemporaryBlockStreamReaderHolder getReadStream() const;
 
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index dc2e09f027e5..d47d06d5c19b 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -115,10 +115,10 @@ size_t ThreadGroup::getPeakThreadsUsage() const
     return peak_threads_usage;
 }
 
-UInt64 ThreadGroup::getThreadsTotalElapsedMs() const
+UInt64 ThreadGroup::getGroupElapsedMs() const
 {
     std::lock_guard lock(mutex);
-    return elapsed_total_threads_counter_ms;
+    return elapsed_group_ms;
 }
 
 void ThreadGroup::linkThread(UInt64 thread_id)
@@ -126,16 +126,21 @@ void ThreadGroup::linkThread(UInt64 thread_id)
     std::lock_guard lock(mutex);
     thread_ids.insert(thread_id);
 
+    if (active_thread_count == 0)
+        effective_group_stopwatch.restart();
+
     ++active_thread_count;
     peak_threads_usage = std::max(peak_threads_usage, active_thread_count);
 }
 
-void ThreadGroup::unlinkThread(UInt64 elapsed_thread_counter_ms)
+void ThreadGroup::unlinkThread()
 {
     std::lock_guard lock(mutex);
     chassert(active_thread_count > 0);
     --active_thread_count;
-    elapsed_total_threads_counter_ms += elapsed_thread_counter_ms;
+
+    if (active_thread_count == 0)
+        elapsed_group_ms += effective_group_stopwatch.elapsedMilliseconds();
 }
 
 ThreadGroupPtr ThreadGroup::createForQuery(ContextPtr query_context_, std::function<void()> fatal_error_callback_)
@@ -145,36 +150,42 @@ ThreadGroupPtr ThreadGroup::createForQuery(ContextPtr query_context_, std::funct
     return group;
 }
 
-ThreadGroupPtr ThreadGroup::createForBackgroundProcess(ContextPtr storage_context)
+ThreadGroupPtr ThreadGroup::create(ContextPtr context)
 {
-    auto group = std::make_shared<ThreadGroup>(storage_context);
+    auto group = std::make_shared<ThreadGroup>(context);
 
-    group->memory_tracker.setDescription("Background process (mutate/merge)");
     /// However settings from storage context have to be applied
-    const Settings & settings = storage_context->getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     group->memory_tracker.setProfilerStep(settings[Setting::memory_profiler_step]);
     group->memory_tracker.setSampleProbability(settings[Setting::memory_profiler_sample_probability]);
     group->memory_tracker.setSampleMinAllocationSize(settings[Setting::memory_profiler_sample_min_allocation_size]);
     group->memory_tracker.setSampleMaxAllocationSize(settings[Setting::memory_profiler_sample_max_allocation_size]);
     group->memory_tracker.setSoftLimit(settings[Setting::memory_overcommit_ratio_denominator]);
-    group->memory_tracker.setParent(&background_memory_tracker);
     if (settings[Setting::memory_tracker_fault_probability] > 0.0)
         group->memory_tracker.setFaultProbability(settings[Setting::memory_tracker_fault_probability]);
 
     return group;
 }
 
-ThreadGroupPtr ThreadGroup::createForMaterializedView()
+ThreadGroupPtr ThreadGroup::createForMergeMutate(ContextPtr storage_context)
 {
-    auto current_group = CurrentThread::getGroup();
-    if (!current_group)
-        return nullptr;
-
-    auto group = std::make_shared<ThreadGroup>(current_group);
-    group->memory_tracker.setDescription("MaterializeView");
+    auto group = create(storage_context);
+    group->memory_tracker.setDescription("Background process (mutate/merge)");
+    group->memory_tracker.setParent(&background_memory_tracker);
     return group;
 }
 
+ThreadGroupPtr ThreadGroup::createForMaterializedView(ContextPtr context)
+{
+    ThreadGroupPtr res_group;
+    if (auto current_group = CurrentThread::getGroup())
+        res_group = std::make_shared<ThreadGroup>(current_group);
+    else
+        res_group = create(context);
+    res_group->memory_tracker.setDescription("MaterializeView");
+    return res_group;
+}
+
 void ThreadGroup::attachQueryForLog(const String & query_, UInt64 normalized_hash)
 {
     auto hash = normalized_hash ? normalized_hash : normalizedQueryHash(query_, false);
@@ -380,7 +391,7 @@ void ThreadStatus::detachFromGroup()
     /// Extract MemoryTracker out from query and user context
     memory_tracker.setParent(&total_memory_tracker);
 
-    thread_group->unlinkThread(thread_attach_time.elapsedMilliseconds());
+    thread_group->unlinkThread();
 
     thread_group.reset();
 
diff --git a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
index 7ef39f82cc29..0eb3c4fcefc3 100644
--- a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
+++ b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
@@ -399,4 +399,15 @@ void RestoreQualifiedNamesMatcher::visit(ASTIdentifier & identifier, ASTPtr &, D
     }
 }
 
+void ResetSemanticTableMatcher::visit(ASTPtr & ast, Data & data)
+{
+    if (auto * t = ast->as<ASTIdentifier>())
+        visit(*t, ast, data);
+}
+
+void ResetSemanticTableMatcher::visit(ASTIdentifier & identifier, ASTPtr &, Data &)
+{
+    identifier.resetSemanticTable();
+}
+
 }
diff --git a/src/Interpreters/TranslateQualifiedNamesVisitor.h b/src/Interpreters/TranslateQualifiedNamesVisitor.h
index 00c85d08873f..becff4845755 100644
--- a/src/Interpreters/TranslateQualifiedNamesVisitor.h
+++ b/src/Interpreters/TranslateQualifiedNamesVisitor.h
@@ -80,4 +80,33 @@ struct RestoreQualifiedNamesMatcher
 
 using RestoreQualifiedNamesVisitor = InDepthNodeVisitor<RestoreQualifiedNamesMatcher, true>;
 
+
+/// Reset semantic->table for all column identifiers in the AST.
+///
+/// PROBLEM DESCRIPTION:
+/// When an AST is passed through multiple query rewrites (e.g., in Hybrid -> remote),
+/// the semantic->table information attached to ASTIdentifier nodes can become stale and
+/// cause incorrect column qualification. This happens because:
+///
+/// 1. During initial parsing, semantic->table is populated with the original table name
+/// 2. When the query is rewritten (e.g., FROM clause changed from table to remote() function inside Hybrid),
+///    the AST structure is modified but semantic->table information is preserved
+/// 3. Subsequent visitors like RestoreQualifiedNamesVisitor called in remote() function over the same AST
+///    may use this stale semantic->table information to incorrectly qualify column names with the original table name
+///
+/// SOLUTION:
+/// This visitor clears semantic->table for all column identifiers, ensuring that subsequent
+/// visitors work with clean semantic information and don't apply stale table qualifications.
+struct ResetSemanticTableMatcher
+{
+    // No data needed for this visitor
+    struct Data {};
+
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+    static void visit(ASTPtr & ast, Data & data);
+    static void visit(ASTIdentifier & identifier, ASTPtr &, Data & data);
+};
+
+using ResetSemanticTableVisitor = InDepthNodeVisitor<ResetSemanticTableMatcher, true>;
+
 }
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 40ceb2303a5c..05768ab19284 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -1225,23 +1225,29 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
     /// Check for subcolumns in unknown required columns.
     if (!unknown_required_source_columns.empty() && (!storage || storage->supportsSubcolumns()))
     {
-        for (const NameAndTypePair & pair : source_columns_ordinary)
+        for (const NameAndTypePair & pair : required_source_columns)
         {
             for (auto it = unknown_required_source_columns.begin(); it != unknown_required_source_columns.end();)
             {
-                auto [column_name, subcolumn_name] = Nested::splitName(*it);
-
-                if (column_name == pair.name)
+                bool found = false;
+                for (auto [column_name, subcolumn_name] : Nested::getAllColumnAndSubcolumnPairs(*it))
                 {
-                    if (auto subcolumn_type = pair.type->tryGetSubcolumnType(subcolumn_name))
+                    if (column_name == pair.name)
                     {
-                        source_columns.emplace_back(*it, subcolumn_type);
-                        it = unknown_required_source_columns.erase(it);
-                        continue;
+                        if (auto subcolumn_type = pair.type->tryGetSubcolumnType(subcolumn_name))
+                        {
+                            source_columns.emplace_back(*it, subcolumn_type);
+                            it = unknown_required_source_columns.erase(it);
+                            found = true;
+                            break;
+                        }
                     }
                 }
 
-                ++it;
+                if (found)
+                    continue;
+                else
+                    ++it;
             }
         }
     }
diff --git a/src/Interpreters/createSubcolumnsExtractionActions.cpp b/src/Interpreters/createSubcolumnsExtractionActions.cpp
index e054fe12e348..ad0508818938 100644
--- a/src/Interpreters/createSubcolumnsExtractionActions.cpp
+++ b/src/Interpreters/createSubcolumnsExtractionActions.cpp
@@ -18,19 +18,24 @@ ActionsDAG createSubcolumnsExtractionActions(const Block & available_columns, co
     std::unordered_map<String, const ActionsDAG::Node *> input_nodes;
     for (const auto & required_column : required_columns)
     {
-        auto subcolumn = available_columns.findSubcolumnByName(required_column);
-        if (!available_columns.has(required_column) && subcolumn)
+        if (available_columns.has(required_column))
+            continue;
+
+        for (auto [column_name, subcolumn_name] : Nested::getAllColumnAndSubcolumnPairs(required_column))
         {
-            auto [column_name, subcolumn_name] = Nested::splitName(required_column);
+            const auto * column = available_columns.findByName(column_name);
+            if (!column || !column->type->tryGetSubcolumnType(subcolumn_name))
+                continue;
+
             const ActionsDAG::Node * column_input_node;
             /// Check if we don't have input with this column yet.
-            if (auto it = input_nodes.find(column_name); it == input_nodes.end())
+            if (auto it = input_nodes.find(column->name); it == input_nodes.end())
             {
-                const auto * node = &extract_subcolumns_dag.addInput(available_columns.getByName(column_name));
+                const auto * node = &extract_subcolumns_dag.addInput(available_columns.getByName(column->name));
                 extract_subcolumns_dag.getOutputs().push_back(node);
-                input_nodes[column_name] = node;
+                input_nodes[column->name] = node;
             }
-            column_input_node = input_nodes[column_name];
+            column_input_node = input_nodes[column->name];
 
             /// Create the second argument of getSubcolumn function with string
             /// containing subcolumn name and add it to the ActionsDAG.
@@ -48,6 +53,8 @@ ActionsDAG createSubcolumnsExtractionActions(const Block & available_columns, co
             /// Create an alias for getSubcolumn function so it has the name of the subcolumn.
             const auto & alias_node = extract_subcolumns_dag.addAlias(function_node, required_column);
             extract_subcolumns_dag.getOutputs().push_back(&alias_node);
+
+            break;
         }
     }
 
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index 792f7f29038f..230599735c4e 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -612,7 +612,7 @@ namespace
 
         if (!type->equals(*node->result_type))
         {
-            cast_col = tryCastColumn(column, value->result_type, node->result_type);
+            cast_col = tryCastColumn(column, type, node->result_type);
             if (!cast_col)
                 return {};
             const auto & col_nullable = assert_cast<const ColumnNullable &>(*cast_col);
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 46ef1aaafee3..eb2315253a0f 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -53,6 +53,8 @@ bool isSupportedAlterTypeForOnClusterDDLQuery(int type)
         ASTAlterCommand::ATTACH_PARTITION,
         /// Usually followed by ATTACH PARTITION
         ASTAlterCommand::FETCH_PARTITION,
+        /// Data operation that should be executed locally on each replica
+        ASTAlterCommand::EXPORT_PART,
         /// Logical error
         ASTAlterCommand::NO_TYPE,
     };
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 41a312de9e51..f3d0c19541e6 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -1185,7 +1185,7 @@ static BlockIO executeQueryImpl(
         }
         else
         {
-            query_for_logging = wipeSensitiveDataAndCutToLength(query, log_queries_cut_to_length);
+            query_for_logging = wipeSensitiveDataAndCutToLength(query, log_queries_cut_to_length, true);
         }
 
         normalized_query_hash = normalizedQueryHash(query_for_logging, false);
@@ -1196,7 +1196,7 @@ static BlockIO executeQueryImpl(
         if (query.empty())
             query.assign(begin, std::min(end - begin, static_cast<ptrdiff_t>(max_query_size)));
 
-        query_for_logging = wipeSensitiveDataAndCutToLength(query, log_queries_cut_to_length);
+        query_for_logging = wipeSensitiveDataAndCutToLength(query, log_queries_cut_to_length, true);
         logQuery(query_for_logging, context, internal, stage);
 
         if (!internal)
@@ -1336,6 +1336,8 @@ static BlockIO executeQueryImpl(
                     input_storage.setPipe(std::move(pipe));
                 }
             }
+
+            insert_query->tail.reset();
         }
         else
         {
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index 5234f5b6d7bc..291e7915dd4e 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -1,48 +1,30 @@
 #include <Interpreters/inplaceBlockConversions.h>
 
-#include <utility>
-
 #include <Core/Block.h>
-#include <Core/Settings.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/ExpressionActions.h>
-#include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTWithAlias.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTWithAlias.h>
-
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnConst.h>
-#include <DataTypes/DataTypeArray.h>
+#include <Parsers/ASTFunction.h>
+#include <utility>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/NestedUtils.h>
 #include <DataTypes/ObjectUtils.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
+#include <Common/checkStackSize.h>
 #include <Storages/ColumnsDescription.h>
+#include <DataTypes/NestedUtils.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeArray.h>
 #include <Storages/StorageInMemoryMetadata.h>
-#include <Storages/StorageDummy.h>
-#include <Common/checkStackSize.h>
-
-#include <Planner/CollectTableExpressionData.h>
-#include <Planner/Utils.h>
-#include <Planner/CollectSets.h>
-#include <Planner/PlannerActionsVisitor.h>
-#include <Analyzer/QueryTreeBuilder.h>
-#include <Analyzer/Resolve/QueryAnalyzer.h>
-#include <Analyzer/TableNode.h>
 
 
 namespace DB
 {
 
-namespace Setting
-{
-    extern const SettingsBool allow_experimental_analyzer;
-}
-
 namespace ErrorCode
 {
     extern const int LOGICAL_ERROR;
@@ -50,6 +32,7 @@ namespace ErrorCode
 
 namespace
 {
+
 /// Add all required expressions for missing columns calculation
 void addDefaultRequiredExpressionsRecursively(
     const Block & block,
@@ -190,53 +173,6 @@ std::optional<ActionsDAG> createExpressions(
     return ActionsDAG::merge(std::move(dag), std::move(actions));
 }
 
-std::optional<ActionsDAG> createExpressionsAnalyzer(
-    const Block & header,
-    ASTPtr expr_list,
-    bool save_unneeded_columns,
-    ContextPtr context)
-{
-    if (!expr_list)
-        return {};
-
-    auto execution_context = Context::createCopy(context);
-    auto expression = buildQueryTree(expr_list, execution_context);
-
-    ColumnsDescription fake_column_descriptions(header.getNamesAndTypesList());
-    auto storage = std::make_shared<StorageDummy>(StorageID{"dummy", "dummy"}, fake_column_descriptions);
-    QueryTreeNodePtr fake_table_expression = std::make_shared<TableNode>(storage, execution_context);
-
-    QueryAnalyzer analyzer(false);
-    analyzer.resolve(expression, fake_table_expression, execution_context);
-
-    GlobalPlannerContextPtr global_planner_context = std::make_shared<GlobalPlannerContext>(nullptr, nullptr, FiltersForTableExpressionMap{});
-    auto planner_context = std::make_shared<PlannerContext>(execution_context, global_planner_context, SelectQueryOptions{});
-
-    collectSourceColumns(expression, planner_context, true /*keep_alias_columns*/);
-    collectSets(expression, *planner_context);
-
-    auto actions = buildActionsDAGFromExpressionNode(expression, header.getColumnsWithTypeAndName(), planner_context, {}).first;
-    chassert(expression->getChildren().size() == actions.getOutputs().size());
-
-    NamesWithAliases result_columns;
-    for (size_t i = 0; i < expression->getChildren().size(); ++i)
-        result_columns.emplace_back(actions.getOutputs()[i]->result_name, expr_list->children[i]->getAliasOrColumnName());
-
-    if (!save_unneeded_columns)
-        actions.addAliases(result_columns);
-    else
-        actions.project(result_columns);
-
-    // Output columns without expression as-is
-    NameSet outputs;
-    for (const auto & output : actions.getOutputs())
-        outputs.insert(output->result_name);
-    for (const auto & input : actions.getInputs())
-        if (!outputs.contains(input->result_name))
-            actions.getOutputs().push_back(input);
-
-    return actions;
-}
 }
 
 void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, ContextPtr context)
@@ -245,13 +181,7 @@ void performRequiredConversions(Block & block, const NamesAndTypesList & require
     if (conversion_expr_list->children.empty())
         return;
 
-    std::optional<ActionsDAG> dag;
-    if (context->getSettingsRef()[Setting::allow_experimental_analyzer])
-        dag = createExpressionsAnalyzer(block, conversion_expr_list, true, context);
-    else
-        dag = createExpressions(block, conversion_expr_list, true, context);
-
-    if (dag)
+    if (auto dag = createExpressions(block, conversion_expr_list, true, context))
     {
         auto expression = std::make_shared<ExpressionActions>(std::move(*dag), ExpressionActionsSettings(context));
         expression->execute(block);
@@ -280,8 +210,6 @@ std::optional<ActionsDAG> evaluateMissingDefaults(
         return {};
 
     ASTPtr expr_list = defaultRequiredExpressions(header, required_columns, columns, null_as_default);
-    if (context->getSettingsRef()[Setting::allow_experimental_analyzer])
-        return createExpressionsAnalyzer(header, expr_list, save_unneeded_columns, context);
     return createExpressions(header, expr_list, save_unneeded_columns, context);
 }
 
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index e2c448c0bc93..f05508975a5b 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -538,7 +538,7 @@ void convertDatabasesEnginesIfNeed(const LoadTaskPtrs & load_metadata, ContextMu
     // Wait for all table to be loaded and started
     waitLoad(TablesLoaderForegroundPoolId, load_metadata);
 
-    for (const auto & [name, _] : DatabaseCatalog::instance().getDatabases())
+    for (const auto & [name, _] : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
         if (name != DatabaseCatalog::SYSTEM_DATABASE)
             maybeConvertOrdinaryDatabaseToAtomic(context, name);
 
diff --git a/src/Interpreters/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
index 6d581574caf1..2fe992b853e9 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.cpp
+++ b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -16,10 +16,7 @@ namespace DB
 {
 namespace Setting
 {
-    extern const SettingsBool allow_experimental_dynamic_type;
-    extern const SettingsBool allow_experimental_json_type;
     extern const SettingsBool allow_experimental_object_type;
-    extern const SettingsBool allow_experimental_variant_type;
     extern const SettingsBool allow_experimental_time_time64_type;
     extern const SettingsBool allow_suspicious_fixed_string_types;
     extern const SettingsBool allow_suspicious_low_cardinality_types;
@@ -42,11 +39,8 @@ DataTypeValidationSettings::DataTypeValidationSettings(const DB::Settings & sett
     : allow_suspicious_low_cardinality_types(settings[Setting::allow_suspicious_low_cardinality_types])
     , allow_experimental_object_type(settings[Setting::allow_experimental_object_type])
     , allow_suspicious_fixed_string_types(settings[Setting::allow_suspicious_fixed_string_types])
-    , enable_variant_type(settings[Setting::allow_experimental_variant_type])
     , allow_suspicious_variant_types(settings[Setting::allow_suspicious_variant_types])
     , validate_nested_types(settings[Setting::validate_experimental_and_suspicious_types_inside_nested_types])
-    , enable_dynamic_type(settings[Setting::allow_experimental_dynamic_type])
-    , enable_json_type(settings[Setting::allow_experimental_json_type])
     , enable_time_time64_type(settings[Setting::allow_experimental_time_time64_type])
 {
 }
@@ -100,18 +94,6 @@ void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidatio
             }
         }
 
-        if (!settings.enable_variant_type)
-        {
-            if (isVariant(data_type))
-            {
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "Cannot create column with type '{}' because Variant type is not allowed. "
-                    "Set setting enable_variant_type = 1 in order to allow it",
-                    data_type.getName());
-            }
-        }
-
         if (!settings.allow_suspicious_variant_types)
         {
             if (const auto * variant_type = typeid_cast<const DataTypeVariant *>(&data_type))
@@ -144,31 +126,6 @@ void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidatio
             }
         }
 
-        if (!settings.enable_dynamic_type)
-        {
-            if (isDynamic(data_type))
-            {
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "Cannot create column with type '{}' because Dynamic type is not allowed. "
-                    "Set setting enable_dynamic_type = 1 in order to allow it",
-                    data_type.getName());
-            }
-        }
-
-        if (!settings.enable_json_type)
-        {
-            const auto * object_type = typeid_cast<const DataTypeObject *>(&data_type);
-            if (object_type && object_type->getSchemaFormat() == DataTypeObject::SchemaFormat::JSON)
-            {
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "Cannot create column with type '{}' because JSON type is not allowed. "
-                    "Set setting enable_json_type = 1 in order to allow it",
-                    data_type.getName());
-            }
-        }
-
         if (!settings.enable_time_time64_type)
         {
             if (isTime(data_type))
diff --git a/src/Interpreters/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
index ac361901ced0..75450cde0bce 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.h
+++ b/src/Interpreters/parseColumnsListForTableFunction.h
@@ -19,11 +19,8 @@ struct DataTypeValidationSettings
     bool allow_suspicious_low_cardinality_types = true;
     bool allow_experimental_object_type = true;
     bool allow_suspicious_fixed_string_types = true;
-    bool enable_variant_type = true;
     bool allow_suspicious_variant_types = true;
     bool validate_nested_types = true;
-    bool enable_dynamic_type = true;
-    bool enable_json_type = true;
     bool enable_time_time64_type = true;
 };
 
diff --git a/src/Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.cpp b/src/Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.cpp
new file mode 100644
index 000000000000..ed817ea6a35a
--- /dev/null
+++ b/src/Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.cpp
@@ -0,0 +1,40 @@
+#include <Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/NestedUtils.h>
+
+namespace DB
+{
+
+void replaceSubcolumnsToGetSubcolumnFunctionInQuery(ASTPtr & ast, const NamesAndTypesList & columns)
+{
+    if (auto * identifier = ast->as<ASTIdentifier>())
+    {
+        if (columns.contains(identifier->getColumnName()))
+            return;
+
+        auto [column_name, subcolumn_name] = Nested::splitName(identifier->getColumnName());
+        auto column = columns.tryGetByName(column_name);
+        if (!column || !column->type->hasSubcolumn(subcolumn_name))
+            return;
+
+        ast = makeASTFunction("getSubcolumn", std::make_shared<ASTIdentifier>(column_name), std::make_shared<ASTLiteral>(subcolumn_name));
+    }
+    else if (auto * node = ast->as<ASTFunction>())
+    {
+        if (node->arguments)
+        {
+            for (auto & child : node->arguments->children)
+                replaceSubcolumnsToGetSubcolumnFunctionInQuery(child, columns);
+        }
+    }
+    else
+    {
+        for (auto & child : ast->children)
+            replaceSubcolumnsToGetSubcolumnFunctionInQuery(child, columns);
+    }
+}
+
+}
diff --git a/src/Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.h b/src/Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.h
new file mode 100644
index 000000000000..4bb88328d052
--- /dev/null
+++ b/src/Interpreters/replaceSubcolumnsToGetSubcolumnFunctionInQuery.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Core/NamesAndTypes.h>
+#include <Parsers/IAST_fwd.h>
+#include <base/types.h>
+
+namespace DB
+{
+
+/// Replace subcolumns to getSubcolumn() function.
+void replaceSubcolumnsToGetSubcolumnFunctionInQuery(ASTPtr & ast, const NamesAndTypesList & columns);
+
+}
+
diff --git a/src/Interpreters/tests/gtest_filecache.cpp b/src/Interpreters/tests/gtest_filecache.cpp
index 16197f35bcf9..13a403583f14 100644
--- a/src/Interpreters/tests/gtest_filecache.cpp
+++ b/src/Interpreters/tests/gtest_filecache.cpp
@@ -19,6 +19,7 @@
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/FileCacheSettings.h>
 #include <Interpreters/Cache/FileSegment.h>
+#include <Interpreters/Cache/EvictionCandidates.h>
 #include <Interpreters/Cache/SLRUFileCachePriority.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
@@ -1015,13 +1016,13 @@ try
 
 
     {
-        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(generateBlock()), tmp_data_scope.get());
+        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(generateBlock()), tmp_data_scope);
         ASSERT_TRUE(stream);
         /// Do nothing with stream, just create it and destroy.
     }
 
     {
-        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(generateBlock()), tmp_data_scope.get());
+        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(generateBlock()), tmp_data_scope);
         ASSERT_GT(stream->write(generateBlock(100)), 0);
 
         ASSERT_GT(file_cache.getUsedCacheSize(), 0);
@@ -1041,7 +1042,7 @@ try
 
     {
         size_t before_used_size = file_cache.getUsedCacheSize();
-        auto write_buf_stream = std::make_unique<TemporaryDataBuffer>(tmp_data_scope.get());
+        auto write_buf_stream = std::make_unique<TemporaryDataBuffer>(tmp_data_scope);
 
         write_buf_stream->write("1234567890", 10);
         write_buf_stream->write("abcde", 5);
@@ -1058,7 +1059,7 @@ try
     }
 
     {
-        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(generateBlock()), tmp_data_scope.get());
+        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(generateBlock()), tmp_data_scope);
 
         ASSERT_GT(stream->write(generateBlock(100)), 0);
 
@@ -1193,7 +1194,7 @@ TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
         auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(&file_cache, TemporaryDataOnDiskSettings{});
 
         auto block = generateBlock(/*size=*/3);
-        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(block), tmp_data_scope.get());
+        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(block), tmp_data_scope);
 
         stream->write(block);
         auto stat = stream.finishWriting();
@@ -1219,7 +1220,7 @@ TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
         auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(volume, TemporaryDataOnDiskSettings{});
 
         auto block = generateBlock(/*size=*/3);
-        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(block), tmp_data_scope.get());
+        TemporaryBlockStreamHolder stream(std::make_shared<const Block>(block), tmp_data_scope);
         stream->write(block);
         auto stat = stream.finishWriting();
 
@@ -1497,3 +1498,108 @@ TEST_F(FileCacheTest, FileCacheGetOrSet)
         assertEqual(holder, { Range(0, 19) }, { State::EMPTY });
     }
 }
+
+TEST_F(FileCacheTest, ContinueEvictionPos)
+{
+    ServerUUID::setRandomForUnitTests();
+
+    size_t max_size = 50;
+    size_t max_elements = 3;
+
+    LRUFileCachePriority priority(max_size, max_elements);
+
+    std::string cache_path = std::filesystem::path(caches_dir) / "test_eviction_pos";
+    CacheMetadata cache_metadata(cache_path, 0, 0, false);
+
+    auto key = DB::FileCacheKey::fromPath("evict_key");
+    auto user = FileCache::getCommonUser();
+
+    CachePriorityGuard cache_guard;
+    auto cache_lock = cache_guard.lock();
+    auto key_metadata = std::make_shared<KeyMetadata>(key, user, &cache_metadata);
+
+    auto add_file_segment = [&](size_t offset, size_t size)
+    {
+        auto it = priority.add(key_metadata, offset, size, user, cache_lock);
+        auto path = cache_metadata.getFileSegmentPath(key, offset, FileSegmentKind::Regular, user);
+
+        if (std::filesystem::exists(path))
+            std::filesystem::remove(path);
+
+        std::filesystem::create_directories(std::filesystem::path(path).parent_path());
+        std::string data(size, '0');
+        WriteBufferFromFile wb(path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+        DB::writeString(data, wb);
+        wb.finalize();
+
+        auto file_segment = std::make_shared<FileSegment>(
+            key, offset, size, FileSegment::State::DOWNLOADED,
+            CreateFileSegmentSettings{}, false, nullptr, key_metadata, it);
+
+        LockedKey(key_metadata).emplace(offset, std::make_shared<FileSegmentMetadata>(std::move(file_segment)));
+        return it;
+    };
+
+    auto get_file_segment = [&](size_t offset)
+    {
+        return LockedKey(key_metadata).getByOffset(offset)->file_segment;
+    };
+
+    auto it1 = add_file_segment(0, 10);
+    auto it2 = add_file_segment(10, 10);
+
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 2);
+    ASSERT_EQ(priority.getEvictionPos(), 2); /// queue.end()
+
+    FileCacheReserveStat stat;
+    auto evicted = std::make_unique<EvictionCandidates>();
+    priority.collectCandidatesForEviction(10, 1, stat, *evicted, nullptr, false, user.user_id, cache_lock);
+
+    ASSERT_EQ(evicted->size(), 0); /// Nothing is evicted.
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 2);
+    ASSERT_EQ(priority.getEvictionPos(), 2); /// queue.end()
+
+    auto it3 = add_file_segment(20, 10);
+
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 3);
+    ASSERT_EQ(priority.getEvictionPos(), 3); /// queue.end()
+
+    evicted = std::make_unique<EvictionCandidates>();
+    stat = {};
+    priority.collectCandidatesForEviction(10, 1, stat, *evicted, nullptr, true, user.user_id, cache_lock);
+
+    ASSERT_EQ(evicted->size(), 1);
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 3);
+    ASSERT_EQ(priority.getEvictionPos(), 0); /// queue.begin()
+
+    evicted->evict();
+    evicted->finalize(nullptr, cache_lock);
+    evicted.reset();
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 2);
+    ASSERT_EQ(priority.getEvictionPos(), 0); /// still queue.begin(), but it2
+
+    /// Make fs2 (it2) non-evictable.
+    auto fs2 = get_file_segment(10);
+    ASSERT_EQ(it2->getEntry()->offset, fs2->offset());
+    /// Make fs3 (it3) non-evictable.
+    auto fs3 = get_file_segment(20);
+    ASSERT_EQ(it3->getEntry()->offset, fs3->offset());
+
+    auto it4 = add_file_segment(30, 10);
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 3);
+    ASSERT_EQ(priority.getEvictionPos(), 0);
+
+    evicted = std::make_unique<EvictionCandidates>();
+    stat = {};
+    priority.collectCandidatesForEviction(10, 1, stat, *evicted, nullptr, true, user.user_id, cache_lock);
+
+    ASSERT_EQ(evicted->size(), 1);
+    ASSERT_EQ(priority.getElementsCount(cache_lock), 3);
+    ASSERT_EQ(priority.getEvictionPos(), 2); /// Last element in the queue.
+
+    fs2.reset();
+    fs3.reset();
+
+    priority.resetEvictionPos(cache_lock);
+    ASSERT_EQ(priority.getEvictionPos(), 3); /// queue.end()
+}
diff --git a/src/Interpreters/tests/gtest_mark_ranges_memory_tracking.cpp b/src/Interpreters/tests/gtest_mark_ranges_memory_tracking.cpp
new file mode 100644
index 000000000000..1e1d884140b3
--- /dev/null
+++ b/src/Interpreters/tests/gtest_mark_ranges_memory_tracking.cpp
@@ -0,0 +1,45 @@
+#include <gtest/gtest.h>
+
+#include <Common/MemoryTracker.h>
+#include <Common/scope_guard_safe.h>
+#include <Common/CurrentThread.h>
+#include <Common/thread_local_rng.h>
+#include <Storages/MergeTree/MarkRange.h>
+
+#include <random>
+
+using namespace DB;
+
+TEST(MarkRanges, MemoryTracking)
+{
+    MainThreadStatus::getInstance();
+    total_memory_tracker.resetCounters();
+    CurrentThread::get().memory_tracker.resetCounters();
+
+    total_memory_tracker.setHardLimit(1_KiB);
+    CurrentThread::get().memory_tracker.setHardLimit(1_KiB);
+
+    SCOPE_EXIT_SAFE(total_memory_tracker.setHardLimit(0));
+    SCOPE_EXIT_SAFE(CurrentThread::get().memory_tracker.setHardLimit(0));
+
+    constexpr size_t num_ranges = 1'000'000;
+    std::uniform_int_distribution<size_t> dist(0, 1'000'000);
+
+    MarkRanges ranges;
+
+    try
+    {
+        for (size_t i = 0; i < num_ranges; ++i)
+        {
+            size_t begin = dist(thread_local_rng);
+            size_t end = begin + dist(thread_local_rng) % 1000 + 1;
+            ranges.emplace_back(begin, end);
+        }
+    }
+    catch (DB::Exception &)
+    {
+        return;
+    }
+
+    FAIL() << "Expected memory limit exception was not thrown";
+}
diff --git a/src/Loggers/Loggers.cpp b/src/Loggers/Loggers.cpp
index e8aa90850ecb..b544b70ed125 100644
--- a/src/Loggers/Loggers.cpp
+++ b/src/Loggers/Loggers.cpp
@@ -67,6 +67,37 @@ static std::string renderFileNameTemplate(time_t now, const std::string & file_p
     return path.replace_filename(ss.str());
 }
 
+Poco::AutoPtr<OwnPatternFormatter> getFormatForChannel(Poco::Util::AbstractConfiguration & config, const std::string & channel, bool color)
+{
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys("logger", keys);
+
+    std::string config_prefix_for_channel;
+    std::string config_prefix_global;
+    for (const auto & key : keys)
+    {
+        if (key != "formatting" && !key.starts_with("formatting["))
+            continue;
+
+        if (config.getString(fmt::format("logger.{}.channel", key), "") == channel)
+        {
+            config_prefix_for_channel = "logger." + key;
+            break;
+        }
+        if (config.getString(fmt::format("logger.{}.channel", key), "").empty())
+        {
+            config_prefix_global = "logger." + key;
+            break;
+        }
+    }
+
+    const auto & config_prefix = config_prefix_for_channel.empty() ? config_prefix_global : config_prefix_for_channel;
+    if (config.getString(config_prefix + ".type", "") == "json")
+        return new OwnJSONPatternFormatter(config, config_prefix);
+    else
+        return new OwnPatternFormatter(color);
+}
+
 /// NOLINTBEGIN(readability-static-accessed-through-instance)
 
 void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Logger & logger /*_root*/, const std::string & cmd_name)
@@ -124,13 +155,7 @@ 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;
-
-        if (config.getString("logger.formatting.type", "") == "json")
-            pf = new OwnJSONPatternFormatter(config);
-        else
-            pf = new OwnPatternFormatter;
-
+        Poco::AutoPtr<OwnPatternFormatter> pf = getFormatForChannel(config, "log");
         auto log = std::make_shared<DB::OwnFormattingChannel>(pf, log_file);
         split->addChannel(
             log, "FileLog", log_level, ProfileEvents::AsyncLoggingFileLogTotalMessages, ProfileEvents::AsyncLoggingFileLogDroppedMessages);
@@ -163,13 +188,7 @@ 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;
-
-        if (config.getString("logger.formatting.type", "") == "json")
-            pf = new OwnJSONPatternFormatter(config);
-        else
-            pf = new OwnPatternFormatter;
-
+        Poco::AutoPtr<OwnPatternFormatter> pf = getFormatForChannel(config, "errorlog");
         auto errorlog = std::make_shared<DB::OwnFormattingChannel>(pf, error_log_file);
         errorlog->open();
         split->addChannel(
@@ -207,13 +226,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         }
         syslog_channel->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf;
-
-        if (config.getString("logger.formatting.type", "") == "json")
-            pf = new OwnJSONPatternFormatter(config);
-        else
-            pf = new OwnPatternFormatter;
-
+        Poco::AutoPtr<OwnPatternFormatter> pf = getFormatForChannel(config, "syslog");
         auto log = std::make_shared<DB::OwnFormattingChannel>(pf, syslog_channel);
         split->addChannel(
             log, "Syslog", syslog_level, ProfileEvents::AsyncLoggingSyslogTotalMessages, ProfileEvents::AsyncLoggingSyslogDroppedMessages);
@@ -231,11 +244,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         auto console_log_level = Poco::Logger::parseLevel(console_log_level_string);
         max_log_level = std::max(console_log_level, max_log_level);
 
-        Poco::AutoPtr<OwnPatternFormatter> pf;
-        if (config.getString("logger.formatting.type", "") == "json")
-            pf = new OwnJSONPatternFormatter(config);
-        else
-            pf = new OwnPatternFormatter(color_enabled);
+        Poco::AutoPtr<OwnPatternFormatter> pf = getFormatForChannel(config, "console", color_enabled);
         auto log = std::make_shared<DB::OwnFormattingChannel>(pf, new Poco::ConsoleChannel);
         split->addChannel(
             log,
diff --git a/src/Loggers/Loggers.h b/src/Loggers/Loggers.h
index eae8e43b15b6..09b2e869fe51 100644
--- a/src/Loggers/Loggers.h
+++ b/src/Loggers/Loggers.h
@@ -50,3 +50,6 @@ class Loggers
 
     Poco::AutoPtr<DB::OwnSplitChannelBase> split;
 };
+
+class OwnPatternFormatter;
+Poco::AutoPtr<OwnPatternFormatter> getFormatForChannel(Poco::Util::AbstractConfiguration & config, const std::string & channel, bool color = false);
diff --git a/src/Loggers/OwnJSONPatternFormatter.cpp b/src/Loggers/OwnJSONPatternFormatter.cpp
index c94e8cad38ee..956ae24d3bf6 100644
--- a/src/Loggers/OwnJSONPatternFormatter.cpp
+++ b/src/Loggers/OwnJSONPatternFormatter.cpp
@@ -1,6 +1,5 @@
 #include <Loggers/OwnJSONPatternFormatter.h>
 
-#include <functional>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/InternalTextLogsQueue.h>
@@ -11,37 +10,37 @@
 #include <Common/DateLUTImpl.h>
 
 
-OwnJSONPatternFormatter::OwnJSONPatternFormatter(Poco::Util::AbstractConfiguration & config)
+OwnJSONPatternFormatter::OwnJSONPatternFormatter(Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
 {
-    if (config.has("logger.formatting.names.date_time"))
-        date_time = config.getString("logger.formatting.names.date_time", "");
+    if (config.has(config_prefix + ".names.date_time"))
+        date_time = config.getString(config_prefix + ".names.date_time", "");
 
-    if (config.has("logger.formatting.names.date_time_utc"))
-        date_time_utc= config.getString("logger.formatting.names.date_time_utc", "");
+    if (config.has(config_prefix + ".names.date_time_utc"))
+        date_time_utc= config.getString(config_prefix + ".names.date_time_utc", "");
 
-    if (config.has("logger.formatting.names.thread_name"))
-        thread_name = config.getString("logger.formatting.names.thread_name", "");
+    if (config.has(config_prefix + ".names.thread_name"))
+        thread_name = config.getString(config_prefix + ".names.thread_name", "");
 
-    if (config.has("logger.formatting.names.thread_id"))
-        thread_id = config.getString("logger.formatting.names.thread_id", "");
+    if (config.has(config_prefix + ".names.thread_id"))
+        thread_id = config.getString(config_prefix + ".names.thread_id", "");
 
-    if (config.has("logger.formatting.names.level"))
-        level = config.getString("logger.formatting.names.level", "");
+    if (config.has(config_prefix + ".names.level"))
+        level = config.getString(config_prefix + ".names.level", "");
 
-    if (config.has("logger.formatting.names.query_id"))
-        query_id = config.getString("logger.formatting.names.query_id", "");
+    if (config.has(config_prefix + ".names.query_id"))
+        query_id = config.getString(config_prefix + ".names.query_id", "");
 
-    if (config.has("logger.formatting.names.logger_name"))
-        logger_name = config.getString("logger.formatting.names.logger_name", "");
+    if (config.has(config_prefix + ".names.logger_name"))
+        logger_name = config.getString(config_prefix + ".names.logger_name", "");
 
-    if (config.has("logger.formatting.names.message"))
-        message = config.getString("logger.formatting.names.message", "");
+    if (config.has(config_prefix + ".names.message"))
+        message = config.getString(config_prefix + ".names.message", "");
 
-    if (config.has("logger.formatting.names.source_file"))
-        source_file = config.getString("logger.formatting.names.source_file", "");
+    if (config.has(config_prefix + ".names.source_file"))
+        source_file = config.getString(config_prefix + ".names.source_file", "");
 
-    if (config.has("logger.formatting.names.source_line"))
-        source_line = config.getString("logger.formatting.names.source_line", "");
+    if (config.has(config_prefix + ".names.source_line"))
+        source_line = config.getString(config_prefix + ".names.source_line", "");
 
     if (date_time.empty() && thread_name.empty() && thread_id.empty() && level.empty() && query_id.empty()
         && logger_name.empty() && message.empty() && source_file.empty() && source_line.empty())
diff --git a/src/Loggers/OwnJSONPatternFormatter.h b/src/Loggers/OwnJSONPatternFormatter.h
index 29fb598034aa..8de0900e1530 100644
--- a/src/Loggers/OwnJSONPatternFormatter.h
+++ b/src/Loggers/OwnJSONPatternFormatter.h
@@ -26,7 +26,7 @@ class Loggers;
 class OwnJSONPatternFormatter : public OwnPatternFormatter
 {
 public:
-    explicit OwnJSONPatternFormatter(Poco::Util::AbstractConfiguration & config);
+    explicit OwnJSONPatternFormatter(Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 
     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/OwnSplitChannel.cpp b/src/Loggers/OwnSplitChannel.cpp
index 1924eeff395c..dd2e6e9de74a 100644
--- a/src/Loggers/OwnSplitChannel.cpp
+++ b/src/Loggers/OwnSplitChannel.cpp
@@ -138,7 +138,6 @@ void logToSystemTextLogQueue(
 void OwnSplitChannel::logSplit(
     const ExtendedLogMessage & msg_ext, const std::shared_ptr<InternalTextLogsQueue> & logs_queue, const std::string & msg_thread_name)
 {
-    LockMemoryExceptionInThread lock_memory_tracker(VariableContext::Global);
     const Poco::Message & msg = *msg_ext.base;
 
     try
@@ -393,7 +392,6 @@ void OwnAsyncSplitChannel::log(const Poco::Message & msg)
 
 void OwnAsyncSplitChannel::log(Poco::Message && msg)
 {
-    LockMemoryExceptionInThread lock_memory_tracker(VariableContext::Global);
     try
     {
         /// Based on logger_useful.h this won't be called if the message is not needed
@@ -489,20 +487,40 @@ void OwnAsyncSplitChannel::runChannel(size_t i)
 
     while (is_open)
     {
-        log_notification(notification);
-        notification = queues[i]->waitDequeueMessage();
+        try
+        {
+            log_notification(notification);
+            notification = queues[i]->waitDequeueMessage();
+        }
+        catch (...)
+        {
+            const std::string & exception_message = getCurrentExceptionMessage(true);
+            writeRetry(STDERR_FILENO, "Cannot log message in OwnAsyncSplitChannel channel: ");
+            writeRetry(STDERR_FILENO, exception_message.data(), exception_message.size());
+            writeRetry(STDERR_FILENO, "\n");
+        }
     }
 
-    /// Flush everything before closing
-    log_notification(notification);
-
-    /// We want to process only what's currently in the queue and not block other logging
-    auto queue = queues[i]->getCurrentQueueAndClear();
-    while (!queue.empty())
+    try
     {
-        notification = queue.front();
-        queue.pop_front();
+        /// Flush everything before closing
         log_notification(notification);
+
+        /// We want to process only what's currently in the queue and not block other logging
+        auto queue = queues[i]->getCurrentQueueAndClear();
+        while (!queue.empty())
+        {
+            notification = queue.front();
+            queue.pop_front();
+            log_notification(notification);
+        }
+    }
+    catch (...)
+    {
+        const std::string & exception_message = getCurrentExceptionMessage(true);
+        writeRetry(STDERR_FILENO, "Cannot flush messages in OwnAsyncSplitChannel channel: ");
+        writeRetry(STDERR_FILENO, exception_message.data(), exception_message.size());
+        writeRetry(STDERR_FILENO, "\n");
     }
 }
 
@@ -532,40 +550,59 @@ void OwnAsyncSplitChannel::runTextLog()
     auto notification = text_log_queue.waitDequeueMessage();
     while (is_open)
     {
-        if (flush_text_logs)
+        try
         {
-            auto text_log_locked = text_log.lock();
-            if (!text_log_locked)
-                return;
+            if (flush_text_logs)
+            {
+                auto text_log_locked = text_log.lock();
+                if (!text_log_locked)
+                    return;
 
-            if (notification)
-                log_notification(notification, text_log_locked);
+                if (notification)
+                    log_notification(notification, text_log_locked);
 
-            flush_queue(text_log_locked);
+                flush_queue(text_log_locked);
 
-            flush_text_logs = false;
-            flush_text_logs.notify_all();
+                flush_text_logs = false;
+                flush_text_logs.notify_all();
+            }
+            else if (notification)
+            {
+                auto text_log_locked = text_log.lock();
+                if (!text_log_locked)
+                    return;
+                log_notification(notification, text_log_locked);
+            }
+
+            notification = text_log_queue.waitDequeueMessage();
         }
-        else if (notification)
+        catch (...)
         {
-            auto text_log_locked = text_log.lock();
-            if (!text_log_locked)
-                return;
-            log_notification(notification, text_log_locked);
+            const std::string & exception_message = getCurrentExceptionMessage(true);
+            writeRetry(STDERR_FILENO, "Cannot log message in OwnAsyncSplitChannel text log: ");
+            writeRetry(STDERR_FILENO, exception_message.data(), exception_message.size());
+            writeRetry(STDERR_FILENO, "\n");
         }
-
-        notification = text_log_queue.waitDequeueMessage();
     }
 
-    /// We want to flush everything already in the queue before closing so all messages are logged
-    auto text_log_locked = text_log.lock();
-    if (!text_log_locked)
-        return;
-
-    if (notification)
-        log_notification(notification, text_log_locked);
+    try
+    {
+        /// We want to flush everything already in the queue before closing so all messages are logged
+        auto text_log_locked = text_log.lock();
+        if (!text_log_locked)
+            return;
 
-    flush_queue(text_log_locked);
+        if (notification)
+            log_notification(notification, text_log_locked);
+        flush_queue(text_log_locked);
+    }
+    catch (...)
+    {
+        const std::string & exception_message = getCurrentExceptionMessage(true);
+        writeRetry(STDERR_FILENO, "Cannot flush queue in OwnAsyncSplitChannel text log: ");
+        writeRetry(STDERR_FILENO, exception_message.data(), exception_message.size());
+        writeRetry(STDERR_FILENO, "\n");
+    }
 }
 
 void OwnAsyncSplitChannel::setChannelProperty(const std::string & channel_name, const std::string & name, const std::string & value)
diff --git a/src/Loggers/OwnSplitChannel.h b/src/Loggers/OwnSplitChannel.h
index dee2c24af72e..436026e60265 100644
--- a/src/Loggers/OwnSplitChannel.h
+++ b/src/Loggers/OwnSplitChannel.h
@@ -33,6 +33,8 @@ using TextLogQueue = SystemLogQueue<TextLogElement>;
 using AsyncLogQueueSize = std::pair<std::string, size_t>;
 using AsyncLogQueueSizes = std::vector<AsyncLogQueueSize>;
 
+class ExtendedLogMessage;
+
 class OwnSplitChannelBase : public Poco::Channel
 {
 public:
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index 32f2156b5cde..1bb3c413e81b 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -65,6 +65,10 @@ ASTPtr ASTAlterCommand::clone() const
         res->sql_security = res->children.emplace_back(sql_security->clone()).get();
     if (rename_to)
         res->rename_to = res->children.emplace_back(rename_to->clone()).get();
+    if (to_table_function)
+        res->to_table_function = res->children.emplace_back(to_table_function->clone()).get();
+    if (partition_by_expr)
+        res->partition_by_expr = res->children.emplace_back(partition_by_expr->clone()).get();
 
     return res;
 }
@@ -358,6 +362,49 @@ void ASTAlterCommand::formatImpl(WriteBuffer & ostr, const FormatSettings & sett
             ostr << quoteString(move_destination_name);
         }
     }
+    else if (type == ASTAlterCommand::EXPORT_PART)
+    {
+        ostr << "EXPORT PART ";
+        partition->format(ostr, settings, state, frame);
+        ostr << " TO ";
+        switch (move_destination_type)
+        {
+            case DataDestinationType::TABLE:
+                ostr << "TABLE ";
+                if (to_table_function)
+                {
+                    ostr << "FUNCTION ";
+                    to_table_function->format(ostr, settings, state, frame);
+                    if (partition_by_expr)
+                    {
+                        ostr << " PARTITION BY ";
+                        partition_by_expr->format(ostr, settings, state, frame);
+                    }
+                }
+                else
+                {
+                    if (!to_database.empty())
+                        ostr << backQuoteIfNeed(to_database) << ".";
+
+                    ostr << backQuoteIfNeed(to_table);
+                }
+                return;
+            default:
+                break;
+        }
+
+    }
+    else if (type == ASTAlterCommand::EXPORT_PARTITION)
+    {
+        ostr << "EXPORT PARTITION ";
+        partition->format(ostr, settings, state, frame);
+        ostr << " TO TABLE ";
+        if (!to_database.empty())
+        {
+            ostr << backQuoteIfNeed(to_database) << ".";
+        }
+        ostr << backQuoteIfNeed(to_table);
+    }
     else if (type == ASTAlterCommand::REPLACE_PARTITION)
     {
         ostr << (replace ? "REPLACE" : "ATTACH") << " PARTITION "
@@ -553,6 +600,8 @@ void ASTAlterCommand::forEachPointerToChild(std::function<void(void**)> f)
     f(reinterpret_cast<void **>(&select));
     f(reinterpret_cast<void **>(&sql_security));
     f(reinterpret_cast<void **>(&rename_to));
+    f(reinterpret_cast<void **>(&to_table_function));
+    f(reinterpret_cast<void **>(&partition_by_expr));
 }
 
 
@@ -627,6 +676,11 @@ bool ASTAlterQuery::isMovePartitionToDiskOrVolumeAlter() const
     return false;
 }
 
+bool ASTAlterQuery::isExportPartAlter() const
+{
+    return isOneCommandTypeOnly(ASTAlterCommand::EXPORT_PART);
+}
+
 
 /** Get the text that identifies this element. */
 String ASTAlterQuery::getID(char delim) const
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index 3867a86cf797..49800e833b22 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -71,6 +71,8 @@ class ASTAlterCommand : public IAST
         FREEZE_ALL,
         UNFREEZE_PARTITION,
         UNFREEZE_ALL,
+        EXPORT_PART,
+        EXPORT_PARTITION,
 
         DELETE,
         UPDATE,
@@ -218,6 +220,9 @@ class ASTAlterCommand : public IAST
     /// MOVE PARTITION partition TO TABLE db.table
     String to_database;
     String to_table;
+    /// EXPORT PART/PARTITION to TABLE FUNCTION (e.g., s3())
+    IAST * to_table_function = nullptr;
+    IAST * partition_by_expr = nullptr;
 
     String snapshot_name;
     IAST * snapshot_desc;
@@ -263,6 +268,8 @@ class ASTAlterQuery : public ASTQueryWithTableAndOutput, public ASTQueryWithOnCl
 
     bool isMovePartitionToDiskOrVolumeAlter() const;
 
+    bool isExportPartAlter() const;
+
     bool isCommentAlter() const;
 
     String getID(char) const override;
diff --git a/src/Parsers/ASTIdentifier.cpp b/src/Parsers/ASTIdentifier.cpp
index 490116cfc6cf..0767516aa74a 100644
--- a/src/Parsers/ASTIdentifier.cpp
+++ b/src/Parsers/ASTIdentifier.cpp
@@ -167,6 +167,17 @@ void ASTIdentifier::restoreTable()
     }
 }
 
+void ASTIdentifier::resetSemanticTable()
+{
+    // Only reset semantic table for column identifiers (not table identifiers)
+    if (semantic && !semantic->special)
+    {
+        semantic->table.clear();
+        semantic->can_be_alias = true;
+        semantic->membership = std::nullopt;
+    }
+}
+
 std::shared_ptr<ASTTableIdentifier> ASTIdentifier::createTable() const
 {
     if (name_parts.size() == 1) return std::make_shared<ASTTableIdentifier>(name_parts[0]);
diff --git a/src/Parsers/ASTIdentifier.h b/src/Parsers/ASTIdentifier.h
index 72dde7f644fb..3ea66264ca24 100644
--- a/src/Parsers/ASTIdentifier.h
+++ b/src/Parsers/ASTIdentifier.h
@@ -52,6 +52,7 @@ class ASTIdentifier : public ASTWithAlias
     void updateTreeHashImpl(SipHash & hash_state, bool ignore_alias) const override;
 
     void restoreTable();  // TODO(ilezhankin): get rid of this
+    void resetSemanticTable();  // Reset semantic to empty string (see ResetSemanticTableVisitor)
     std::shared_ptr<ASTTableIdentifier> createTable() const;  // returns |nullptr| if identifier is not table.
 
     String full_name;
diff --git a/src/Parsers/ASTKillQueryQuery.cpp b/src/Parsers/ASTKillQueryQuery.cpp
index 0334b78d559e..9911e60b5ed9 100644
--- a/src/Parsers/ASTKillQueryQuery.cpp
+++ b/src/Parsers/ASTKillQueryQuery.cpp
@@ -27,6 +27,9 @@ void ASTKillQueryQuery::formatQueryImpl(WriteBuffer & ostr, const FormatSettings
         case Type::Transaction:
             ostr << "TRANSACTION";
             break;
+        case Type::ExportPartition:
+            ostr << "EXPORT PARTITION";
+            break;
     }
 
     formatOnCluster(ostr, settings);
diff --git a/src/Parsers/ASTKillQueryQuery.h b/src/Parsers/ASTKillQueryQuery.h
index 99a14c56d72b..13d2811534f0 100644
--- a/src/Parsers/ASTKillQueryQuery.h
+++ b/src/Parsers/ASTKillQueryQuery.h
@@ -13,6 +13,7 @@ class ASTKillQueryQuery : public ASTQueryWithOutput, public ASTQueryWithOnCluste
     {
         Query,      /// KILL QUERY
         Mutation,   /// KILL MUTATION
+        ExportPartition, /// KILL EXPORT_PARTITION
         PartMoveToShard, /// KILL PART_MOVE_TO_SHARD
         Transaction,     /// KILL TRANSACTION
     };
diff --git a/src/Parsers/ASTObjectTypeArgument.cpp b/src/Parsers/ASTObjectTypeArgument.cpp
index c8aaf950deb1..c33e8050dcfc 100644
--- a/src/Parsers/ASTObjectTypeArgument.cpp
+++ b/src/Parsers/ASTObjectTypeArgument.cpp
@@ -1,11 +1,39 @@
 #include <IO/Operators.h>
 #include <Parsers/ASTObjectTypeArgument.h>
 #include <Parsers/CommonParsers.h>
+#include <Common/quoteString.h>
+#include <boost/algorithm/string.hpp>
 
 
 namespace DB
 {
 
+ASTPtr ASTObjectTypedPathArgument::clone() const
+{
+    auto res = std::make_shared<ASTObjectTypedPathArgument>(*this);
+    res->children.clear();
+
+    if (type)
+    {
+        res->type = type->clone();
+        res->children.push_back(res->type);
+    }
+
+    return res;
+}
+
+void ASTObjectTypedPathArgument::formatImpl(
+    WriteBuffer & ostr, const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    /// We must quote path "SKIP" to avoid its confusion with SKIP keyword in Object arguments.
+    if (boost::to_upper_copy(path) == "SKIP")
+        ostr << backQuote(path) << ' ';
+    else
+        ostr << backQuoteIfNeed(path) << ' ';
+
+    type->format(ostr, settings, state, frame);
+}
+
 ASTPtr ASTObjectTypeArgument::clone() const
 {
     auto res = std::make_shared<ASTObjectTypeArgument>(*this);
diff --git a/src/Parsers/ASTObjectTypeArgument.h b/src/Parsers/ASTObjectTypeArgument.h
index 19db28b03989..0ddd353c3abb 100644
--- a/src/Parsers/ASTObjectTypeArgument.h
+++ b/src/Parsers/ASTObjectTypeArgument.h
@@ -6,6 +6,23 @@
 namespace DB
 {
 
+/// A pair of  Object path and its data type. For example: a.b.c String.
+class ASTObjectTypedPathArgument : public IAST
+{
+public:
+    /// path
+    String path;
+    /// type
+    ASTPtr type;
+
+    /** Get the text that identifies this element. */
+    String getID(char delim) const override { return "ObjectTypedPath" + (delim + path); }
+    ASTPtr clone() const override;
+
+protected:
+    void formatImpl(WriteBuffer & ostr, const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+};
+
 /** An argument of Object data type declaration (for example for JSON). Can contain one of:
  *  - pair (path, data type)
  *  - path that should be skipped
diff --git a/src/Parsers/ASTSetQuery.cpp b/src/Parsers/ASTSetQuery.cpp
index 94e2ee5fbfc2..f5962b64c954 100644
--- a/src/Parsers/ASTSetQuery.cpp
+++ b/src/Parsers/ASTSetQuery.cpp
@@ -129,7 +129,8 @@ void ASTSetQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & format,
                 return true;
             }
 
-            if (DataLake::DATABASE_ENGINE_NAME == state.create_engine_name)
+            if (DataLake::DATABASE_ENGINE_NAME == state.create_engine_name
+                    || DataLake::DATABASE_ALIAS_NAME == state.create_engine_name)
             {
                 if (DataLake::SETTINGS_TO_HIDE.contains(change.name))
                 {
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index 9cdd034f2ca3..00925e561219 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -163,7 +163,13 @@ void ASTSystemQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & setti
 
     print_keyword("SYSTEM") << " ";
     print_keyword(typeToString(type));
-    if (!cluster.empty())
+
+    std::unordered_set<Type> queries_with_on_cluster_at_end = {
+        Type::DROP_FILESYSTEM_CACHE,
+        Type::SYNC_FILESYSTEM_CACHE,
+    };
+
+    if (!queries_with_on_cluster_at_end.contains(type) && !cluster.empty())
         formatOnCluster(ostr, settings);
 
     switch (type)
@@ -484,6 +490,8 @@ void ASTSystemQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & setti
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
         case Type::DROP_S3_CLIENT_CACHE:
         case Type::DROP_ICEBERG_METADATA_CACHE:
+        case Type::DROP_OBJECT_STORAGE_LIST_OBJECTS_CACHE:
+        case Type::DROP_PARQUET_METADATA_CACHE:
         case Type::RESET_COVERAGE:
         case Type::RESTART_REPLICAS:
         case Type::JEMALLOC_PURGE:
@@ -510,11 +518,16 @@ void ASTSystemQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & setti
         case Type::DROP_PAGE_CACHE:
         case Type::STOP_REPLICATED_DDL_QUERIES:
         case Type::START_REPLICATED_DDL_QUERIES:
+        case Type::STOP_SWARM_MODE:
+        case Type::START_SWARM_MODE:
             break;
         case Type::UNKNOWN:
         case Type::END:
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown SYSTEM command");
     }
+
+    if (queries_with_on_cluster_at_end.contains(type) && !cluster.empty())
+        formatOnCluster(ostr, settings);
 }
 
 
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index cb21d3d12ba2..22a0dab53e25 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -41,6 +41,8 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
         DROP_SCHEMA_CACHE,
         DROP_FORMAT_SCHEMA_CACHE,
         DROP_S3_CLIENT_CACHE,
+        DROP_OBJECT_STORAGE_LIST_OBJECTS_CACHE,
+        DROP_PARQUET_METADATA_CACHE,
         STOP_LISTEN,
         START_LISTEN,
         RESTART_REPLICAS,
@@ -80,6 +82,8 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
         START_FETCHES,
         STOP_MOVES,
         START_MOVES,
+        STOP_SWARM_MODE,
+        START_SWARM_MODE,
         STOP_REPLICATED_SENDS,
         START_REPLICATED_SENDS,
         STOP_REPLICATION_QUEUES,
diff --git a/src/Parsers/Access/ASTAuthenticationData.cpp b/src/Parsers/Access/ASTAuthenticationData.cpp
index 35e7d2032d83..7fe8de9bdb5b 100644
--- a/src/Parsers/Access/ASTAuthenticationData.cpp
+++ b/src/Parsers/Access/ASTAuthenticationData.cpp
@@ -116,8 +116,11 @@ void ASTAuthenticationData::formatImpl(WriteBuffer & ostr, const FormatSettings
             }
             case AuthenticationType::JWT:
             {
-                prefix = "CLAIMS";
-                parameter = true;
+                if (!children.empty())
+                {
+                    prefix = "CLAIMS";
+                    parameter = true;
+                }
                 break;
             }
             case AuthenticationType::LDAP:
diff --git a/src/Parsers/Access/ASTCreateUserQuery.h b/src/Parsers/Access/ASTCreateUserQuery.h
index ff1ec4f12705..ae0485773489 100644
--- a/src/Parsers/Access/ASTCreateUserQuery.h
+++ b/src/Parsers/Access/ASTCreateUserQuery.h
@@ -17,7 +17,7 @@ class ASTAuthenticationData;
 
 
 /** CREATE USER [IF NOT EXISTS | OR REPLACE] name
-  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']|{WITH jwt [CLAIMS 'json_object']}}]
   *     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
   *     [DEFAULT ROLE role [,...]]
   *     [DEFAULT DATABASE database | NONE]
@@ -26,7 +26,7 @@ class ASTAuthenticationData;
   *
   * ALTER USER [IF EXISTS] name
   *     [RENAME TO new_name]
-  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']|{WITH jwt [CLAIMS 'json_object']}}]
   *     [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
   *     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
   *     [DEFAULT DATABASE database | NONE]
diff --git a/src/Parsers/Access/ParserCreateUserQuery.cpp b/src/Parsers/Access/ParserCreateUserQuery.cpp
index 1f3b0089410b..3c98fe81ae9b 100644
--- a/src/Parsers/Access/ParserCreateUserQuery.cpp
+++ b/src/Parsers/Access/ParserCreateUserQuery.cpp
@@ -83,6 +83,7 @@ namespace
             bool expect_ssl_cert_subjects = false;
             bool expect_public_ssh_key = false;
             bool expect_http_auth_server = false;
+            bool expect_claims = false;   // NOLINT
 
             auto parse_non_password_based_type = [&](auto check_type)
             {
@@ -105,6 +106,7 @@ namespace
                         expect_http_auth_server = true;
                     else if (check_type == AuthenticationType::JWT)
                         throw Exception(ErrorCodes::BAD_ARGUMENTS, "CREATE USER is not supported for JWT");
+                        // expect_claims = true;
                     else if (check_type != AuthenticationType::NO_PASSWORD)
                         expect_password = true;
 
@@ -165,6 +167,7 @@ namespace
             ASTPtr http_auth_scheme;
             ASTPtr ssl_cert_subjects;
             std::optional<String> ssl_cert_subject_type;
+            ASTPtr jwt_claims;
 
             if (expect_password || expect_hash)
             {
@@ -229,6 +232,14 @@ namespace
                         return false;
                 }
             }
+            else if (expect_claims)
+            {
+                if (ParserKeyword{Keyword::CLAIMS}.ignore(pos, expected))
+                {
+                    if (!ParserStringAndSubstitution{}.parse(pos, jwt_claims, expected))
+                        return false;
+                }
+            }
 
             auth_data = std::make_shared<ASTAuthenticationData>();
 
@@ -254,6 +265,9 @@ namespace
             if (http_auth_scheme)
                 auth_data->children.push_back(std::move(http_auth_scheme));
 
+            if (jwt_claims)
+                auth_data->children.push_back(std::move(jwt_claims));
+
             parseValidUntil(pos, expected, auth_data->valid_until);
 
             return true;
diff --git a/src/Parsers/Access/ParserCreateUserQuery.h b/src/Parsers/Access/ParserCreateUserQuery.h
index 4dfff8713d76..5f4cfcd6c45f 100644
--- a/src/Parsers/Access/ParserCreateUserQuery.h
+++ b/src/Parsers/Access/ParserCreateUserQuery.h
@@ -7,7 +7,7 @@ namespace DB
 {
 /** Parses queries like
   * CREATE USER [IF NOT EXISTS | OR REPLACE] name
-  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}|{WITH jwt}]
   *     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
   *     [DEFAULT ROLE role [,...]]
   *     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [CONST|READONLY|WRITABLE|CHANGEABLE_IN_READONLY] | PROFILE 'profile_name'] [,...]
@@ -15,7 +15,7 @@ namespace DB
   *
   * ALTER USER [IF EXISTS] name
   *     [RENAME TO new_name]
-  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}|{WITH jwt}]
   *     [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
   *     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
   *     [ADD|MODIFY SETTINGS variable [=value] [MIN [=] min_value] [MAX [=] max_value] [CONST|READONLY|WRITABLE|CHANGEABLE_IN_READONLY] [,...] ]
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index 057aad6fffea..e364a48e55d9 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -85,6 +85,7 @@ namespace DB
     MR_MACROS(CHECK_TABLE, "CHECK TABLE") \
     MR_MACROS(CHECK_GRANT, "CHECK GRANT") \
     MR_MACROS(CHECK, "CHECK") \
+    MR_MACROS(CLAIMS, "CLAIMS") \
     MR_MACROS(CLEANUP, "CLEANUP") \
     MR_MACROS(CLEAR_COLUMN, "CLEAR COLUMN") \
     MR_MACROS(CLEAR_INDEX, "CLEAR INDEX") \
@@ -332,6 +333,8 @@ namespace DB
     MR_MACROS(MONTHS, "MONTHS") \
     MR_MACROS(MOVE_PART, "MOVE PART") \
     MR_MACROS(MOVE_PARTITION, "MOVE PARTITION") \
+    MR_MACROS(EXPORT_PART, "EXPORT PART") \
+    MR_MACROS(EXPORT_PARTITION, "EXPORT PARTITION") \
     MR_MACROS(MOVE, "MOVE") \
     MR_MACROS(MS, "MS") \
     MR_MACROS(MUTATION, "MUTATION") \
diff --git a/src/Parsers/FunctionSecretArgumentsFinder.h b/src/Parsers/FunctionSecretArgumentsFinder.h
index 7e045dc636c6..2485a9ec5f7e 100644
--- a/src/Parsers/FunctionSecretArgumentsFinder.h
+++ b/src/Parsers/FunctionSecretArgumentsFinder.h
@@ -3,9 +3,12 @@
 #include <Common/KnownObjectNames.h>
 #include <Common/re2.h>
 #include <Common/maskURIPassword.h>
+#include <Common/NamedCollections/NamedCollections.h>
+#include <Common/NamedCollections/NamedCollectionsFactory.h>
 #include <Core/QualifiedTableName.h>
 #include <base/defines.h>
 #include <boost/algorithm/string/predicate.hpp>
+#include <Poco/String.h>
 
 
 namespace DB
@@ -29,6 +32,21 @@ class AbstractFunction
         virtual ~Arguments() = default;
         virtual size_t size() const = 0;
         virtual std::unique_ptr<Argument> at(size_t n) const = 0;
+        void skipArgument(size_t n) { skipped_indexes.insert(n); }
+        void unskipArguments() { skipped_indexes.clear(); }
+        size_t getRealIndex(size_t n) const
+        {
+            for (auto idx : skipped_indexes)
+            {
+                if (n < idx)
+                    break;
+                ++n;
+            }
+            return n;
+        }
+        size_t skippedSize() const { return skipped_indexes.size(); }
+    private:
+        std::set<size_t> skipped_indexes;
     };
 
     virtual ~AbstractFunction() = default;
@@ -75,14 +93,15 @@ class FunctionSecretArgumentsFinder
     {
         if (index >= function->arguments->size())
             return;
+        auto real_index = function->arguments->getRealIndex(index);
         if (!result.count)
         {
-            result.start = index;
+            result.start = real_index;
             result.are_named = argument_is_named;
         }
-        chassert(index >= result.start); /// We always check arguments consecutively
+        chassert(real_index >= result.start); /// We always check arguments consecutively
         chassert(result.replacement.empty()); /// We shouldn't use replacement with masking other arguments
-        result.count = index + 1 - result.start;
+        result.count = real_index + 1 - result.start;
         if (!argument_is_named)
             result.are_named = false;
     }
@@ -100,8 +119,12 @@ class FunctionSecretArgumentsFinder
         {
             findMongoDBSecretArguments();
         }
+        else if (function->name() == "iceberg")
+        {
+            findIcebergFunctionSecretArguments();
+        }
         else if ((function->name() == "s3") || (function->name() == "cosn") || (function->name() == "oss") ||
-                 (function->name() == "deltaLake") || (function->name() == "hudi") || (function->name() == "iceberg") ||
+                 (function->name() == "deltaLake") || (function->name() == "hudi") ||
                  (function->name() == "gcs") || (function->name() == "icebergS3"))
         {
             /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
@@ -140,6 +163,10 @@ class FunctionSecretArgumentsFinder
         {
             findURLSecretArguments();
         }
+        else if (function->name() == "redis")
+        {
+            findRedisFunctionSecretArguments();
+        }
         else if (function->name() == "ytsaurus")
         {
             findYTsaurusStorageTableEngineSecretArguments();
@@ -194,7 +221,7 @@ class FunctionSecretArgumentsFinder
         result.replacement = std::move(uri);
     }
 
-    void findRedisSecretArguments()
+    void findRedisTableEngineSecretArguments()
     {
         /// Redis does not have URL/address argument,
         /// only 'host:port' and separate "password" argument.
@@ -242,6 +269,12 @@ class FunctionSecretArgumentsFinder
             findSecretNamedArgument("secret_access_key", 1);
             return;
         }
+        if (is_cluster_function && isNamedCollectionName(1))
+        {
+            /// s3Cluster(cluster, named_collection, ..., secret_access_key = 'secret_access_key', ...)
+            findSecretNamedArgument("secret_access_key", 2);
+            return;
+        }
 
         findSecretNamedArgument("secret_access_key", url_arg_idx);
 
@@ -249,6 +282,7 @@ class FunctionSecretArgumentsFinder
         /// s3('url', NOSIGN, 'format' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
         /// s3('url', 'format', 'structure' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
         size_t count = excludeS3OrURLNestedMaps();
+
         if ((url_arg_idx + 3 <= count) && (count <= url_arg_idx + 4))
         {
             String second_arg;
@@ -313,6 +347,48 @@ class FunctionSecretArgumentsFinder
             markSecretArgument(url_arg_idx + 4);
     }
 
+    std::string findIcebergStorageType()
+    {
+        std::string storage_type = "s3";
+
+        size_t count = function->arguments->size();
+        if (!count)
+            return storage_type;
+
+        auto storage_type_idx = findNamedArgument(&storage_type, "storage_type");
+        if (storage_type_idx != -1)
+        {
+            storage_type = Poco::toLower(storage_type);
+            function->arguments->skipArgument(storage_type_idx);
+        }
+        else if (isNamedCollectionName(0))
+        {
+            std::string collection_name;
+            if (function->arguments->at(0)->tryGetString(&collection_name, true))
+            {
+                NamedCollectionPtr collection = NamedCollectionFactory::instance().tryGet(collection_name);
+                if (collection && collection->has("storage_type"))
+                {
+                    storage_type = Poco::toLower(collection->get<std::string>("storage_type"));
+                }
+            }
+        }
+
+        return storage_type;
+    }
+
+    void findIcebergFunctionSecretArguments()
+    {
+        auto storage_type = findIcebergStorageType();
+
+        if (storage_type == "s3")
+            findS3FunctionSecretArguments(false);
+        else if (storage_type == "azure")
+            findAzureBlobStorageFunctionSecretArguments(false);
+
+        function->arguments->unskipArguments();
+    }
+
     bool maskAzureConnectionString(ssize_t url_arg_idx, bool argument_is_named = false, size_t start = 0)
     {
         String url_arg;
@@ -336,7 +412,7 @@ class FunctionSecretArgumentsFinder
             if (RE2::Replace(&url_arg, account_key_pattern, "AccountKey=[HIDDEN]\\1"))
             {
                 chassert(result.count == 0); /// We shouldn't use replacement with masking other arguments
-                result.start = url_arg_idx;
+                result.start = function->arguments->getRealIndex(url_arg_idx);
                 result.are_named = argument_is_named;
                 result.count = 1;
                 result.replacement = url_arg;
@@ -495,6 +571,7 @@ class FunctionSecretArgumentsFinder
     void findTableEngineSecretArguments()
     {
         const String & engine_name = function->name();
+
         if (engine_name == "ExternalDistributed")
         {
             /// ExternalDistributed('engine', 'host:port', 'database', 'table', 'user', 'password')
@@ -512,10 +589,13 @@ class FunctionSecretArgumentsFinder
         {
             findMongoDBSecretArguments();
         }
+        else if (engine_name == "Iceberg")
+        {
+            findIcebergTableEngineSecretArguments();
+        }
         else if ((engine_name == "S3") || (engine_name == "COSN") || (engine_name == "OSS")
                  || (engine_name == "DeltaLake") || (engine_name == "Hudi")
-                 || (engine_name == "Iceberg") || (engine_name == "IcebergS3")
-                 || (engine_name == "S3Queue"))
+                 || (engine_name == "IcebergS3") || (engine_name == "S3Queue"))
         {
             /// S3('url', ['aws_access_key_id', 'aws_secret_access_key',] ...)
             findS3TableEngineSecretArguments();
@@ -524,13 +604,13 @@ class FunctionSecretArgumentsFinder
         {
             findURLSecretArguments();
         }
-        else if (engine_name == "AzureBlobStorage" || engine_name == "AzureQueue")
+        else if (engine_name == "AzureBlobStorage" || engine_name == "AzureQueue" || engine_name == "IcebergAzure")
         {
             findAzureBlobStorageTableEngineSecretArguments();
         }
         else if (engine_name == "Redis")
         {
-            findRedisSecretArguments();
+            findRedisTableEngineSecretArguments();
         }
         else if (engine_name == "YTsaurus")
         {
@@ -626,12 +706,30 @@ class FunctionSecretArgumentsFinder
             markSecretArgument(url_arg_idx + 4);
     }
 
+    void findRedisFunctionSecretArguments()
+    {
+        // redis(host:port, key, structure, db_index, password, pool_size)
+        markSecretArgument(4);
+    }
+
     void findYTsaurusStorageTableEngineSecretArguments()
     {
         // YTsaurus('base_uri', 'yt_path', 'auth_token')
         markSecretArgument(2);
     }
 
+    void findIcebergTableEngineSecretArguments()
+    {
+        auto storage_type = findIcebergStorageType();
+
+        if (storage_type == "s3")
+            findS3TableEngineSecretArguments();
+        else if (storage_type == "azure")
+            findAzureBlobStorageTableEngineSecretArguments();
+
+        function->arguments->unskipArguments();
+    }
+
     void findDatabaseEngineSecretArguments()
     {
         const String & engine_name = function->name();
@@ -648,7 +746,7 @@ class FunctionSecretArgumentsFinder
             /// S3('url', 'access_key_id', 'secret_access_key')
             findS3DatabaseSecretArguments();
         }
-        else if (engine_name == "DataLakeCatalog")
+        else if (engine_name == "DataLakeCatalog" || engine_name == "Iceberg")
         {
             findDataLakeCatalogSecretArguments();
         }
@@ -695,6 +793,12 @@ class FunctionSecretArgumentsFinder
         const String & engine_name = function->name();
         if (engine_name == "S3")
         {
+            if (isNamedCollectionName(0))
+            {
+                /// BACKUP ... TO S3(named_collection, ..., secret_access_key = 'secret_access_key', ...)
+                findSecretNamedArgument("secret_access_key", 1);
+                return;
+            }
             /// BACKUP ... TO S3(url, [aws_access_key_id, aws_secret_access_key])
             markSecretArgument(2);
         }
diff --git a/src/Parsers/FunctionSecretArgumentsFinderAST.h b/src/Parsers/FunctionSecretArgumentsFinderAST.h
index a260c0d58da6..3624d7a7e87b 100644
--- a/src/Parsers/FunctionSecretArgumentsFinderAST.h
+++ b/src/Parsers/FunctionSecretArgumentsFinderAST.h
@@ -54,10 +54,13 @@ class FunctionAST : public AbstractFunction
     {
     public:
         explicit ArgumentsAST(const ASTs * arguments_) : arguments(arguments_) {}
-        size_t size() const override { return arguments ? arguments->size() : 0; }
+        size_t size() const override
+        { /// size withous skipped indexes
+            return arguments ? arguments->size() - skippedSize() : 0;
+        }
         std::unique_ptr<Argument> at(size_t n) const override
-        {
-            return std::make_unique<ArgumentAST>(arguments->at(n).get());
+        { /// n is relative index, some can be skipped
+            return std::make_unique<ArgumentAST>(arguments->at(getRealIndex(n)).get());
         }
     private:
         const ASTs * arguments = nullptr;
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index a9923f6e00d6..7cb64bd931a2 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -176,7 +176,7 @@ String IAST::formatWithPossiblyHidingSensitiveData(
     settings.identifier_quoting_rule = identifier_quoting_rule;
     settings.identifier_quoting_style = identifier_quoting_style;
     format(buf, settings);
-    return wipeSensitiveDataAndCutToLength(buf.str(), max_length);
+    return wipeSensitiveDataAndCutToLength(buf.str(), max_length, !show_secrets);
 }
 
 String IAST::formatForLogging(size_t max_length) const
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index 4bb76c0d2e4b..a14ab699a919 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -82,6 +82,8 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_forget_partition(Keyword::FORGET_PARTITION);
     ParserKeyword s_move_partition(Keyword::MOVE_PARTITION);
     ParserKeyword s_move_part(Keyword::MOVE_PART);
+    ParserKeyword s_export_part(Keyword::EXPORT_PART);
+    ParserKeyword s_export_partition(Keyword::EXPORT_PARTITION);
     ParserKeyword s_drop_detached_partition(Keyword::DROP_DETACHED_PARTITION);
     ParserKeyword s_drop_detached_part(Keyword::DROP_DETACHED_PART);
     ParserKeyword s_fetch_partition(Keyword::FETCH_PARTITION);
@@ -91,6 +93,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_unfreeze(Keyword::UNFREEZE);
     ParserKeyword s_unlock_snapshot(Keyword::UNLOCK_SNAPSHOT);
     ParserKeyword s_partition(Keyword::PARTITION);
+    ParserKeyword s_partition_by(Keyword::PARTITION_BY);
 
     ParserKeyword s_first(Keyword::FIRST);
     ParserKeyword s_after(Keyword::AFTER);
@@ -105,6 +108,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_to_volume(Keyword::TO_VOLUME);
     ParserKeyword s_to_table(Keyword::TO_TABLE);
     ParserKeyword s_to_shard(Keyword::TO_SHARD);
+    ParserKeyword s_function(Keyword::FUNCTION);
 
     ParserKeyword s_delete(Keyword::DELETE);
     ParserKeyword s_update(Keyword::UPDATE);
@@ -174,6 +178,8 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ASTPtr command_rename_to;
     ASTPtr command_sql_security;
     ASTPtr command_snapshot_desc;
+    ASTPtr export_table_function;
+    ASTPtr export_table_function_partition_by_expr;
 
     if (with_round_bracket)
     {
@@ -535,6 +541,57 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.safeGet<String>();
             }
+            else if (s_export_part.ignore(pos, expected))
+            {
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::EXPORT_PART;
+                command->part = true;
+
+                if (!s_to_table.ignore(pos, expected))
+                {
+                    return false;
+                }
+
+                if (s_function.ignore(pos, expected))
+                {
+                    ParserFunction table_function_parser(/*allow_function_parameters=*/true, /*is_table_function=*/true);
+
+                    if (!table_function_parser.parse(pos, export_table_function, expected))
+                        return false;
+
+                    if (s_partition_by.ignore(pos, expected))
+                        if (!parser_exp_elem.parse(pos, export_table_function_partition_by_expr, expected))
+                            return false;
+
+                    command->to_table_function = export_table_function.get();
+                    command->partition_by_expr = export_table_function_partition_by_expr.get();
+                    command->move_destination_type = DataDestinationType::TABLE;
+                }
+                else
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                        return false;
+                    command->move_destination_type = DataDestinationType::TABLE;
+                }
+            }
+            else if (s_export_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command_partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::EXPORT_PARTITION;
+
+                if (!s_to_table.ignore(pos, expected))
+                {
+                    return false;
+                }
+
+                if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                    return false;
+                command->move_destination_type = DataDestinationType::TABLE;
+            }
             else if (s_move_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command_partition, expected))
@@ -1026,6 +1083,10 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         command->rename_to = command->children.emplace_back(std::move(command_rename_to)).get();
     if (command_snapshot_desc)
         command->snapshot_desc = command->children.emplace_back(std::move(command_snapshot_desc)).get();
+    if (export_table_function)
+        command->to_table_function = command->children.emplace_back(std::move(export_table_function)).get();
+    if (export_table_function_partition_by_expr)
+        command->partition_by_expr = command->children.emplace_back(std::move(export_table_function_partition_by_expr)).get();
 
     return true;
 }
diff --git a/src/Parsers/ParserDataType.cpp b/src/Parsers/ParserDataType.cpp
index cea7d14e0c06..3b351073d68b 100644
--- a/src/Parsers/ParserDataType.cpp
+++ b/src/Parsers/ParserDataType.cpp
@@ -110,8 +110,8 @@ class ObjectArgumentParser : public IParserBase
         if (!type_parser.parse(pos, type, expected))
             return false;
 
-        auto name_and_type = std::make_shared<ASTNameTypePair>();
-        name_and_type->name = getIdentifierName(identifier);
+        auto name_and_type = std::make_shared<ASTObjectTypedPathArgument>();
+        name_and_type->path = getIdentifierName(identifier);
         name_and_type->type = type;
         name_and_type->children.push_back(name_and_type->type);
         argument->path_with_type = name_and_type;
diff --git a/src/Parsers/ParserKillQueryQuery.cpp b/src/Parsers/ParserKillQueryQuery.cpp
index 55bd5100009e..7e06ae8d30b7 100644
--- a/src/Parsers/ParserKillQueryQuery.cpp
+++ b/src/Parsers/ParserKillQueryQuery.cpp
@@ -17,6 +17,7 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
     ParserKeyword p_kill{Keyword::KILL};
     ParserKeyword p_query{Keyword::QUERY};
     ParserKeyword p_mutation{Keyword::MUTATION};
+    ParserKeyword p_export_partition{Keyword::EXPORT_PARTITION};
     ParserKeyword p_part_move_to_shard{Keyword::PART_MOVE_TO_SHARD};
     ParserKeyword p_transaction{Keyword::TRANSACTION};
     ParserKeyword p_on{Keyword::ON};
@@ -33,6 +34,8 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
         query->type = ASTKillQueryQuery::Type::Query;
     else if (p_mutation.ignore(pos, expected))
         query->type = ASTKillQueryQuery::Type::Mutation;
+    else if (p_export_partition.ignore(pos, expected))
+        query->type = ASTKillQueryQuery::Type::ExportPartition;
     else if (p_part_move_to_shard.ignore(pos, expected))
         query->type = ASTKillQueryQuery::Type::PartMoveToShard;
     else if (p_transaction.ignore(pos, expected))
diff --git a/src/Parsers/SelectUnionMode.h b/src/Parsers/SelectUnionMode.h
index fc0a766eb668..8089dac529c1 100644
--- a/src/Parsers/SelectUnionMode.h
+++ b/src/Parsers/SelectUnionMode.h
@@ -7,7 +7,7 @@ namespace DB
 {
 enum class SelectUnionMode : uint8_t
 {
-    UNION_DEFAULT,
+    UNION_DEFAULT = 0,
     UNION_ALL,
     UNION_DISTINCT,
     EXCEPT_DEFAULT,
diff --git a/src/Planner/CollectSets.cpp b/src/Planner/CollectSets.cpp
index ec3b88bdcfe1..d2822b0a3181 100644
--- a/src/Planner/CollectSets.cpp
+++ b/src/Planner/CollectSets.cpp
@@ -81,7 +81,9 @@ class CollectSetsVisitor : public ConstInDepthQueryTreeVisitor<CollectSetsVisito
 
             DataTypes set_element_types = {in_first_argument->getResultType()};
             const auto * left_tuple_type = typeid_cast<const DataTypeTuple *>(set_element_types.front().get());
-            if (left_tuple_type && left_tuple_type->getElements().size() != 1)
+
+            /// Do not unpack if empty tuple or single element tuple
+            if (left_tuple_type && left_tuple_type->getElements().size() > 1)
                 set_element_types = left_tuple_type->getElements();
 
             set_element_types = Set::getElementTypes(std::move(set_element_types), settings[Setting::transform_null_in]);
diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index bd33315d138d..c53e9d73ea6d 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -39,6 +39,7 @@
 #include <Processors/QueryPlan/WindowStep.h>
 #include <Processors/QueryPlan/ReadNothingStep.h>
 #include <Processors/QueryPlan/ReadFromRecursiveCTEStep.h>
+#include <Processors/QueryPlan/ObjectFilterStep.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
 #include <Interpreters/Context.h>
@@ -53,6 +54,7 @@
 #include <Storages/StorageDummy.h>
 #include <Storages/StorageMerge.h>
 #include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
+#include <Storages/IStorageCluster.h>
 
 #include <AggregateFunctions/IAggregateFunction.h>
 
@@ -144,6 +146,8 @@ namespace Setting
     extern const SettingsUInt64 max_rows_to_transfer;
     extern const SettingsOverflowMode transfer_overflow_mode;
     extern const SettingsBool enable_parallel_blocks_marshalling;
+    extern const SettingsBool use_hive_partitioning;
+    extern const SettingsBool serialize_string_in_memory_with_zero_byte;
 }
 
 namespace ServerSetting
@@ -473,6 +477,19 @@ void addFilterStep(
     query_plan.addStep(std::move(where_step));
 }
 
+void addObjectFilterStep(QueryPlan & query_plan,
+    FilterAnalysisResult & filter_analysis_result,
+    const std::string & step_description)
+{
+    auto actions = std::move(filter_analysis_result.filter_actions->dag);
+
+    auto where_step = std::make_unique<ObjectFilterStep>(query_plan.getCurrentHeader(),
+        std::move(actions),
+        filter_analysis_result.filter_column_name);
+    where_step->setStepDescription(step_description);
+    query_plan.addStep(std::move(where_step));
+}
+
 Aggregator::Params getAggregatorParams(const PlannerContextPtr & planner_context,
     const AggregationAnalysisResult & aggregation_analysis_result,
     const QueryAnalysisResult & query_analysis_result,
@@ -517,7 +534,8 @@ Aggregator::Params getAggregatorParams(const PlannerContextPtr & planner_context
         /* only_merge */ false,
         settings[Setting::optimize_group_by_constant_keys],
         settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization],
-        stats_collecting_params);
+        stats_collecting_params,
+        settings[Setting::serialize_string_in_memory_with_zero_byte]);
 
     return aggregator_params;
 }
@@ -627,7 +645,8 @@ void addMergingAggregatedStep(QueryPlan & query_plan,
         query_analysis_result.aggregate_overflow_row,
         max_threads,
         settings[Setting::max_block_size],
-        settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization]);
+        settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization],
+        settings[Setting::serialize_string_in_memory_with_zero_byte]);
 
     bool is_remote_storage = false;
     bool parallel_replicas_from_merge_tree = false;
@@ -1256,7 +1275,14 @@ void addBuildSubqueriesForSetsStepIfNeeded(
             std::make_shared<GlobalPlannerContext>(nullptr, nullptr, FiltersForTableExpressionMap{}));
         subquery_planner.buildQueryPlanIfNeeded();
 
-        subquery->setQueryPlan(std::make_unique<QueryPlan>(std::move(subquery_planner).extractQueryPlan()));
+        auto subquery_plan = std::move(subquery_planner).extractQueryPlan();
+        /// Contexts should be copied into the root query plan, because some functions may
+        /// be created using them while this subquery plan will be destroyed after
+        /// FutureSetFromSubquery::buildSetInplace(). Otherwise, function execution may fail
+        /// with a "Context has expired" exception.
+        for (const auto & context : subquery_plan.getInterpretersContexts())
+            query_plan.addInterpreterContext(context);
+        subquery->setQueryPlan(std::make_unique<QueryPlan>(std::move(subquery_plan)));
     }
 
     if (!subqueries.empty())
@@ -1787,6 +1813,16 @@ void Planner::buildPlanForQueryNode()
 
     if (query_processing_info.isSecondStage() || query_processing_info.isFromAggregationState())
     {
+        if (settings[Setting::use_hive_partitioning]
+            && !query_processing_info.isFirstStage()
+            && expression_analysis_result.hasWhere())
+        {
+            if (typeid_cast<ReadFromCluster *>(query_plan.getRootNode()->step.get()))
+            {
+                addObjectFilterStep(query_plan, expression_analysis_result.getWhere(), "WHERE");
+            }
+        }
+
         if (query_processing_info.isFromAggregationState())
         {
             /// Aggregation was performed on remote shards
@@ -1977,15 +2013,18 @@ void Planner::buildPlanForQueryNode()
         addAdditionalFilterStepIfNeeded(query_plan, query_node, select_query_options, planner_context);
     }
 
+    const auto & client_info = query_context->getClientInfo();
+
     // Not all cases are supported here yet. E.g. for this query:
     // select * from remote('127.0.0.{1,2}', numbers_mt(1e6)) group by number
     // we will have `BlocksMarshallingStep` added to the query plan, but not for
     // select * from remote('127.0.0.{1,2}', numbers_mt(1e6))
     // because `to_stage` for it will be `QueryProcessingStage::Complete`.
     if (query_context->getSettingsRef()[Setting::enable_parallel_blocks_marshalling]
-        && query_context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY
+        && client_info.query_kind == ClientInfo::QueryKind::SECONDARY_QUERY
         && select_query_options.to_stage != QueryProcessingStage::Complete // Don't do it for INSERT SELECT, for example
-        && query_context->getClientInfo().distributed_depth <= 1 // Makes sense for higher depths too, just not supported
+        && client_info.distributed_depth <= 1 // Makes sense for higher depths too, just not supported
+        && !client_info.is_replicated_database_internal
     )
         query_plan.addStep(std::make_unique<BlocksMarshallingStep>(query_plan.getCurrentHeader()));
 
diff --git a/src/Planner/PlannerActionsVisitor.cpp b/src/Planner/PlannerActionsVisitor.cpp
index 50e54a113967..7bc8426582f5 100644
--- a/src/Planner/PlannerActionsVisitor.cpp
+++ b/src/Planner/PlannerActionsVisitor.cpp
@@ -16,6 +16,7 @@
 #include <Analyzer/WindowNode.h>
 
 #include <DataTypes/DataTypeSet.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/FieldToDataType.h>
 
@@ -178,7 +179,25 @@ class ActionNodeNameHelper
             case QueryTreeNodeType::FUNCTION:
             {
                 const auto & function_node = node->as<FunctionNode &>();
-                if (function_node.getFunctionName() == "__actionName")
+                if (function_node.getFunctionName() == "__aliasMarker")
+                {
+                    /// Perform sanity check, because user may call this function with unexpected arguments
+                    const auto & function_argument_nodes = function_node.getArguments().getNodes();
+                    if (function_argument_nodes.size() == 2)
+                    {
+                        if (const auto * second_argument = function_argument_nodes.at(1)->as<ConstantNode>())
+                        {
+                            if (isString(second_argument->getResultType()))
+                                result = second_argument->getValue().safeGet<String>();
+                        }
+                    }
+
+                    /// Empty node name is not allowed and leads to logical errors
+                    if (result.empty())
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker is internal and should not be used directly");
+                    break;
+                }
+                else if (function_node.getFunctionName() == "__actionName")
                 {
                     /// Perform sanity check, because user may call this function with unexpected arguments
                     const auto & function_argument_nodes = function_node.getArguments().getNodes();
@@ -348,7 +367,7 @@ class ActionNodeNameHelper
             }
             default:
             {
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid action query tree node {}", node->formatASTForErrorMessage());
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid action query tree node {} (node_type: {})", node->formatASTForErrorMessage(), static_cast<int>(node_type));
             }
         }
 
@@ -601,6 +620,18 @@ class ActionsScopeNode
         return node;
     }
 
+    const ActionsDAG::Node * addAliasIfNecessary(const std::string & node_name, const ActionsDAG::Node * child)
+    {
+        auto it = node_name_to_node.find(node_name);
+        if (it != node_name_to_node.end())
+            return it->second;
+
+        const auto * node = &actions_dag.addAlias(*child, node_name);
+        node_name_to_node[node->result_name] = node;
+
+        return node;
+    }
+
 private:
     std::unordered_map<std::string_view, const ActionsDAG::Node *> node_name_to_node;
     ActionsDAG & actions_dag;
@@ -947,7 +978,9 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::ma
     {
         set_element_types = {in_first_argument->getResultType()};
         const auto * left_tuple_type = typeid_cast<const DataTypeTuple *>(set_element_types.front().get());
-        if (left_tuple_type && left_tuple_type->getElements().size() != 1)
+
+        /// Do not unpack if empty tuple or single element tuple
+        if (left_tuple_type && left_tuple_type->getElements().size() > 1)
             set_element_types = left_tuple_type->getElements();
 
         set_element_types
@@ -1060,6 +1093,38 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
 {
     const auto & function_node = node->as<FunctionNode &>();
 
+    if (function_node.getFunctionName() == "__aliasMarker")
+    {
+        const auto & function_arguments = function_node.getArguments().getNodes();
+        if (function_arguments.size() != 2)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker expects 2 arguments");
+
+        const auto * alias_id_node = function_arguments.at(1)->as<ConstantNode>();
+        if (!alias_id_node || !isString(alias_id_node->getResultType()))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker is internal and should not be used directly");
+
+        const auto & alias_id = alias_id_node->getValue().safeGet<String>();
+        if (alias_id.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function __aliasMarker is internal and should not be used directly");
+
+        auto [child_name, levels] = visitImpl(function_arguments.at(0));
+        if (alias_id == child_name)
+            return {child_name, levels};
+
+        size_t level = levels.max();
+        const auto * child_node = actions_stack[level].getNodeOrThrow(child_name);
+        actions_stack[level].addAliasIfNecessary(alias_id, child_node);
+
+        size_t actions_stack_size = actions_stack.size();
+        for (size_t i = level + 1; i < actions_stack_size; ++i)
+        {
+            auto & actions_stack_node = actions_stack[i];
+            actions_stack_node.addInputColumnIfNecessary(alias_id, function_node.getResultType());
+        }
+
+        return {alias_id, levels};
+    }
+
     if (function_node.getFunctionName() == "indexHint")
         return visitIndexHintFunction(node);
     if (function_node.getFunctionName() == "exists")
diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp
index dff3ebfb14c2..96cee39c4069 100644
--- a/src/Planner/PlannerJoinTree.cpp
+++ b/src/Planner/PlannerJoinTree.cpp
@@ -654,13 +654,14 @@ UInt64 mainQueryNodeBlockSizeByLimit(const SelectQueryInfo & select_query_info)
 }
 
 std::unique_ptr<ExpressionStep> createComputeAliasColumnsStep(
-    std::unordered_map<std::string, ActionsDAG> & alias_column_expressions, const SharedHeader & current_header)
+    AliasColumnExpressions & alias_column_expressions, const SharedHeader & current_header)
 {
     ActionsDAG merged_alias_columns_actions_dag(current_header->getColumnsWithTypeAndName());
     ActionsDAG::NodeRawConstPtrs action_dag_outputs = merged_alias_columns_actions_dag.getInputs();
 
-    for (auto & [column_name, alias_column_actions_dag] : alias_column_expressions)
+    for (auto & alias_column_expression : alias_column_expressions)
     {
+        auto & alias_column_actions_dag = alias_column_expression.second;
         const auto & current_outputs = alias_column_actions_dag.getOutputs();
         action_dag_outputs.insert(action_dag_outputs.end(), current_outputs.begin(), current_outputs.end());
         merged_alias_columns_actions_dag.mergeNodes(std::move(alias_column_actions_dag));
@@ -1370,7 +1371,9 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                     /// Overall, IStorage::read    -> FetchColumns returns normal column names (except Distributed, which is inconsistent)
                     /// Interpreter::getQueryPlan  -> FetchColumns returns identifiers (why?) and this the reason for the bug ^ in Distributed
                     /// Hopefully there is no other case when we read from Distributed up to FetchColumns.
-                    if (table_node && table_node->getStorage()->isRemote() && select_query_options.to_stage == QueryProcessingStage::FetchColumns)
+                    if (table_node && table_node->getStorage()->isRemote())
+                        updated_actions_dag_outputs.push_back(output_node);
+                    else if (table_function_node && table_function_node->getStorage()->isRemote())
                         updated_actions_dag_outputs.push_back(output_node);
                 }
                 else
diff --git a/src/Planner/TableExpressionData.h b/src/Planner/TableExpressionData.h
index 565250e8ed26..7c77c20afdfa 100644
--- a/src/Planner/TableExpressionData.h
+++ b/src/Planner/TableExpressionData.h
@@ -18,6 +18,8 @@ namespace ErrorCodes
 using ColumnIdentifier = std::string;
 using ColumnIdentifiers = std::vector<ColumnIdentifier>;
 using ColumnIdentifierSet = std::unordered_set<ColumnIdentifier>;
+using AliasColumnExpression = std::pair<std::string, ActionsDAG>;
+using AliasColumnExpressions = std::vector<AliasColumnExpression>;
 
 struct PrewhereInfo;
 using PrewhereInfoPtr = std::shared_ptr<PrewhereInfo>;
@@ -77,7 +79,8 @@ class TableExpressionData
     /// Add alias column
     void addAliasColumn(const NameAndTypePair & column, const ColumnIdentifier & column_identifier, ActionsDAG actions_dag, bool is_selected_column = true)
     {
-        alias_column_expressions.emplace(column.name, std::move(actions_dag));
+        alias_column_expressions.emplace_back(column.name, std::move(actions_dag));
+        alias_column_names_set.emplace(column.name);
         addColumnImpl(column, column_identifier, is_selected_column);
     }
 
@@ -96,11 +99,21 @@ class TableExpressionData
     }
 
     /// Get ALIAS columns names mapped to expressions
-    std::unordered_map<std::string, ActionsDAG> & getAliasColumnExpressions()
+    AliasColumnExpressions & getAliasColumnExpressions()
     {
         return alias_column_expressions;
     }
 
+    const AliasColumnExpressions & getAliasColumnExpressions() const
+    {
+        return alias_column_expressions;
+    }
+
+    bool hasAliasColumn(const std::string & column_name) const
+    {
+        return alias_column_names_set.contains(column_name);
+    }
+
     /// Get column name to column map
     const ColumnNameToColumn & getColumnNameToColumn() const
     {
@@ -279,7 +292,10 @@ class TableExpressionData
     NameSet selected_column_names_set;
 
     /// Expression to calculate ALIAS columns
-    std::unordered_map<std::string, ActionsDAG> alias_column_expressions;
+    /// Keep alias name (String) + expression (ActionsDAG) pairs; vector preserves insertion order.
+    AliasColumnExpressions alias_column_expressions;
+    /// Fast membership checks for alias column names.
+    NameSet alias_column_names_set;
 
     /// Valid for table, table function, array join, query, union nodes
     ColumnNameToColumn column_name_to_column;
diff --git a/src/Planner/Utils.cpp b/src/Planner/Utils.cpp
index f9e1d0bbf4d9..08db59bfdb44 100644
--- a/src/Planner/Utils.cpp
+++ b/src/Planner/Utils.cpp
@@ -30,6 +30,7 @@
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/UnionNode.h>
 #include <Analyzer/TableNode.h>
@@ -191,13 +192,62 @@ ASTPtr queryNodeToSelectQuery(const QueryTreeNodePtr & query_node, bool set_subq
     return result_ast;
 }
 
+namespace
+{
+class NormalizeAliasMarkerVisitor : public InDepthQueryTreeVisitor<NormalizeAliasMarkerVisitor>
+{
+public:
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * function_node = node->as<FunctionNode>();
+        if (!function_node || function_node->getFunctionName() != "__aliasMarker")
+            return;
+
+        auto & arguments = function_node->getArguments().getNodes();
+        if (arguments.size() != 2)
+            return;
+
+        while (true)
+        {
+            auto * inner_function = arguments.front()->as<FunctionNode>();
+            if (!inner_function || inner_function->getFunctionName() != "__aliasMarker")
+                break;
+
+            auto & inner_arguments = inner_function->getArguments().getNodes();
+            if (inner_arguments.size() != 2)
+                break;
+
+            arguments.front() = inner_arguments.front();
+        }
+    }
+
+    bool needChildVisit(QueryTreeNodePtr & parent, QueryTreeNodePtr & child)
+    {
+        auto * parent_function = parent->as<FunctionNode>();
+        if (parent_function && parent_function->getFunctionName() == "__aliasMarker")
+            return false;
+
+        auto child_node_type = child->getNodeType();
+        return !(child_node_type == QueryTreeNodeType::QUERY || child_node_type == QueryTreeNodeType::UNION);
+    }
+};
+
+void normalizeAliasMarkersInQueryTree(QueryTreeNodePtr & node)
+{
+    NormalizeAliasMarkerVisitor visitor;
+    visitor.visit(node);
+}
+}
+
 ASTPtr queryNodeToDistributedSelectQuery(const QueryTreeNodePtr & query_node)
 {
     /// Remove CTEs information from distributed queries.
     /// Now, if cte_name is set for subquery node, AST -> String serialization will only print cte name.
     /// But CTE is defined only for top-level query part, so may not be sent.
     /// Removing cte_name forces subquery to be always printed.
-    auto ast = queryNodeToSelectQuery(query_node, /*set_subquery_cte_name=*/false);
+    auto query_node_to_convert = query_node->clone();
+    normalizeAliasMarkersInQueryTree(query_node_to_convert);
+    auto ast = queryNodeToSelectQuery(query_node_to_convert, /*set_subquery_cte_name=*/false);
     return ast;
 }
 
diff --git a/src/Processors/Chunk.cpp b/src/Processors/Chunk.cpp
index e27762f53dc4..34402cd58249 100644
--- a/src/Processors/Chunk.cpp
+++ b/src/Processors/Chunk.cpp
@@ -108,7 +108,12 @@ void Chunk::addColumn(ColumnPtr column)
 
 void Chunk::addColumn(size_t position, ColumnPtr column)
 {
-    if (position >= columns.size())
+    if (position == columns.size())
+    {
+        addColumn(column);
+        return;
+    }
+    if (position > columns.size())
         throw Exception(ErrorCodes::POSITION_OUT_OF_BOUND,
                         "Position {} out of bound in Chunk::addColumn(), max position = {}",
                         position, !columns.empty() ? columns.size() - 1 : 0);
diff --git a/src/Processors/Executors/ExecutorTasks.cpp b/src/Processors/Executors/ExecutorTasks.cpp
index 11bbf8f1921f..15b578f2e422 100644
--- a/src/Processors/Executors/ExecutorTasks.cpp
+++ b/src/Processors/Executors/ExecutorTasks.cpp
@@ -18,12 +18,26 @@ void ExecutorTasks::finish()
         async_task_queue.finish();
     }
 
+    freeCPU();
+
     std::lock_guard guard(executor_contexts_mutex);
 
     for (auto & context : executor_contexts)
         context->wakeUp();
 }
 
+void ExecutorTasks::freeCPU()
+{
+    SlotAllocationPtr slots;
+    {
+        std::lock_guard lock(mutex);
+        slots = std::exchange(cpu_slots, nullptr);
+    }
+    if (!slots)
+        return;
+    slots->free();
+}
+
 void ExecutorTasks::rethrowFirstThreadException()
 {
     for (auto & executor_context : executor_contexts)
@@ -177,7 +191,7 @@ ExecutorTasks::SpawnStatus ExecutorTasks::pushTasks(Queue & queue, Queue & async
     return DO_NOT_SPAWN; // No new tasks -- no need for new threads
 }
 
-void ExecutorTasks::init(size_t num_threads_, size_t use_threads_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback)
+void ExecutorTasks::init(size_t num_threads_, size_t use_threads_, const SlotAllocationPtr & cpu_slots_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback)
 {
     num_threads = num_threads_;
     use_threads = use_threads_;
@@ -185,6 +199,11 @@ void ExecutorTasks::init(size_t num_threads_, size_t use_threads_, bool profile_
     task_queue.init(num_threads);
     fast_task_queue.init(num_threads);
 
+    {
+        std::lock_guard lock(mutex); // In case finish() is executed concurrently with init() due to exception
+        cpu_slots = cpu_slots_;
+    }
+
     // Initialize slot counters with zeros up to max_threads
     slot_count.resize(num_threads, 0);
 
@@ -246,12 +265,11 @@ ExecutorTasks::SpawnStatus ExecutorTasks::upscale(size_t slot_id)
 
 void ExecutorTasks::downscale(size_t slot_id)
 {
-    std::unique_lock lock(mutex);
+    std::lock_guard lock(mutex);
 
     if (slot_id >= slot_count.size() || slot_count[slot_id] == 0)
         return;
     --slot_count[slot_id];
-    --total_slots;
 
     if (slot_id + 1 == use_threads)
     {
@@ -265,16 +283,34 @@ void ExecutorTasks::downscale(size_t slot_id)
             }
         }
     }
+}
 
-    // We should make sure that downscaled thread has no local task inside context.
-    // It is allowed to have tasks in `task_queue` or `fast_task_queue` because they can be stealed by other threads.
+void ExecutorTasks::preempt(size_t slot_id)
+{
+    std::unique_lock lock(mutex);
+    --total_slots;
+
+    /// We should make sure that preempted thread has no local task inside context.
+    /// It is allowed to have tasks in `task_queue` or `fast_task_queue` because they can be stealed by other threads.
     auto & context = executor_contexts[slot_id];
     if (auto * task = context->popTask())
     {
         task_queue.push(task, slot_id);
         /// Wake up at least one thread to avoid deadlocks (all other threads maybe idle)
-        tryWakeUpAnyOtherThreadWithTasks(*context, lock);
+        tryWakeUpAnyOtherThreadWithTasks(*context, lock); // this releases the lock if it wakes up a thread
     }
+    else if (task_queue.empty() && fast_task_queue.empty() && async_task_queue.empty() && threads_queue.size() == total_slots)
+    {
+        /// Finish pipeline if preempted thread was the last non-idle thread executed the last task of the whole pipeline
+        lock.unlock();
+        finish();
+    }
+}
+
+void ExecutorTasks::resume(size_t)
+{
+    std::lock_guard lock(mutex);
+    ++total_slots;
 }
 
 void ExecutorTasks::processAsyncTasks()
diff --git a/src/Processors/Executors/ExecutorTasks.h b/src/Processors/Executors/ExecutorTasks.h
index 30ef6ca1927f..c60c70a09b4e 100644
--- a/src/Processors/Executors/ExecutorTasks.h
+++ b/src/Processors/Executors/ExecutorTasks.h
@@ -4,6 +4,7 @@
 #include <Processors/Executors/PollingQueue.h>
 #include <Processors/Executors/ThreadsQueue.h>
 #include <Processors/Executors/TasksQueue.h>
+#include <Common/ISlotControl.h>
 #include <stack>
 
 namespace DB
@@ -46,12 +47,15 @@ class ExecutorTasks
     /// Reference counters for thread CPU slots to handle race conditions between upscale/downscale.
     std::vector<size_t> slot_count;
 
-    /// Total number of slots (sum of all slot_count).
+    /// Total number of non-preempted slots.
     size_t total_slots = 0;
 
     /// A set of currently waiting threads.
     ThreadsQueue threads_queue;
 
+    /// CPU slots for each thread.
+    SlotAllocationPtr cpu_slots;
+
     /// Threshold found by rolling dice.
     const static size_t TOO_MANY_IDLE_THRESHOLD = 4;
 
@@ -94,18 +98,27 @@ class ExecutorTasks
     // If non-local tasks were added, wake up one thread to process them.
     SpawnStatus pushTasks(Queue & queue, Queue & async_queue, ExecutionThreadContext & context);
 
-    void init(size_t num_threads_, size_t use_threads_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback);
+    void init(size_t num_threads_, size_t use_threads_, const SlotAllocationPtr & cpu_slots_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback);
     void fill(Queue & queue, Queue & async_queue);
 
+    /// Release CPU slots
+    void freeCPU();
+
     /// Upscale to include slot_id. Updates use_threads to max(use_threads, slot_id + 1)
     /// Returns spawn status indicating if more threads should be spawned
     SpawnStatus upscale(size_t slot_id);
 
-    void processAsyncTasks();
-
     /// Downscale by removing slot_id from active slots. Updates use_threads to highest active slot + 1
     void downscale(size_t slot_id);
 
+    /// Temporarily release slot_id without downscale. Later either downscale() or resume() is called.
+    void preempt(size_t slot_id);
+
+    /// Resume execution of a previously preempted slot.
+    void resume(size_t slot_id);
+
+    void processAsyncTasks();
+
     ExecutionThreadContext & getThreadContext(size_t thread_num) { return *executor_contexts[thread_num]; }
 
     String dump();
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index dbe7a39e9ac1..bcf1502144d8 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -226,6 +226,7 @@ void PipelineExecutor::setReadProgressCallback(ReadProgressCallbackPtr callback)
 void PipelineExecutor::finalizeExecution()
 {
     single_thread_cpu_slot.reset();
+    tasks.freeCPU();
     {
         std::lock_guard lock(spawn_mutex);
         cpu_slots.reset();
@@ -408,6 +409,7 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, IAcquiredSlot * cpu_sl
                 try
                 {
                     // Preemption point. Renewal could block execution due to CPU overload.
+                    // It may trigger callbacks to tasks.preempt() and tasks.resume()
                     if (!cpu_helper.renew())
                     {
                         tasks.downscale(cpu_helper.id());
@@ -437,7 +439,7 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, IAcquiredSlot * cpu_sl
 }
 
 /// Properly allocate CPU slots or lease for the thread pool
-static SlotAllocationPtr allocateCPU(size_t num_threads, bool concurrency_control, bool trace_cpu_scheduling)
+SlotAllocationPtr PipelineExecutor::allocateCPU(size_t num_threads, bool concurrency_control)
 {
     // The first thread is called master thread.
     // It is NOT the thread that handles async tasks (unless query has max_threads=1).
@@ -494,6 +496,8 @@ static SlotAllocationPtr allocateCPU(size_t num_threads, bool concurrency_contro
                             .quantum_ns = static_cast<ResourceCost>(quantum_ns),
                             .report_ns = static_cast<ResourceCost>(quantum_ns / 10),
                             .preemption_timeout = std::chrono::milliseconds(query_context->getCPUSlotPreemptionTimeout()),
+                            .on_preempt = [this](size_t slot_id) { tasks.preempt(slot_id); },
+                            .on_resume = [this](size_t slot_id) { tasks.resume(slot_id); },
                             .workload = query_context->getSettingsRef()[Setting::workload],
                             .trace_cpu_scheduling = trace_cpu_scheduling,
                         });
@@ -521,7 +525,7 @@ void PipelineExecutor::initializeExecution(size_t num_threads, bool concurrency_
     is_execution_initialized = true;
     tryUpdateExecutionStatus(ExecutionStatus::NotStarted, ExecutionStatus::Executing);
 
-    cpu_slots = allocateCPU(num_threads, concurrency_control, trace_cpu_scheduling);
+    cpu_slots = allocateCPU(num_threads, concurrency_control);
 
     Queue queue;
     Queue async_queue;
@@ -530,7 +534,7 @@ void PipelineExecutor::initializeExecution(size_t num_threads, bool concurrency_
     /// use_threads should reflect number of thread spawned and can grow with tasks.upscale(...).
     /// Starting from 1 instead of 0 is to tackle the single thread scenario, where no upscale() will
     /// be invoked but actually 1 thread used.
-    tasks.init(num_threads, 1, profile_processors, trace_processors, read_progress_callback.get());
+    tasks.init(num_threads, 1, cpu_slots, profile_processors, trace_processors, read_progress_callback.get());
     tasks.fill(queue, async_queue);
 
     if (num_threads > 1)
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index 242b38ff5015..2481f85e349f 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -30,10 +30,13 @@ class PipelineExecutor
 public:
     /// Get pipeline as a set of processors.
     /// Processors should represent full graph. All ports must be connected, all connected nodes are mentioned in set.
-    /// Executor doesn't own processors, just stores reference.
     /// During pipeline execution new processors can appear. They will be added to existing set.
     ///
     /// Explicit graph representation is built in constructor. Throws if graph is not correct.
+    ///
+    /// PipelineExecutor must be destroyed before the corresponding QueryPipeline, because
+    /// QueryPlanResourceHolder may hold some resources referenced by processors and used in
+    /// processor destructors.
     explicit PipelineExecutor(std::shared_ptr<Processors> & processors, QueryStatusPtr elem);
     ~PipelineExecutor();
 
@@ -111,7 +114,6 @@ class PipelineExecutor
 
     void initializeExecution(size_t num_threads, bool concurrency_control); /// Initialize executor contexts and task_queue.
     void finalizeExecution(); /// Check all processors are finished.
-    void spawnThreads(AcquiredSlotPtr slot) TSA_REQUIRES(spawn_mutex);
 
     /// Methods connected to execution.
     void executeImpl(size_t num_threads, bool concurrency_control);
@@ -120,6 +122,10 @@ class PipelineExecutor
     void finish();
     void cancel(ExecutionStatus reason);
 
+    // Methods for CPU scheduling
+    SlotAllocationPtr allocateCPU(size_t num_threads, bool concurrency_control);
+    void spawnThreads(AcquiredSlotPtr slot) TSA_REQUIRES(spawn_mutex);
+
     /// If execution_status == from, change it to desired.
     bool tryUpdateExecutionStatus(ExecutionStatus expected, ExecutionStatus desired);
 
diff --git a/src/Processors/Formats/IInputFormat.cpp b/src/Processors/Formats/IInputFormat.cpp
index f7449b2c8728..3ed63fdbbaa2 100644
--- a/src/Processors/Formats/IInputFormat.cpp
+++ b/src/Processors/Formats/IInputFormat.cpp
@@ -1,11 +1,26 @@
+#include <optional>
 #include <Processors/Formats/IInputFormat.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WithFileName.h>
 #include <Common/Exception.h>
+#include <IO/VarInt.h>
+#include <Interpreters/Context_fwd.h>
+#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 
 namespace DB
 {
 
+ChunkInfoRowNumbers::ChunkInfoRowNumbers(size_t row_num_offset_, std::optional<IColumnFilter> applied_filter_)
+    : row_num_offset(row_num_offset_), applied_filter(std::move(applied_filter_)) { }
+
+ChunkInfoRowNumbers::Ptr ChunkInfoRowNumbers::clone() const
+{
+    auto res = std::make_shared<ChunkInfoRowNumbers>(row_num_offset);
+    if (applied_filter.has_value())
+        res->applied_filter.emplace(applied_filter->begin(), applied_filter->end());
+    return res;
+}
+
 IInputFormat::IInputFormat(SharedHeader header, ReadBuffer * in_) : ISource(std::move(header)), in(in_)
 {
     column_mapping = std::make_shared<ColumnMapping>();
@@ -59,4 +74,9 @@ void IInputFormat::onFinish()
 {
     resetReadBuffer();
 }
+
+void IInputFormat::setBucketsToRead(const FileBucketInfoPtr & /*buckets_to_read*/)
+{
+}
+
 }
diff --git a/src/Processors/Formats/IInputFormat.h b/src/Processors/Formats/IInputFormat.h
index 31a7e816f24a..bf0eccf2fa88 100644
--- a/src/Processors/Formats/IInputFormat.h
+++ b/src/Processors/Formats/IInputFormat.h
@@ -3,8 +3,12 @@
 #include <Formats/ColumnMapping.h>
 #include <IO/ReadBuffer.h>
 #include <Processors/Formats/InputFormatErrorsLogger.h>
+#include <Common/PODArray.h>
+#include <IO/WriteBuffer.h>
+#include <base/types.h>
 #include <Core/BlockMissingValues.h>
 #include <Processors/ISource.h>
+#include <Core/Settings.h>
 
 
 namespace DB
@@ -13,14 +17,59 @@ namespace DB
 struct SelectQueryInfo;
 
 using ColumnMappingPtr = std::shared_ptr<ColumnMapping>;
-
-struct ChunkInfoRowNumOffset : public ChunkInfoCloneable<ChunkInfoRowNumOffset>
+using IColumnFilter = PaddedPODArray<UInt8>;
+
+/// Most (all?) file formats have a natural order of rows within the file.
+/// But our format readers and query pipeline may reorder or filter rows. This struct is used to
+/// propagate the original row numbers, e.g. for _row_number virtual column or for iceberg
+/// positional deletes.
+///
+/// Warning: we currently don't correctly update this info in most transforms. E.g. things like
+/// FilterTransform and SortingTransform logically should remove this ChunkInfo, but don't; we don't
+/// have a mechanism to systematically find all code sites that would need to do that or to detect
+/// if one was missed.
+/// So this is only used in a few specific situations, and the builder of query pipeline must be
+/// careful to never put a step that uses this info after a step that breaks it.
+///
+/// If row numbers in a chunk are consecutive, this contains just the first row number.
+/// If row numbers are not consecutive as a result of filtering, this additionally contains the mask
+/// that was used for filtering, from which row numbers can be recovered.
+struct ChunkInfoRowNumbers : public ChunkInfo
 {
-    ChunkInfoRowNumOffset(const ChunkInfoRowNumOffset & other) = default;
-    explicit ChunkInfoRowNumOffset(size_t row_num_offset_) : row_num_offset(row_num_offset_) { }
+    explicit ChunkInfoRowNumbers(size_t row_num_offset_, std::optional<IColumnFilter> applied_filter_ = std::nullopt);
+
+    Ptr clone() const override;
 
     const size_t row_num_offset;
+    /// If nullopt, row numbers are consecutive.
+    /// If not empty, the number of '1' elements is equal to the number of rows in the chunk;
+    /// row i in the chunk has row number:
+    /// row_num_offset + {index of the i-th '1' element in applied_filter}.
+    std::optional<IColumnFilter> applied_filter;
+};
+
+/// Structure for storing information about buckets that IInputFormat needs to read.
+struct FileBucketInfo
+{
+    virtual void serialize(WriteBuffer & buffer) = 0;
+    virtual void deserialize(ReadBuffer & buffer) = 0;
+    virtual String getIdentifier() const = 0;
+    virtual String getFormatName() const = 0;
+
+    virtual ~FileBucketInfo() = default;
 };
+using FileBucketInfoPtr = std::shared_ptr<FileBucketInfo>;
+
+/// Interface for splitting a file into buckets.
+struct IBucketSplitter
+{
+    /// Splits a file into buckets using the given read buffer and format settings.
+    /// Returns information about the resulting buckets (see the structure above for details).
+    virtual std::vector<FileBucketInfoPtr> splitToBuckets(size_t bucket_size, ReadBuffer & buf, const FormatSettings & format_settings_) = 0;
+
+    virtual ~IBucketSplitter() = default;
+};
+using BucketSplitter = std::shared_ptr<IBucketSplitter>;
 
 /** Input format is a source, that reads data from ReadBuffer.
   */
@@ -45,6 +94,7 @@ class IInputFormat : public ISource
     /// All data reading from the read buffer must be performed by this method.
     virtual Chunk read() = 0;
 
+    virtual void setBucketsToRead(const FileBucketInfoPtr & buckets_to_read);
     /** In some usecase (hello Kafka) we need to read a lot of tiny streams in exactly the same format.
      * The recreating of parser for each small stream takes too long, so we introduce a method
      * resetParser() which allow to reset the state of parser to continue reading of
@@ -79,6 +129,9 @@ class IInputFormat : public ISource
 
     void needOnlyCount() { need_only_count = true; }
 
+    /// Set additional info/key/id related to underlying storage of the ReadBuffer
+    virtual void setStorageRelatedUniqueKey(const Settings & /*settings*/, const String & /*key*/) {}
+
 protected:
     ReadBuffer & getReadBuffer() const { chassert(in); return *in; }
 
diff --git a/src/Processors/Formats/IOutputFormat.h b/src/Processors/Formats/IOutputFormat.h
index c903b1c6ae5c..1ec661e49ea5 100644
--- a/src/Processors/Formats/IOutputFormat.h
+++ b/src/Processors/Formats/IOutputFormat.h
@@ -107,6 +107,11 @@ class IOutputFormat : public IProcessor
         progress_write_frequency_us = value;
     }
 
+    /// Derived classes can use some wrappers around out WriteBuffer
+    /// and can override this method to return wrapper
+    /// that should be used in its derived classes.
+    virtual WriteBuffer * getWriteBufferPtr() { return &out; }
+
 protected:
     friend class ParallelFormattingOutputFormat;
 
@@ -182,11 +187,6 @@ class IOutputFormat : public IProcessor
     /// outputs them in finalize() method.
     virtual bool areTotalsAndExtremesUsedInFinalize() const { return false; }
 
-    /// Derived classes can use some wrappers around out WriteBuffer
-    /// and can override this method to return wrapper
-    /// that should be used in its derived classes.
-    virtual WriteBuffer * getWriteBufferPtr() { return &out; }
-
     WriteBuffer & out;
 
     Chunk current_chunk;
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 15f423c3d421..3e73df4ebf3d 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -1121,7 +1121,7 @@ static ColumnWithTypeAndName readNonNullableColumnFromArrowColumn(
 
             auto nested_column = readColumnFromArrowColumn(arrow_nested_column,
                 column_name,
-                Nested::concatenateName(full_column_name, "list.element"),
+                full_column_name,
                 dictionary_infos,
                 nested_type_hint,
                 is_nested_nullable_column,
@@ -1211,12 +1211,9 @@ static ColumnWithTypeAndName readNonNullableColumnFromArrowColumn(
                 {
                     chassert(clickhouse_columns_to_parquet);
 
-                    auto column_to_search = full_column_name;
-                    if (column_to_search.ends_with("list.element"))
-                        column_to_search = column_to_search.substr(0, column_to_search.size() - 13);
                     /// Full name of the parquet column.
                     /// For example, if the column name is "a" and the field name in the structure is "b", the full name will be "a.b".
-                    auto full_name = clickhouse_columns_to_parquet->at(column_to_search);
+                    auto full_name = clickhouse_columns_to_parquet->at(full_column_name);
                     full_name += "." + field_name;
                     if (auto it = parquet_columns_to_clickhouse->find(full_name); it != parquet_columns_to_clickhouse->end())
                     {
@@ -1317,7 +1314,7 @@ static ColumnWithTypeAndName readNonNullableColumnFromArrowColumn(
 
             auto arrow_indexes_column = std::make_shared<arrow::ChunkedArray>(indexes_array);
             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_column = ColumnLowCardinality::create(dict_info.values->column, indexes_column, /*is_shared=*/true);
             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};
         }
@@ -1559,7 +1556,18 @@ Chunk ArrowColumnToCHColumn::arrowTableToCHChunk(
         auto arrow_field = table->schema()->GetFieldByName(column_name);
 
         if (parquet_columns_to_clickhouse)
-            column_name = parquet_columns_to_clickhouse->at(column_name);
+        {
+            auto column_name_it = parquet_columns_to_clickhouse->find(column_name);
+            if (column_name_it == parquet_columns_to_clickhouse->end())
+            {
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Column '{}' is not present in input data. Column name mapping has {} columns",
+                    column_name,
+                    parquet_columns_to_clickhouse->size());
+            }
+            column_name = column_name_it->second;
+        }
 
         if (case_insensitive_matching)
             boost::to_lower(column_name);
diff --git a/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h b/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h
index bab62ec5e39e..4447200b931b 100644
--- a/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h
+++ b/src/Processors/Formats/Impl/ArrowFieldIndexUtil.h
@@ -179,7 +179,7 @@ class ArrowFieldIndexUtil
             const auto * map_type = static_cast<arrow::MapType *>(field_type.get());
             auto index_snapshot = current_start_index;
             current_start_index += countIndicesForType(map_type->key_type());
-            calculateFieldIndices(*map_type->item_field(), field_name, current_start_index, result, name_prefix);
+            calculateFieldIndices(*map_type->item_field(), Nested::concatenateName(field_name, "value"), current_start_index, result, name_prefix);
             index_info.first = index_snapshot;
         }
         else
@@ -217,7 +217,9 @@ class ArrowFieldIndexUtil
                     if (clickhouse_to_parquet_names)
                     {
                         if (auto it = clickhouse_to_parquet_names->find(full_name); it != clickhouse_to_parquet_names->end())
+                        {
                             full_name = it->second;
+                        }
                     }
 
                     findRequiredIndices(Nested::concatenateName(name, field_name), full_name, header_index, field_type, field_indices, added_indices, required_indices, file, clickhouse_to_parquet_names);
@@ -233,7 +235,7 @@ class ArrowFieldIndexUtil
         else if (const auto * type_map = typeid_cast<const DB::DataTypeMap *>(nested_type.get()))
         {
             findRequiredIndices(name, transformed_name, header_index, type_map->getKeyType(), field_indices, added_indices, required_indices, file, clickhouse_to_parquet_names);
-            findRequiredIndices(name, transformed_name, header_index, type_map->getValueType(), field_indices, added_indices, required_indices, file, clickhouse_to_parquet_names);
+            findRequiredIndices(Nested::concatenateName(name, "value"), Nested::concatenateName(transformed_name, "value"), header_index, type_map->getValueType(), field_indices, added_indices, required_indices, file, clickhouse_to_parquet_names);
             return;
         }
         auto it = field_indices.find(transformed_name);
diff --git a/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp
index 22373e1f4d18..3f2750b98d00 100644
--- a/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BSONEachRowRowInputFormat.cpp
@@ -433,14 +433,20 @@ void BSONEachRowRowInputFormat::readTuple(IColumn & column, const DataTypePtr &
 
     assertChar(BSON_DOCUMENT_END, *in);
 
-    if (read_nested_columns != data_type_tuple->getElements().size())
+    const auto elements_size = data_type_tuple->getElements().size();
+    if (read_nested_columns != elements_size)
         throw Exception(
                         ErrorCodes::INCORRECT_DATA,
                         "Cannot parse tuple column with type {} from BSON array/embedded document field, "
                         "the number of fields in tuple and BSON document doesn't match: {} != {}",
                         data_type->getName(),
-                        data_type_tuple->getElements().size(),
+                        elements_size,
                         read_nested_columns);
+
+    /// There are no nested columns to grow, so we must explicitly increment the column size.
+    /// Otherwise, `column.size()` will return 0 for empty tuples columns.
+    if (elements_size == 0)
+        tuple_column.addSize(1);
 }
 
 void BSONEachRowRowInputFormat::readMap(IColumn & column, const DataTypePtr & data_type, BSONType bson_type)
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 6d76a105e96d..402ada7a491e 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -41,6 +41,7 @@
         M(Float64, arrow::DoubleBuilder)
 
 #define FOR_ARROW_TYPES(M) \
+        M(BOOL, arrow::BooleanType) \
         M(UINT8, arrow::UInt8Type) \
         M(INT8, arrow::Int8Type) \
         M(UINT16, arrow::UInt16Type) \
@@ -53,7 +54,8 @@
         M(DOUBLE, arrow::DoubleType) \
         M(BINARY, arrow::BinaryType) \
         M(STRING, arrow::StringType) \
-        M(FIXED_SIZE_BINARY, arrow::FixedSizeBinaryType)
+        M(FIXED_SIZE_BINARY, arrow::FixedSizeBinaryType) \
+        M(DATE32, arrow::Date32Type)
 
 namespace DB
 {
diff --git a/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp b/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp
index 2d599dd22dd8..c82984068b80 100644
--- a/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp
@@ -396,7 +396,10 @@ Chunk DWARFBlockInputFormat::parseEntries(UnitState & unit)
     auto col_attr_name = ColumnVector<UInt16>::create();
     auto col_attr_form = ColumnVector<UInt16>::create();
     auto col_attr_int = ColumnVector<UInt64>::create();
-    auto col_attr_str = ColumnLowCardinality::create(MutableColumnPtr(ColumnUnique<ColumnString>::create(ColumnString::create()->cloneResized(1), /*is_nullable*/ false)), MutableColumnPtr(ColumnVector<UInt16>::create()));
+    auto col_attr_str = ColumnLowCardinality::create(
+        MutableColumnPtr(ColumnUnique<ColumnString>::create(ColumnString::create()->cloneResized(1), /*is_nullable*/ false)),
+        MutableColumnPtr(ColumnVector<UInt16>::create()),
+        /*is_shared=*/false);
     auto col_attr_offsets = ColumnVector<UInt64>::create();
     size_t num_rows = 0;
     auto err = llvm::Error::success();
@@ -749,8 +752,8 @@ Chunk DWARFBlockInputFormat::parseEntries(UnitState & unit)
                 auto index = ColumnVector<UInt8>::create();
                 index->insert(1);
                 auto indices = index->replicate({num_rows});
-                cols.push_back(ColumnLowCardinality::create(ColumnUnique<ColumnString>::create(
-                    std::move(dict), /*is_nullable*/ false), indices));
+                cols.push_back(ColumnLowCardinality::create(
+                    ColumnUnique<ColumnString>::create(std::move(dict), /*is_nullable*/ false), indices, /*is_shared*/ false));
                 break;
             }
             case COL_UNIT_OFFSET:
@@ -761,8 +764,8 @@ Chunk DWARFBlockInputFormat::parseEntries(UnitState & unit)
                 auto index = ColumnVector<UInt8>::create();
                 index->insert(1);
                 auto indices = index->replicate({num_rows});
-                cols.push_back(ColumnLowCardinality::create(ColumnUnique<ColumnVector<UInt64>>::create(
-                    std::move(dict), /*is_nullable*/ false), indices));
+                cols.push_back(ColumnLowCardinality::create(
+                    ColumnUnique<ColumnVector<UInt64>>::create(std::move(dict), /*is_nullable*/ false), indices, /*is_shared*/ false));
                 break;
             }
             case COL_ANCESTOR_TAGS:
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
index d207639ebcce..e84ff2158189 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
@@ -13,7 +13,6 @@ namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
     extern const int INCORRECT_DATA;
-    extern const int ILLEGAL_COLUMN;
 }
 
 JSONAsRowInputFormat::JSONAsRowInputFormat(SharedHeader header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_) :
@@ -190,11 +189,6 @@ Chunk JSONAsObjectRowInputFormat::getChunkForCount(size_t rows)
 
 JSONAsObjectExternalSchemaReader::JSONAsObjectExternalSchemaReader(const FormatSettings & settings_) : settings(settings_)
 {
-    if (!settings.json.allow_deprecated_object_type && !settings.json.allow_json_type)
-        throw Exception(
-            ErrorCodes::ILLEGAL_COLUMN,
-            "Cannot infer the data structure in JSONAsObject format because experimental JSON type is not allowed. Set setting "
-            "enable_json_type = 1 in order to allow it");
 }
 
 void registerInputFormatJSONAsString(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
index f1689e63019c..a3920ace83e4 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
@@ -74,9 +74,7 @@ class JSONAsObjectExternalSchemaReader : public IExternalSchemaReader
 
     NamesAndTypesList readSchema() override
     {
-        if (settings.json.allow_json_type)
-            return {{"json", std::make_shared<DataTypeObject>(DataTypeObject::SchemaFormat::JSON)}};
-        return {{"json", std::make_shared<DataTypeObjectDeprecated>("json", false)}};
+        return {{"json", std::make_shared<DataTypeObject>(DataTypeObject::SchemaFormat::JSON)}};
     }
 
 private:
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
index df613206f3cf..790f1c42a5a3 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <IO/PeekableWriteBuffer.h>
 #include <Processors/Formats/OutputFormatWithUTF8ValidationAdaptor.h>
 #include <Processors/Formats/RowOutputFormatWithExceptionHandlerAdaptor.h>
 #include <Formats/FormatSettings.h>
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.h b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
index dc5459611615..4290313f1fdc 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <IO/Progress.h>
-#include <IO/PeekableWriteBuffer.h>
 #include <Common/Stopwatch.h>
 #include <Processors/Formats/OutputFormatWithUTF8ValidationAdaptor.h>
 #include <Processors/Formats/RowOutputFormatWithExceptionHandlerAdaptor.h>
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
index c2df0ffb41c3..1f6c09212693 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
@@ -407,8 +407,13 @@ bool MsgPackVisitor::start_array(size_t size) // NOLINT
 
         ColumnTuple & column_tuple = assert_cast<ColumnTuple &>(info_stack.top().column);
         /// Push nested columns into stack in reverse order.
-        for (ssize_t i = nested_types.size() - 1; i >= 0; --i)
+        for (ssize_t i = static_cast<ssize_t>(nested_types.size()) - 1; i >= 0; --i)
             info_stack.push(Info{column_tuple.getColumn(i), nested_types[i], true, std::nullopt, nullptr});
+
+        /// There are no nested columns to grow, so we must explicitly increment the column size.
+        /// Otherwise, `column.size()` will return 0 for empty tuples columns.
+        if (nested_types.empty())
+            column_tuple.addSize(1);
     }
     else
     {
diff --git a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
index 1ba10e3d44a0..17e4a9426170 100644
--- a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
@@ -1422,7 +1422,7 @@ static ColumnWithTypeAndName readColumnWithEncodedStringOrFixedStringData(
             }
         }
 
-        return ColumnLowCardinality::create(std::move(dictionary_column), std::move(new_index_column));
+        return ColumnLowCardinality::create(std::move(dictionary_column), std::move(new_index_column), /*is_shared=*/false);
     };
 
     MutableColumnPtr internal_column;
diff --git a/src/Processors/Formats/Impl/Parquet/Decoding.cpp b/src/Processors/Formats/Impl/Parquet/Decoding.cpp
index 40f4efcf68c9..56b27309deb0 100644
--- a/src/Processors/Formats/Impl/Parquet/Decoding.cpp
+++ b/src/Processors/Formats/Impl/Parquet/Decoding.cpp
@@ -41,7 +41,7 @@ struct BitPackedRLEDecoder : public PageDecoder
             requireRemainingBytes(1);
             bit_width = size_t(UInt8(*data));
             data += 1;
-            if (bit_width > 8 * sizeof(T) || (bit_width == 0 && limit > 1))
+            if (bit_width > 8 * sizeof(T))
                 throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid dict indices bit width: {}", bit_width);
         }
         else
@@ -120,7 +120,7 @@ struct BitPackedRLEDecoder : public PageDecoder
     {
         if (bit_width == 0)
         {
-            /// bit_width == 0 can be used for dictionary indices if the dictionary has only one value.
+            /// bit_width == 0 means all values are 0.
             if constexpr (!skip)
                 memset(out, 0, num_values * sizeof(T));
             return;
@@ -249,7 +249,7 @@ struct PlainBooleanDecoder : public PageDecoder
                 /// x = 00000000 000000hg 00000000 000000fe 00000000 000000dc 00000000 000000ba
                 x = (x | (x <<  7)) & 0x0101010101010101ul;
                 /// x = 0000000h 0000000g 0000000f 0000000e 0000000d 0000000c 0000000b 0000000a
-                memcpy(to + i * 8, &x, 8);
+                memcpy(to + i, &x, 8);
                 i += 8;
             }
             else
@@ -745,7 +745,7 @@ struct ByteStreamSplitDecoder : public PageDecoder
 
 bool PageDecoderInfo::canReadDirectlyIntoColumn(parq::Encoding::type encoding, size_t num_values, IColumn & col, std::span<char> & out) const
 {
-    if (encoding == parq::Encoding::PLAIN && fixed_size_converter && fixed_size_converter->isTrivial())
+    if (encoding == parq::Encoding::PLAIN && fixed_size_converter && physical_type != parq::Type::BOOLEAN && fixed_size_converter->isTrivial())
     {
         chassert(col.sizeOfValueIfFixed() == fixed_size_converter->input_size);
         out = col.insertRawUninitialized(num_values);
@@ -1003,7 +1003,7 @@ void Dictionary::index(const ColumnUInt32 & indexes_col, IColumn & out)
             c.reserve(c.size() + indexes.size());
             for (UInt32 idx : indexes)
             {
-                size_t start = offsets[size_t(idx) - 1] + 4; // offsets[-1] is ok because of padding
+                size_t start = offsets[ssize_t(idx) - 1] + 4; // offsets[-1] is ok because of padding
                 size_t len = offsets[idx] - start;
                 /// TODO [parquet]: Try optimizing short memcpy by taking advantage of padding (maybe memcpySmall.h helps). Also in PlainStringDecoder.
                 c.insertData(data.data() + start, len);
@@ -1096,6 +1096,8 @@ void IntConverter::convertField(std::span<const char> data, bool /*is_max*/, Fie
     UInt64 val = 0;
     switch (input_size)
     {
+        case 1: val = unalignedLoad<UInt8>(data.data()); break;
+        case 2: val = unalignedLoad<UInt16>(data.data()); break;
         case 4: val = unalignedLoad<UInt32>(data.data()); break;
         case 8: val = unalignedLoad<UInt64>(data.data()); break;
         default: chassert(false);
@@ -1219,7 +1221,7 @@ void TrivialStringConverter::convertColumn(std::span<const char> chars, const UI
     {
         col_str.getChars().reserve(col_str.getChars().size() + (offsets[num_values - 1] - offsets[-1]) - separator_bytes * num_values);
         for (size_t i = 0; i < num_values; ++i)
-            col_str.insertData(chars.data() + offsets[i - 1], offsets[i] - offsets[i - 1] - separator_bytes);
+            col_str.insertData(chars.data() + offsets[ssize_t(i) - 1], offsets[i] - offsets[ssize_t(i) - 1] - separator_bytes);
     }
 }
 
@@ -1345,8 +1347,8 @@ void BigEndianDecimalStringConverter<T>::convertColumn(std::span<const char> cha
 
     for (size_t i = 0; i < num_values; ++i)
     {
-        const char * data = chars.data() + offsets[i - 1];
-        size_t size = offsets[i] - offsets[i - 1] - separator_bytes;
+        const char * data = chars.data() + offsets[ssize_t(i) - 1];
+        size_t size = offsets[i] - offsets[ssize_t(i) - 1] - separator_bytes;
         if (size > sizeof(T))
             throw Exception(ErrorCodes::CANNOT_PARSE_NUMBER, "Unexpectedly wide Decimal value: {} > {} bytes", size, sizeof(T));
 
@@ -1417,7 +1419,7 @@ void GeoConverter::convertColumn(std::span<const char> chars, const UInt64 * off
 {
     col.reserve(col.size() + num_values);
     chassert(chars.size() >= offsets[num_values - 1]);
-    for (size_t i = 0; i < num_values; ++i)
+    for (ssize_t i = 0; i < ssize_t(num_values); ++i)
     {
         char * ptr = const_cast<char*>(chars.data() + offsets[i - 1]);
         size_t length = offsets[i] - offsets[i - 1] - separator_bytes;
diff --git a/src/Processors/Formats/Impl/Parquet/Decoding.h b/src/Processors/Formats/Impl/Parquet/Decoding.h
index 9682c9848fc5..44f8f047bf98 100644
--- a/src/Processors/Formats/Impl/Parquet/Decoding.h
+++ b/src/Processors/Formats/Impl/Parquet/Decoding.h
@@ -155,7 +155,8 @@ struct PageDecoderInfo
 };
 
 
-/// Input physical type: INT32 or INT64.
+/// Input physical type: BOOLEAN, INT32, or INT64.
+/// input_size in {1, 4, 8}.
 /// Output column type: [U]Int{8,16,32,64}.
 /// Output Field type: [U]Int64, IPv4, or Decimal{32,64}.
 struct IntConverter : public FixedSizeConverter
diff --git a/src/Processors/Formats/Impl/Parquet/Prefetcher.cpp b/src/Processors/Formats/Impl/Parquet/Prefetcher.cpp
index ba80137305d4..9cf2077b0c19 100644
--- a/src/Processors/Formats/Impl/Parquet/Prefetcher.cpp
+++ b/src/Processors/Formats/Impl/Parquet/Prefetcher.cpp
@@ -15,6 +15,11 @@ namespace DB::ErrorCodes
     extern const int CANNOT_READ_ALL_DATA;
 }
 
+namespace ProfileEvents
+{
+    extern const Event ParquetFetchWaitTimeMicroseconds;
+}
+
 namespace DB::Parquet
 {
 
@@ -69,7 +74,7 @@ void Prefetcher::determineReadModeAndFileSize(ReadBuffer * reader_, const ReadOp
         if (!reader_->eof() && reader_->available() >= expected_prefix.size() &&
             memcmp(reader_->position(), expected_prefix.data(), expected_prefix.size()) != 0)
         {
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Not a parquet file (wrong magic bytes at the start)");
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Not a Parquet file (wrong magic bytes at the start)");
         }
 
         WriteBufferFromVector<PaddedPODArray<char>> out(entire_file);
@@ -395,9 +400,9 @@ void Prefetcher::decreaseTaskRefcount(Task * task, size_t amount)
 void Prefetcher::scheduleTask(Task * task)
 {
     if (parser_shared_resources && !parser_shared_resources->io_runner.isDisabled())
-        parser_shared_resources->io_runner([this, task]
+        parser_shared_resources->io_runner([this, task, _shutdown = shutdown]
             {
-                std::shared_lock shutdown_lock(*shutdown, std::try_to_lock);
+                std::shared_lock shutdown_lock(*_shutdown, std::try_to_lock);
                 if (!shutdown_lock.owns_lock())
                     return;
                 runTask(task);
@@ -409,16 +414,24 @@ std::span<const char> Prefetcher::getRangeData(const PrefetchHandle & request)
     const RequestState * req = request.request;
     chassert(req->state == RequestState::State::HasTask);
     Task * task = req->task;
-    auto s = task->state.load(std::memory_order_acquire);
-    if (s == Task::State::Scheduled)
+    Task::State s = task->state.load(std::memory_order_acquire);
+    if (s == Task::State::Scheduled || s == Task::State::Running)
     {
-        s = runTask(task);
-        chassert(s != Task::State::Scheduled);
-    }
-    if (s == Task::State::Running)
-    {
-        task->completion.wait();
-        s = task->state.load();
+        Stopwatch wait_time;
+
+        if (s == Task::State::Scheduled)
+        {
+            s = runTask(task);
+            chassert(s != Task::State::Scheduled);
+        }
+
+        if (s == Task::State::Running) // (not `else`, the runTask above may return Running)
+        {
+            task->completion.wait();
+            s = task->state.load();
+        }
+
+        ProfileEvents::increment(ProfileEvents::ParquetFetchWaitTimeMicroseconds, wait_time.elapsedMicroseconds());
     }
     if (s == Task::State::Exception)
         rethrowException(task);
diff --git a/src/Processors/Formats/Impl/Parquet/ReadManager.cpp b/src/Processors/Formats/Impl/Parquet/ReadManager.cpp
index 1af017d0086e..f6cd46092594 100644
--- a/src/Processors/Formats/Impl/Parquet/ReadManager.cpp
+++ b/src/Processors/Formats/Impl/Parquet/ReadManager.cpp
@@ -4,8 +4,11 @@
 #include <Common/ProfileEvents.h>
 #include <Formats/FormatFilterInfo.h>
 #include <Formats/FormatParserSharedResources.h>
+#include <Processors/Formats/IInputFormat.h>
 
+#include <mutex>
 #include <shared_mutex>
+#include <unordered_set>
 
 namespace DB::ErrorCodes
 {
@@ -17,6 +20,8 @@ namespace ProfileEvents
 {
     extern const Event ParquetDecodingTasks;
     extern const Event ParquetDecodingTaskBatches;
+    extern const Event ParquetReadRowGroups;
+    extern const Event ParquetPrunedRowGroups;
 }
 
 namespace DB::Parquet
@@ -38,13 +43,23 @@ std::optional<size_t> AtomicBitSet::findFirst()
     return std::nullopt;
 }
 
-void ReadManager::init(FormatParserSharedResourcesPtr parser_shared_resources_)
+void ReadManager::init(FormatParserSharedResourcesPtr parser_shared_resources_, const std::optional<std::vector<size_t>> & buckets_to_read_)
 {
     parser_shared_resources = parser_shared_resources_;
     reader.file_metadata = Reader::readFileMetaData(reader.prefetcher);
-    reader.prefilterAndInitRowGroups();
+
+    if (buckets_to_read_)
+    {
+        row_groups_to_read = std::unordered_set<UInt64>{};
+        for (auto rg : *buckets_to_read_)
+            row_groups_to_read->insert(rg);
+    }
+    reader.prefilterAndInitRowGroups(row_groups_to_read);
     reader.preparePrewhere();
 
+    ProfileEvents::increment(ProfileEvents::ParquetReadRowGroups, reader.row_groups.size());
+    ProfileEvents::increment(ProfileEvents::ParquetPrunedRowGroups, reader.file_metadata.row_groups.size() - reader.row_groups.size());
+
     size_t num_row_groups = reader.row_groups.size();
     for (size_t i = size_t(ReadStage::NotStarted) + 1; i < size_t(ReadStage::Deliver); ++i)
     {
@@ -202,9 +217,10 @@ void ReadManager::finishRowGroupStage(size_t row_group_idx, ReadStage stage, Mem
             {
                 diff.scheduleAllStages();
 
-                if (i + 1 == reader.row_groups.size())
+                /// Notify read() if everything is done or if it's relying on
+                /// first_incomplete_row_group to deliver chunks in order.
+                if (i + 1 == reader.row_groups.size() || reader.options.format.parquet.preserve_order)
                 {
-                    /// Notify read() that everything is done.
                     {
                         /// Lock and unlock to avoid race condition on condition variable.
                         /// (Otherwise the notify_all() may happen after read() saw the old
@@ -330,8 +346,8 @@ void ReadManager::finishRowSubgroupStage(size_t row_group_idx, size_t row_subgro
         case ReadStage::PrewhereData:
         {
             chassert(!reader.prewhere_steps.empty());
-            reader.applyPrewhere(row_subgroup);
-            size_t prev = row_group.prewhere_ptr.exchange(row_subgroup_idx + 1);
+            reader.applyPrewhere(row_subgroup, row_group);
+            size_t prev = row_group.prewhere_ptr.exchange(row_subgroup_idx + 1);  /// NOLINT(clang-analyzer-deadcode.DeadStores)
             chassert(prev == row_subgroup_idx);
             if (row_subgroup_idx + 1 < row_group.subgroups.size())
             {
@@ -349,14 +365,20 @@ void ReadManager::finishRowSubgroupStage(size_t row_group_idx, size_t row_subgro
         }
         case ReadStage::MainData:
         {
-            size_t prev = row_group.read_ptr.exchange(row_subgroup_idx + 1);
-            chassert(prev == row_subgroup_idx);
-            advanced_read_ptr = prev + 1;
             row_subgroup.stage.store(ReadStage::Deliver, std::memory_order::relaxed);
+
+            /// Must add to delivery_queue before advancing read_ptr to deliver subgroups in order.
+            /// (If we advanced read_ptr first, another thread could start and finish reading the
+            ///  next subgroup before we add this one to delivery_queue, and ReadManager::read could
+            ///  pick up the later subgroup before we add this one.)
             {
                 std::lock_guard lock(delivery_mutex);
                 delivery_queue.push(Task {.stage = ReadStage::Deliver, .row_group_idx = row_group_idx, .row_subgroup_idx = row_subgroup_idx});
             }
+
+            size_t prev = row_group.read_ptr.exchange(row_subgroup_idx + 1);
+            chassert(prev == row_subgroup_idx);
+            advanced_read_ptr = prev + 1;
             delivery_cv.notify_one();
             break; // proceed to advancing read_ptr
         }
@@ -421,8 +443,14 @@ void ReadManager::finishRowSubgroupStage(size_t row_group_idx, size_t row_subgro
             /// there can only be one such thread.
             /// (I.e. avoid this race condition: one thread increments read_ptr, another thread sees the
             ///  new value, both threads call clearColumnChunk in parallel, the computer explodes.)
+            /// Don't touch columns with use_prewhere == true, they're cleared by
+            /// ReadStage::PrewhereData instead, which might be happening in parallel with us
+            /// (but doesn't prewhere happen before MainData read? yes, but the clearColumnChunk call
+            ///  happens after advancing prewhere_ptr, so another thread may do MainData+clearColumnChunk
+            ///  before the thread that did prewhere is still clearing the corresponding columns).
             for (size_t i = 0; i < reader.primitive_columns.size(); ++i)
-                clearColumnChunk(row_group.columns.at(i), diff);
+                if (!reader.primitive_columns[i].use_prewhere)
+                    clearColumnChunk(row_group.columns.at(i), diff);
         }
     }
 }
@@ -570,9 +598,9 @@ void ReadManager::scheduleTasksIfNeeded(ReadStage stage_idx)
                 n += 1;
                 ++i;
             }
-            funcs.push_back([this, _batch = std::move(batch)]
+            funcs.push_back([this, _batch = std::move(batch), _shutdown = shutdown]
             {
-                std::shared_lock shutdown_lock(*shutdown, std::try_to_lock);
+                std::shared_lock shutdown_lock(*_shutdown, std::try_to_lock);
                 if (!shutdown_lock.owns_lock())
                     return;
                 runBatchOfTasks(_batch);
@@ -810,13 +838,13 @@ void ReadManager::clearColumnChunk(ColumnChunk & column, MemoryUsageDiff & diff)
 
 void ReadManager::clearRowSubgroup(RowSubgroup & row_subgroup, MemoryUsageDiff & diff)
 {
-    row_subgroup.filter.memory.reset(&diff);
+    row_subgroup.filter.clear(&diff);
     row_subgroup.output.clear();
     for (ColumnSubchunk & col : row_subgroup.columns)
         col.column_and_offsets_memory.reset(&diff);
 }
 
-std::tuple<Chunk, BlockMissingValues> ReadManager::read()
+ReadManager::ReadResult ReadManager::read()
 {
     Task task;
     {
@@ -827,11 +855,17 @@ std::tuple<Chunk, BlockMissingValues> ReadManager::read()
             bool thread_pool_was_idle = parser_shared_resources->parsing_runner.isIdle();
 
             if (exception)
-                std::rethrow_exception(exception);
-
-            if (!delivery_queue.empty())
+                std::rethrow_exception(copyMutableException(exception));
+
+            /// If `preserve_order`, only deliver chunks from `first_incomplete_row_group`.
+            /// This ensures that row groups are delivered in order. Within a row group, row
+            /// subgroups are read and added to `delivery_queue` in order.
+            if (!delivery_queue.empty() &&
+                (!reader.options.format.parquet.preserve_order ||
+                 delivery_queue.top().row_group_idx ==
+                    first_incomplete_row_group.load(std::memory_order_relaxed)))
             {
-                task = delivery_queue.front();
+                task = delivery_queue.top();
                 delivery_queue.pop();
                 break;
             }
@@ -840,7 +874,10 @@ std::tuple<Chunk, BlockMissingValues> ReadManager::read()
             {
                 /// All done. Check for memory accounting leaks.
                 /// First join the threads because they might still be decrementing memory_usage.
+                lock.unlock();
                 shutdown->shutdown();
+                lock.lock();
+
                 for (const RowGroup & row_group : reader.row_groups)
                 {
                     chassert(row_group.stage.load(std::memory_order_relaxed) == ReadStage::Deallocated);
@@ -867,7 +904,10 @@ std::tuple<Chunk, BlockMissingValues> ReadManager::read()
             {
                 /// Pump the manual executor.
                 lock.unlock();
-                if (!parser_shared_resources->parsing_runner.runTaskInline())
+                /// Note: the executor can be shared among multiple files, so we may execute someone
+                /// else's task, and someone else may execute our task.
+                /// Hence the thread_pool_was_idle check.
+                if (!parser_shared_resources->parsing_runner.runTaskInline() && thread_pool_was_idle)
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Deadlock in Parquet::ReadManager (single-threaded)");
                 lock.lock();
             }
@@ -886,7 +926,8 @@ std::tuple<Chunk, BlockMissingValues> ReadManager::read()
         }
     }
 
-    auto & row_subgroup = reader.row_groups.at(task.row_group_idx).subgroups.at(task.row_subgroup_idx);
+    RowGroup & row_group = reader.row_groups.at(task.row_group_idx);
+    RowSubgroup & row_subgroup = row_group.subgroups.at(task.row_subgroup_idx);
     chassert(row_subgroup.stage == ReadStage::Deliver);
     size_t num_final_columns = reader.sample_block->columns();
     for (size_t i = 0; i < reader.output_columns.size(); ++i)
@@ -906,12 +947,44 @@ std::tuple<Chunk, BlockMissingValues> ReadManager::read()
     Chunk chunk(std::move(row_subgroup.output), row_subgroup.filter.rows_pass);
     BlockMissingValues block_missing_values = std::move(row_subgroup.block_missing_values);
 
+    auto row_numbers_info = std::make_shared<ChunkInfoRowNumbers>(
+        row_subgroup.start_row_idx + row_group.start_global_row_idx);
+    if (row_subgroup.filter.rows_pass != row_subgroup.filter.rows_total)
+    {
+        chassert(row_subgroup.filter.rows_pass > 0);
+        chassert(!row_subgroup.filter.filter.empty());
+        chassert(std::accumulate(row_subgroup.filter.filter.begin(), row_subgroup.filter.filter.end(), size_t(0)) == chunk.getNumRows());
+
+        row_numbers_info->applied_filter = std::move(row_subgroup.filter.filter);
+    }
+    chunk.getChunkInfos().add(std::move(row_numbers_info));
+
+    /// This is a terrible hack to make progress indication kind of work.
+    ///
+    /// TODO: Fix progress bar in many ways:
+    ///        1. use number of rows instead of bytes;
+    ///           don't lie about number of bytes read (getApproxBytesReadForChunk()),
+    ///        2. estimate total rows to read after filtering row groups;
+    ///           for rows filtered out by PREWHERE, either report them as read or reduce the
+    ///           estimate of number of rows to read (make it signed),
+    ///        3. report uncompressed deserialized IColumn bytes instead of file bytes, for
+    ///           consistency with MergeTree reads,
+    ///        4. correctly extrapolate progress when reading many files in sequence, e.g.
+    ///           file('part{1..1000}.parquet'),
+    ///        5. correctly merge progress info when a query reads both from MergeTree and files, or
+    ///           parquet and text files.
+    ///       Probably get rid of getApproxBytesReadForChunk() and use the existing
+    ///       ISource::progress()/addTotalRowsApprox instead.
+    ///       For (4) and (5), either add things to struct Progress or make progress bar use
+    ///       ProfileEvents instead of Progress.
+    size_t virtual_bytes_read = size_t(row_group.meta->total_compressed_size) * row_subgroup.filter.rows_total / std::max(size_t(1), size_t(row_group.meta->num_rows));
+
     /// This updates `memory_usage` of previous stages, which may allow more tasks to be scheduled.
     MemoryUsageDiff diff(ReadStage::Deliver);
     finishRowSubgroupStage(task.row_group_idx, task.row_subgroup_idx, ReadStage::Deliver, diff);
     flushMemoryUsageDiff(std::move(diff));
 
-    return {std::move(chunk), std::move(block_missing_values)};
+    return {std::move(chunk), std::move(block_missing_values), virtual_bytes_read};
 }
 
 }
diff --git a/src/Processors/Formats/Impl/Parquet/ReadManager.h b/src/Processors/Formats/Impl/Parquet/ReadManager.h
index f5c850ca7bcb..113d4430ee2a 100644
--- a/src/Processors/Formats/Impl/Parquet/ReadManager.h
+++ b/src/Processors/Formats/Impl/Parquet/ReadManager.h
@@ -40,12 +40,19 @@ class ReadManager
     /// (I'm trying this style because the usual pattern of passing-through lots of arguments through
     /// layers of constructors seems bad. This seems better but still not great, hopefully there's an
     /// even better way.)
-    void init(FormatParserSharedResourcesPtr parser_shared_resources_);
+    void init(FormatParserSharedResourcesPtr parser_shared_resources_, const std::optional<std::vector<size_t>> & buckets_to_read_);
 
     ~ReadManager();
 
+    struct ReadResult
+    {
+        Chunk chunk;
+        BlockMissingValues block_missing_values;
+        size_t virtual_bytes_read = 0;
+    };
+
     /// Not thread safe.
-    std::tuple<Chunk, BlockMissingValues> read();
+    ReadResult read();
 
     void cancel() noexcept;
 
@@ -63,6 +70,14 @@ class ReadManager
         size_t row_subgroup_idx = UINT64_MAX;
         size_t column_idx = UINT64_MAX;
         size_t cost_estimate_bytes = 0;
+
+        struct Comparator
+        {
+            bool operator()(const Task & x, const Task & y) const
+            {
+                return std::make_tuple(x.row_group_idx, x.row_subgroup_idx) > std::make_tuple(y.row_group_idx, y.row_subgroup_idx);
+            }
+        };
     };
 
     struct Stage
@@ -91,9 +106,11 @@ class ReadManager
     std::atomic<size_t> first_incomplete_row_group {0};
 
     std::mutex delivery_mutex;
-    std::queue<Task> delivery_queue;
+    std::priority_queue<Task, std::vector<Task>, Task::Comparator> delivery_queue;
     std::condition_variable delivery_cv;
     std::exception_ptr exception;
+    /// Nullopt means that ReadManager reads all row groups
+    std::optional<std::unordered_set<UInt64>> row_groups_to_read;
 
     void scheduleTask(Task task, bool is_first_in_group, MemoryUsageDiff & diff, std::vector<Task> & out_tasks);
     void runTask(Task task, bool last_in_batch, MemoryUsageDiff & diff);
@@ -101,6 +118,8 @@ class ReadManager
     void scheduleTasksIfNeeded(ReadStage stage_idx);
     void finishRowGroupStage(size_t row_group_idx, ReadStage stage, MemoryUsageDiff & diff);
     void finishRowSubgroupStage(size_t row_group_idx, size_t row_subgroup_idx, ReadStage stage, MemoryUsageDiff & diff);
+    /// Free some memory ColumnChunk that's not needed after decoding is done in all row sugroups.
+    /// Call sites should be careful to not call it from multiple threads in parallel.
     void clearColumnChunk(ColumnChunk & column, MemoryUsageDiff & diff);
     void clearRowSubgroup(RowSubgroup & row_subgroup, MemoryUsageDiff & diff);
     void setTasksToSchedule(size_t row_group_idx, ReadStage stage, std::vector<Task> add_tasks, MemoryUsageDiff & diff);
diff --git a/src/Processors/Formats/Impl/Parquet/Reader.cpp b/src/Processors/Formats/Impl/Parquet/Reader.cpp
index 4b3b8548428e..c46274902eeb 100644
--- a/src/Processors/Formats/Impl/Parquet/Reader.cpp
+++ b/src/Processors/Formats/Impl/Parquet/Reader.cpp
@@ -14,7 +14,9 @@
 #include <Processors/Formats/Impl/Parquet/SchemaConverter.h>
 #include <Storages/SelectQueryInfo.h>
 
+#include <mutex>
 #include <lz4.h>
+#include <arrow/util/crc32.h>
 
 #if USE_SNAPPY
 #include <snappy.h>
@@ -28,6 +30,7 @@ namespace DB::ErrorCodes
     extern const int INCORRECT_DATA;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
+    extern const int CHECKSUM_DOESNT_MATCH;
 }
 
 namespace DB::Parquet
@@ -176,7 +179,7 @@ parq::FileMetaData Reader::readFileMetaData(Prefetcher & prefetcher)
     prefetcher.readSync(buf.data(), initial_read_size, file_size - initial_read_size);
 
     if (memcmp(buf.data() + initial_read_size - 4, "PAR1", 4) != 0)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Not a parquet file (wrong magic bytes at the end of file)");
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Not a Parquet file (wrong magic bytes at the end of file)");
 
     int32_t metadata_size_i32;
     memcpy(&metadata_size_i32, buf.data() + initial_read_size - 8, 4);
@@ -211,6 +214,33 @@ parq::FileMetaData Reader::readFileMetaData(Prefetcher & prefetcher)
         }
     }
 
+    /// Consider two quirks:
+    ///  (1) Some versions of spark didn't write dictionary_page_offset even when dictionary page is
+    ///      present. Instead, data_page_offset points to the dictionary page.
+    ///  (2) Old DuckDB versions (<= 0.10.2) wrote incorrect data_page_offset when dictionary is
+    ///      present.
+    /// We work around (1) in initializeDataPage by allowing dictionary page in place of data page.
+    /// We work around (2) here by converting it to case (1):
+    ///   data_page_offset = dictionary_page_offset
+    ///   dictionary_page_offset.reset()
+    /// Note: newer versions of DuckDB include version number in the `created_by` string, so this
+    /// `if` only applies to relatively old versions. Newer versions don't have this bug.
+    if (file_metadata.created_by == "DuckDB")
+    {
+        for (auto & rg : file_metadata.row_groups)
+        {
+            for (auto & col : rg.columns)
+            {
+                if (!col.__isset.offset_index_offset && col.meta_data.__isset.dictionary_page_offset)
+                {
+                    col.meta_data.data_page_offset = col.meta_data.dictionary_page_offset;
+                    col.meta_data.__isset.dictionary_page_offset = false;
+                    col.meta_data.dictionary_page_offset = 0;
+                }
+            }
+        }
+    }
+
     return file_metadata;
 }
 
@@ -262,7 +292,7 @@ void Reader::getHyperrectangleForRowGroup(const parq::RowGroup * meta, Hyperrect
     }
 }
 
-void Reader::prefilterAndInitRowGroups()
+void Reader::prefilterAndInitRowGroups(const std::optional<std::unordered_set<UInt64>> & row_groups_to_read)
 {
     extended_sample_block = *sample_block;
     for (const auto & col : format_filter_info->additional_columns)
@@ -274,6 +304,7 @@ void Reader::prefilterAndInitRowGroups()
     SchemaConverter schemer(file_metadata, options, &extended_sample_block);
     if (prewhere_info && !prewhere_info->remove_prewhere_column)
         schemer.external_columns.push_back(prewhere_info->prewhere_column_name);
+    schemer.column_mapper = format_filter_info->column_mapper.get();
     schemer.prepareForReading();
     primitive_columns = std::move(schemer.primitive_columns);
     total_primitive_columns_in_file = schemer.primitive_column_idx;
@@ -281,30 +312,33 @@ void Reader::prefilterAndInitRowGroups()
 
     /// Precalculate some column index mappings.
 
-    sample_block_to_output_columns_idx.resize(extended_sample_block.columns(), UINT64_MAX);
+    sample_block_to_output_columns_idx.resize(extended_sample_block.columns());
     for (size_t i = 0; i < output_columns.size(); ++i)
     {
         const auto & idx = output_columns[i].idx_in_output_block;
         if (idx.has_value())
         {
-            chassert(sample_block_to_output_columns_idx.at(*idx) == UINT64_MAX);
+            chassert(!sample_block_to_output_columns_idx.at(*idx).has_value());
             sample_block_to_output_columns_idx.at(*idx) = i;
         }
     }
-    chassert(std::all_of(sample_block_to_output_columns_idx.begin(), sample_block_to_output_columns_idx.end(), [](size_t x) { return x != UINT64_MAX; }));
 
     if (format_filter_info->key_condition)
     {
         for (size_t idx_in_output_block : format_filter_info->key_condition->getUsedColumns())
         {
-            size_t output_idx = sample_block_to_output_columns_idx.at(idx_in_output_block);
-            const OutputColumnInfo & output_info = output_columns[output_idx];
+            const auto & output_idx = sample_block_to_output_columns_idx.at(idx_in_output_block);
+            if (!output_idx.has_value())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "KeyCondition uses PREWHERE output");
+            const OutputColumnInfo & output_info = output_columns[output_idx.value()];
+
             if (output_info.is_primitive)
                 primitive_columns[output_info.primitive_start].used_by_key_condition = idx_in_output_block;
         }
     }
 
     /// Populate row_groups. Skip row groups based on column chunk min/max statistics.
+    size_t total_rows = 0;
     for (size_t row_group_idx = 0; row_group_idx < file_metadata.row_groups.size(); ++row_group_idx)
     {
         const auto * meta = &file_metadata.row_groups[row_group_idx];
@@ -313,6 +347,8 @@ void Reader::prefilterAndInitRowGroups()
         if (meta->columns.size() != total_primitive_columns_in_file)
             throw Exception(ErrorCodes::INCORRECT_DATA, "Row group {} has unexpected number of columns: {} != {}", row_group_idx, meta->columns.size(), total_primitive_columns_in_file);
 
+        total_rows += size_t(meta->num_rows); // before potentially skipping the row group
+
         Hyperrectangle hyperrectangle(extended_sample_block.columns(), Range::createWholeUniverse());
         if (options.format.parquet.filter_push_down && format_filter_info->key_condition)
         {
@@ -324,7 +360,9 @@ void Reader::prefilterAndInitRowGroups()
 
         RowGroup & row_group = row_groups.emplace_back();
         row_group.meta = meta;
+        row_group.need_to_process = !row_groups_to_read.has_value() || row_groups_to_read->contains(row_group_idx);
         row_group.row_group_idx = row_group_idx;
+        row_group.start_global_row_idx = total_rows - size_t(meta->num_rows);
         row_group.columns.resize(primitive_columns.size());
         row_group.hyperrectangle = std::move(hyperrectangle);
 
@@ -359,7 +397,11 @@ void Reader::prefilterAndInitRowGroups()
         const auto & column_conditions = static_cast<FilterInfoExt *>(format_filter_info->opaque.get())->column_conditions;
         for (const auto & [idx_in_output_block, key_condition] : column_conditions)
         {
-            const OutputColumnInfo & output_info = output_columns[sample_block_to_output_columns_idx.at(idx_in_output_block)];
+            const auto & output_idx = sample_block_to_output_columns_idx.at(idx_in_output_block);
+            if (!output_idx.has_value())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Column condition uses PREWHERE output");
+            const OutputColumnInfo & output_info = output_columns[output_idx.value()];
+
             if (!output_info.is_primitive)
                 continue;
             primitive_columns[output_info.primitive_start].column_index_condition = key_condition.get();
@@ -598,44 +640,47 @@ void Reader::initializePrefetches()
 void Reader::preparePrewhere()
 {
     PrewhereInfoPtr prewhere_info = format_filter_info->prewhere_info;
-    if (!prewhere_info)
-        return;
+    if (prewhere_info)
+    {
+        /// TODO [parquet]: We currently run prewhere after reading all prewhere columns of the row
+        ///     subgroup, in one thread per row group. Instead, we could extract single-column conditions
+        ///     and run them after decoding the corresponding columns, in parallel.
+        ///     (Still run multi-column conditions, like `col1 = 42 or col2 = 'yes'`, after reading all columns.)
+        ///     Probably reuse tryBuildPrewhereSteps from MergeTree for splitting the expression.
 
-    /// TODO [parquet]: We currently run prewhere after reading all prewhere columns of the row
-    ///     subgroup, in one thread per row group. Instead, we could extract single-column conditions
-    ///     and run them after decoding the corresponding columns, in parallel.
-    ///     (Still run multi-column conditions, like `col1 = 42 or col2 = 'yes'`, after reading all columns.)
-    ///     Probably reuse tryBuildPrewhereSteps from MergeTree for splitting the expression.
 
-    /// Convert ActionsDAG to ExpressionActions.
-    ExpressionActionsSettings actions_settings;
-    if (prewhere_info->row_level_filter.has_value())
-    {
-        ExpressionActions actions(prewhere_info->row_level_filter->clone(), actions_settings);
+        /// Convert ActionsDAG to ExpressionActions.
+        ExpressionActionsSettings actions_settings;
+        if (prewhere_info->row_level_filter.has_value())
+        {
+            ExpressionActions actions(prewhere_info->row_level_filter->clone(), actions_settings);
+            prewhere_steps.push_back(PrewhereStep
+            {
+                .actions = std::move(actions),
+                .result_column_name = prewhere_info->row_level_column_name,
+            });
+        }
+        ExpressionActions actions(prewhere_info->prewhere_actions.clone(), actions_settings);
         prewhere_steps.push_back(PrewhereStep
             {
                 .actions = std::move(actions),
-                .result_column_name = prewhere_info->row_level_column_name
+                .result_column_name = prewhere_info->prewhere_column_name,
+                .need_filter = prewhere_info->need_filter,
             });
+        if (!prewhere_info->remove_prewhere_column)
+            prewhere_steps.back().idx_in_output_block = sample_block->getPositionByName(prewhere_info->prewhere_column_name);
     }
-    ExpressionActions actions(prewhere_info->prewhere_actions.clone(), actions_settings);
-    prewhere_steps.push_back(PrewhereStep
-        {
-            .actions = std::move(actions),
-            .result_column_name = prewhere_info->prewhere_column_name,
-            .need_filter = prewhere_info->need_filter,
-        });
-    if (!prewhere_info->remove_prewhere_column)
-        prewhere_steps.back().idx_in_output_block = sample_block->getPositionByName(prewhere_info->prewhere_column_name);
-
     /// Look up expression inputs in extended_sample_block.
     for (PrewhereStep & step : prewhere_steps)
     {
         for (const auto & col : step.actions.getRequiredColumnsWithTypes())
         {
             size_t idx_in_output_block = extended_sample_block.getPositionByName(col.name, /* case_insensitive= */ false);
-            size_t output_idx = sample_block_to_output_columns_idx.at(idx_in_output_block);
-            OutputColumnInfo & output_info = output_columns[output_idx];
+            const auto & output_idx = sample_block_to_output_columns_idx.at(idx_in_output_block);
+            if (!output_idx.has_value())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "PREWHERE appears to use its own output as input");
+            OutputColumnInfo & output_info = output_columns[output_idx.value()];
+
             output_info.use_prewhere = true;
             bool only_for_prewhere = idx_in_output_block >= sample_block->columns();
 
@@ -645,7 +690,21 @@ void Reader::preparePrewhere()
                 primitive_columns[primitive_idx].only_for_prewhere = only_for_prewhere;
             }
 
-            step.input_column_idxs.push_back(output_idx);
+            step.input_column_idxs.push_back(output_idx.value());
+        }
+    }
+
+    /// Assert that sample_block_to_output_columns_idx is valid.
+    for (size_t i = 0; i < sample_block_to_output_columns_idx.size(); ++i)
+    {
+        /// (`prewhere_steps` has at most two elements)
+        size_t is_prewhere_output = std::count_if(prewhere_steps.begin(), prewhere_steps.end(),
+            [&](const PrewhereStep & step) { return step.idx_in_output_block == i; });
+        if (is_prewhere_output > 1 ||
+            /// Column must appear in exactly one of {output_columns, prewhere output}.
+            sample_block_to_output_columns_idx[i].has_value() != !is_prewhere_output)
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected column in sample block: {}", extended_sample_block.getByPosition(i).name);
         }
     }
 }
@@ -701,8 +760,9 @@ void Reader::processBloomFilterHeader(ColumnChunk & column, const PrimitiveColum
 bool Reader::decodeDictionaryPage(ColumnChunk & column, const PrimitiveColumnInfo & column_info)
 {
     auto data = prefetcher.getRangeData(column.dictionary_page_prefetch);
-    parq::PageHeader header;
-    size_t header_size = deserializeThriftStruct(header, data.data(), data.size());
+    const char * data_ptr = data.data();
+    const char * data_end = data.data() + data.size();
+    auto [header, page_data] = decodeAndCheckPageHeader(data_ptr, data_end);
 
     if (header.type != parq::PageType::DICTIONARY_PAGE)
     {
@@ -713,7 +773,7 @@ bool Reader::decodeDictionaryPage(ColumnChunk & column, const PrimitiveColumnInf
         return false;
     }
 
-    decodeDictionaryPageImpl(header, data.subspan(header_size), column, column_info);
+    decodeDictionaryPageImpl(header, page_data, column, column_info);
     return true;
 }
 
@@ -721,7 +781,6 @@ void Reader::decodeDictionaryPageImpl(const parq::PageHeader & header, std::span
 {
     chassert(header.type == parq::PageType::DICTIONARY_PAGE);
 
-    /// TODO [parquet]: Check checksum.
     size_t compressed_page_size = size_t(header.compressed_page_size);
     if (header.compressed_page_size < 0 || compressed_page_size > data.size())
         throw Exception(ErrorCodes::INCORRECT_DATA, "Dictionary page size out of bounds: {} > {}", header.compressed_page_size, data.size());
@@ -970,7 +1029,8 @@ void Reader::intersectColumnIndexResultsAndInitSubgroups(RowGroup & row_group)
             bytes_per_row += estimateColumnMemoryBytesPerRow(row_group.columns.at(i), row_group, primitive_columns.at(i));
 
         size_t n = size_t(options.format.parquet.prefer_block_bytes / std::max(bytes_per_row, 1.));
-        rows_per_subgroup = std::min(rows_per_subgroup, std::max(n, 1ul));
+        n = std::max(n, size_t(128)); // avoid super tiny blocks if something is wrong with stats
+        rows_per_subgroup = std::min(rows_per_subgroup, n);
     }
     chassert(rows_per_subgroup > 0);
 
@@ -987,8 +1047,8 @@ void Reader::intersectColumnIndexResultsAndInitSubgroups(RowGroup & row_group)
 
             RowSubgroup & row_subgroup = row_group.subgroups.emplace_back();
             row_subgroup.start_row_idx = substart;
-            row_subgroup.filter.rows_pass = subend - substart;
-            row_subgroup.filter.rows_total = row_subgroup.filter.rows_pass;
+            row_subgroup.filter.rows_pass = row_group.need_to_process ? subend - substart : 0;
+            row_subgroup.filter.rows_total = subend - substart;
 
             row_subgroup.columns.resize(primitive_columns.size());
             row_subgroup.output.resize(extended_sample_block.columns());
@@ -996,7 +1056,6 @@ void Reader::intersectColumnIndexResultsAndInitSubgroups(RowGroup & row_group)
                 row_subgroup.block_missing_values.init(sample_block->columns());
         }
     }
-
     row_group.intersected_row_ranges_after_column_index = std::move(row_ranges);
 }
 
@@ -1325,7 +1384,7 @@ void Reader::skipToRow(size_t row_idx, ColumnChunk & column, const PrimitiveColu
 
         auto data = prefetcher.getRangeData(page_info.prefetch);
         const char * ptr = data.data();
-        if (!initializePage(ptr, ptr + data.size(), first_row_idx, page_info.end_row_idx, row_idx, column, column_info))
+        if (!initializeDataPage(ptr, ptr + data.size(), first_row_idx, page_info.end_row_idx, row_idx, column, column_info))
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Page doesn't contain requested row");
         found_page = true;
     }
@@ -1347,12 +1406,33 @@ void Reader::skipToRow(size_t row_idx, ColumnChunk & column, const PrimitiveColu
         chassert(column.next_page_offset <= all_pages.size());
         const char * ptr = all_pages.data() + column.next_page_offset;
         const char * end = all_pages.data() + all_pages.size();
-        initializePage(ptr, end, page.next_row_idx, /*end_row_idx=*/ std::nullopt, row_idx, column, column_info);
+        initializeDataPage(ptr, end, page.next_row_idx, /*end_row_idx=*/ std::nullopt, row_idx, column, column_info);
         column.next_page_offset = ptr - all_pages.data();
     }
 }
 
-bool Reader::initializePage(const char * & data_ptr, const char * data_end, size_t next_row_idx, std::optional<size_t> end_row_idx, size_t target_row_idx, ColumnChunk & column, const PrimitiveColumnInfo & column_info)
+std::tuple<parq::PageHeader, std::span<const char>> Reader::decodeAndCheckPageHeader(const char * & data_ptr, const char * data_end) const
+{
+    parq::PageHeader header;
+    data_ptr += deserializeThriftStruct(header, data_ptr, data_end - data_ptr);
+    size_t compressed_page_size = size_t(header.compressed_page_size);
+    if (header.compressed_page_size < 0 || compressed_page_size > size_t(data_end - data_ptr))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Page size out of bounds: {} > {}", header.compressed_page_size, data_end - data_ptr);
+
+    std::span page_data(data_ptr, compressed_page_size);
+    data_ptr += compressed_page_size;
+
+    if (header.__isset.crc && options.format.parquet.verify_checksums)
+    {
+        uint32_t crc = arrow::internal::crc32(0, page_data.data(), page_data.size());
+        if (crc != uint32_t(header.crc))
+            throw Exception(ErrorCodes::CHECKSUM_DOESNT_MATCH, "Page CRC checksum verification failed");
+    }
+
+    return {header, page_data};
+}
+
+bool Reader::initializeDataPage(const char * & data_ptr, const char * data_end, size_t next_row_idx, std::optional<size_t> end_row_idx, size_t target_row_idx, ColumnChunk & column, const PrimitiveColumnInfo & column_info)
 {
     PageState & page = column.page;
     /// We reuse PageState instance across pages to reuse memory in buffers like decompressed_buf.
@@ -1369,13 +1449,7 @@ bool Reader::initializePage(const char * & data_ptr, const char * data_end, size
     /// Decode page header.
 
     parq::PageHeader header;
-    data_ptr += deserializeThriftStruct(header, data_ptr, data_end - data_ptr);
-    /// TODO [parquet]: Check checksum.
-    size_t compressed_page_size = size_t(header.compressed_page_size);
-    if (header.compressed_page_size < 0 || compressed_page_size > size_t(data_end - data_ptr))
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Page size out of bounds: {} > {}", header.compressed_page_size, data_end - data_ptr);
-    page.data = std::span(data_ptr, compressed_page_size);
-    data_ptr += compressed_page_size;
+    std::tie(header, page.data) = decodeAndCheckPageHeader(data_ptr, data_end);
 
     /// Check if all rows of the page are filtered out, if we have enough information.
 
@@ -1391,10 +1465,13 @@ bool Reader::initializePage(const char * & data_ptr, const char * data_end, size
         if (end_row_idx.has_value() && *end_row_idx - next_row_idx != *num_rows_in_page)
             throw Exception(ErrorCodes::INCORRECT_DATA, "Number of rows in page header doesn't match offset index: {} != {}", *num_rows_in_page, *end_row_idx - next_row_idx);
 
-        if (next_row_idx + *num_rows_in_page <= target_row_idx)
-            return false;
-
         page.end_row_idx = next_row_idx + *num_rows_in_page;
+
+        if (*page.end_row_idx <= target_row_idx)
+        {
+            page.next_row_idx = *page.end_row_idx;
+            return false;
+        }
     }
 
     /// Get information about page layout and encoding out of page header.
@@ -1466,7 +1543,7 @@ bool Reader::initializePage(const char * & data_ptr, const char * data_end, size
             page.codec = parq::CompressionCodec::UNCOMPRESSED;
         }
 
-        if (encoded_def_size + encoded_rep_size > compressed_page_size)
+        if (encoded_def_size + encoded_rep_size > page.data.size())
             throw Exception(ErrorCodes::INCORRECT_DATA, "Page data is too short (def+rep)");
         encoded_rep = page.data.data();
         encoded_def = page.data.data() + encoded_rep_size;
@@ -1479,9 +1556,9 @@ bool Reader::initializePage(const char * & data_ptr, const char * data_end, size
         if (column.dictionary.isInitialized())
             throw Exception(ErrorCodes::INCORRECT_DATA, "Column chunk has multiple dictionary pages or inaccurate data_page_offset");
 
-        /// If we got here, this is a weird parquet file that has a dictionary page but no
-        /// dictionary_page_offset in ColumnMetaData. Not sure whether this is allowed, but spark
-        /// can output such files, so we have to support it.
+        /// There's a dictionary page, but there was no dictionary_page_offset in ColumnMetaData.
+        /// This is probably not allowed, but we have to support it because some writers wrote such
+        /// files, see comment in readFileMetaData.
         decodeDictionaryPageImpl(header, page.data, column, column_info);
         return false;
     }
@@ -1907,7 +1984,7 @@ MutableColumnPtr Reader::formOutputColumn(RowSubgroup & row_subgroup, size_t out
     return res;
 }
 
-void Reader::applyPrewhere(RowSubgroup & row_subgroup)
+void Reader::applyPrewhere(RowSubgroup & row_subgroup, const RowGroup & row_group)
 {
     for (size_t step_idx = 0; step_idx < prewhere_steps.size(); ++step_idx)
     {
@@ -1958,7 +2035,7 @@ void Reader::applyPrewhere(RowSubgroup & row_subgroup)
         chassert(filter.size() == row_subgroup.filter.rows_pass);
 
         size_t rows_pass = countBytesInFilter(filter.data(), 0, filter.size());
-        if (rows_pass == 0)
+        if (rows_pass == 0 || !row_group.need_to_process)
         {
             /// Whole row group was filtered out.
             row_subgroup.filter.rows_pass = 0;
diff --git a/src/Processors/Formats/Impl/Parquet/Reader.h b/src/Processors/Formats/Impl/Parquet/Reader.h
index 51c86bdc55ff..296cb41419a2 100644
--- a/src/Processors/Formats/Impl/Parquet/Reader.h
+++ b/src/Processors/Formats/Impl/Parquet/Reader.h
@@ -24,12 +24,11 @@ namespace DB::Parquet
 {
 
 // TODO [parquet]:
-//  * column_mapper
-//  * allow_geoparquet_parser
-//  * test on files from https://github.com/apache/parquet-testing
+//  * either multistage PREWHERE or make query optimizer selectively move parts of the condition to prewhere instead of the whole condition
+//  * test on files from https://github.com/apache/parquet-testing and https://www.timestored.com/data/sample/parquet
+//  * look at issues in 00900_long_parquet_load.sh
 //  * check fields for false sharing, add cacheline padding as needed
 //  * make sure userspace page cache read buffer supports readBigAt
-//  * assert that memory usage is zero at the end, the reset()s are easy to miss
 //  * support newer parquet versions: https://github.com/apache/parquet-format/blob/master/CHANGES.md
 //  * make writer write DataPageV2
 //  * make writer write PageEncodingStats
@@ -37,8 +36,6 @@ namespace DB::Parquet
 //  * try adding [[unlikely]] to all ifs
 //  * try adding __restrict to pointers on hot paths
 //  * support or deprecate the preserve-order setting
-//  * stats (reuse the ones from the other PR?)
-//     - number of row groups that were split into chunks
 //  * add comments everywhere
 //  * progress indication and estimating bytes to read; allow negative total_bytes_to_read?
 //  * cache FileMetaData in something like SchemaCache
@@ -64,7 +61,7 @@ namespace DB::Parquet
 //     - no columns to read outside prewhere
 //     - no columns to read, but not trivial count either
 //     - ROW POLICY, with and without prewhere, with old and new reader
-//     - prewhere with defaults (it probably doesn't fill them correctly, see MergeTreeRangeReader::executeActionsBeforePrewhere)
+//     - prewhere and other skipping with defaults (it probably doesn't fill them correctly, see MergeTreeRangeReader::executeActionsBeforePrewhere)
 //     - prewhere on virtual columns (do they end up in additional_columns?)
 //     - prewhere with weird filter type (LowCardinality(UInt8), Nullable(UInt8), const UInt8)
 //     - prewhere involving arrays and tuples
@@ -156,7 +153,7 @@ struct Reader
         size_t column_idx;
         /// Index in parquet `schema` (in FileMetaData).
         size_t schema_idx;
-        String name;
+        String name; // possibly mapped by ColumnMapper (e.g. using iceberg metadata)
         PageDecoderInfo decoder;
 
         DataTypePtr raw_decoded_type; // not Nullable
@@ -192,7 +189,7 @@ struct Reader
 
     struct OutputColumnInfo
     {
-        String name;
+        String name; // possibly mapped by ColumnMapper
         /// Range in primitive_columns.
         size_t primitive_start = 0;
         size_t primitive_end = 0;
@@ -389,7 +386,9 @@ struct Reader
         const parq::RowGroup * meta;
 
         size_t row_group_idx; // in parquet file
+        size_t start_global_row_idx = 0; // total number of rows in preceding row groups in the file
 
+        bool need_to_process = false;
         /// Parallel to Reader::primitive_columns.
         /// NOT parallel to `meta.columns` (it's a subset of parquet columns).
         std::vector<ColumnChunk> columns;
@@ -454,8 +453,10 @@ struct Reader
     size_t total_primitive_columns_in_file = 0;
     std::vector<OutputColumnInfo> output_columns;
     /// Maps idx_in_output_block to index in output_columns. I.e.:
-    /// sample_block_to_output_columns_idx[output_columns[i].idx_in_output_block] = i
-    std::vector<size_t> sample_block_to_output_columns_idx;
+    ///     sample_block_to_output_columns_idx[output_columns[i].idx_in_output_block] = i
+    /// nullopt if the column is produced by PREWHERE expression:
+    ///     prewhere_steps[?].idx_in_output_block == i
+    std::vector<std::optional<size_t>> sample_block_to_output_columns_idx;
 
     /// sample_block with maybe some columns added at the end.
     /// The added columns are used as inputs to prewhere expression, then discarded.
@@ -471,7 +472,7 @@ struct Reader
     void init(const ReadOptions & options_, const Block & sample_block_, FormatFilterInfoPtr format_filter_info_);
 
     static parq::FileMetaData readFileMetaData(Prefetcher & prefetcher);
-    void prefilterAndInitRowGroups();
+    void prefilterAndInitRowGroups(const std::optional<std::unordered_set<UInt64>> & row_groups_to_read);
     void preparePrewhere();
 
     /// Deserialize bf header and determine which bf blocks to read.
@@ -503,7 +504,7 @@ struct Reader
     /// is not called again for the moved-out columns.
     MutableColumnPtr formOutputColumn(RowSubgroup & row_subgroup, size_t output_column_idx, size_t num_rows);
 
-    void applyPrewhere(RowSubgroup & row_subgroup);
+    void applyPrewhere(RowSubgroup & row_subgroup, const RowGroup & row_group);
 
 private:
     struct BloomFilterLookup : public KeyCondition::BloomFilter
@@ -523,7 +524,8 @@ struct Reader
     double estimateAverageStringLengthPerRow(const ColumnChunk & column, const RowGroup & row_group) const;
     void decodeDictionaryPageImpl(const parq::PageHeader & header, std::span<const char> data, ColumnChunk & column, const PrimitiveColumnInfo & column_info);
     void skipToRow(size_t row_idx, ColumnChunk & column, const PrimitiveColumnInfo & column_info);
-    bool initializePage(const char * & data_ptr, const char * data_end, size_t next_row_idx, std::optional<size_t> end_row_idx, size_t target_row_idx, ColumnChunk & column, const PrimitiveColumnInfo & column_info);
+    std::tuple<parq::PageHeader, std::span<const char>> decodeAndCheckPageHeader(const char * & data_ptr, const char * data_end) const;
+    bool initializeDataPage(const char * & data_ptr, const char * data_end, size_t next_row_idx, std::optional<size_t> end_row_idx, size_t target_row_idx, ColumnChunk & column, const PrimitiveColumnInfo & column_info);
     void decompressPageIfCompressed(PageState & page);
     void createPageDecoder(PageState & page, ColumnChunk & column, const PrimitiveColumnInfo & column_info);
     bool skipRowsInPage(size_t target_row_idx, PageState & page, ColumnChunk & column, const PrimitiveColumnInfo & column_info);
diff --git a/src/Processors/Formats/Impl/Parquet/SchemaConverter.cpp b/src/Processors/Formats/Impl/Parquet/SchemaConverter.cpp
index 2232adc7d42e..59b21f7b442d 100644
--- a/src/Processors/Formats/Impl/Parquet/SchemaConverter.cpp
+++ b/src/Processors/Formats/Impl/Parquet/SchemaConverter.cpp
@@ -12,6 +12,8 @@
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/NestedUtils.h>
+#include <Formats/FormatFilterInfo.h>
 #include <Processors/Formats/Impl/Parquet/Decoding.h>
 
 #include <fmt/ranges.h>
@@ -25,6 +27,7 @@ namespace DB::ErrorCodes
     extern const int TOO_DEEP_RECURSION;
     extern const int NOT_IMPLEMENTED;
     extern const int THERE_IS_NO_COLUMN;
+    extern const int ICEBERG_SPECIFICATION_VIOLATION;
 }
 
 namespace DB::Parquet
@@ -65,7 +68,10 @@ void SchemaConverter::prepareForReading()
     /// DFS the schema tree.
     size_t top_level_columns = size_t(file_metadata.schema.at(0).num_children);
     for (size_t i = 0; i < top_level_columns; ++i)
-        processSubtree("", /*requested*/ false, /*type_hint*/ nullptr, SchemaContext::None);
+    {
+        TraversalNode node;
+        processSubtree(node);
+    }
 
     /// Check that all requested columns were found.
     std::vector<UInt8> found_columns(sample_block->columns());
@@ -109,33 +115,63 @@ NamesAndTypesList SchemaConverter::inferSchema()
     NamesAndTypesList res;
     for (size_t i = 0; i < top_level_columns; ++i)
     {
-        std::optional<size_t> idx = processSubtree("", /*requested*/ true, /*type_hint*/ nullptr, SchemaContext::None);
-        if (idx.has_value())
+        TraversalNode node;
+        node.requested = true;
+        processSubtree(node);
+        if (node.output_idx.has_value())
         {
-            const OutputColumnInfo & col = output_columns.at(idx.value());
+            const OutputColumnInfo & col = output_columns.at(node.output_idx.value());
             res.emplace_back(col.name, col.type);
         }
     }
     return res;
 }
 
-std::optional<size_t> SchemaConverter::processSubtree(String name, bool requested, DataTypePtr type_hint, SchemaContext schema_context)
+std::string_view SchemaConverter::useColumnMapperIfNeeded(const parq::SchemaElement & element, const String & current_path) const
 {
-    if (type_hint)
-        chassert(requested);
+    if (!column_mapper)
+        return element.name;
+    const auto & map = column_mapper->getFieldIdToClickHouseName();
+    if (!element.__isset.field_id)
+    {
+        /// Does iceberg require that parquet files have field ids?
+        /// Our iceberg writer currently doesn't write them.
+        //throw Exception(ErrorCodes::ICEBERG_SPECIFICATION_VIOLATION, "Missing field_id for column {}", element.name);
+        return element.name;
+    }
+    auto it = map.find(element.field_id);
+    if (it == map.end())
+        throw Exception(ErrorCodes::ICEBERG_SPECIFICATION_VIOLATION, "Parquet file has column {} with field_id {} that is not in datalake metadata", element.name, element.field_id);
+
+    /// At top level (empty path), return the full mapped name. For nested
+    /// elements, strip the parent path prefix to get the child name.
+    if (current_path.empty())
+        return it->second;
+
+    /// Strip "current_path." prefix to get child name (preserves dots in child names)
+    std::string_view mapped = it->second;
+    if (mapped.starts_with(current_path) && mapped.size() > current_path.size()
+        && mapped[current_path.size()] == '.')
+        return mapped.substr(current_path.size() + 1);
+
+    return mapped;
+}
+
+void SchemaConverter::processSubtree(TraversalNode & node)
+{
+    if (node.type_hint)
+        chassert(node.requested);
     if (schema_idx >= file_metadata.schema.size())
         throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid parquet schema tree");
-    const parq::SchemaElement & element = file_metadata.schema.at(schema_idx);
+    node.element = &file_metadata.schema.at(schema_idx);
     schema_idx += 1;
 
     std::optional<size_t> idx_in_output_block;
     size_t wrap_in_arrays = 0;
 
-    if (schema_context == SchemaContext::None)
+    if (node.schema_context == SchemaContext::None)
     {
-        if (!name.empty())
-            name += ".";
-        name += element.name;
+        node.appendNameComponent(node.element->name, useColumnMapperIfNeeded(*node.element, node.name));
 
         if (sample_block)
         {
@@ -143,24 +179,24 @@ std::optional<size_t> SchemaConverter::processSubtree(String name, bool requeste
             /// E.g.:
             ///   insert into function file('t.parquet') select [(10,20,30)] as x;
             ///   select * from file('t.parquet', Parquet, '`x.2` Array(UInt8)'); -- outputs [20]
-            std::optional<size_t> pos = sample_block->findPositionByName(name, options.format.parquet.case_insensitive_column_matching);
+            std::optional<size_t> pos = sample_block->findPositionByName(node.name, options.format.parquet.case_insensitive_column_matching);
             if (pos.has_value())
             {
-                if (requested)
-                    throw Exception(ErrorCodes::COLUMN_QUERIED_MORE_THAN_ONCE, "Requested column {} is part of another requested column", name);
+                if (node.requested)
+                    throw Exception(ErrorCodes::COLUMN_QUERIED_MORE_THAN_ONCE, "Requested column {} is part of another requested column", node.getNameForLogging());
 
-                requested = true;
-                name = sample_block->getByPosition(pos.value()).name; // match case
-                type_hint = sample_block->getByPosition(pos.value()).type;
+                node.requested = true;
+                node.name = sample_block->getByPosition(pos.value()).name; // match case
+                node.type_hint = sample_block->getByPosition(pos.value()).type;
 
                 for (size_t i = 1; i < levels.size(); ++i)
                 {
                     if (levels[i].is_array)
                     {
-                        const DataTypeArray * array = typeid_cast<const DataTypeArray *>(type_hint.get());
+                        const DataTypeArray * array = typeid_cast<const DataTypeArray *>(node.type_hint.get());
                         if (!array)
-                            throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of nested column {} doesn't match parquet schema: parquet type is Array, requested type is {}", name, type_hint->getName());
-                        type_hint = array->getNestedType();
+                            throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of nested column {} doesn't match parquet schema: parquet type is Array, requested type is {}", node.getNameForLogging(), node.type_hint->getName());
+                        node.type_hint = array->getNestedType();
                         wrap_in_arrays += 1;
                     }
                 }
@@ -178,62 +214,60 @@ std::optional<size_t> SchemaConverter::processSubtree(String name, bool requeste
             levels.resize(prev_levels_size);
         });
 
-    if (element.repetition_type != parq::FieldRepetitionType::REQUIRED)
+    if (node.element->repetition_type != parq::FieldRepetitionType::REQUIRED)
     {
         LevelInfo prev = levels.back();
         if (prev.def == UINT8_MAX)
-            throw Exception(ErrorCodes::TOO_DEEP_RECURSION, "Parquet column {} has extremely deeply nested (>255 levels) arrays or nullables", name);
+            throw Exception(ErrorCodes::TOO_DEEP_RECURSION, "Parquet column {} has extremely deeply nested (>255 levels) arrays or nullables", node.getNameForLogging());
         auto level = LevelInfo {.def = UInt8(prev.def + 1), .rep = prev.rep};
-        if (element.repetition_type == parq::FieldRepetitionType::REPEATED)
+        if (node.element->repetition_type == parq::FieldRepetitionType::REPEATED)
         {
             level.rep += 1; // no overflow, rep <= def
             level.is_array = true;
 
             /// We'll first process schema for array element type, then wrap it in Array type.
-            if (type_hint)
+            if (node.type_hint)
             {
-                const DataTypeArray * array_type = typeid_cast<const DataTypeArray *>(type_hint.get());
+                const DataTypeArray * array_type = typeid_cast<const DataTypeArray *>(node.type_hint.get());
                 if (!array_type)
-                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Array, requested type is {}", name, type_hint->getName());
-                type_hint = array_type->getNestedType();
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Array, requested type is {}", node.getNameForLogging(), node.type_hint->getName());
+                node.type_hint = array_type->getNestedType();
             }
         }
         chassert(level.def == levels.size());
         levels.push_back(level);
     }
 
-    std::optional<size_t> output_idx; // index in output_columns
-
     /// https://github.com/apache/parquet-format/blob/master/LogicalTypes.md
 
-    if (!processSubtreePrimitive(name, requested, type_hint, schema_context, element, output_idx) &&
-        !processSubtreeMap(name, requested, type_hint, schema_context, element, output_idx) &&
-        !processSubtreeArrayOuter(name, requested, type_hint, schema_context, element, output_idx) &&
-        !processSubtreeArrayInner(name, requested, type_hint, schema_context, element, output_idx))
+    if (!processSubtreePrimitive(node) &&
+        !processSubtreeMap(node) &&
+        !processSubtreeArrayOuter(node) &&
+        !processSubtreeArrayInner(node))
     {
-        processSubtreeTuple(name, requested, type_hint, schema_context, element, output_idx);
+        processSubtreeTuple(node);
     }
 
-    if (!output_idx.has_value())
-        return std::nullopt;
-    if (!requested)
-        return std::nullopt; // we just needed to recurse to children, not interested in output_idx
+    if (!node.output_idx.has_value())
+        return;
+    if (!node.requested)
+        return; // we just needed to recurse to children, not interested in output_idx
 
     auto make_array = [&](UInt8 rep)
     {
         size_t array_idx = output_columns.size();
         OutputColumnInfo & array = output_columns.emplace_back();
-        const OutputColumnInfo & array_element = output_columns.at(*output_idx);
-        array.name = name;
+        const OutputColumnInfo & array_element = output_columns.at(node.output_idx.value());
+        array.name = node.name;
         array.primitive_start = array_element.primitive_start;
         array.primitive_end = primitive_columns.size();
         array.type = std::make_shared<DataTypeArray>(array_element.type);
-        array.nested_columns = {*output_idx};
+        array.nested_columns = {*node.output_idx};
         array.rep = rep;
-        output_idx = array_idx;
+        node.output_idx = array_idx;
     };
 
-    if (element.repetition_type == parq::FieldRepetitionType::REPEATED)
+    if (node.element->repetition_type == parq::FieldRepetitionType::REPEATED)
     {
         /// Array of some kind. Can be a child of List or Map, or a standalone repeated field.
         /// We dispatch all 3 cases to this one code path to minimize probability of bugs.
@@ -248,30 +282,32 @@ std::optional<size_t> SchemaConverter::processSubtree(String name, bool requeste
         for (size_t i = 0; i < wrap_in_arrays; ++i)
             make_array(levels[prev_levels_size - 1].rep - i);
 
-        output_columns[*output_idx].idx_in_output_block = idx_in_output_block;
+        output_columns[node.output_idx.value()].idx_in_output_block = idx_in_output_block;
     }
-
-    return output_idx;
 }
 
-bool SchemaConverter::processSubtreePrimitive(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx)
+static bool isPrimitiveNode(const parq::SchemaElement & elem)
 {
     /// `parquet.thrift` says "[num_children] is not set when the element is a primitive type".
-    /// If it's set but has value 0, logically it would make sense to interpret it as empty tuple/struct.
+    /// If it's set but has value 0, logically it should be an empty tuple/struct.
     /// But in practice some writers are sloppy about it and set this field to 0 (rather than unset)
     /// for primitive columns. E.g.
     /// tests/queries/0_stateless/data_hive/partitioning/non_existing_column=Elizabeth/sample.parquet
-    bool is_primitive = !element.__isset.num_children || (element.num_children == 0 && element.__isset.type);
-    if (!is_primitive)
+    return !elem.__isset.num_children || (elem.num_children == 0 && elem.__isset.type);
+}
+
+bool SchemaConverter::processSubtreePrimitive(TraversalNode & node)
+{
+    if (!isPrimitiveNode(*node.element))
         return false;
 
     primitive_column_idx += 1;
-    if (!requested)
+    if (!node.requested)
         return true;
-    if (!element.__isset.type)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Parquet metadata is missing physical type for column {}", element.name);
+    if (!node.element->__isset.type)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Parquet metadata is missing physical type for column {}", node.getNameForLogging());
 
-    DataTypePtr primitive_type_hint = type_hint;
+    DataTypePtr primitive_type_hint = node.type_hint;
     bool output_nullable = false;
     bool output_nullable_if_not_json = false;
     if (primitive_type_hint)
@@ -287,7 +323,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
         }
     }
     /// Force map key to be non-nullable because clickhouse Map doesn't support nullable map key.
-    else if (!options.schema_inference_force_not_nullable && schema_context != SchemaContext::MapKey)
+    else if (!options.schema_inference_force_not_nullable && node.schema_context != SchemaContext::MapKey)
     {
         if (levels.back().is_array == false)
         {
@@ -306,7 +342,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
         }
     }
 
-    auto geo_it = geo_columns.find(name);
+    auto geo_it = geo_columns.find(node.getParquetName());
     auto geo_metadata = geo_it == geo_columns.end() ? std::nullopt : std::optional(geo_it->second);
 
     DataTypePtr inferred_type;
@@ -314,7 +350,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
     PageDecoderInfo decoder;
     try
     {
-        processPrimitiveColumn(element, primitive_type_hint, decoder, raw_decoded_type, inferred_type, geo_metadata);
+        processPrimitiveColumn(*node.element, primitive_type_hint, decoder, raw_decoded_type, inferred_type, geo_metadata);
     }
     catch (Exception & e)
     {
@@ -325,7 +361,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
         }
         else
         {
-            e.addMessage("column '" + name + "'");
+            e.addMessage("column '" + node.getNameForLogging() + "'");
             throw;
         }
     }
@@ -341,7 +377,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
     PrimitiveColumnInfo & primitive = primitive_columns.emplace_back();
     primitive.column_idx = primitive_column_idx - 1;
     primitive.schema_idx = schema_idx - 1;
-    primitive.name = name;
+    primitive.name = node.name;
     primitive.levels = levels;
     primitive.output_nullable = output_nullable || (output_nullable_if_not_json && !typeid_cast<const DataTypeObject *>(inferred_type.get()));
     primitive.decoder = std::move(decoder);
@@ -350,9 +386,9 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
         if (level.is_array)
             primitive.max_array_def = level.def;
 
-    output_idx = output_columns.size();
+    node.output_idx = output_columns.size();
     OutputColumnInfo & output = output_columns.emplace_back();
-    output.name = name;
+    output.name = node.name;
     output.primitive_start = primitive_idx;
     output.primitive_end = primitive_idx + 1;
     output.is_primitive = true;
@@ -367,7 +403,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
         inferred_type = std::make_shared<DataTypeNullable>(inferred_type);
     }
 
-    primitive.final_type = type_hint ? type_hint : inferred_type;
+    primitive.final_type = node.type_hint ? node.type_hint : inferred_type;
     primitive.needs_cast = !primitive.final_type->equals(*primitive.intermediate_type);
 
     output.type = primitive.final_type;
@@ -375,7 +411,7 @@ bool SchemaConverter::processSubtreePrimitive(const String & name, bool requeste
     return true;
 }
 
-bool SchemaConverter::processSubtreeMap(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx)
+bool SchemaConverter::processSubtreeMap(TraversalNode & node)
 {
     /// Map, aka Array(Tuple(2)).
     ///   required group `name` (MAP or MAP_KEY_VALUE):
@@ -383,18 +419,18 @@ bool SchemaConverter::processSubtreeMap(const String & name, bool requested, Dat
     ///       reqiured <recurse> "key"
     ///       <recurse> "value"
 
-    if (element.converted_type != parq::ConvertedType::MAP && element.converted_type != parq::ConvertedType::MAP_KEY_VALUE && !element.logicalType.__isset.MAP)
+    if (node.element->converted_type != parq::ConvertedType::MAP && node.element->converted_type != parq::ConvertedType::MAP_KEY_VALUE && !node.element->logicalType.__isset.MAP)
         return false;
     /// If an element is declared as MAP, but doesn't have the expected structure of children
     /// and grandchildren, we fall back to interpreting it as array of tuples, as if there were
     /// no MAP annotation on it. Also fall back if Tuple type was requested
     /// (presumably `Tuple(Array(Tuple(key, value))` - a literal interpretation of the schema tree)
     /// (not to be confused with the case when `Array(Tuple(key, value))` was requested).
-    if (schema_context != SchemaContext::None && schema_context != SchemaContext::ListElement)
+    if (node.schema_context != SchemaContext::None && node.schema_context != SchemaContext::ListElement)
         return false;
-    if (typeid_cast<const DataTypeTuple *>(type_hint.get()))
+    if (typeid_cast<const DataTypeTuple *>(node.type_hint.get()))
         return false;
-    if (element.num_children != 1)
+    if (node.element->num_children != 1)
         return false;
     const parq::SchemaElement & child = file_metadata.schema.at(schema_idx);
     if (child.repetition_type != parq::FieldRepetitionType::REPEATED || child.num_children != 2)
@@ -402,102 +438,113 @@ bool SchemaConverter::processSubtreeMap(const String & name, bool requested, Dat
 
     DataTypePtr array_type_hint;
     bool no_map = false; // return plain Array(Tuple) instead of Map
-    if (type_hint)
+    if (node.type_hint)
     {
-        if (const DataTypeMap * map_type = typeid_cast<const DataTypeMap *>(type_hint.get()))
+        if (const DataTypeMap * map_type = typeid_cast<const DataTypeMap *>(node.type_hint.get()))
         {
             array_type_hint = map_type->getNestedType();
         }
-        else if (typeid_cast<const DataTypeArray *>(type_hint.get()))
+        else if (typeid_cast<const DataTypeArray *>(node.type_hint.get()))
         {
-            array_type_hint = type_hint;
+            array_type_hint = node.type_hint;
             no_map = true;
         }
         else
         {
-            throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Map, requested type is {}", name, type_hint->getName());
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Map, requested type is {}", node.getNameForLogging(), node.type_hint->getName());
         }
     }
     /// (MapTupleAsPlainTuple is needed to skip a level in the column name: it changes
     /// `my_map.key_value.key` to `my_map.key`.
-    auto array_idx = processSubtree(name, requested, array_type_hint, no_map ? SchemaContext::MapTupleAsPlainTuple : SchemaContext::MapTuple);
+    TraversalNode subnode = node.prepareToRecurse(no_map ? SchemaContext::MapTupleAsPlainTuple : SchemaContext::MapTuple, array_type_hint);
+    processSubtree(subnode);
 
-    if (!requested || !array_idx.has_value())
+    if (!node.requested || !subnode.output_idx.has_value())
         return true;
+    size_t array_idx = subnode.output_idx.value();
 
     /// Support explicitly requesting Array(Tuple) type for map columns. Useful e.g. if the map
     /// key type is something that's not allowed as Map key in clickhouse.
     if (no_map)
     {
-        output_idx = array_idx;
+        node.output_idx = array_idx;
     }
     else
     {
-        output_idx = output_columns.size();
+        node.output_idx = output_columns.size();
         OutputColumnInfo & output = output_columns.emplace_back();
-        const OutputColumnInfo & array = output_columns.at(array_idx.value());
+        const OutputColumnInfo & array = output_columns.at(array_idx);
 
-        output.name = name;
+        output.name = node.name;
         output.primitive_start = array.primitive_start;
         output.primitive_end = array.primitive_end;
         output.type = std::make_shared<DataTypeMap>(array.type);
-        output.nested_columns = {array_idx.value()};
+        output.nested_columns = {array_idx};
     }
 
     return true;
 }
 
-bool SchemaConverter::processSubtreeArrayOuter(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx)
+bool SchemaConverter::processSubtreeArrayOuter(TraversalNode & node)
 {
     /// Array:
-    ///   required group `name` (List):
+    ///   required/optional group `name` (List):
     ///     repeated group "list":
     ///       <recurse> "element"
     ///
     /// I.e. it's a double-wrapped burrito. To unwrap it into one Array, we have to coordinate
     /// across two levels of recursion: processSubtreeArrayOuter for the outer wrapper,
     /// processSubtreeArrayInner for the inner wrapper.
+    ///
+    /// But hudi writes arrays differently, without the inner group:
+    ///   required/optional group `name` (List):
+    ///     repeated <recurse> "array"
+    /// This probably makes it indinsinguishable from a single-element tuple.
 
-    if (element.converted_type != parq::ConvertedType::LIST && !element.logicalType.__isset.LIST)
+    if (node.element->converted_type != parq::ConvertedType::LIST && !node.element->logicalType.__isset.LIST)
         return false;
-    if (schema_context != SchemaContext::None && schema_context != SchemaContext::ListElement)
+    if (node.schema_context != SchemaContext::None && node.schema_context != SchemaContext::ListElement)
         return false;
-    if (element.num_children != 1)
+    if (node.element->num_children != 1)
         return false;
     const parq::SchemaElement & child = file_metadata.schema.at(schema_idx);
-    if (child.repetition_type != parq::FieldRepetitionType::REPEATED || child.num_children != 1)
+    if (child.repetition_type != parq::FieldRepetitionType::REPEATED)
         return false;
 
-    auto array_idx = processSubtree(name, requested, type_hint, SchemaContext::ListTuple);
+    bool has_inner_group = child.num_children == 1;
+
+    TraversalNode subnode = node.prepareToRecurse(has_inner_group ? SchemaContext::ListTuple : SchemaContext::ListElement, node.type_hint);
+    processSubtree(subnode);
 
-    if (!requested || !array_idx.has_value())
+    if (!node.requested || !subnode.output_idx.has_value())
         return true;
 
-    output_idx = array_idx;
+    node.output_idx = subnode.output_idx;
 
     return true;
 }
 
-bool SchemaConverter::processSubtreeArrayInner(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx)
+bool SchemaConverter::processSubtreeArrayInner(TraversalNode & node)
 {
-    if (schema_context != SchemaContext::ListTuple)
+    if (node.schema_context != SchemaContext::ListTuple)
         return false;
 
     /// Array (middle schema element).
-    chassert(element.repetition_type == parq::FieldRepetitionType::REPEATED &&
-                element.num_children == 1); // caller checked this
+    chassert(node.element->repetition_type == parq::FieldRepetitionType::REPEATED &&
+             node.element->num_children == 1); // caller checked this
     /// (type_hint is already unwrapped to be element type, because of REPEATED)
-    auto element_idx = processSubtree(name, requested, type_hint, SchemaContext::ListElement);
+    TraversalNode subnode = node.prepareToRecurse(SchemaContext::ListElement, node.type_hint);
+    processSubtree(subnode);
 
-    if (!requested || !element_idx.has_value())
+    if (!node.requested || !subnode.output_idx.has_value())
         return true;
 
-    output_idx = element_idx;
+    node.output_idx = subnode.output_idx;
 
     return true;
 }
 
-void SchemaConverter::processSubtreeTuple(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx)
+void SchemaConverter::processSubtreeTuple(TraversalNode & node)
 {
     /// Tuple (possibly a Map key_value tuple):
     ///   (required|optional) group `name`:
@@ -505,9 +552,9 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
     ///     <recurse> `name2`
     ///     ...
 
-    const DataTypeTuple * tuple_type_hint = typeid_cast<const DataTypeTuple *>(type_hint.get());
-    if (type_hint && !tuple_type_hint)
-        throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Tuple, requested type is {}", name, type_hint->getName());
+    const DataTypeTuple * tuple_type_hint = typeid_cast<const DataTypeTuple *>(node.type_hint.get());
+    if (node.type_hint && !tuple_type_hint)
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Tuple, requested type is {}", node.getNameForLogging(), node.type_hint->getName());
 
     /// 3 modes:
     ///  * If type_hint has element names, we match elements from parquet to elements from type
@@ -521,10 +568,10 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
 
     bool lookup_by_name = false;
     std::vector<size_t> elements;
-    if (type_hint)
+    if (node.type_hint)
     {
         if (tuple_type_hint->hasExplicitNames() && !tuple_type_hint->getElements().empty() &&
-            schema_context != SchemaContext::MapTuple)
+            node.schema_context != SchemaContext::MapTuple)
         {
             /// Allow reading a subset of tuple elements, matched by name, possibly reordered.
             lookup_by_name = true;
@@ -532,16 +579,16 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
         }
         else
         {
-            if (tuple_type_hint->getElements().size() != size_t(element.num_children))
-                throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Tuple with {} elements, requested type is Tuple with {} elements", name, element.num_children, tuple_type_hint->getElements().size());
+            if (tuple_type_hint->getElements().size() != size_t(node.element->num_children))
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Requested type of column {} doesn't match parquet schema: parquet type is Tuple with {} elements, requested type is Tuple with {} elements", node.getNameForLogging(), node.element->num_children, tuple_type_hint->getElements().size());
         }
     }
-    if (!lookup_by_name && requested)
-        elements.resize(size_t(element.num_children), UINT64_MAX);
+    if (!lookup_by_name && node.requested)
+        elements.resize(size_t(node.element->num_children), UINT64_MAX);
 
     Strings names;
     DataTypes types;
-    if (!type_hint && requested)
+    if (!node.type_hint && node.requested)
     {
         names.resize(elements.size());
         types.resize(elements.size());
@@ -551,36 +598,37 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
     size_t output_start = output_columns.size();
     size_t skipped_unsupported_columns = 0;
     std::vector<String> element_names_in_file;
-    for (size_t i = 0; i < size_t(element.num_children); ++i)
+    for (size_t i = 0; i < size_t(node.element->num_children); ++i)
     {
-        const String & element_name = file_metadata.schema.at(schema_idx).name;
-        element_names_in_file.push_back(element_name);
+        const String & element_name = element_names_in_file.emplace_back(useColumnMapperIfNeeded(file_metadata.schema.at(schema_idx), node.name));
         std::optional<size_t> idx_in_output_tuple = i - skipped_unsupported_columns;
         if (lookup_by_name)
         {
             idx_in_output_tuple = tuple_type_hint->tryGetPositionByName(element_name, options.format.parquet.case_insensitive_column_matching);
 
             if (idx_in_output_tuple.has_value() && elements.at(idx_in_output_tuple.value()) != UINT64_MAX)
-                throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Parquet tuple {} has multiple elements with name `{}`", name, element_name);
+                throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Parquet tuple {} has multiple elements with name `{}`", node.getNameForLogging(), element_name);
         }
 
         DataTypePtr element_type_hint;
-        if (type_hint && idx_in_output_tuple.has_value())
+        if (node.type_hint && idx_in_output_tuple.has_value())
             element_type_hint = tuple_type_hint->getElement(idx_in_output_tuple.value());
 
-        bool element_requested = requested && idx_in_output_tuple.has_value();
+        const bool element_requested = node.requested && idx_in_output_tuple.has_value();
 
-        SchemaContext child_context = SchemaContext::None;
-        if (schema_context == SchemaContext::MapTuple && idx_in_output_tuple == 0)
-            child_context = SchemaContext::MapKey;
+        TraversalNode subnode = node.prepareToRecurse(SchemaContext::None, element_type_hint);
+        subnode.requested = element_requested;
+        if (node.schema_context == SchemaContext::MapTuple && idx_in_output_tuple == 0)
+            subnode.schema_context = SchemaContext::MapKey;
 
-        auto element_idx = processSubtree(name, element_requested, element_type_hint, child_context);
+        processSubtree(subnode);
+        auto element_idx = subnode.output_idx;
 
         if (element_requested)
         {
             if (!element_idx.has_value())
             {
-                if (type_hint || schema_context == SchemaContext::MapTuple)
+                if (node.type_hint || node.schema_context == SchemaContext::MapTuple)
                 {
                     /// If one of the elements is skipped, skip the whole tuple.
                     /// Remove previous elements.
@@ -601,7 +649,7 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
             elements.at(idx_in_output_tuple.value()) = element_idx.value();
 
             const auto & type = output_columns.at(element_idx.value()).type;
-            if (type_hint)
+            if (node.type_hint)
             {
                 chassert(type->equals(*element_type_hint));
             }
@@ -613,16 +661,16 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
         }
     }
 
-    if (!requested)
+    if (!node.requested)
         return;
 
     /// Map tuple in parquet has elements: {"key" , "value" },
     /// but DataTypeMap requires:          {"keys", "values"}.
-    if (schema_context == SchemaContext::MapTuple)
+    if (node.schema_context == SchemaContext::MapTuple)
         names = {"keys", "values"};
 
     DataTypePtr output_type;
-    if (type_hint)
+    if (node.type_hint)
     {
         chassert(elements.size() == tuple_type_hint->getElements().size());
         for (size_t i = 0; i < elements.size(); ++i)
@@ -630,24 +678,24 @@ void SchemaConverter::processSubtreeTuple(const String & name, bool requested, D
             if (elements[i] != UINT64_MAX)
                 continue;
             if (!options.format.parquet.allow_missing_columns)
-                throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Requested tuple element {} of column {} was not found in parquet schema ({})", tuple_type_hint->getNameByPosition(i + 1), name, element_names_in_file);
+                throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Requested tuple element {} of column {} was not found in parquet schema ({})", tuple_type_hint->getNameByPosition(i + 1), node.getNameForLogging(), element_names_in_file);
 
             elements[i] = output_columns.size();
             OutputColumnInfo & missing_output = output_columns.emplace_back();
-            missing_output.name = name + "." + (tuple_type_hint->hasExplicitNames() ? tuple_type_hint->getNameByPosition(i + 1) : std::to_string(i + 1));
+            missing_output.name = node.name + "." + (tuple_type_hint->hasExplicitNames() ? tuple_type_hint->getNameByPosition(i + 1) : std::to_string(i + 1));
             missing_output.type = tuple_type_hint->getElement(i);
             missing_output.is_missing_column = true;
         }
-        output_type = type_hint;
+        output_type = node.type_hint;
     }
     else
     {
         output_type = std::make_shared<DataTypeTuple>(types, names);
     }
 
-    output_idx = output_columns.size();
+    node.output_idx = output_columns.size();
     OutputColumnInfo & output = output_columns.emplace_back();
-    output.name = name;
+    output.name = node.name;
     output.primitive_start = primitive_start;
     output.primitive_end = primitive_columns.size();
     output.type = std::move(output_type);
@@ -790,7 +838,9 @@ void SchemaConverter::processPrimitiveColumn(
 
     /// GeoParquet.
     /// Spec says "Geometry columns MUST be at the root of the schema", but we allow them to be
-    /// nested in tuples etc, why not.
+    /// nested in tuples etc, why not. (Though nesting in arrays/maps probably currently wouldn't
+    /// work because our names omit the wrapper SchemaElement-s. That would be easy to fix by
+    /// including them in parquet_name.)
     /// If type hint is String, ignore geoparquet and return raw bytes.
     if (geo_metadata.has_value() && (!type_hint || !typeid_cast<const DataTypeString *>(type_hint.get())))
     {
@@ -1045,7 +1095,7 @@ void SchemaConverter::processPrimitiveColumn(
         if (precision > max_precision)
             throw Exception(ErrorCodes::INCORRECT_DATA, "Parquet decimal type precision or scale is too big ({} digits) for physical type {}", precision, thriftToString(type));
 
-        out_inferred_type = createDecimal<DataTypeDecimal>(max_precision, scale);
+        out_inferred_type = createDecimal<DataTypeDecimal>(precision, scale);
         size_t output_size = out_inferred_type->getSizeOfValueInMemory();
         out_decoder.allow_stats = is_output_type_decimal(output_size, scale);
 
@@ -1097,6 +1147,8 @@ void SchemaConverter::processPrimitiveColumn(
             out_inferred_type = DataTypeFactory::instance().get("Bool");
             auto converter = std::make_shared<IntConverter>();
             converter->input_size = 1;
+            converter->input_signed = false;
+            converter->field_signed = false;
             out_decoder.allow_stats = dispatch_int_stats_converter(/*allow_datetime_and_ipv4=*/ false, *converter);
             out_decoder.fixed_size_converter = std::move(converter);
             return;
diff --git a/src/Processors/Formats/Impl/Parquet/SchemaConverter.h b/src/Processors/Formats/Impl/Parquet/SchemaConverter.h
index eb8bf807b350..0eda419e6966 100644
--- a/src/Processors/Formats/Impl/Parquet/SchemaConverter.h
+++ b/src/Processors/Formats/Impl/Parquet/SchemaConverter.h
@@ -2,6 +2,13 @@
 
 #include <Processors/Formats/Impl/Parquet/Reader.h>
 
+namespace DB
+{
+
+class ColumnMapper;
+
+}
+
 namespace DB::Parquet
 {
 
@@ -16,6 +23,7 @@ struct SchemaConverter
     const parq::FileMetaData & file_metadata;
     const ReadOptions & options;
     const Block * sample_block;
+    const ColumnMapper * column_mapper = nullptr;
     std::vector<String> external_columns;
 
     std::vector<PrimitiveColumnInfo> primitive_columns;
@@ -25,6 +33,7 @@ struct SchemaConverter
     size_t primitive_column_idx = 0;
     std::vector<LevelInfo> levels;
 
+    /// The key is the parquet column name, without ColumnMapper.
     std::unordered_map<String, GeoColumnMetadata> geo_columns;
 
     SchemaConverter(const parq::FileMetaData &, const ReadOptions &, const Block *);
@@ -49,23 +58,89 @@ struct SchemaConverter
         ListElement,
     };
 
+    /// Parameters of a recursive call that traverses a subtree, corresponding to a parquet SchemaElement.
+    struct TraversalNode
+    {
+        /// Assigned by the caller.
+        SchemaContext schema_context = SchemaContext::None;
+
+        /// These fields are assigned by the caller, then updated by the callee.
+        /// E.g. name is initially the parent element's name, then the callee appends a path
+        /// component to it.
+        ///
+        /// If there's ColumnMapper, `name` is the mapped name (clickhouse column name), while
+        /// `parquet_name` is the name according to the parquet schema.
+        /// If `parquet_name` is nullopt, the clickhouse and parquet names are equal.
+        String name;
+        std::optional<String> parquet_name;
+        DataTypePtr type_hint;
+        bool requested = false;
+
+        /// These are assigned by the callee.
+        const parq::SchemaElement * element = nullptr;
+        std::optional<size_t> output_idx; // index in output_columns
+
+        const String & getParquetName() const
+        {
+            return parquet_name.has_value() ? *parquet_name : name;
+        }
+
+        String getNameForLogging() const
+        {
+            if (parquet_name.has_value() && *parquet_name != name)
+                return fmt::format("{} (mapped to {})", *parquet_name, name);
+            return name;
+        }
+
+        void appendNameComponent(const String & parquet_field_name, std::string_view mapped_field_name)
+        {
+            if (!name.empty())
+                name += ".";
+            name += mapped_field_name;
+            if (parquet_name.has_value() || mapped_field_name != parquet_field_name)
+            {
+                if (parquet_name.has_value())
+                    *parquet_name += ".";
+                else
+                    parquet_name.emplace();
+                *parquet_name += parquet_field_name;
+            }
+        }
+
+        TraversalNode prepareToRecurse(SchemaContext schema_context_, DataTypePtr type_hint_)
+        {
+            TraversalNode res = *this;
+            res.schema_context = schema_context_;
+            res.type_hint = std::move(type_hint_);
+            res.element = nullptr;
+            res.output_idx.reset();
+            return res;
+        }
+    };
+
     void checkHasColumns();
 
-    std::optional<size_t> processSubtree(String name, bool requested, DataTypePtr type_hint, SchemaContext);
+    void processSubtree(TraversalNode & node);
 
     /// These functions are used by processSubtree for different kinds of SchemaElement.
     /// Return true if the schema element was recognized as the corresponding kind,
     /// even if no output column needs to be produced.
-    bool processSubtreePrimitive(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx);
-    bool processSubtreeMap(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx);
-    bool processSubtreeArrayOuter(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx);
-    bool processSubtreeArrayInner(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx);
-    void processSubtreeTuple(const String & name, bool requested, DataTypePtr type_hint, SchemaContext schema_context, const parq::SchemaElement & element, std::optional<size_t> & output_idx);
+    bool processSubtreePrimitive(TraversalNode & node);
+    bool processSubtreeMap(TraversalNode & node);
+    bool processSubtreeArrayOuter(TraversalNode & node);
+    bool processSubtreeArrayInner(TraversalNode & node);
+    void processSubtreeTuple(TraversalNode & node);
 
     void processPrimitiveColumn(
         const parq::SchemaElement & element, DataTypePtr type_hint,
         PageDecoderInfo & out_decoder, DataTypePtr & out_decoded_type,
         DataTypePtr & out_inferred_type, std::optional<GeoColumnMetadata> geo_metadata) const;
+
+    /// Returns element.name or a corresponding name from ColumnMapper.
+    /// For nested tuple elements, returns just the element name like `x`, not the whole path like `t.x`.
+    /// For top-level columns (when current_path is empty), returns the full mapped name to support
+    /// column names with dots (e.g., `integer.col` in Iceberg).
+    std::string_view useColumnMapperIfNeeded(const parq::SchemaElement & element, const String & current_path) const;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/Parquet/ThriftUtil.cpp b/src/Processors/Formats/Impl/Parquet/ThriftUtil.cpp
index 21938c4921c5..16ef89c9bbea 100644
--- a/src/Processors/Formats/Impl/Parquet/ThriftUtil.cpp
+++ b/src/Processors/Formats/Impl/Parquet/ThriftUtil.cpp
@@ -1,6 +1,8 @@
-#include <IO/WriteBuffer.h>
 #include <Processors/Formats/Impl/Parquet/ThriftUtil.h>
 
+#include <Common/Exception.h>
+#include <IO/WriteBuffer.h>
+
 #include <thrift/protocol/TCompactProtocol.h>
 #include <thrift/transport/TBufferTransports.h>
 
@@ -37,15 +39,29 @@ size_t serializeThriftStruct(const T & obj, WriteBuffer & out)
 template <typename T>
 size_t deserializeThriftStruct(T & out, const char * buf, size_t limit)
 {
-    limit = std::min(limit, size_t(UINT32_MAX));
-    /// TMemoryBuffer promises to not write to the buffer (in OBSERVE mode),
-    /// so it should be ok to const_cast.
-    uint8_t * cast_buf = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(buf));
-    auto trans = std::make_shared<apache::thrift::transport::TMemoryBuffer>(cast_buf, uint32_t(limit));
-    apache::thrift::protocol::TCompactProtocolT<apache::thrift::transport::TMemoryBuffer> proto(trans);
-    uint32_t bytes_read = out.read(&proto);
-    chassert(size_t(bytes_read + trans->available_read()) == limit);
-    return size_t(bytes_read);
+    try
+    {
+        limit = std::min(limit, size_t(UINT32_MAX));
+        /// TMemoryBuffer promises to not write to the buffer (in OBSERVE mode),
+        /// so it should be ok to const_cast.
+        uint8_t * cast_buf = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(buf));
+
+        /// Set max message size to avoid 'apache::thrift::transport::TTransportException: MaxMessageSize reached' on big files
+        /// Similar to https://github.com/ClickHouse/arrow/blob/5cfccd8ea65f33d4517e7409815d761c7650b45d/cpp/src/parquet/thrift_internal.h#L437
+        auto configuration = std::make_shared<apache::thrift::TConfiguration>();
+        configuration->setMaxMessageSize(std::numeric_limits<int>::max());
+        auto trans = std::make_shared<apache::thrift::transport::TMemoryBuffer>(cast_buf, uint32_t(limit), apache::thrift::transport::TMemoryBuffer::OBSERVE, configuration);
+
+        apache::thrift::protocol::TCompactProtocolT<apache::thrift::transport::TMemoryBuffer> proto(trans);
+        uint32_t bytes_read = out.read(&proto);
+        chassert(size_t(bytes_read + trans->available_read()) == limit);
+        return size_t(bytes_read);
+    }
+    catch (const std::exception & e)
+    {
+        /// Convert to DB::Exception for convenience, so that callers can catch+addMessage+rethrow.
+        throw Exception(Exception::CreateFromSTDTag(), e);
+    }
 }
 
 template <typename T>
diff --git a/src/Processors/Formats/Impl/Parquet/Write.cpp b/src/Processors/Formats/Impl/Parquet/Write.cpp
index 2102f50f879d..0177940c1118 100644
--- a/src/Processors/Formats/Impl/Parquet/Write.cpp
+++ b/src/Processors/Formats/Impl/Parquet/Write.cpp
@@ -4,6 +4,7 @@
 #include <parquet/encoding.h>
 #include <parquet/schema.h>
 #include <arrow/util/rle_encoding.h>
+#include <arrow/util/crc32.h>
 #include <lz4.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
@@ -815,8 +816,12 @@ void writeColumnImpl(
         d.__set_encoding(use_dictionary ? parq::Encoding::RLE_DICTIONARY : encoding);
         d.__set_definition_level_encoding(parq::Encoding::RLE);
         d.__set_repetition_level_encoding(parq::Encoding::RLE);
-        /// We could also put checksum in `header.crc`, but apparently no one uses it:
-        /// https://issues.apache.org/jira/browse/PARQUET-594
+
+        if (options.write_checksums)
+        {
+            uint32_t crc = arrow::internal::crc32(0, compressed.data(), compressed.size());
+            header.__set_crc(crc);
+        }
 
         parq::Statistics page_stats = page_statistics.get(options);
         bool has_null_count = s.max_def == 1 && s.max_rep == 0;
@@ -878,6 +883,12 @@ void writeColumnImpl(
         header.dictionary_page_header.__set_num_values(dict_encoder->num_entries());
         header.dictionary_page_header.__set_encoding(parq::Encoding::PLAIN);
 
+        if (options.write_checksums)
+        {
+            uint32_t crc = arrow::internal::crc32(0, compressed.data(), compressed.size());
+            header.__set_crc(crc);
+        }
+
         writePage(header, compressed, s, /*add_to_offset_index*/ false, /*first_row_index*/ 0, out);
 
         for (auto & p : dict_encoded_pages)
@@ -1311,7 +1322,12 @@ void writeFileFooter(FileWriteState & file,
         meta.num_rows += rg.row_group.num_rows;
         meta.row_groups.push_back(std::move(rg.row_group));
     }
-    meta.__set_created_by(std::string(VERSION_NAME) + " " + VERSION_DESCRIBE);
+
+    /// parquet.thrift sayeth:
+    ///  >  This should be in the format
+    ///  >  <Application> version <App Version> (build <App Build Hash>).
+    ///  >  e.g. impala version 1.0 (build 6cf94d29b2b7115df4de2c06e2ab4326d721eb55)
+    meta.__set_created_by(fmt::format("ClickHouse version {}.{}.{} (build {})", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_GITHASH));
 
     if (options.write_page_statistics || options.write_column_chunk_statistics)
     {
diff --git a/src/Processors/Formats/Impl/Parquet/Write.h b/src/Processors/Formats/Impl/Parquet/Write.h
index bf027227e6d1..1571cada52d6 100644
--- a/src/Processors/Formats/Impl/Parquet/Write.h
+++ b/src/Processors/Formats/Impl/Parquet/Write.h
@@ -46,6 +46,7 @@ struct WriteOptions
     bool write_page_statistics = true;
     bool write_page_index = true;
     bool write_bloom_filter = true;
+    bool write_checksums = true;
 
     size_t max_statistics_size = 4096;
 
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index b049cc446162..80730808aa69 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -1,8 +1,16 @@
+#include <atomic>
 #include <memory>
+#include <mutex>
+#include <optional>
 #include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
+#include <Common/Exception.h>
+#include <Formats/FormatSettings.h>
 
 #if USE_PARQUET
 
+#include <Core/Settings.h>
+#include <Core/ServerSettings.h>
+#include <Common/ProfileEvents.h>
 #include <Common/logger_useful.h>
 #include <Common/ThreadPool.h>
 #include <Formats/FormatFactory.h>
@@ -30,6 +38,7 @@
 #include <Processors/Formats/Impl/Parquet/ParquetRecordReader.h>
 #include <Processors/Formats/Impl/Parquet/parquetBloomFilterHash.h>
 #include <Interpreters/Context.h>
+#include <Processors/Formats/Impl/ParquetFileMetaDataCache.h>
 #include <Interpreters/convertFieldToType.h>
 #include <Storages/MergeTree/KeyCondition.h>
 #include <Processors/Formats/Impl/ParquetV3BlockInputFormat.h>
@@ -41,6 +50,8 @@ namespace ProfileEvents
     extern const Event ParquetFetchWaitTimeMicroseconds;
     extern const Event ParquetReadRowGroups;
     extern const Event ParquetPrunedRowGroups;
+    extern const Event ParquetMetaDataCacheHits;
+    extern const Event ParquetMetaDataCacheMisses;
 }
 
 namespace CurrentMetrics
@@ -57,6 +68,16 @@ namespace CurrentMetrics
 namespace DB
 {
 
+namespace Setting
+{
+    extern const SettingsBool input_format_parquet_use_metadata_cache;
+}
+
+namespace ServerSetting
+{
+    extern const ServerSettingsUInt64 input_format_parquet_metadata_cache_max_size;
+}
+
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
@@ -64,11 +85,19 @@ namespace ErrorCodes
     extern const int MEMORY_LIMIT_EXCEEDED;
     extern const int CANNOT_READ_ALL_DATA;
     extern const int CANNOT_PARSE_NUMBER;
-    extern const int LOGICAL_ERROR;
 }
 
 namespace
 {
+String removeListElement(const String & value)
+{
+    const String pattern = ".list.element";
+    String result = value;
+    size_t pos;
+    while ((pos = result.find(pattern)) != std::string::npos)
+        result.erase(pos, pattern.size());
+    return result;
+}
 
 
 void traverseAllFields(const parquet::schema::NodePtr & node, std::unordered_map<Int64, String> & fields_mapping, const String & current_path = "")
@@ -80,7 +109,7 @@ void traverseAllFields(const parquet::schema::NodePtr & node, std::unordered_map
             traverseAllFields(group->field(i), fields_mapping, Nested::concatenateName(current_path, group->name()));
     }
     int field_id = node->field_id();
-    fields_mapping[field_id] = Nested::concatenateName(current_path, node->name());
+    fields_mapping[field_id] = removeListElement(Nested::concatenateName(current_path, node->name()));
 }
 
 }
@@ -349,7 +378,7 @@ static KeyCondition::ColumnIndexToBloomFilter buildColumnIndexToBF(
         }
 
         // Complex / nested types contain more than one index. We don't support those.
-        if (parquet_indexes.size() > 1)
+        if (parquet_indexes.size() != 1)
         {
             continue;
         }
@@ -534,6 +563,49 @@ static std::vector<Range> getHyperrectangleForRowGroup(const parquet::FileMetaDa
     return hyperrectangle;
 }
 
+std::shared_ptr<parquet::FileMetaData> ParquetBlockInputFormat::readMetadataFromFile()
+{
+    createArrowFileIfNotCreated();
+    return parquet::ReadMetaData(arrow_file);
+}
+
+std::shared_ptr<parquet::FileMetaData> ParquetBlockInputFormat::getFileMetaData()
+{
+    // in-memory cache is not implemented for local file operations, only for remote files
+    // there is a chance the user sets `input_format_parquet_use_metadata_cache=1` for a local file operation
+    // and the cache_key won't be set. Therefore, we also need to check for metadata_cache.key
+    if (!metadata_cache.use_cache || metadata_cache.key.empty())
+    {
+        return readMetadataFromFile();
+    }
+
+    auto [parquet_file_metadata, loaded] = ParquetFileMetaDataCache::instance()->getOrSet(
+        metadata_cache.key,
+        [&]()
+        {
+            return readMetadataFromFile();
+        }
+    );
+    if (loaded)
+        ProfileEvents::increment(ProfileEvents::ParquetMetaDataCacheMisses);
+    else
+        ProfileEvents::increment(ProfileEvents::ParquetMetaDataCacheHits);
+    return parquet_file_metadata;
+}
+
+void ParquetBlockInputFormat::createArrowFileIfNotCreated()
+{
+    if (arrow_file)
+    {
+        return;
+    }
+
+    // Create arrow file adapter.
+    // TODO: Make the adapter do prefetching on IO threads, based on the full set of ranges that
+    //       we'll need to read (which we know in advance). Use max_download_threads for that.
+    arrow_file = asArrowFile(*in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES, /* avoid_buffering */ true);
+}
+
 std::unordered_set<std::size_t> getBloomFilterFilteringColumnKeys(const KeyCondition::RPN & rpn)
 {
     std::unordered_set<std::size_t> column_keys;
@@ -564,18 +636,13 @@ const parquet::ColumnDescriptor * getColumnDescriptorIfBloomFilterIsPresent(
 
     const auto & parquet_indexes = clickhouse_column_index_to_parquet_index[clickhouse_column_index].parquet_indexes;
 
-    // complex types like structs, tuples and maps will have more than one index.
-    // we don't support those for now
-    if (parquet_indexes.size() > 1)
+    /// Complex types like structs, tuples and maps will have more than one index; we don't support those for now.
+    /// Empty tuples are also not supported.
+    if (parquet_indexes.size() != 1)
     {
         return nullptr;
     }
 
-    if (parquet_indexes.empty())
-    {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Column maps to 0 parquet leaf columns, raise an issue and try the query with `input_format_parquet_bloom_filter_push_down=false`");
-    }
-
     auto parquet_column_index = parquet_indexes[0];
 
     const auto * parquet_column_descriptor = parquet_rg_metadata->schema()->Column(parquet_column_index);
@@ -589,6 +656,45 @@ const parquet::ColumnDescriptor * getColumnDescriptorIfBloomFilterIsPresent(
     return parquet_column_descriptor;
 }
 
+void ParquetFileBucketInfo::serialize(WriteBuffer & buffer)
+{
+    writeVarUInt(row_group_ids.size(), buffer);
+    for (auto chunk : row_group_ids)
+        writeVarUInt(chunk, buffer);
+}
+
+void ParquetFileBucketInfo::deserialize(ReadBuffer & buffer)
+{
+    size_t size_chunks;
+    readVarUInt(size_chunks, buffer);
+    row_group_ids = std::vector<size_t>{};
+    row_group_ids.resize(size_chunks);
+    size_t bucket;
+    for (size_t i = 0; i < size_chunks; ++i)
+    {
+        readVarUInt(bucket, buffer);
+        row_group_ids[i] = bucket;
+    }
+}
+
+String ParquetFileBucketInfo::getIdentifier() const
+{
+    String result;
+    for (auto chunk : row_group_ids)
+        result += "_" + std::to_string(chunk);
+    return result;
+}
+
+ParquetFileBucketInfo::ParquetFileBucketInfo(const std::vector<size_t> & row_group_ids_)
+    : row_group_ids(row_group_ids_)
+{
+}
+
+void registerParquetFileBucketInfo(std::unordered_map<String, FileBucketInfoPtr> & instances)
+{
+    instances.emplace("Parquet", std::make_shared<ParquetFileBucketInfo>());
+}
+
 ParquetBlockInputFormat::ParquetBlockInputFormat(
     ReadBuffer & buf,
     SharedHeader header_,
@@ -647,7 +753,18 @@ void ParquetBlockInputFormat::initializeIfNeeded()
     if (is_stopped)
         return;
 
-    metadata = parquet::ReadMetaData(arrow_file);
+    metadata = getFileMetaData();
+
+    if (buckets_to_read)
+    {
+        std::unordered_set<size_t> set_to_read(buckets_to_read->row_group_ids.begin(), buckets_to_read->row_group_ids.end());
+        for (int i = 0; i < metadata->num_row_groups(); ++i)
+        {
+            if (!set_to_read.contains(i))
+                skip_row_groups.insert(i);
+        }
+    }
+
     const bool prefetch_group = io_pool != nullptr;
 
     std::shared_ptr<arrow::Schema> schema;
@@ -753,6 +870,8 @@ void ParquetBlockInputFormat::initializeIfNeeded()
         }
     }
 
+    bool has_row_groups_to_read = false;
+
     auto skip_row_group_based_on_filters = [&](int row_group)
     {
         if (!format_settings.parquet.filter_push_down && !format_settings.parquet.bloom_filter_push_down)
@@ -811,18 +930,32 @@ void ParquetBlockInputFormat::initializeIfNeeded()
         row_group_batches.back().total_bytes_compressed += row_group_size;
         auto rows = adaptive_chunk_size(row_group);
         row_group_batches.back().adaptive_chunk_size = rows ? rows : format_settings.parquet.max_block_size;
+
+        has_row_groups_to_read = true;
+    }
+
+    if (has_row_groups_to_read)
+    {
+        createArrowFileIfNotCreated();
     }
 }
 
+void ParquetBlockInputFormat::setStorageRelatedUniqueKey(const Settings & settings, const String & key_)
+{
+    metadata_cache.key = key_;
+    metadata_cache.use_cache = settings[Setting::input_format_parquet_use_metadata_cache];
+}
+
 void ParquetBlockInputFormat::initializeRowGroupBatchReader(size_t row_group_batch_idx)
 {
-    const bool row_group_prefetch = io_pool != nullptr;
+    bool row_group_prefetch = io_pool != nullptr;
     auto & row_group_batch = row_group_batches[row_group_batch_idx];
 
     parquet::ArrowReaderProperties arrow_properties;
     parquet::ReaderProperties reader_properties(ArrowMemoryPool::instance());
     arrow_properties.set_use_threads(false);
     arrow_properties.set_batch_size(row_group_batch.adaptive_chunk_size);
+    reader_properties.set_page_checksum_verification(format_settings.parquet.verify_checksums);
 
     // When reading a row group, arrow will:
     //  1. Look at `metadata` to get all byte ranges it'll need to read from the file (typically one
@@ -868,7 +1001,10 @@ void ParquetBlockInputFormat::initializeRowGroupBatchReader(size_t row_group_bat
     // other, failing an assert. So we disable pre-buffering in this case.
     // That version is >10 years old, so this is not very important.
     if (metadata->writer_version().VersionLt(parquet::ApplicationVersion::PARQUET_816_FIXED_VERSION()))
+    {
         arrow_properties.set_pre_buffer(false);
+        row_group_prefetch = false;
+    }
 
     if (format_settings.parquet.use_native_reader)
     {
@@ -1116,9 +1252,8 @@ void ParquetBlockInputFormat::scheduleMoreWorkIfNeeded(std::optional<size_t> row
     {
         size_t max_decoding_threads = parser_shared_resources->getParsingThreadsPerReader();
         while (row_group_batches_started - row_group_batches_completed < max_decoding_threads &&
-               row_group_batches_started < row_group_batches.size())
+                row_group_batches_started < row_group_batches.size())
             scheduleRowGroup(row_group_batches_started++);
-
         if (row_group_batch_touched)
         {
             auto & row_group = row_group_batches[*row_group_batch_touched];
@@ -1149,7 +1284,7 @@ Chunk ParquetBlockInputFormat::read()
                               [](size_t sum, const RowGroupBatchState & batch) { return sum + batch.total_rows; });
 
         row_group_batches_completed++;
-        chunk.getChunkInfos().add(std::make_shared<ChunkInfoRowNumOffset>(total_rows_before));
+        chunk.getChunkInfos().add(std::make_shared<ChunkInfoRowNumbers>(total_rows_before));
         return chunk;
     }
 
@@ -1160,7 +1295,9 @@ Chunk ParquetBlockInputFormat::read()
         if (background_exception)
         {
             is_stopped = true;
-            std::rethrow_exception(background_exception);
+            /// This exception can be mutated (addMessage()) in IInputFormat::generate(),
+            /// so we need to copy it (copyMutableException()) to avoid sharing mutable exception between multiple threads
+            std::rethrow_exception(copyMutableException(background_exception));
         }
         if (is_stopped)
             return {};
@@ -1197,7 +1334,7 @@ Chunk ParquetBlockInputFormat::read()
                 + std::accumulate(row_group.chunk_sizes.begin(), row_group.chunk_sizes.begin() + chunk.chunk_idx, 0ull);
 
 
-            chunk.chunk.getChunkInfos().add(std::make_shared<ChunkInfoRowNumOffset>(total_rows_before));
+            chunk.chunk.getChunkInfos().add(std::make_shared<ChunkInfoRowNumbers>(total_rows_before));
 
             return std::move(chunk.chunk);
         }
@@ -1212,6 +1349,11 @@ Chunk ParquetBlockInputFormat::read()
     }
 }
 
+void ParquetBlockInputFormat::setBucketsToRead(const FileBucketInfoPtr & buckets_to_read_)
+{
+    buckets_to_read = std::static_pointer_cast<ParquetFileBucketInfo>(buckets_to_read_);
+}
+
 void ParquetBlockInputFormat::resetParser()
 {
     is_stopped = true;
@@ -1264,23 +1406,33 @@ NamesAndTypesList ArrowParquetSchemaReader::readSchema()
     THROW_ARROW_NOT_OK(parquet::arrow::FromParquetSchema(metadata->schema(), &schema));
 
     /// When Parquet's schema is converted to Arrow's schema, logical types are lost (at least in
-    /// the currently used Arrow 11 version). Therefore, we manually add the logical types as metadata
-    /// to Arrow's schema. Logical types are useful for determining which ClickHouse column type to convert to.
+    /// the currently used Arrow 11 version). This is only a problem for JSON columns, which are
+    /// string columns with a piece of metadata saying that they should be converted to JSON.
+    /// Here's a hack to propagate logical types in simple cases.
     std::vector<std::shared_ptr<arrow::Field>> new_fields;
     new_fields.reserve(schema->num_fields());
 
+    ArrowFieldIndexUtil field_util(
+        format_settings.parquet.case_insensitive_column_matching,
+        format_settings.parquet.allow_missing_columns);
+    const auto field_indices = field_util.calculateFieldIndices(*schema);
+
     for (int i = 0; i < schema->num_fields(); ++i)
     {
         auto field = schema->field(i);
-        const auto * parquet_node = metadata->schema()->Column(i);
-        const auto * lt = parquet_node->logical_type().get();
-
-        if (lt and !lt->is_invalid())
+        auto it = field_indices.find(field->name());
+        if (it != field_indices.end() && it->second.second == 1)
         {
-            std::shared_ptr<arrow::KeyValueMetadata> kv = field->HasMetadata() ? field->metadata()->Copy() : arrow::key_value_metadata({}, {});
-            THROW_ARROW_NOT_OK(kv->Set("PARQUET:logical_type", lt->ToString()));
+            const auto * parquet_node = metadata->schema()->Column(it->second.first);
+            const auto * lt = parquet_node->logical_type().get();
+
+            if (lt && !lt->is_invalid())
+            {
+                std::shared_ptr<arrow::KeyValueMetadata> kv = field->HasMetadata() ? field->metadata()->Copy() : arrow::key_value_metadata({}, {});
+                THROW_ARROW_NOT_OK(kv->Set("PARQUET:logical_type", lt->ToString()));
 
-            field = field->WithMetadata(std::move(kv));
+                field = field->WithMetadata(std::move(kv));
+            }
         }
         new_fields.emplace_back(std::move(field));
     }
@@ -1308,8 +1460,53 @@ std::optional<size_t> ArrowParquetSchemaReader::readNumberOrRows()
     return metadata->num_rows();
 }
 
+std::vector<FileBucketInfoPtr> ParquetBucketSplitter::splitToBuckets(size_t bucket_size, ReadBuffer & buf, const FormatSettings & format_settings_)
+{
+    std::atomic<int> is_stopped = false;
+    auto arrow_file = asArrowFile(buf, format_settings_, is_stopped, "Parquet", PARQUET_MAGIC_BYTES, /* avoid_buffering */ true, nullptr);
+    auto metadata = parquet::ReadMetaData(arrow_file);
+    std::vector<size_t> bucket_sizes;
+    for (int i = 0; i < metadata->num_row_groups(); ++i)
+        bucket_sizes.push_back(metadata->RowGroup(i)->total_byte_size());
+
+    std::vector<std::vector<size_t>> buckets;
+    size_t current_weight = 0;
+    for (size_t i = 0; i < bucket_sizes.size(); ++i)
+    {
+        if (current_weight + bucket_sizes[i] <= bucket_size)
+        {
+            if (buckets.empty())
+                buckets.emplace_back();
+            buckets.back().push_back(i);
+            current_weight += bucket_sizes[i];
+        }
+        else
+        {
+            current_weight = 0;
+            buckets.push_back({});
+            buckets.back().push_back(i);
+            current_weight += bucket_sizes[i];
+        }
+    }
+
+    std::vector<FileBucketInfoPtr> result;
+    for (const auto & bucket : buckets)
+    {
+        result.push_back(std::make_shared<ParquetFileBucketInfo>(bucket));
+    }
+    return result;
+}
+
 void registerInputFormatParquet(FormatFactory & factory)
 {
+    factory.registerFileBucketInfo(
+        "Parquet",
+        []
+        {
+            return std::make_shared<ParquetFileBucketInfo>();
+        }
+    );
+
     factory.registerRandomAccessInputFormat(
         "Parquet",
         [](ReadBuffer & buf,
@@ -1352,6 +1549,10 @@ void registerInputFormatParquet(FormatFactory & factory)
 
 void registerParquetSchemaReader(FormatFactory & factory)
 {
+    factory.registerSplitter("Parquet", []
+        {
+            return std::make_shared<ParquetBucketSplitter>();
+        });
     factory.registerSchemaReader(
         "Parquet",
         [](ReadBuffer & buf, const FormatSettings & settings) -> SchemaReaderPtr
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
index cf30aa6e36b1..5c2bf96325a1 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
@@ -51,6 +51,28 @@ class ParquetRecordReader;
 // parallel reading+decoding, instead of using ParallelReadBuffer and ParallelParsingInputFormat.
 // That's what RandomAccessInputCreator in FormatFactory is about.
 
+struct ParquetFileBucketInfo : public FileBucketInfo
+{
+    std::vector<size_t> row_group_ids;
+
+    ParquetFileBucketInfo() = default;
+    explicit ParquetFileBucketInfo(const std::vector<size_t> & row_group_ids_);
+    void serialize(WriteBuffer & buffer) override;
+    void deserialize(ReadBuffer & buffer) override;
+    String getIdentifier() const override;
+    String getFormatName() const override
+    {
+        return "Parquet";
+    }
+};
+using ParquetFileBucketInfoPtr = std::shared_ptr<ParquetFileBucketInfo>;
+
+struct ParquetBucketSplitter : public IBucketSplitter
+{
+    ParquetBucketSplitter() = default;
+    std::vector<FileBucketInfoPtr> splitToBuckets(size_t bucket_size, ReadBuffer & buf, const FormatSettings & format_settings_) override;
+};
+
 class ParquetBlockInputFormat : public IInputFormat
 {
 public:
@@ -72,6 +94,10 @@ class ParquetBlockInputFormat : public IInputFormat
 
     size_t getApproxBytesReadForChunk() const override { return previous_approx_bytes_read_for_chunk; }
 
+    void setStorageRelatedUniqueKey(const Settings & settings, const String & key_) override;
+
+    void setBucketsToRead(const FileBucketInfoPtr & buckets_to_read_) override;
+
 private:
     Chunk read() override;
 
@@ -90,6 +116,13 @@ class ParquetBlockInputFormat : public IInputFormat
 
     void threadFunction(size_t row_group_batch_idx);
 
+    void createArrowFileIfNotCreated();
+    std::shared_ptr<parquet::FileMetaData> readMetadataFromFile();
+
+    std::shared_ptr<parquet::FileMetaData> getFileMetaData();
+
+    inline bool supportPrefetch() const;
+
     // Data layout in the file:
     //
     // row group 0
@@ -295,7 +328,8 @@ class ParquetBlockInputFormat : public IInputFormat
     };
 
     const FormatSettings format_settings;
-    const std::unordered_set<int> & skip_row_groups;
+    std::unordered_set<int> skip_row_groups;
+    ParquetFileBucketInfoPtr buckets_to_read;
     FormatParserSharedResourcesPtr parser_shared_resources;
     FormatFilterInfoPtr format_filter_info;
     size_t min_bytes_for_seek;
@@ -340,6 +374,13 @@ class ParquetBlockInputFormat : public IInputFormat
     bool is_initialized = false;
     std::optional<std::unordered_map<String, String>> parquet_names_to_clickhouse;
     std::optional<std::unordered_map<String, String>> clickhouse_names_to_parquet;
+    struct Cache
+    {
+        String key;
+        bool use_cache = false;
+    };
+
+    Cache metadata_cache;
 };
 
 class ArrowParquetSchemaReader : public ISchemaReader
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
index 0c86689e8bdc..2649ea49233b 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
@@ -111,6 +111,7 @@ ParquetBlockOutputFormat::ParquetBlockOutputFormat(WriteBuffer & out_, SharedHea
         options.write_batch_size = format_settings.parquet.write_batch_size;
         options.write_page_index = format_settings.parquet.write_page_index;
         options.write_bloom_filter = format_settings.parquet.write_bloom_filter;
+        options.write_checksums = format_settings.parquet.write_checksums;
         options.bloom_filter_bits_per_value = format_settings.parquet.bloom_filter_bits_per_value;
         options.bloom_filter_flush_threshold_bytes = format_settings.parquet.bloom_filter_flush_threshold_bytes;
         options.write_geometadata = format_settings.parquet.write_geometadata;
@@ -306,13 +307,17 @@ void ParquetBlockOutputFormat::writeRowGroup(std::vector<Chunk> chunks)
     else
     {
         Chunk concatenated;
-        while (!chunks.empty())
+        for (auto & chunk : chunks)
         {
             if (concatenated.empty())
-                concatenated.swap(chunks.back());
+            {
+                concatenated.swap(chunk);
+            }
             else
-                concatenated.append(chunks.back());
-            chunks.pop_back();
+            {
+                concatenated.append(chunk);
+                chunk.clear(); // free chunk's buffers so memory is release earlier
+            }
         }
         writeRowGroupInOneThread(std::move(concatenated));
     }
@@ -349,6 +354,10 @@ void ParquetBlockOutputFormat::writeUsingArrow(std::vector<Chunk> chunks)
         builder.version(getParquetVersion(format_settings));
         auto compression_codec = getParquetCompression(format_settings.parquet.output_compression_method);
         builder.compression(compression_codec);
+        if (format_settings.parquet.max_dictionary_size == 0)
+            builder.disable_dictionary();
+        else
+            builder.dictionary_pagesize_limit(format_settings.parquet.max_dictionary_size);
 
         if (arrow::util::Codec::SupportsCompressionLevel(compression_codec))
         {
diff --git a/src/Processors/Formats/Impl/ParquetFileMetaDataCache.cpp b/src/Processors/Formats/Impl/ParquetFileMetaDataCache.cpp
new file mode 100644
index 000000000000..da8ad825f505
--- /dev/null
+++ b/src/Processors/Formats/Impl/ParquetFileMetaDataCache.cpp
@@ -0,0 +1,20 @@
+#include <Processors/Formats/Impl/ParquetFileMetaDataCache.h>
+
+#if USE_PARQUET
+
+namespace DB
+{
+
+ParquetFileMetaDataCache::ParquetFileMetaDataCache()
+    : CacheBase<String, parquet::FileMetaData>(CurrentMetrics::end(), CurrentMetrics::end(), 0)
+{}
+
+ParquetFileMetaDataCache * ParquetFileMetaDataCache::instance()
+{
+    static ParquetFileMetaDataCache instance;
+    return &instance;
+}
+
+}
+
+#endif
diff --git a/src/Processors/Formats/Impl/ParquetFileMetaDataCache.h b/src/Processors/Formats/Impl/ParquetFileMetaDataCache.h
new file mode 100644
index 000000000000..fb5fc1bb0217
--- /dev/null
+++ b/src/Processors/Formats/Impl/ParquetFileMetaDataCache.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_PARQUET
+
+namespace parquet
+{
+
+class FileMetaData;
+
+}
+
+#include <Common/CacheBase.h>
+
+namespace DB
+{
+
+class ParquetFileMetaDataCache : public CacheBase<String, parquet::FileMetaData>
+{
+public:
+    static ParquetFileMetaDataCache * instance();
+
+private:
+    ParquetFileMetaDataCache();
+};
+
+}
+
+#endif
diff --git a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp
index 4e8973c2bc61..1a9ac2cb0379 100644
--- a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.cpp
@@ -22,8 +22,17 @@
 #include <parquet/statistics.h>
 #include <Processors/Formats/Impl/ArrowBufferedStreams.h>
 #include <DataTypes/NestedUtils.h>
+#include <Core/Settings.h>
+#include <Common/ProfileEvents.h>
+#include <Processors/Formats/Impl/ParquetFileMetaDataCache.h>
 
 
+namespace ProfileEvents
+{
+extern const Event ParquetMetaDataCacheHits;
+extern const Event ParquetMetaDataCacheMisses;
+}
+
 namespace DB
 {
 
@@ -32,6 +41,11 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+namespace Setting
+{
+extern const SettingsBool input_format_parquet_use_metadata_cache;
+}
+
 static NamesAndTypesList getHeaderForParquetMetadata()
 {
     NamesAndTypesList names_and_types{
@@ -130,10 +144,35 @@ void checkHeader(const Block & header)
 static std::shared_ptr<parquet::FileMetaData> getFileMetadata(
     ReadBuffer & in,
     const FormatSettings & format_settings,
-    std::atomic<int> & is_stopped)
+    std::atomic<int> & is_stopped,
+    ParquetMetadataInputFormat::Cache metadata_cache)
 {
-    auto arrow_file = asArrowFile(in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES, /* avoid_buffering */ true);
-    return parquet::ReadMetaData(arrow_file);
+    // in-memory cache is not implemented for local file operations, only for remote files
+    // there is a chance the user sets `input_format_parquet_use_metadata_cache=1` for a local file operation
+    // and the cache_key won't be set. Therefore, we also need to check for metadata_cache.key
+    if (!metadata_cache.use_cache || metadata_cache.key.empty())
+    {
+        auto arrow_file = asArrowFile(in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES, /* avoid_buffering */ true);
+        return parquet::ReadMetaData(arrow_file);
+    }
+
+    auto [parquet_file_metadata, loaded] = ParquetFileMetaDataCache::instance()->getOrSet(
+        metadata_cache.key,
+        [&]()
+        {
+            auto arrow_file = asArrowFile(in, format_settings, is_stopped, "Parquet", PARQUET_MAGIC_BYTES, /* avoid_buffering */ true);
+            return parquet::ReadMetaData(arrow_file);
+        }
+    );
+
+    if (loaded)
+        ProfileEvents::increment(ProfileEvents::ParquetMetaDataCacheMisses);
+    else
+        ProfileEvents::increment(ProfileEvents::ParquetMetaDataCacheHits);
+
+    return parquet_file_metadata;
+
+
 }
 
 ParquetMetadataInputFormat::ParquetMetadataInputFormat(ReadBuffer & in_, SharedHeader header_, const FormatSettings & format_settings_)
@@ -148,7 +187,7 @@ Chunk ParquetMetadataInputFormat::read()
     if (done)
         return res;
 
-    auto metadata = getFileMetadata(*in, format_settings, is_stopped);
+    auto metadata = getFileMetadata(*in, format_settings, is_stopped, metadata_cache);
 
     const auto & header = getPort().getHeader();
     auto names_and_types = getHeaderForParquetMetadata();
@@ -489,6 +528,12 @@ void ParquetMetadataInputFormat::resetParser()
     done = false;
 }
 
+void ParquetMetadataInputFormat::setStorageRelatedUniqueKey(const Settings & settings, const String & key_)
+{
+    metadata_cache.key = key_;
+    metadata_cache.use_cache = settings[Setting::input_format_parquet_use_metadata_cache];
+}
+
 ParquetMetadataSchemaReader::ParquetMetadataSchemaReader(ReadBuffer & in_)
     : ISchemaReader(in_)
 {
diff --git a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
index 81cf7890ee7e..6b667dcc5b1e 100644
--- a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
@@ -62,6 +62,14 @@ class ParquetMetadataInputFormat : public IInputFormat
 
     void resetParser() override;
 
+    void setStorageRelatedUniqueKey(const Settings & settings, const String & key_) override;
+
+    struct Cache
+    {
+        String key;
+        bool use_cache = false;
+    };
+
 private:
     Chunk read() override;
 
@@ -78,6 +86,8 @@ class ParquetMetadataInputFormat : public IInputFormat
     const FormatSettings format_settings;
     bool done = false;
     std::atomic<int> is_stopped{0};
+
+    Cache metadata_cache;
 };
 
 class ParquetMetadataSchemaReader : public ISchemaReader
diff --git a/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.cpp
index 6ff171b6a2c9..2d2bc2f318f0 100644
--- a/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+#include <optional>
 #include <Processors/Formats/Impl/ParquetV3BlockInputFormat.h>
 
 #if USE_PARQUET
@@ -7,10 +9,16 @@
 #include <Formats/FormatParserSharedResources.h>
 #include <IO/SharedThreadPools.h>
 #include <Processors/Formats/Impl/Parquet/SchemaConverter.h>
+#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 Parquet::ReadOptions convertReadOptions(const FormatSettings & format_settings)
 {
     Parquet::ReadOptions options;
@@ -37,6 +45,9 @@ ParquetV3BlockInputFormat::ParquetV3BlockInputFormat(
 {
     read_options.min_bytes_for_seek = min_bytes_for_seek;
     read_options.bytes_per_read_task = min_bytes_for_seek * 4;
+
+    if (!format_filter_info)
+        format_filter_info = std::make_shared<FormatFilterInfo>();
 }
 
 void ParquetV3BlockInputFormat::initializeIfNeeded()
@@ -63,9 +74,9 @@ void ParquetV3BlockInputFormat::initializeIfNeeded()
                 /// (inside IInputFormat::read()), with no thread pool". But such mode seems
                 /// useful, at least for testing performance. So we use max_parsing_threads = 1
                 /// as a signal to disable thread pool altogether, sacrificing the ability to
-                /// use thread pool with 1 thread. We could subtract 1 instead, but then the
-                /// by default the thread pool will use `num_cores - 1` threads, also bad.
-                if (parser_shared_resources->max_parsing_threads <= 1 || format_settings.parquet.preserve_order)
+                /// use thread pool with 1 thread. We could subtract 1 instead, but then
+                /// by default the thread pool would use `num_cores - 1` threads, also bad.
+                if (parser_shared_resources->max_parsing_threads <= 1)
                     parser_shared_resources->parsing_runner.initManual();
                 else
                     parser_shared_resources->parsing_runner.initThreadPool(
@@ -81,16 +92,41 @@ void ParquetV3BlockInputFormat::initializeIfNeeded()
         reader.emplace();
         reader->reader.prefetcher.init(in, read_options, parser_shared_resources);
         reader->reader.init(read_options, getPort().getHeader(), format_filter_info);
-        reader->init(parser_shared_resources);
+        reader->init(parser_shared_resources, buckets_to_read ? std::optional(buckets_to_read->row_group_ids) : std::nullopt);
     }
 }
 
 Chunk ParquetV3BlockInputFormat::read()
 {
+    if (need_only_count)
+    {
+        if (reported_count)
+            return {};
+
+        /// Don't init Reader and ReadManager if we only need file metadata.
+        Parquet::Prefetcher temp_prefetcher;
+        temp_prefetcher.init(in, read_options, parser_shared_resources);
+        auto file_metadata = Parquet::Reader::readFileMetaData(temp_prefetcher);
+
+        auto chunk = getChunkForCount(size_t(file_metadata.num_rows));
+        chunk.getChunkInfos().add(std::make_shared<ChunkInfoRowNumbers>(0));
+
+        reported_count = true;
+        return chunk;
+    }
+
     initializeIfNeeded();
-    Chunk chunk;
-    std::tie(chunk, previous_block_missing_values) = reader->read();
-    return chunk;
+    auto res = reader->read();
+    previous_block_missing_values = res.block_missing_values;
+    previous_approx_bytes_read_for_chunk = res.virtual_bytes_read;
+    return std::move(res.chunk);
+}
+
+void ParquetV3BlockInputFormat::setBucketsToRead(const FileBucketInfoPtr & buckets_to_read_)
+{
+    if (reader)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Reader already initialized");
+    buckets_to_read = std::static_pointer_cast<ParquetFileBucketInfo>(buckets_to_read_);
 }
 
 const BlockMissingValues * ParquetV3BlockInputFormat::getMissingValues() const
diff --git a/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.h b/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.h
index 73725c5f53ad..ff7c80a6b230 100644
--- a/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetV3BlockInputFormat.h
@@ -6,6 +6,7 @@
 #include <Processors/Formats/IInputFormat.h>
 #include <Processors/Formats/Impl/Parquet/ReadManager.h>
 #include <Processors/Formats/ISchemaReader.h>
+#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 
 namespace DB
 {
@@ -29,10 +30,11 @@ class ParquetV3BlockInputFormat : public IInputFormat
 
     size_t getApproxBytesReadForChunk() const override
     {
-        /// TODO [parquet]:
-        return 0;
+        return previous_approx_bytes_read_for_chunk;
     }
 
+    void setBucketsToRead(const FileBucketInfoPtr & buckets_to_read_) override;
+
 private:
     Chunk read() override;
 
@@ -44,10 +46,13 @@ class ParquetV3BlockInputFormat : public IInputFormat
     FormatFilterInfoPtr format_filter_info;
 
     std::optional<Parquet::ReadManager> reader;
+    bool reported_count = false; // if need_only_count
 
     BlockMissingValues previous_block_missing_values;
+    size_t previous_approx_bytes_read_for_chunk = 0;
 
     void initializeIfNeeded();
+    std::shared_ptr<ParquetFileBucketInfo> buckets_to_read;
 };
 
 class NativeParquetSchemaReader : public ISchemaReader
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 43f53f9387f2..64547828612e 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -19,7 +19,6 @@
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/ObjectUtils.h>
 
-
 namespace DB
 {
 namespace Setting
diff --git a/src/Processors/Merges/AggregatingSortedTransform.h b/src/Processors/Merges/AggregatingSortedTransform.h
index 8ecdf7b89ee7..334b86f99fe9 100644
--- a/src/Processors/Merges/AggregatingSortedTransform.h
+++ b/src/Processors/Merges/AggregatingSortedTransform.h
@@ -22,14 +22,16 @@ class AggregatingSortedTransform final : public IMergingTransform<AggregatingSor
         size_t num_inputs,
         SortDescription description_,
         size_t max_block_size_rows,
-        size_t max_block_size_bytes)
+        size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_)
         : IMergingTransform(
             num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
             num_inputs,
             std::move(description_),
             max_block_size_rows,
-            max_block_size_bytes)
+            max_block_size_bytes,
+            max_dynamic_subcolumns_)
     {
     }
 
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
index f9c5d1c5e815..47ae4eff10ed 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
@@ -141,8 +141,9 @@ AggregatingSortedAlgorithm::SimpleAggregateDescription::~SimpleAggregateDescript
 AggregatingSortedAlgorithm::AggregatingMergedData::AggregatingMergedData(
     UInt64 max_block_size_rows_,
     UInt64 max_block_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     ColumnsDefinition & def_)
-    : MergedData(false, max_block_size_rows_, max_block_size_bytes_), def(def_)
+    : MergedData(false, max_block_size_rows_, max_block_size_bytes_, max_dynamic_subcolumns_), def(def_)
 {
 }
 
@@ -152,9 +153,10 @@ void AggregatingSortedAlgorithm::AggregatingMergedData::initialize(const DB::Blo
 
     for (const auto & desc : def.columns_to_simple_aggregate)
     {
-        const auto & type = desc.nested_type ? desc.nested_type
-                                             : desc.real_type;
-        columns[desc.column_number] = type->createColumn();
+        /// Remove LowCardinality from columns if needed. It's important to use columns initialized in
+        /// MergedData::initialize to keep correct dynamic structure of some columns (like JSON/Dynamic).
+        if (desc.nested_type)
+            columns[desc.column_number] = recursiveRemoveLowCardinality(std::move(columns[desc.column_number]))->assumeMutable();
     }
 
     initAggregateDescription();
@@ -256,10 +258,11 @@ AggregatingSortedAlgorithm::AggregatingSortedAlgorithm(
     size_t num_inputs,
     SortDescription description_,
     size_t max_block_size_rows_,
-    size_t max_block_size_bytes_)
+    size_t max_block_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_)
     : IMergingAlgorithmWithDelayedChunk(header_, num_inputs, description_)
     , columns_definition(defineColumns(*header_, description_))
-    , merged_data(max_block_size_rows_, max_block_size_bytes_, columns_definition)
+    , merged_data(max_block_size_rows_, max_block_size_bytes_, max_dynamic_subcolumns_, columns_definition)
 {
 }
 
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
index 6dd821bd778d..5786812d0b47 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
@@ -24,7 +24,8 @@ class AggregatingSortedAlgorithm final : public IMergingAlgorithmWithDelayedChun
         size_t num_inputs,
         SortDescription description_,
         size_t max_block_size_rows_,
-        size_t max_block_size_bytes_);
+        size_t max_block_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_);
 
     const char * getName() const override { return "AggregatingSortedAlgorithm"; }
     void initialize(Inputs inputs) override;
@@ -112,6 +113,7 @@ class AggregatingSortedAlgorithm final : public IMergingAlgorithmWithDelayedChun
         AggregatingMergedData(
             UInt64 max_block_size_rows_,
             UInt64 max_block_size_bytes_,
+            std::optional<size_t> max_dynamic_subcolumns_,
             ColumnsDefinition & def_);
 
         void initialize(const Block & header, const IMergingAlgorithm::Inputs & inputs) override;
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
index 68efd6673c2c..17322a56edac 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
@@ -29,6 +29,7 @@ CollapsingSortedAlgorithm::CollapsingSortedAlgorithm(
     bool only_positive_sign_,
     size_t max_block_size_rows_,
     size_t max_block_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     LoggerPtr log_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes,
@@ -39,7 +40,7 @@ CollapsingSortedAlgorithm::CollapsingSortedAlgorithm(
         std::move(description_),
         out_row_sources_buf_,
         max_row_refs,
-        std::make_unique<MergedData>(use_average_block_sizes, max_block_size_rows_, max_block_size_bytes_))
+        std::make_unique<MergedData>(use_average_block_sizes, max_block_size_rows_, max_block_size_bytes_, max_dynamic_subcolumns_))
     , sign_column_number(header_->getPositionByName(sign_column))
     , only_positive_sign(only_positive_sign_)
     , throw_if_invalid_sign(throw_if_invalid_sign_)
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
index 72486c996aa9..80ddc3017b3d 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
@@ -34,6 +34,7 @@ class CollapsingSortedAlgorithm final : public IMergingAlgorithmWithSharedChunks
         bool only_positive_sign_, /// For select final. Skip rows with sum(sign) < 0.
         size_t max_block_size_rows_,
         size_t max_block_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         LoggerPtr log_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
index e9c7d87c619e..866e21a2e3bf 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
@@ -44,9 +44,10 @@ GraphiteRollupSortedAlgorithm::GraphiteRollupSortedAlgorithm(
     SortDescription description_,
     size_t max_block_size_rows_,
     size_t max_block_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     Graphite::Params params_,
     time_t time_of_merge_)
-    : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), nullptr, max_row_refs, std::make_unique<GraphiteRollupMergedData>(false, max_block_size_rows_, max_block_size_bytes_))
+    : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), nullptr, max_row_refs, std::make_unique<GraphiteRollupMergedData>(false, max_block_size_rows_, max_block_size_bytes_, max_dynamic_subcolumns_))
     , graphite_rollup_merged_data(assert_cast<GraphiteRollupMergedData &>(*merged_data))
     , params(std::move(params_))
     , time_of_merge(time_of_merge_)
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
index 27ea23216e4f..05c7a68c17d6 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
@@ -27,6 +27,7 @@ class GraphiteRollupSortedAlgorithm final : public IMergingAlgorithmWithSharedCh
         SortDescription description_,
         size_t max_block_size_rows_,
         size_t max_block_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         Graphite::Params params_,
         time_t time_of_merge_);
 
diff --git a/src/Processors/Merges/Algorithms/MergedData.cpp b/src/Processors/Merges/Algorithms/MergedData.cpp
index d2aa197c5f7f..9167661b1f55 100644
--- a/src/Processors/Merges/Algorithms/MergedData.cpp
+++ b/src/Processors/Merges/Algorithms/MergedData.cpp
@@ -1,6 +1,7 @@
 #include <Columns/IColumn.h>
 #include <Core/Block.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
+#include <Columns/ColumnSparse.h>
 
 namespace DB
 {
@@ -27,8 +28,10 @@ void MergedData::initialize(const Block & header, const IMergingAlgorithm::Input
 
     for (size_t i = 0; i != columns.size(); ++i)
     {
+        /// Sometimes header can contain Sparse columns, we don't support Sparse in merge algorithms.
+        columns[i] = recursiveRemoveSparse(std::move(columns[i]))->assumeMutable();
         if (columns[i]->hasDynamicStructure())
-            columns[i]->takeDynamicStructureFromSourceColumns(source_columns[i]);
+            columns[i]->takeDynamicStructureFromSourceColumns(source_columns[i], max_dynamic_subcolumns);
     }
 }
 
diff --git a/src/Processors/Merges/Algorithms/MergedData.h b/src/Processors/Merges/Algorithms/MergedData.h
index 2561c1e19aea..59bca3262501 100644
--- a/src/Processors/Merges/Algorithms/MergedData.h
+++ b/src/Processors/Merges/Algorithms/MergedData.h
@@ -13,8 +13,8 @@ class Block;
 class MergedData
 {
 public:
-    explicit MergedData(bool use_average_block_size_, UInt64 max_block_size_, UInt64 max_block_size_bytes_)
-        : max_block_size(max_block_size_), max_block_size_bytes(max_block_size_bytes_), use_average_block_size(use_average_block_size_)
+    explicit MergedData(bool use_average_block_size_, UInt64 max_block_size_, UInt64 max_block_size_bytes_, std::optional<size_t> max_dynamic_subcolumns_)
+        : max_block_size(max_block_size_), max_block_size_bytes(max_block_size_bytes_), use_average_block_size(use_average_block_size_), max_dynamic_subcolumns(max_dynamic_subcolumns_)
     {
     }
 
@@ -55,6 +55,7 @@ class MergedData
     const UInt64 max_block_size = 0;
     const UInt64 max_block_size_bytes = 0;
     const bool use_average_block_size = false;
+    const std::optional<size_t> max_dynamic_subcolumns;
 
     bool need_flush = false;
 };
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
index 60116994df45..c9e869b18729 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
@@ -14,13 +14,14 @@ MergingSortedAlgorithm::MergingSortedAlgorithm(
     const SortDescription & description_,
     size_t max_block_size_,
     size_t max_block_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     SortingQueueStrategy sorting_queue_strategy_,
     UInt64 limit_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes,
     bool apply_virtual_row_conversions_)
     : header(std::move(header_))
-    , merged_data(use_average_block_sizes, max_block_size_, max_block_size_bytes_)
+    , merged_data(use_average_block_sizes, max_block_size_, max_block_size_bytes_, max_dynamic_subcolumns_)
     , description(description_)
     , limit(limit_)
     , out_row_sources_buf(out_row_sources_buf_)
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
index d9e73472ac79..511dac4cfee9 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
@@ -20,6 +20,7 @@ class MergingSortedAlgorithm final : public IMergingAlgorithm
         const SortDescription & description_,
         size_t max_block_size_,
         size_t max_block_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         SortingQueueStrategy sorting_queue_strategy_,
         UInt64 limit_ = 0,
         WriteBuffer * out_row_sources_buf_ = nullptr,
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
index 4fcb74660e97..9dff38c02bf0 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
@@ -38,11 +38,12 @@ ReplacingSortedAlgorithm::ReplacingSortedAlgorithm(
     const String & version_column,
     size_t max_block_size_rows,
     size_t max_block_size_bytes,
+    std::optional<size_t> max_dynamic_subcolumns_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes,
     bool cleanup_,
     bool enable_vertical_final_)
-    : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, max_row_refs, std::make_unique<MergedData>(use_average_block_sizes, max_block_size_rows, max_block_size_bytes))
+    : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, max_row_refs, std::make_unique<MergedData>(use_average_block_sizes, max_block_size_rows, max_block_size_bytes, max_dynamic_subcolumns_))
     , cleanup(cleanup_), enable_vertical_final(enable_vertical_final_)
 {
     if (!is_deleted_column.empty())
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
index 40ef8eb7f7e0..7ab4d07ba0a2 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
@@ -44,6 +44,7 @@ class ReplacingSortedAlgorithm final : public IMergingAlgorithmWithSharedChunks
         const String & version_column,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
         bool cleanup = false,
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
index 7fbb7ae75de3..6598846d4ae7 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
@@ -1,12 +1,15 @@
+#include <memory>
 #include <Processors/Merges/Algorithms/SummingSortedAlgorithm.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <Columns/ColumnTuple.h>
+#include <Common/Exception.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
 #include <Common/FieldVisitorSum.h>
 #include <Common/StringUtils.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeCustomSimpleAggregateFunction.h>
 #include <DataTypes/NestedUtils.h>
@@ -51,7 +54,7 @@ struct SummingSortedAlgorithm::AggregateDescription
     bool is_agg_func_type = false;
     bool is_simple_agg_func_type = false;
     bool remove_default_values;
-    bool aggregate_all_columns;
+    bool aggregate_all_columns = false;
 
     String sum_function_map_name;
 
@@ -257,6 +260,45 @@ static SummingSortedAlgorithm::ColumnsDefinition defineColumns(
         const ColumnWithTypeAndName & column = header.safeGetByPosition(i);
 
         const auto * simple = dynamic_cast<const DataTypeCustomSimpleAggregateFunction *>(column.type->getCustomName());
+        bool is_non_empty_tuple = typeid_cast<const DataTypeTuple *>(column.type.get()) && !typeid_cast<const DataTypeTuple *>(column.type.get())->getElements().empty();
+        if (aggregate_all_columns && (is_non_empty_tuple || typeid_cast<const DataTypeArray *>(column.type.get())) && !simple)
+        {
+            const auto map_name = Nested::extractTableName(column.name);
+            /// if nested table name ends with `Map` it is a possible candidate for special handling
+            if (map_name == column.name || !endsWith(map_name, "Map"))
+            {
+                bool is_agg_func = WhichDataType(column.type).isAggregateFunction();
+
+                SummingSortedAlgorithm::AggregateDescription desc;
+                desc.remove_default_values = remove_default_values;
+                desc.aggregate_all_columns = aggregate_all_columns;
+                desc.sum_function_map_name = sum_function_map_name;
+                desc.is_agg_func_type = is_agg_func;
+                desc.column_numbers = {i};
+
+                desc.real_type = column.type;
+                desc.nested_type = recursiveRemoveLowCardinality(desc.real_type);
+                if (desc.real_type.get() == desc.nested_type.get())
+                    desc.nested_type = nullptr;
+
+                if (simple)
+                {
+                    // simple aggregate function
+                    desc.init(simple->getFunction(), true);
+                    if (desc.function->allocatesMemoryInArena())
+                        def.allocates_memory_in_arena = true;
+                }
+                else if (!is_agg_func)
+                {
+                    desc.init(sum_function_name.c_str(), {column.type});
+                }
+
+                def.columns_to_aggregate.emplace_back(std::move(desc));
+            }
+
+            continue;
+        }
+
         if (column.name == BlockNumberColumn::name || column.name == BlockOffsetColumn::name)
         {
             def.column_numbers_not_to_aggregate.push_back(i);
@@ -281,7 +323,15 @@ static SummingSortedAlgorithm::ColumnsDefinition defineColumns(
             bool is_agg_func = WhichDataType(column.type).isAggregateFunction();
 
             /// There are special const columns for example after prewhere sections.
-            if (!aggregate_all_columns && ((!column.type->isSummable() && !is_agg_func && !simple) || isColumnConst(*column.column)))
+            if (!aggregate_all_columns)
+            {
+                if ((!column.type->isSummable() && !is_agg_func && !simple) || isColumnConst(*column.column))
+                {
+                    def.column_numbers_not_to_aggregate.push_back(i);
+                    continue;
+                }
+            }
+            else if (column.type->getTypeId() == TypeIndex::Tuple)
             {
                 def.column_numbers_not_to_aggregate.push_back(i);
                 continue;
@@ -365,7 +415,7 @@ static SummingSortedAlgorithm::ColumnsDefinition defineColumns(
         {
             const ColumnWithTypeAndName & key_col = header.safeGetByPosition(*column_num_it);
             const String & name = key_col.name;
-            const IDataType & nested_type = *assert_cast<const DataTypeArray &>(*key_col.type).getNestedType();
+            const IDataType & nested_type = *recursiveRemoveLowCardinality(assert_cast<const DataTypeArray &>(*key_col.type).getNestedType());
 
             if (column_num_it == map.second.begin()
                 || endsWith(name, "ID")
@@ -450,12 +500,12 @@ static void postprocessChunk(
         auto column = std::move(columns[next_column]);
         ++next_column;
 
-        if (!desc.is_agg_func_type && !desc.is_simple_agg_func_type && isTuple(desc.function->getResultType()))
+        if (!desc.aggregate_all_columns && !desc.is_agg_func_type && !desc.is_simple_agg_func_type && isTuple(desc.function->getResultType()))
         {
             /// Unpack tuple into block.
-            size_t tuple_size = desc.column_numbers.size();
+            const size_t tuple_size = desc.column_numbers.size();
             for (size_t i = 0; i < tuple_size; ++i)
-                res_columns[desc.column_numbers[i]] = assert_cast<const ColumnTuple &>(*column).getColumnPtr(i);
+               res_columns[desc.column_numbers[i]] = assert_cast<const ColumnTuple &>(*column).getColumnPtr(i);
         }
         else if (desc.nested_type)
         {
@@ -516,8 +566,8 @@ static void setRow(Row & row, std::vector<ColumnPtr> & row_columns, const Column
 }
 
 
-SummingSortedAlgorithm::SummingMergedData::SummingMergedData(UInt64 max_block_size_rows_, UInt64 max_block_size_bytes_, ColumnsDefinition & def_)
-    : MergedData(false, max_block_size_rows_, max_block_size_bytes_)
+SummingSortedAlgorithm::SummingMergedData::SummingMergedData(UInt64 max_block_size_rows_, UInt64 max_block_size_bytes_, std::optional<size_t> max_dynamic_subcolumns_, ColumnsDefinition & def_)
+    : MergedData(false, max_block_size_rows_, max_block_size_bytes_, max_dynamic_subcolumns_)
     , def(def_), current_row(def.column_names.size()), current_row_columns(def.column_names.size())
 {
 }
@@ -533,9 +583,9 @@ void SummingSortedAlgorithm::SummingMergedData::initialize(const DB::Block & hea
     for (const auto & desc : def.columns_to_aggregate)
     {
         // Wrap aggregated columns in a tuple to match function signature
-        if (!desc.is_agg_func_type && !desc.is_simple_agg_func_type && isTuple(desc.function->getResultType()))
+        if (!desc.aggregate_all_columns && !desc.is_agg_func_type && !desc.is_simple_agg_func_type && isTuple(desc.function->getResultType()))
         {
-            size_t tuple_size = desc.column_numbers.size();
+            const size_t tuple_size = desc.column_numbers.size();
             MutableColumns tuple_columns(tuple_size);
             for (size_t i = 0; i < tuple_size; ++i)
                 tuple_columns[i] = std::move(columns[desc.column_numbers[i]]);
@@ -544,8 +594,12 @@ void SummingSortedAlgorithm::SummingMergedData::initialize(const DB::Block & hea
         }
         else
         {
-            const auto & type = desc.nested_type ? desc.nested_type : desc.real_type;
-            new_columns.emplace_back(type->createColumn());
+            /// Remove LowCardinality from columns if needed. It's important to use columns initialized in
+            /// MergedData::initialize to keep correct dynamic structure of some columns (like JSON/Dynamic).
+            if (desc.nested_type)
+                new_columns.emplace_back(recursiveRemoveLowCardinality(std::move(columns[desc.column_numbers[0]]))->assumeMutable());
+            else
+                new_columns.emplace_back(std::move(columns[desc.column_numbers[0]]));
         }
     }
 
@@ -734,7 +788,6 @@ Chunk SummingSortedAlgorithm::SummingMergedData::pull()
 {
     auto chunk = MergedData::pull();
     postprocessChunk(chunk, def.column_names.size(), def);
-
     initAggregateDescription();
 
     return chunk;
@@ -749,6 +802,7 @@ SummingSortedAlgorithm::SummingSortedAlgorithm(
     const Names & partition_and_sorting_required_columns,
     size_t max_block_size_rows,
     size_t max_block_size_bytes,
+    std::optional<size_t> max_dynamic_subcolumns_,
     const String & sum_function_name,
     const String & sum_function_map_name,
     bool remove_default_values,
@@ -756,7 +810,7 @@ SummingSortedAlgorithm::SummingSortedAlgorithm(
     : IMergingAlgorithmWithDelayedChunk(header_, num_inputs, std::move(description_))
     , columns_definition(
           defineColumns(*header_, description, column_names_to_sum, partition_and_sorting_required_columns, sum_function_name, sum_function_map_name, remove_default_values, aggregate_all_columns))
-    , merged_data(max_block_size_rows, max_block_size_bytes, columns_definition)
+    , merged_data(max_block_size_rows, max_block_size_bytes, max_dynamic_subcolumns_, columns_definition)
 {
 }
 
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
index 577dcba0fc2a..bbe68cf219a5 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
@@ -25,6 +25,7 @@ class SummingSortedAlgorithm final : public IMergingAlgorithmWithDelayedChunk
         const Names & partition_and_sorting_required_columns,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         const String & sum_function_name,
         const String & sum_function_map_name,
         bool remove_default_values,
@@ -77,7 +78,7 @@ class SummingSortedAlgorithm final : public IMergingAlgorithmWithDelayedChunk
         using MergedData::insertRow;
 
     public:
-        SummingMergedData(UInt64 max_block_size_rows, UInt64 max_block_size_bytes_, ColumnsDefinition & def_);
+        SummingMergedData(UInt64 max_block_size_rows, UInt64 max_block_size_bytes_, std::optional<size_t> max_dynamic_subcolumns_, ColumnsDefinition & def_);
 
         void initialize(const Block & header, const IMergingAlgorithm::Inputs & inputs) override;
 
diff --git a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
index 51be6347861d..3452b25a7a5a 100644
--- a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
@@ -15,9 +15,10 @@ VersionedCollapsingAlgorithm::VersionedCollapsingAlgorithm(
     const String & sign_column_,
     size_t max_block_size_rows_,
     size_t max_block_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes)
-    : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, MAX_ROWS_IN_MULTIVERSION_QUEUE, std::make_unique<MergedData>(use_average_block_sizes, max_block_size_rows_, max_block_size_bytes_))
+    : IMergingAlgorithmWithSharedChunks(header_, num_inputs, std::move(description_), out_row_sources_buf_, MAX_ROWS_IN_MULTIVERSION_QUEUE, std::make_unique<MergedData>(use_average_block_sizes, max_block_size_rows_, max_block_size_bytes_, max_dynamic_subcolumns_))
     /// -1 for +1 in FixedSizeDequeWithGaps's internal buffer. 3 is a reasonable minimum size to collapse anything.
     , max_rows_in_queue(std::min(std::max<size_t>(3, max_block_size_rows_), MAX_ROWS_IN_MULTIVERSION_QUEUE) - 1)
     , current_keys(max_rows_in_queue)
diff --git a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
index 0cf6315b9b51..1522b41697af 100644
--- a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
@@ -22,6 +22,7 @@ class VersionedCollapsingAlgorithm final : public IMergingAlgorithmWithSharedChu
         SortDescription description_, const String & sign_column_,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false);
 
diff --git a/src/Processors/Merges/CoalescingSortedTransform.h b/src/Processors/Merges/CoalescingSortedTransform.h
index d37ba2984c41..c9bab156469b 100644
--- a/src/Processors/Merges/CoalescingSortedTransform.h
+++ b/src/Processors/Merges/CoalescingSortedTransform.h
@@ -21,7 +21,8 @@ class CoalescingSortedTransform final : public IMergingTransform<SummingSortedAl
         const Names & partition_and_sorting_required_columns,
         const Names & partition_key_columns,
         size_t max_block_size_rows,
-        size_t max_block_size_bytes
+        size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_
         )
         : IMergingTransform(
             num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
@@ -32,6 +33,7 @@ class CoalescingSortedTransform final : public IMergingTransform<SummingSortedAl
             partition_key_columns,
             max_block_size_rows,
             max_block_size_bytes,
+            max_dynamic_subcolumns_,
             "last_value",
             "last_value",
             /*remove_default_values*/ false,
diff --git a/src/Processors/Merges/CollapsingSortedTransform.h b/src/Processors/Merges/CollapsingSortedTransform.h
index 9fa061393de0..f721e57e728d 100644
--- a/src/Processors/Merges/CollapsingSortedTransform.h
+++ b/src/Processors/Merges/CollapsingSortedTransform.h
@@ -23,6 +23,7 @@ class CollapsingSortedTransform final : public IMergingTransform<CollapsingSorte
         bool only_positive_sign,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
@@ -34,6 +35,7 @@ class CollapsingSortedTransform final : public IMergingTransform<CollapsingSorte
             only_positive_sign,
             max_block_size_rows,
             max_block_size_bytes,
+            max_dynamic_subcolumns_,
             getLogger("CollapsingSortedTransform"),
             out_row_sources_buf_,
             use_average_block_sizes)
diff --git a/src/Processors/Merges/GraphiteRollupSortedTransform.h b/src/Processors/Merges/GraphiteRollupSortedTransform.h
index 829cb8a459b1..129b186ad108 100644
--- a/src/Processors/Merges/GraphiteRollupSortedTransform.h
+++ b/src/Processors/Merges/GraphiteRollupSortedTransform.h
@@ -16,6 +16,7 @@ class GraphiteRollupSortedTransform final : public IMergingTransform<GraphiteRol
         SortDescription description_,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         Graphite::Params params_,
         time_t time_of_merge_)
         : IMergingTransform(
@@ -25,6 +26,7 @@ class GraphiteRollupSortedTransform final : public IMergingTransform<GraphiteRol
             std::move(description_),
             max_block_size_rows,
             max_block_size_bytes,
+            max_dynamic_subcolumns_,
             std::move(params_),
             time_of_merge_)
     {
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index 43450207f073..9f2814692fbf 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -18,6 +18,7 @@ MergingSortedTransform::MergingSortedTransform(
     const SortDescription & description_,
     size_t max_block_size_rows,
     size_t max_block_size_bytes,
+    std::optional<size_t> max_dynamic_subcolumns_,
     SortingQueueStrategy sorting_queue_strategy,
     UInt64 limit_,
     bool always_read_till_end_,
@@ -37,6 +38,7 @@ MergingSortedTransform::MergingSortedTransform(
         description_,
         max_block_size_rows,
         max_block_size_bytes,
+        max_dynamic_subcolumns_,
         sorting_queue_strategy,
         limit_,
         out_row_sources_buf_,
diff --git a/src/Processors/Merges/MergingSortedTransform.h b/src/Processors/Merges/MergingSortedTransform.h
index ee4be2177cab..7f2ccfab38bd 100644
--- a/src/Processors/Merges/MergingSortedTransform.h
+++ b/src/Processors/Merges/MergingSortedTransform.h
@@ -17,6 +17,7 @@ class MergingSortedTransform final : public IMergingTransform<MergingSortedAlgor
         const SortDescription & description,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         SortingQueueStrategy sorting_queue_strategy,
         UInt64 limit_ = 0,
         bool always_read_till_end_ = false,
diff --git a/src/Processors/Merges/ReplacingSortedTransform.h b/src/Processors/Merges/ReplacingSortedTransform.h
index 6e8eb4dff6c2..e9bf4aed7b6a 100644
--- a/src/Processors/Merges/ReplacingSortedTransform.h
+++ b/src/Processors/Merges/ReplacingSortedTransform.h
@@ -21,6 +21,7 @@ class ReplacingSortedTransform final : public IMergingTransform<ReplacingSortedA
         const String & is_deleted_column, const String & version_column,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
         bool cleanup = false,
@@ -34,6 +35,7 @@ class ReplacingSortedTransform final : public IMergingTransform<ReplacingSortedA
             version_column,
             max_block_size_rows,
             max_block_size_bytes,
+            max_dynamic_subcolumns_,
             out_row_sources_buf_,
             use_average_block_sizes,
             cleanup,
diff --git a/src/Processors/Merges/SummingSortedTransform.h b/src/Processors/Merges/SummingSortedTransform.h
index 623e8dd10af0..b3ac15c7e236 100644
--- a/src/Processors/Merges/SummingSortedTransform.h
+++ b/src/Processors/Merges/SummingSortedTransform.h
@@ -23,7 +23,8 @@ class SummingSortedTransform final : public IMergingTransform<SummingSortedAlgor
         const Names & partition_and_sorting_required_columns,
         const Names & partition_key_columns,
         size_t max_block_size_rows,
-        size_t max_block_size_bytes
+        size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_
         )
         : IMergingTransform(
             num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
@@ -34,6 +35,7 @@ class SummingSortedTransform final : public IMergingTransform<SummingSortedAlgor
             partition_key_columns,
             max_block_size_rows,
             max_block_size_bytes,
+            max_dynamic_subcolumns_,
             "sumWithOverflow",
             "sumMapWithOverflow",
             true,
diff --git a/src/Processors/Merges/VersionedCollapsingTransform.h b/src/Processors/Merges/VersionedCollapsingTransform.h
index 6e87416311c8..e7c51f1abeab 100644
--- a/src/Processors/Merges/VersionedCollapsingTransform.h
+++ b/src/Processors/Merges/VersionedCollapsingTransform.h
@@ -21,6 +21,7 @@ class VersionedCollapsingTransform final : public IMergingTransform<VersionedCol
         SortDescription description_, const String & sign_column_,
         size_t max_block_size_rows,
         size_t max_block_size_bytes,
+        std::optional<size_t> max_dynamic_subcolumns_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
@@ -31,6 +32,7 @@ class VersionedCollapsingTransform final : public IMergingTransform<VersionedCol
             sign_column_,
             max_block_size_rows,
             max_block_size_bytes,
+            max_dynamic_subcolumns_,
             out_row_sources_buf_,
             use_average_block_sizes)
     {
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index 840f8d694c46..16b00a3797de 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -51,6 +51,7 @@ namespace QueryPlanSerializationSetting
     extern const QueryPlanSerializationSettingsUInt64 min_free_disk_space_for_temporary_data;
     extern const QueryPlanSerializationSettingsFloat min_hit_rate_to_use_consecutive_keys_optimization;
     extern const QueryPlanSerializationSettingsBool optimize_group_by_constant_keys;
+    extern const QueryPlanSerializationSettingsBool serialize_string_in_memory_with_zero_byte;
 }
 
 namespace ErrorCodes
@@ -867,8 +868,8 @@ std::unique_ptr<IQueryPlanStep> AggregatingStep::deserialize(Deserialization & c
         /* only_merge */ false,
         ctx.settings[QueryPlanSerializationSetting::optimize_group_by_constant_keys],
         ctx.settings[QueryPlanSerializationSetting::min_hit_rate_to_use_consecutive_keys_optimization],
-        stats_collecting_params
-    };
+        stats_collecting_params,
+        ctx.settings[QueryPlanSerializationSetting::serialize_string_in_memory_with_zero_byte]};
 
     SortDescription sort_description_for_merging;
 
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 51ecef51a9b2..2f2c5a6bf85b 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -218,14 +218,13 @@ std::vector<std::unique_ptr<QueryPlan>> DelayedCreatingSetsStep::makePlansForSet
             continue;
 
         plan->optimize(optimization_settings);
-
         plans.emplace_back(std::move(plan));
     }
 
     return plans;
 }
 
-void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context)
+void addDelayedCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context)
 {
     if (!prepared_sets)
         return;
@@ -234,7 +233,17 @@ void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets,
     if (subqueries.empty())
         return;
 
-    addCreatingSetsStep(query_plan, std::move(subqueries), context);
+    const auto & settings = context->getSettingsRef();
+    SizeLimits network_transfer_limits(settings[Setting::max_rows_to_transfer], settings[Setting::max_bytes_to_transfer], settings[Setting::transfer_overflow_mode]);
+    auto prepared_sets_cache = context->getPreparedSetsCache();
+
+    auto step = std::make_unique<DelayedCreatingSetsStep>(
+            query_plan.getCurrentHeader(),
+            std::move(subqueries),
+            network_transfer_limits,
+            prepared_sets_cache);
+
+    query_plan.addStep(std::move(step));
 }
 
 DelayedCreatingSetsStep::DelayedCreatingSetsStep(
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index 3730545d8125..35dd7515759e 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -92,7 +92,7 @@ class DelayedCreatingSetsStep final : public IQueryPlanStep
 
 void addCreatingSetsStep(QueryPlan & query_plan, PreparedSets::Subqueries subqueries, ContextPtr context);
 
-void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context);
+void addDelayedCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context);
 
 QueryPipelineBuilderPtr addCreatingSetsTransform(QueryPipelineBuilderPtr pipeline, PreparedSets::Subqueries subqueries, ContextPtr context);
 
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.cpp b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
index f990d5dc5201..57ad612212cf 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.cpp
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
@@ -24,6 +24,7 @@ namespace QueryPlanSerializationSetting
     extern const QueryPlanSerializationSettingsUInt64 max_size_to_preallocate_for_aggregation;
     extern const QueryPlanSerializationSettingsFloat min_hit_rate_to_use_consecutive_keys_optimization;
     extern const QueryPlanSerializationSettingsBool distributed_aggregation_memory_efficient;
+    extern const QueryPlanSerializationSettingsBool serialize_string_in_memory_with_zero_byte;
 }
 
 namespace Setting
@@ -309,7 +310,8 @@ std::unique_ptr<IQueryPlanStep> MergingAggregatedStep::deserialize(Deserializati
         overflow_row,
         settings[Setting::max_threads],
         ctx.settings[QueryPlanSerializationSetting::max_block_size],
-        ctx.settings[QueryPlanSerializationSetting::min_hit_rate_to_use_consecutive_keys_optimization]);
+        ctx.settings[QueryPlanSerializationSetting::min_hit_rate_to_use_consecutive_keys_optimization],
+        ctx.settings[QueryPlanSerializationSetting::serialize_string_in_memory_with_zero_byte]);
 
     auto merging_aggregated_step = std::make_unique<MergingAggregatedStep>(
         ctx.input_headers.front(),
diff --git a/src/Processors/QueryPlan/ObjectFilterStep.cpp b/src/Processors/QueryPlan/ObjectFilterStep.cpp
new file mode 100644
index 000000000000..a635aee729c7
--- /dev/null
+++ b/src/Processors/QueryPlan/ObjectFilterStep.cpp
@@ -0,0 +1,63 @@
+#include <Processors/QueryPlan/ObjectFilterStep.h>
+#include <Processors/QueryPlan/QueryPlanStepRegistry.h>
+#include <Processors/QueryPlan/Serialization.h>
+#include <Processors/Transforms/FilterTransform.h>
+#include <IO/Operators.h>
+
+#include <memory>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DATA;
+}
+
+ObjectFilterStep::ObjectFilterStep(
+    SharedHeader input_header_,
+    ActionsDAG actions_dag_,
+    String filter_column_name_)
+    : actions_dag(std::move(actions_dag_))
+    , filter_column_name(std::move(filter_column_name_))
+{
+    input_headers.emplace_back(input_header_);
+    output_header = input_headers.front();
+}
+
+QueryPipelineBuilderPtr ObjectFilterStep::updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & /* settings */)
+{
+    return std::move(pipelines.front());
+}
+
+void ObjectFilterStep::updateOutputHeader()
+{
+    output_header = input_headers.front();
+}
+
+void ObjectFilterStep::serialize(Serialization & ctx) const
+{
+    writeStringBinary(filter_column_name, ctx.out);
+
+    actions_dag.serialize(ctx.out, ctx.registry);
+}
+
+std::unique_ptr<IQueryPlanStep> ObjectFilterStep::deserialize(Deserialization & ctx)
+{
+    if (ctx.input_headers.size() != 1)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "ObjectFilterStep must have one input stream");
+
+    String filter_column_name;
+    readStringBinary(filter_column_name, ctx.in);
+
+    ActionsDAG actions_dag = ActionsDAG::deserialize(ctx.in, ctx.registry, ctx.context);
+
+    return std::make_unique<ObjectFilterStep>(ctx.input_headers.front(), std::move(actions_dag), std::move(filter_column_name));
+}
+
+void registerObjectFilterStep(QueryPlanStepRegistry & registry)
+{
+    registry.registerStep("ObjectFilter", ObjectFilterStep::deserialize);
+}
+
+}
diff --git a/src/Processors/QueryPlan/ObjectFilterStep.h b/src/Processors/QueryPlan/ObjectFilterStep.h
new file mode 100644
index 000000000000..ef35d20068ba
--- /dev/null
+++ b/src/Processors/QueryPlan/ObjectFilterStep.h
@@ -0,0 +1,35 @@
+#pragma once
+#include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <Interpreters/ActionsDAG.h>
+
+namespace DB
+{
+
+/// Implements WHERE operation.
+class ObjectFilterStep : public IQueryPlanStep
+{
+public:
+    ObjectFilterStep(
+        SharedHeader input_header_,
+        ActionsDAG actions_dag_,
+        String filter_column_name_);
+
+    String getName() const override { return "ObjectFilter"; }
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & settings) override;
+
+    const ActionsDAG & getExpression() const { return actions_dag; }
+    ActionsDAG & getExpression() { return actions_dag; }
+    const String & getFilterColumnName() const { return filter_column_name; }
+
+    void serialize(Serialization & ctx) const override;
+
+    static std::unique_ptr<IQueryPlanStep> deserialize(Deserialization & ctx);
+
+private:
+    void updateOutputHeader() override;
+
+    ActionsDAG actions_dag;
+    String filter_column_name;
+};
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeLazyMaterialization.cpp b/src/Processors/QueryPlan/Optimizations/optimizeLazyMaterialization.cpp
index 7beea58fadea..950ac49c1055 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeLazyMaterialization.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeLazyMaterialization.cpp
@@ -241,7 +241,7 @@ bool optimizeLazyMaterialization(QueryPlan::Node & root, Stack & stack, QueryPla
     if (!sorting_step)
         return false;
 
-    if (sorting_step->getType() != SortingStep::Type::Full)
+    if (sorting_step->getType() != SortingStep::Type::Full && sorting_step->getType() != SortingStep::Type::FinishSorting)
         return false;
 
     const auto limit = limit_step->getLimit();
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp
index ce36c7bddb43..33408e02df87 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp
@@ -3,6 +3,7 @@
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
 #include <Processors/QueryPlan/SourceStepWithFilter.h>
+#include <Processors/QueryPlan/ObjectFilterStep.h>
 
 namespace DB::QueryPlanOptimizations
 {
@@ -41,6 +42,10 @@ void optimizePrimaryKeyConditionAndLimit(const Stack & stack)
             /// So this is likely not needed.
             continue;
         }
+        else if (auto * object_filter_step = typeid_cast<ObjectFilterStep *>(iter->node->step.get()))
+        {
+            source_step_with_filter->addFilter(object_filter_step->getExpression().clone(), object_filter_step->getFilterColumnName());
+        }
         else
         {
             break;
diff --git a/src/Processors/QueryPlan/PartsSplitter.cpp b/src/Processors/QueryPlan/PartsSplitter.cpp
index 22de71fb50ef..1ccce1e6bd60 100644
--- a/src/Processors/QueryPlan/PartsSplitter.cpp
+++ b/src/Processors/QueryPlan/PartsSplitter.cpp
@@ -947,6 +947,14 @@ RangesInDataParts findPKRangesForFinalAfterSkipIndexImpl(RangesInDataParts & ran
     for (size_t part_index = 0; part_index < ranges_in_data_parts.size(); ++part_index)
     {
         const auto & index_granularity = ranges_in_data_parts[part_index].data_part->index_granularity;
+
+        /// The optimization's logic needs the final mark to get the primary key upper bound of this part.
+        /// The final mark may not be written under some situations e.g index_granularity_bytes = 0.
+        if (!index_granularity->hasFinalMark())
+        {
+            return skip_and_return_all_part_ranges();
+        }
+
         for (const auto & range : ranges_in_data_parts[part_index].ranges)
         {
             const bool value_is_defined_at_end_mark = range.end < index_granularity->getMarksCount();
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index 23d3b7dba3b0..2eb384b1cf6c 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -109,6 +109,7 @@ class QueryPlan
     /// Do not allow to change the table while the pipeline alive.
     void addTableLock(TableLockHolder lock) { resources.table_locks.emplace_back(std::move(lock)); }
     void addInterpreterContext(std::shared_ptr<const Context> context) { resources.interpreter_context.emplace_back(std::move(context)); }
+    auto getInterpretersContexts() const { return resources.interpreter_context; }
     void addStorageHolder(StoragePtr storage) { resources.storage_holders.emplace_back(std::move(storage)); }
 
     void addResources(QueryPlanResourceHolder resources_) { resources = std::move(resources_); }
diff --git a/src/Processors/QueryPlan/QueryPlanSerializationSettings.cpp b/src/Processors/QueryPlan/QueryPlanSerializationSettings.cpp
index 6e9e7d0beb27..1a9492c4775e 100644
--- a/src/Processors/QueryPlan/QueryPlanSerializationSettings.cpp
+++ b/src/Processors/QueryPlan/QueryPlanSerializationSettings.cpp
@@ -80,7 +80,9 @@ namespace DB
     DECLARE(UInt64, join_output_by_rowlist_perkey_rows_threshold, 5, "The lower limit of per-key average rows in the right table to determine whether to output by row list in hash join.", 0) \
     DECLARE(Bool, allow_experimental_join_right_table_sorting, false, "If it is set to true, and the conditions of `join_to_sort_minimum_perkey_rows` and `join_to_sort_maximum_table_rows` are met, rerange the right table by key to improve the performance in left or inner hash join.", 0) \
     DECLARE(UInt64, join_to_sort_minimum_perkey_rows, 40, "The lower limit of per-key average rows in the right table to determine whether to rerange the right table by key in left or inner join. This setting ensures that the optimization is not applied for sparse table keys", 0) \
-    DECLARE(UInt64, join_to_sort_maximum_table_rows, 10000, "The maximum number of rows in the right table to determine whether to rerange the right table by key in left or inner join.", 0)
+    DECLARE(UInt64, join_to_sort_maximum_table_rows, 10000, "The maximum number of rows in the right table to determine whether to rerange the right table by key in left or inner join.", 0) \
+    \
+    DECLARE(Bool, serialize_string_in_memory_with_zero_byte, true, "Serialize String values during aggregation with zero byte at the end. Enable to keep compatibility when querying cluster of incompatible versions.", 0) \
 
 
 // clang-format on
diff --git a/src/Processors/QueryPlan/QueryPlanStepRegistry.cpp b/src/Processors/QueryPlan/QueryPlanStepRegistry.cpp
index 517f46fbfc96..283eece53c00 100644
--- a/src/Processors/QueryPlan/QueryPlanStepRegistry.cpp
+++ b/src/Processors/QueryPlan/QueryPlanStepRegistry.cpp
@@ -50,6 +50,7 @@ void registerFilterStep(QueryPlanStepRegistry & registry);
 void registerTotalsHavingStep(QueryPlanStepRegistry & registry);
 void registerExtremesStep(QueryPlanStepRegistry & registry);
 void registerJoinStep(QueryPlanStepRegistry & registry);
+void registerObjectFilterStep(QueryPlanStepRegistry & registry);
 
 void registerReadFromTableStep(QueryPlanStepRegistry & registry);
 void registerReadFromTableFunctionStep(QueryPlanStepRegistry & registry);
@@ -75,6 +76,7 @@ void QueryPlanStepRegistry::registerPlanSteps()
 
     registerReadFromTableStep(registry);
     registerReadFromTableFunctionStep(registry);
+    registerObjectFilterStep(registry);
 }
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 61e9e34fcfea..3f23bf393f07 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -878,7 +878,8 @@ Pipe ReadFromMergeTree::readByLayers(const RangesInDataParts & parts_with_ranges
                     pipe.numOutputPorts(),
                     sort_description,
                     block_size.max_block_size_rows,
-                    /*max_block_size_bytes=*/0,
+                    /*max_block_size_bytes=*/ 0,
+                    /*max_dynamic_subcolumns*/ std::nullopt,
                     SortingQueueStrategy::Batch,
                     0,
                     false,
@@ -1292,6 +1293,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
                     sort_description,
                     block_size.max_block_size_rows,
                     /*max_block_size_bytes=*/0,
+                    /*max_dynamic_subcolumns=*/ std::nullopt,
                     SortingQueueStrategy::Batch,
                     0,
                     false,
@@ -1343,42 +1345,42 @@ static void addMergingFinal(
         {
             case MergeTreeData::MergingParams::Ordinary:
                 return std::make_shared<MergingSortedTransform>(header, num_outputs,
-                            sort_description, max_block_size_rows, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch);
+                            sort_description, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt, SortingQueueStrategy::Batch);
 
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.sign_column, true, max_block_size_rows, /*max_block_size_bytes=*/0);
+                            sort_description, merging_params.sign_column, true, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt);
 
             case MergeTreeData::MergingParams::Summing: {
                 auto required_columns = metadata_snapshot->getPartitionKey().expression->getRequiredColumns();
                 required_columns.append_range(metadata_snapshot->getSortingKey().expression->getRequiredColumns());
                 return std::make_shared<SummingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.columns_to_sum, required_columns, max_block_size_rows, /*max_block_size_bytes=*/0);
+                            sort_description, merging_params.columns_to_sum, required_columns, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt);
             }
 
             case MergeTreeData::MergingParams::Aggregating:
                 return std::make_shared<AggregatingSortedTransform>(header, num_outputs,
-                            sort_description, max_block_size_rows, /*max_block_size_bytes=*/0);
+                            sort_description, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt);
 
             case MergeTreeData::MergingParams::Replacing:
                 return std::make_shared<ReplacingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.is_deleted_column, merging_params.version_column, max_block_size_rows, /*max_block_size_bytes=*/0, /*out_row_sources_buf_*/ nullptr, /*use_average_block_sizes*/ false, /*cleanup*/ !merging_params.is_deleted_column.empty(), enable_vertical_final);
+                            sort_description, merging_params.is_deleted_column, merging_params.version_column, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt, /*out_row_sources_buf_*/ nullptr, /*use_average_block_sizes*/ false, /*cleanup*/ !merging_params.is_deleted_column.empty(), enable_vertical_final);
 
 
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 return std::make_shared<VersionedCollapsingTransform>(header, num_outputs,
-                            sort_description, merging_params.sign_column, max_block_size_rows, /*max_block_size_bytes=*/0);
+                            sort_description, merging_params.sign_column, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt);
 
             case MergeTreeData::MergingParams::Graphite:
                 return std::make_shared<GraphiteRollupSortedTransform>(header, num_outputs,
-                            sort_description, max_block_size_rows, /*max_block_size_bytes=*/0, merging_params.graphite_params, now);
+                            sort_description, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt, merging_params.graphite_params, now);
 
             case MergeTreeData::MergingParams::Coalescing:
             {
                 auto required_columns = metadata_snapshot->getPartitionKey().expression->getRequiredColumns();
                 required_columns.append_range(metadata_snapshot->getSortingKey().expression->getRequiredColumns());
                 return std::make_shared<CoalescingSortedTransform>(header, num_outputs,
-                            sort_description, merging_params.columns_to_sum, required_columns, max_block_size_rows, /*max_block_size_bytes=*/0);
+                            sort_description, merging_params.columns_to_sum, required_columns, max_block_size_rows, /*max_block_size_bytes=*/0, /*max_dynamic_subcolumns*/std::nullopt);
             }
         }
     };
@@ -1798,7 +1800,8 @@ static void buildIndexes(
     {
         std::vector<size_t> index_sizes;
         index_sizes.reserve(skip_indexes.useful_indices.size());
-        for (const auto& part : parts)
+
+        for (const auto & part : parts)
         {
             auto &index_order = skip_indexes.per_part_index_orders.emplace_back();
             index_order.resize(skip_indexes.useful_indices.size());
@@ -1808,7 +1811,7 @@ static void buildIndexes(
 
             for (const auto &idx : skip_indexes.useful_indices)
             {
-                const auto *extension = idx.index->getDeserializedFormat(part.data_part->getDataPartStorage(), idx.index->getFileName()).extension;
+                const auto *extension = idx.index->getDeserializedFormat(part.data_part->checksums, idx.index->getFileName()).extension;
                 auto sz = part.data_part->getFileSizeOrZero(idx.index->getFileName() + extension);
                 index_sizes.emplace_back(sz);
             }
diff --git a/src/Processors/QueryPlan/ReadFromObjectStorageStep.cpp b/src/Processors/QueryPlan/ReadFromObjectStorageStep.cpp
index fc7a9e440c99..34914c39fc2b 100644
--- a/src/Processors/QueryPlan/ReadFromObjectStorageStep.cpp
+++ b/src/Processors/QueryPlan/ReadFromObjectStorageStep.cpp
@@ -15,6 +15,7 @@
 #include <Formats/FormatFactory.h>
 #include <IO/ReadBufferFromString.h>
 #include <Interpreters/Context.h>
+#include <Storages/VirtualColumnUtils.h>
 
 
 namespace DB
@@ -53,9 +54,22 @@ ReadFromObjectStorageStep::ReadFromObjectStorageStep(
 {
 }
 
+QueryPlanStepPtr ReadFromObjectStorageStep::clone() const
+{
+    return std::make_unique<ReadFromObjectStorageStep>(*this);
+}
+
 void ReadFromObjectStorageStep::applyFilters(ActionDAGNodes added_filter_nodes)
 {
     SourceStepWithFilter::applyFilters(std::move(added_filter_nodes));
+    // It is important to build the inplace sets for the filter here, before reading data from object storage.
+    // If we delay building these sets until later in the pipeline, the filter can be applied after the data
+    // has already been read, potentially in parallel across many streams. This can significantly reduce the
+    // effectiveness of an Iceberg partition pruning, as unnecessary data may be read. Additionally, building ordered sets
+    // at this stage enables the KeyCondition class to apply more efficient optimizations than for unordered sets.
+    if (!filter_actions_dag)
+        return;
+    VirtualColumnUtils::buildOrderedSetsForDAG(*filter_actions_dag, getContext());
 }
 
 void ReadFromObjectStorageStep::updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value)
@@ -83,9 +97,11 @@ void ReadFromObjectStorageStep::initializePipeline(QueryPipelineBuilder & pipeli
         num_streams = 1;
     }
 
+//    const size_t max_parsing_threads = (distributed_processing || num_streams >= max_threads) ? 1 : (max_threads / std::max(num_streams, 1ul));
     auto parser_shared_resources = std::make_shared<FormatParserSharedResources>(context->getSettingsRef(), num_streams);
 
-    auto format_filter_info = std::make_shared<FormatFilterInfo>(filter_actions_dag, context, configuration->getColumnMapper());
+    auto format_filter_info
+        = std::make_shared<FormatFilterInfo>(filter_actions_dag, context, configuration->getColumnMapperForCurrentSchema());
     format_filter_info->prewhere_info = prewhere_info;
 
     for (size_t i = 0; i < num_streams; ++i)
diff --git a/src/Processors/QueryPlan/ReadFromObjectStorageStep.h b/src/Processors/QueryPlan/ReadFromObjectStorageStep.h
index c6adc4a961ef..b0e5397ad688 100644
--- a/src/Processors/QueryPlan/ReadFromObjectStorageStep.h
+++ b/src/Processors/QueryPlan/ReadFromObjectStorageStep.h
@@ -33,6 +33,7 @@ class ReadFromObjectStorageStep : public SourceStepWithFilter
     void updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value) override;
 
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+    QueryPlanStepPtr clone() const override;
 
 private:
     ObjectStoragePtr object_storage;
diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index 48a412ef781f..70f3b78b8245 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -508,7 +508,8 @@ void ReadFromRemote::addLazyPipe(
             my_stage = stage, my_storage = storage,
             add_agg_info, add_totals, add_extremes, async_read, async_query_sending,
             query_tree = shard.query_tree, planner_context = shard.planner_context,
-            pushed_down_filters, parallel_marshalling_threads]() mutable
+            pushed_down_filters, parallel_marshalling_threads,
+            my_is_remote_function = is_remote_function]() mutable
         -> QueryPipelineBuilder
     {
         auto current_settings = my_context->getSettingsRef();
@@ -603,6 +604,8 @@ void ReadFromRemote::addLazyPipe(
             {DataTypeUInt32().createColumnConst(1, my_shard.shard_info.shard_num), std::make_shared<DataTypeUInt32>(), "_shard_num"}};
         auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
             std::move(connections), query_string, header, my_context, my_throttler, my_scalars, my_external_tables, stage_to_use, my_shard.query_plan);
+        remote_query_executor->setRemoteFunction(my_is_remote_function);
+        remote_query_executor->setShardCount(my_shard_count);
 
         auto pipe = createRemoteSourcePipe(
             remote_query_executor, add_agg_info, add_totals, add_extremes, async_read, async_query_sending, parallel_marshalling_threads);
@@ -693,6 +696,8 @@ void ReadFromRemote::addPipe(
                 priority_func);
             remote_query_executor->setLogger(log);
             remote_query_executor->setPoolMode(PoolMode::GET_ONE);
+            remote_query_executor->setRemoteFunction(is_remote_function);
+            remote_query_executor->setShardCount(shard_count);
 
             if (!table_func_ptr)
                 remote_query_executor->setMainTable(shard.main_table ? shard.main_table : main_table);
@@ -713,6 +718,8 @@ void ReadFromRemote::addPipe(
         auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
             shard.shard_info.pool, query_string, shard.header, context, throttler, scalars, external_tables, stage_to_use, shard.query_plan);
         remote_query_executor->setLogger(log);
+        remote_query_executor->setRemoteFunction(is_remote_function);
+        remote_query_executor->setShardCount(shard_count);
 
         if (context->canUseTaskBasedParallelReplicas() || parallel_replicas_disabled)
         {
diff --git a/src/Processors/QueryPlan/ReadFromRemote.h b/src/Processors/QueryPlan/ReadFromRemote.h
index fec1549430e1..02e1536e05d1 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.h
+++ b/src/Processors/QueryPlan/ReadFromRemote.h
@@ -45,6 +45,7 @@ class ReadFromRemote final : public SourceStepWithFilterBase
 
     void enableMemoryBoundMerging();
     void enforceAggregationInOrder(const SortDescription & sort_description);
+    void setIsRemoteFunction(bool is_remote_function_ = true) { is_remote_function = is_remote_function_; }
 
     bool hasSerializedPlan() const;
 
@@ -62,6 +63,7 @@ class ReadFromRemote final : public SourceStepWithFilterBase
     UInt32 shard_count;
     const String cluster_name;
     std::optional<GetPriorityForLoadBalancing> priority_func_factory;
+    bool is_remote_function = false;
 
     Pipes addPipes(const ClusterProxy::SelectStreamFactory::Shards & used_shards, const SharedHeader & out_header);
 
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 8c180d864a6c..13c22aa441ef 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -342,6 +342,7 @@ void SortingStep::mergingSorted(QueryPipelineBuilder & pipeline, const SortDescr
             result_sort_desc,
             sort_settings.max_block_size,
             /*max_block_size_bytes=*/0,
+            /*max_dynamic_subcolumns*/std::nullopt,
             SortingQueueStrategy::Batch,
             limit_,
             always_read_till_end,
@@ -446,6 +447,7 @@ void SortingStep::fullSort(
             result_sort_desc,
             sort_settings.max_block_size,
             /*max_block_size_bytes=*/0,
+            /*max_dynamic_subcolumns*/std::nullopt,
             SortingQueueStrategy::Batch,
             limit_,
             always_read_till_end);
diff --git a/src/Processors/QueryPlan/resolveStorages.cpp b/src/Processors/QueryPlan/resolveStorages.cpp
index 38ea216b5ec6..411df98ecc32 100644
--- a/src/Processors/QueryPlan/resolveStorages.cpp
+++ b/src/Processors/QueryPlan/resolveStorages.cpp
@@ -44,6 +44,7 @@ namespace Setting
     extern const SettingsSetOperationMode except_default_mode;
     extern const SettingsSetOperationMode intersect_default_mode;
     extern const SettingsSetOperationMode union_default_mode;
+    extern const SettingsSeconds lock_acquire_timeout;
 }
 
 namespace ErrorCodes
@@ -186,6 +187,8 @@ static QueryPlanResourceHolder replaceReadingFromTable(QueryPlan::Node & node, Q
         select_query_info.table_expression_modifiers = reading_from_table_function->getTableExpressionModifiers();
     }
 
+    auto table_lock = storage->lockForShare(context->getInitialQueryId(), context->getSettingsRef()[Setting::lock_acquire_timeout]);
+
     ASTPtr query;
     bool is_storage_merge = typeid_cast<const StorageMerge *>(storage.get());
     if (storage->isRemote() || is_storage_merge)
@@ -255,6 +258,10 @@ static QueryPlanResourceHolder replaceReadingFromTable(QueryPlan::Node & node, Q
     node.step = std::make_unique<ExpressionStep>(reading_plan.getCurrentHeader(), std::move(converting_actions));
     node.children = {reading_plan.getRootNode()};
 
+    reading_plan.addInterpreterContext(context);
+    reading_plan.addStorageHolder(std::move(storage));
+    reading_plan.addTableLock(std::move(table_lock));
+
     auto nodes_and_resource = QueryPlan::detachNodesAndResources(std::move(reading_plan));
 
     nodes.splice(nodes.end(), std::move(nodes_and_resource.first));
diff --git a/src/Processors/Sources/ConstChunkGenerator.h b/src/Processors/Sources/ConstChunkGenerator.h
index 8232bd5f0dff..ca120fc23d23 100644
--- a/src/Processors/Sources/ConstChunkGenerator.h
+++ b/src/Processors/Sources/ConstChunkGenerator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Processors/ISource.h>
+#include <Processors/Formats/IInputFormat.h>
 
 
 namespace DB
@@ -13,7 +14,7 @@ class ConstChunkGenerator : public ISource
 public:
     ConstChunkGenerator(SharedHeader header, size_t total_num_rows, size_t max_block_size_)
         : ISource(std::move(header))
-        , remaining_rows(total_num_rows), max_block_size(max_block_size_)
+        , generated_rows(0), remaining_rows(total_num_rows), max_block_size(max_block_size_)
     {
     }
 
@@ -27,10 +28,14 @@ class ConstChunkGenerator : public ISource
 
         size_t num_rows = std::min(max_block_size, remaining_rows);
         remaining_rows -= num_rows;
-        return cloneConstWithDefault(Chunk{getPort().getHeader().getColumns(), 0}, num_rows);
+        auto chunk = cloneConstWithDefault(Chunk{getPort().getHeader().getColumns(), 0}, num_rows);
+        chunk.getChunkInfos().add(std::make_shared<ChunkInfoRowNumbers>(generated_rows));
+        generated_rows += num_rows;
+        return chunk;
     }
 
 private:
+    size_t generated_rows;
     size_t remaining_rows;
     size_t max_block_size;
 };
diff --git a/src/Processors/Sources/RecursiveCTESource.cpp b/src/Processors/Sources/RecursiveCTESource.cpp
index 4a160465626e..62edbdc6645f 100644
--- a/src/Processors/Sources/RecursiveCTESource.cpp
+++ b/src/Processors/Sources/RecursiveCTESource.cpp
@@ -38,7 +38,7 @@ namespace ErrorCodes
 namespace
 {
 
-std::vector<TableNode *> collectTableNodesWithStorage(const StoragePtr & storage, IQueryTreeNode * root)
+std::vector<TableNode *> collectTableNodesWithTemporaryTableName(const std::string & temporary_table_name, IQueryTreeNode * root)
 {
     std::vector<TableNode *> result;
 
@@ -51,7 +51,7 @@ std::vector<TableNode *> collectTableNodesWithStorage(const StoragePtr & storage
         nodes_to_process.pop_back();
 
         auto * table_node = subtree_node->as<TableNode>();
-        if (table_node && table_node->getStorageID() == storage->getStorageID())
+        if (table_node && table_node->getTemporaryTableName() == temporary_table_name)
             result.push_back(table_node);
 
         for (auto & child : subtree_node->getChildren())
@@ -77,7 +77,9 @@ class RecursiveCTEChunkGenerator
         chassert(recursive_cte_union_node_typed.hasRecursiveCTETable());
 
         auto & recursive_cte_table = recursive_cte_union_node_typed.getRecursiveCTETable();
-        recursive_table_nodes = collectTableNodesWithStorage(recursive_cte_table->storage, recursive_cte_union_node.get());
+
+        const auto & cte_name = recursive_cte_union_node_typed.getCTEName();
+        recursive_table_nodes = collectTableNodesWithTemporaryTableName(cte_name, recursive_cte_union_node.get());
         if (recursive_table_nodes.empty())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "UNION query {} is not recursive", recursive_cte_union_node->formatASTForErrorMessage());
 
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index 8a1224b47bd9..1ced06f0a955 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -93,8 +93,11 @@ ISource::Status RemoteSource::prepare()
     if (is_async_state)
         return Status::Async;
 
-    if (executor_finished)
+    if (query_executor->isFinished())
+    {
+        getPort().finish();
         return Status::Finished;
+    }
 
     Status status = ISource::prepare();
     /// To avoid resetting the connection (because of "unfinished" query) in the
@@ -126,7 +129,6 @@ void RemoteSource::work()
     if (need_drain)
     {
         query_executor->finish();
-        executor_finished = true;
         return;
     }
 
@@ -246,10 +248,10 @@ void RemoteSource::onCancel() noexcept
 
 void RemoteSource::onUpdatePorts()
 {
+    if (isCancelled())
+        return;
     if (getPort().isFinished())
-    {
         query_executor->finish();
-    }
 }
 
 
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index 7f414ea6d9de..f7c414b7e6f9 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -48,7 +48,6 @@ class RemoteSource final : public ISource
 private:
     std::atomic_bool was_query_sent = false;
     bool need_drain = false;
-    bool executor_finished = false;
     bool add_aggregation_info = false;
     RemoteQueryExecutorPtr query_executor;
     RowsBeforeStepCounterPtr rows_before_limit;
diff --git a/src/Processors/Sources/ShellCommandSource.cpp b/src/Processors/Sources/ShellCommandSource.cpp
index e0ba6d002128..649db32051e3 100644
--- a/src/Processors/Sources/ShellCommandSource.cpp
+++ b/src/Processors/Sources/ShellCommandSource.cpp
@@ -566,7 +566,7 @@ namespace
     class SendingChunkHeaderTransform final : public ISimpleTransform
     {
     public:
-        SendingChunkHeaderTransform(SharedHeader header, std::shared_ptr<TimeoutWriteBufferFromFileDescriptor> buffer_)
+        SendingChunkHeaderTransform(SharedHeader header, WriteBuffer & buffer_)
             : ISimpleTransform(header, header, false)
             , buffer(buffer_)
         {
@@ -578,12 +578,12 @@ namespace
 
         void transform(Chunk & chunk) override
         {
-            writeText(chunk.getNumRows(), *buffer);
-            writeChar('\n', *buffer);
+            writeText(chunk.getNumRows(), buffer);
+            writeChar('\n', buffer);
         }
 
     private:
-        std::shared_ptr<TimeoutWriteBufferFromFileDescriptor> buffer;
+        WriteBuffer & buffer;
     };
 
 }
@@ -677,17 +677,19 @@ Pipe ShellCommandSourceCoordinator::createPipe(
 
         input_pipes[i].resize(1);
 
+        auto out = context->getOutputFormat(configuration.format, *timeout_write_buffer, materializeBlock(input_pipes[i].getHeader()));
+        out->setAutoFlush();
+
         if (configuration.send_chunk_header)
         {
-            auto transform = std::make_shared<SendingChunkHeaderTransform>(input_pipes[i].getSharedHeader(), timeout_write_buffer);
+            /// We cannot use timeout_write_buffer directly since the output format may wrap the buffer, so we need to use a wrapper
+            auto transform = std::make_shared<SendingChunkHeaderTransform>(input_pipes[i].getSharedHeader(), *out->getWriteBufferPtr());
             input_pipes[i].addTransform(std::move(transform));
         }
 
         auto num_streams = input_pipes[i].maxParallelStreams();
         auto pipeline = std::make_shared<QueryPipeline>(std::move(input_pipes[i]));
         pipeline->setNumThreads(num_streams);
-        auto out = context->getOutputFormat(configuration.format, *timeout_write_buffer, materializeBlock(pipeline->getHeader()));
-        out->setAutoFlush();
         pipeline->complete(std::move(out));
 
         ShellCommandSource::SendDataTask task = [pipeline, timeout_write_buffer, write_buffer, is_executable_pool]()
diff --git a/src/Processors/TTL/TTLAggregationAlgorithm.cpp b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
index bfb79672636e..8acf2c24ae36 100644
--- a/src/Processors/TTL/TTLAggregationAlgorithm.cpp
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
@@ -22,6 +22,7 @@ namespace Setting
     extern const SettingsUInt64 min_count_to_compile_aggregate_expression;
     extern const SettingsUInt64 min_free_disk_space_for_temporary_data;
     extern const SettingsBool optimize_group_by_constant_keys;
+    extern const SettingsBool serialize_string_in_memory_with_zero_byte;
 }
 
 TTLAggregationAlgorithm::TTLAggregationAlgorithm(
@@ -65,7 +66,8 @@ TTLAggregationAlgorithm::TTLAggregationAlgorithm(
         /*only_merge=*/false,
         settings[Setting::optimize_group_by_constant_keys],
         settings[Setting::min_chunk_bytes_for_parallel_parsing],
-        /*stats_collecting_params_=*/{});
+        /*stats_collecting_params_=*/{},
+        settings[Setting::serialize_string_in_memory_with_zero_byte]);
 
     aggregator = std::make_unique<Aggregator>(header, params);
 
diff --git a/src/Processors/Transforms/ColumnGathererTransform.cpp b/src/Processors/Transforms/ColumnGathererTransform.cpp
index 321804652758..8a892867f0a7 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.cpp
+++ b/src/Processors/Transforms/ColumnGathererTransform.cpp
@@ -35,11 +35,13 @@ ColumnGathererStream::ColumnGathererStream(
     ReadBuffer & row_sources_buf_,
     size_t block_preferred_size_rows_,
     size_t block_preferred_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     bool is_result_sparse_)
     : sources(num_inputs)
     , row_sources_buf(row_sources_buf_)
     , block_preferred_size_rows(block_preferred_size_rows_)
     , block_preferred_size_bytes(block_preferred_size_bytes_)
+    , max_dynamic_subcolumns(max_dynamic_subcolumns_)
     , is_result_sparse(is_result_sparse_)
 {
     if (num_inputs == 0)
@@ -77,7 +79,7 @@ void ColumnGathererStream::initialize(Inputs inputs)
         result_column = ColumnSparse::create(std::move(result_column));
 
     if (result_column->hasDynamicStructure())
-        result_column->takeDynamicStructureFromSourceColumns(source_columns);
+        result_column->takeDynamicStructureFromSourceColumns(source_columns, max_dynamic_subcolumns);
 }
 
 IMergingAlgorithm::Status ColumnGathererStream::merge()
@@ -195,10 +197,11 @@ ColumnGathererTransform::ColumnGathererTransform(
     std::unique_ptr<ReadBuffer> row_sources_buf_,
     size_t block_preferred_size_rows_,
     size_t block_preferred_size_bytes_,
+    std::optional<size_t> max_dynamic_subcolumns_,
     bool is_result_sparse_)
     : IMergingTransform<ColumnGathererStream>(
         num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
-        num_inputs, *row_sources_buf_, block_preferred_size_rows_, block_preferred_size_bytes_, is_result_sparse_)
+        num_inputs, *row_sources_buf_, block_preferred_size_rows_, block_preferred_size_bytes_, max_dynamic_subcolumns_, is_result_sparse_)
     , row_sources_buf_holder(std::move(row_sources_buf_))
     , log(getLogger("ColumnGathererStream"))
 {
diff --git a/src/Processors/Transforms/ColumnGathererTransform.h b/src/Processors/Transforms/ColumnGathererTransform.h
index d3b3bca6c768..1b70212ea4e6 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.h
+++ b/src/Processors/Transforms/ColumnGathererTransform.h
@@ -61,6 +61,7 @@ class ColumnGathererStream final : public IMergingAlgorithm
         ReadBuffer & row_sources_buf_,
         size_t block_preferred_size_rows_,
         size_t block_preferred_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         bool is_result_sparse_);
 
     const char * getName() const override { return "ColumnGathererStream"; }
@@ -94,6 +95,7 @@ class ColumnGathererStream final : public IMergingAlgorithm
 
     const size_t block_preferred_size_rows;
     const size_t block_preferred_size_bytes;
+    const std::optional<size_t> max_dynamic_subcolumns;
     const bool is_result_sparse;
 
     Source * source_to_fully_copy = nullptr;
@@ -113,6 +115,7 @@ class ColumnGathererTransform final : public IMergingTransform<ColumnGathererStr
         std::unique_ptr<ReadBuffer> row_sources_buf_,
         size_t block_preferred_size_rows_,
         size_t block_preferred_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         bool is_result_sparse_);
 
     String getName() const override { return "ColumnGathererTransform"; }
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index c667ce6c4cf2..f4080aa9d691 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -134,7 +134,7 @@ void JoiningTransform::work()
     {
         chassert(!output_chunk.has_value());
         transform(input_chunk);
-        has_input = join_result != nullptr;
+        has_input = input_chunk.hasRows() || join_result != nullptr;
     }
     else
     {
@@ -170,6 +170,8 @@ void JoiningTransform::work()
     }
 }
 
+/// transform should consume the input chunk and set the output chunk
+/// if not all data is consumed it may be set to the chunk and transform will be called again
 void JoiningTransform::transform(Chunk & chunk)
 {
     if (!initialized)
@@ -220,6 +222,13 @@ Block JoiningTransform::readExecute(Chunk & chunk)
     }
 
     auto data = join_result->next();
+    if (data.is_last && data.next_block)
+    {
+        data.next_block->filterBySelector();
+        auto next_block = std::move(*data.next_block).getSourceBlock();
+        chunk.setColumns(next_block.getColumns(), next_block.rows());
+    }
+
     if (data.is_last)
         join_result.reset();
 
diff --git a/src/Processors/Transforms/MergeSortingTransform.cpp b/src/Processors/Transforms/MergeSortingTransform.cpp
index 222ef4454411..d8f80640ea12 100644
--- a/src/Processors/Transforms/MergeSortingTransform.cpp
+++ b/src/Processors/Transforms/MergeSortingTransform.cpp
@@ -243,7 +243,7 @@ void MergeSortingTransform::consume(Chunk chunk)
             /// If there's less free disk space than reserve_size, an exception will be thrown
             size_t reserve_size = sum_bytes_in_blocks + min_free_disk_space;
             SharedHeader shared_header_without_constants = std::make_shared<const Block>(header_without_constants);
-            TemporaryBlockStreamHolder tmp_stream(shared_header_without_constants, tmp_data.get(), reserve_size);
+            TemporaryBlockStreamHolder tmp_stream(shared_header_without_constants, tmp_data, reserve_size);
             size_t max_merged_block_size = this->max_merged_block_size;
             if (max_block_bytes > 0 && sum_rows_in_blocks > 0 && sum_bytes_in_blocks > 0)
             {
@@ -269,7 +269,8 @@ void MergeSortingTransform::consume(Chunk chunk)
                         0,
                         description,
                         max_merged_block_size,
-                        /*max_merged_block_size_bytes*/0,
+                        /*max_merged_block_size_bytes=*/0,
+                        /*max_dynamic_subcolumns=*/std::nullopt,
                         SortingQueueStrategy::Batch,
                         limit,
                         /*always_read_till_end_=*/ false,
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.cpp b/src/Processors/Transforms/MergingAggregatedTransform.cpp
index 0508541a2c10..86c1bb44b997 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedTransform.cpp
@@ -90,7 +90,8 @@ MergingAggregatedTransform::MergingAggregatedTransform(
                 params.overflow_row,
                 params.max_threads,
                 params.max_block_size,
-                params.min_hit_rate_to_use_consecutive_keys_optimization);
+                params.min_hit_rate_to_use_consecutive_keys_optimization,
+                params.serialize_string_with_zero_byte);
 
             auto transform_params = std::make_shared<AggregatingTransformParams>(std::make_shared<const Block>(reordering.updateHeader(in_header)), std::move(set_params), final);
 
diff --git a/src/Processors/Transforms/TTLTransform.cpp b/src/Processors/Transforms/TTLTransform.cpp
index cfbf97769183..f8c3ff8d1627 100644
--- a/src/Processors/Transforms/TTLTransform.cpp
+++ b/src/Processors/Transforms/TTLTransform.cpp
@@ -31,16 +31,36 @@ static TTLExpressions getExpressions(const TTLDescription & ttl_descr, PreparedS
     return {expr.expression, where_expr.expression};
 }
 
+SharedHeader TTLTransform::addExpiredColumnsToBlock(const SharedHeader & header, const NamesAndTypesList & expired_columns_)
+{
+    if (expired_columns_.empty())
+        return header;
+
+    auto output_block = *header;
+
+    for (const auto & col : expired_columns_)
+    {
+        if (output_block.has(col.name))
+            continue;
+
+        output_block.insert({col.type->createColumn(), col.type, col.name});
+    }
+
+    return std::make_shared<const Block>(std::move(output_block));
+}
+
 TTLTransform::TTLTransform(
     const ContextPtr & context,
     SharedHeader header_,
     const MergeTreeData & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const MergeTreeData::MutableDataPartPtr & data_part_,
+    const NamesAndTypesList & expired_columns_,
     time_t current_time_,
     bool force_)
-    : IAccumulatingTransform(header_, header_)
+    : IAccumulatingTransform(header_, addExpiredColumnsToBlock(header_, expired_columns_))
     , data_part(data_part_)
+    , expired_columns(expired_columns_)
     , log(getLogger(storage_.getLogName() + " (TTLTransform)"))
 {
     auto old_ttl_infos = data_part->ttl_infos;
@@ -71,32 +91,49 @@ TTLTransform::TTLTransform(
                 old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_,
                 getInputPort().getHeader(), storage_));
 
-    if (metadata_snapshot_->hasAnyColumnTTL())
+    const auto & storage_columns = metadata_snapshot_->getColumns();
+    const auto & column_defaults = storage_columns.getDefaults();
+
+    auto build_default_expr = [&](const String & name)
     {
-        const auto & storage_columns = metadata_snapshot_->getColumns();
-        const auto & column_defaults = storage_columns.getDefaults();
+        using Result = std::pair<ExpressionActionsPtr, String>;
+        auto it = column_defaults.find(name);
+        if (it == column_defaults.end())
+            return Result{};
+        const auto & column = storage_columns.get(name);
+        auto default_ast = it->second.expression->clone();
+        default_ast = addTypeConversionToAST(std::move(default_ast), column.type->getName());
+        auto syntax_result = TreeRewriter(storage_.getContext()).analyze(default_ast, storage_columns.getAll());
+        auto actions = ExpressionAnalyzer{default_ast, syntax_result, storage_.getContext()}.getActions(true);
+        return Result{actions, default_ast->getColumnName()};
+    };
+
+    for (const auto & expired_column : expired_columns)
+    {
+        auto [default_expression, default_column_name] = build_default_expr(expired_column.name);
+        expired_columns_data.emplace(
+            expired_column.name, ExpiredColumnData{expired_column.type, std::move(default_expression), std::move(default_column_name)});
+    }
 
+    if (metadata_snapshot_->hasAnyColumnTTL())
+    {
+        auto expired_columns_map = expired_columns.getNameToTypeMap();
         for (const auto & [name, description] : metadata_snapshot_->getColumnTTLs())
         {
-            ExpressionActionsPtr default_expression;
-            String default_column_name;
-            auto it = column_defaults.find(name);
-            if (it != column_defaults.end())
+            if (!expired_columns_map.contains(name))
             {
-                const auto & column = storage_columns.get(name);
-                auto default_ast = it->second.expression->clone();
-                default_ast = addTypeConversionToAST(std::move(default_ast), column.type->getName());
-
-                auto syntax_result
-                    = TreeRewriter(storage_.getContext()).analyze(default_ast, metadata_snapshot_->getColumns().getAllPhysical());
-                default_expression = ExpressionAnalyzer{default_ast, syntax_result, storage_.getContext()}.getActions(true);
-                default_column_name = default_ast->getColumnName();
+                auto [default_expression, default_column_name] = build_default_expr(name);
+                algorithms.emplace_back(std::make_unique<TTLColumnAlgorithm>(
+                    getExpressions(description, subqueries_for_sets, context),
+                    description,
+                    old_ttl_infos.columns_ttl[name],
+                    current_time_,
+                    force_,
+                    name,
+                    default_expression,
+                    default_column_name,
+                    isCompactPart(data_part)));
             }
-
-            algorithms.emplace_back(std::make_unique<TTLColumnAlgorithm>(
-                getExpressions(description, subqueries_for_sets, context), description,
-                old_ttl_infos.columns_ttl[name], current_time_,
-                force_, name, default_expression, default_column_name, isCompactPart(data_part)));
         }
     }
 
@@ -131,6 +168,25 @@ void TTLTransform::consume(Chunk chunk)
     convertToFullIfSparse(chunk);
     auto block = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
 
+    /// Fill expired columns with default values which will later be handled in TTLColumnAlgorithm
+    for (const auto & [column, data] : expired_columns_data)
+    {
+        auto default_column
+            = ITTLAlgorithm::executeExpressionAndGetColumn(data.default_expression, block, data.default_column_name);
+        if (default_column)
+            default_column = default_column->convertToFullColumnIfConst();
+        else
+            default_column = data.type->createColumnConstWithDefaultValue(block.rows())->convertToFullColumnIfConst();
+
+        /// Expired column may pre-exist (e.g. from customized merges like ReplacingMergeTree with version key), so
+        /// replace it with default instead of inserting a new one.
+        auto * c = block.findByName(column);
+        if (c)
+            c->column = default_column;
+        else
+            block.insert(ColumnWithTypeAndName(default_column, data.type, column));
+    }
+
     for (const auto & algorithm : algorithms)
         algorithm->execute(block);
 
diff --git a/src/Processors/Transforms/TTLTransform.h b/src/Processors/Transforms/TTLTransform.h
index 5a337e889614..0fed59119a86 100644
--- a/src/Processors/Transforms/TTLTransform.h
+++ b/src/Processors/Transforms/TTLTransform.h
@@ -20,6 +20,7 @@ class TTLTransform : public IAccumulatingTransform
         const MergeTreeData & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         const MergeTreeData::MutableDataPartPtr & data_part_,
+        const NamesAndTypesList & expired_columns_,
         time_t current_time,
         bool force_
     );
@@ -30,6 +31,8 @@ class TTLTransform : public IAccumulatingTransform
 
     PreparedSets::Subqueries getSubqueries() { return std::move(subqueries_for_sets); }
 
+    static SharedHeader addExpiredColumnsToBlock(const SharedHeader & header, const NamesAndTypesList & expired_columns_);
+
 protected:
     void consume(Chunk chunk) override;
     Chunk generate() override;
@@ -46,6 +49,16 @@ class TTLTransform : public IAccumulatingTransform
 
     /// ttl_infos and empty_columns are updating while reading
     const MergeTreeData::MutableDataPartPtr & data_part;
+
+    NamesAndTypesList expired_columns;
+
+    struct ExpiredColumnData
+    {
+        DataTypePtr type;
+        ExpressionActionsPtr default_expression;
+        String default_column_name;
+    };
+    std::unordered_map<String, ExpiredColumnData> expired_columns_data;
     LoggerPtr log;
 };
 
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index 9984ca24117f..b3ac7228bca5 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -406,7 +406,16 @@ void RemoteQueryExecutor::sendQueryUnlocked(ClientInfo::QueryKind query_kind, As
 
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
     ClientInfo modified_client_info = context->getClientInfo();
-    modified_client_info.query_kind = query_kind;
+
+    /// Doesn't support now "remote('1.1.1.{1,2}')""
+    if (is_remote_function && (shard_count == 1))
+    {
+        modified_client_info.setInitialQuery();
+        modified_client_info.client_name = "ClickHouse server";
+        modified_client_info.interface = ClientInfo::Interface::TCP;
+    }
+    else
+        modified_client_info.query_kind = query_kind;
 
     if (extension)
         modified_client_info.collaborate_with_initiator = true;
@@ -425,7 +434,8 @@ void RemoteQueryExecutor::sendQueryUnlocked(ClientInfo::QueryKind query_kind, As
             const auto & access_control = context->getAccessControl();
             for (const auto & e : user->granted_roles.getElements())
             {
-                auto names = access_control.readNames(e.ids);
+                // `tryReadNames` instead of `readNames` because the original user might have a dropped role.
+                auto names = access_control.tryReadNames(e.ids);
                 granted_roles.insert(names.begin(), names.end());
             }
         }
@@ -654,7 +664,11 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::processPacket(Packet packet
             /// We can actually return it, and the first call to RemoteQueryExecutor::read
             /// will return earlier. We should consider doing it.
             if (!packet.block.empty() && (packet.block.rows() > 0))
+            {
+                if (extension && extension->replica_info)
+                    replica_has_processed_data.insert(extension->replica_info->number_of_current_replica);
                 return ReadResult(adaptBlockStructure(packet.block, *header));
+            }
             break;  /// If the block is empty - we will receive other packets before EndOfStream.
 
         case Protocol::Server::Exception:
@@ -716,6 +730,19 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::processPacket(Packet packet
         case Protocol::Server::TimezoneUpdate:
             break;
 
+        case Protocol::Server::ConnectionLost:
+            if (extension && extension->task_iterator && extension->task_iterator->supportRerunTask() && extension->replica_info)
+            {
+                if (!replica_has_processed_data.contains(extension->replica_info->number_of_current_replica))
+                {
+                    finished = true;
+                    extension->task_iterator->rescheduleTasksFromReplica(extension->replica_info->number_of_current_replica);
+                    return ReadResult(Block{});
+                }
+            }
+            packet.exception->rethrow();
+            break;
+
         default:
             got_unknown_packet_from_replica = true;
             throw Exception(
@@ -784,9 +811,12 @@ void RemoteQueryExecutor::finish()
       * - received an unknown packet from one replica;
       * then you do not need to read anything.
       */
-    if (!isQueryPending() || hasThrownException())
+    if (!isQueryPending() || hasThrownException() || was_cancelled)
         return;
 
+    /// To make sure finish is only called once
+    SCOPE_EXIT({ finished = true; });
+
     /** If you have not read all the data yet, but they are no longer needed.
       * This may be due to the fact that the data is sufficient (for example, when using LIMIT).
       */
@@ -983,6 +1013,11 @@ void RemoteQueryExecutor::setProfileInfoCallback(ProfileInfoCallback callback)
     profile_info_callback = std::move(callback);
 }
 
+bool RemoteQueryExecutor::skipUnavailableShards() const
+{
+    return context->getSettingsRef()[Setting::skip_unavailable_shards];
+}
+
 bool RemoteQueryExecutor::needToSkipUnavailableShard() const
 {
     return context->getSettingsRef()[Setting::skip_unavailable_shards] && (0 == connections->size());
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index e3fb64bb0f7b..48a30497c2f0 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -31,8 +31,22 @@ class RemoteQueryExecutorReadContext;
 
 class ParallelReplicasReadingCoordinator;
 
-/// This is the same type as StorageS3Source::IteratorWrapper
-using TaskIterator = std::function<ClusterFunctionReadTaskResponsePtr(size_t)>;
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+};
+
+class TaskIterator
+{
+public:
+    virtual ~TaskIterator() = default;
+    virtual bool supportRerunTask() const { return false; }
+    virtual void rescheduleTasksFromReplica(size_t /* number_of_current_replica */)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method rescheduleTasksFromReplica is not implemented");
+    }
+    virtual ClusterFunctionReadTaskResponsePtr operator()(size_t number_of_current_replica) const = 0;
+};
 
 /// This class allows one to launch queries on remote replicas of one shard and get results
 class RemoteQueryExecutor
@@ -210,11 +224,17 @@ class RemoteQueryExecutor
 
     void setLogger(LoggerPtr logger) { log = logger; }
 
+    void setRemoteFunction(bool is_remote_function_ = true) { is_remote_function = is_remote_function_; }
+
+    void setShardCount(UInt32 shard_count_) { shard_count = shard_count_; }
+
     const Block & getHeader() const { return *header; }
     const SharedHeader & getSharedHeader() const { return header; }
 
     IConnections & getConnections() { return *connections; }
 
+    bool skipUnavailableShards() const;
+
     bool needToSkipUnavailableShard() const;
 
     bool isReplicaUnavailable() const { return extension && extension->parallel_reading_coordinator && connections->size() == 0; }
@@ -222,6 +242,8 @@ class RemoteQueryExecutor
     /// return true if parallel replica packet was processed
     bool processParallelReplicaPacketIfAny();
 
+    bool isFinished() const { return finished; }
+
 private:
     RemoteQueryExecutor(
         const String & query_,
@@ -304,6 +326,9 @@ class RemoteQueryExecutor
     bool packet_in_progress = false;
 #endif
 
+    bool is_remote_function = false;
+    UInt32 shard_count = 0;
+
     /// Parts uuids, collected from remote replicas
     std::vector<UUID> duplicated_part_uuids;
 
@@ -316,6 +341,8 @@ class RemoteQueryExecutor
 
     const bool read_packet_type_separately = false;
 
+    std::unordered_set<size_t> replica_has_processed_data;
+
     /// Send all scalars to remote servers
     void sendScalars();
 
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
index 9090d045daae..2fe4cab35003 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
@@ -16,10 +16,13 @@ namespace ErrorCodes
     extern const int CANNOT_READ_FROM_SOCKET;
     extern const int CANNOT_OPEN_FILE;
     extern const int SOCKET_TIMEOUT;
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
 }
 
 RemoteQueryExecutorReadContext::RemoteQueryExecutorReadContext(
-    RemoteQueryExecutor & executor_, bool suspend_when_query_sent_, bool read_packet_type_separately_)
+    RemoteQueryExecutor & executor_,
+    bool suspend_when_query_sent_,
+    bool read_packet_type_separately_)
     : AsyncTaskExecutor(std::make_unique<Task>(*this))
     , executor(executor_)
     , suspend_when_query_sent(suspend_when_query_sent_)
@@ -54,19 +57,42 @@ void RemoteQueryExecutorReadContext::Task::run(AsyncCallback async_callback, Sus
     if (read_context.executor.needToSkipUnavailableShard())
         return;
 
-    while (true)
+    try
     {
-        read_context.has_read_packet_part = PacketPart::None;
+        while (true)
+        {
+            read_context.has_read_packet_part = PacketPart::None;
+
+            if (read_context.read_packet_type_separately)
+            {
+                read_context.packet.type = read_context.executor.getConnections().receivePacketTypeUnlocked(async_callback);
+                read_context.has_read_packet_part = PacketPart::Type;
+                suspend_callback();
+            }
+            read_context.packet = read_context.executor.getConnections().receivePacketUnlocked(async_callback);
+            read_context.has_read_packet_part = PacketPart::Body;
+            if (read_context.packet.type == Protocol::Server::Data)
+                read_context.has_data_packets = true;
 
-        if (read_context.read_packet_type_separately)
+            suspend_callback();
+        }
+    }
+    catch (const Exception & e)
+    {
+        /// If cluster node unxepectedly shutted down (kill/segfault/power off/etc.) socket just closes.
+        /// If initiator did not process any data packets before, this fact can be ignored.
+        /// Unprocessed tasks will be executed on other nodes.
+        if (e.code() == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF
+            && !read_context.has_data_packets.load()
+            && read_context.executor.skipUnavailableShards())
         {
-            read_context.packet.type = read_context.executor.getConnections().receivePacketTypeUnlocked(async_callback);
-            read_context.has_read_packet_part = PacketPart::Type;
+            read_context.packet.type = Protocol::Server::ConnectionLost;
+            read_context.packet.exception = std::make_unique<Exception>(getCurrentExceptionMessageAndPattern(true), getCurrentExceptionCode());
+            read_context.has_read_packet_part = PacketPart::Body;
             suspend_callback();
         }
-        read_context.packet = read_context.executor.getConnections().receivePacketUnlocked(async_callback);
-        read_context.has_read_packet_part = PacketPart::Body;
-        suspend_callback();
+        else
+            throw;
     }
 }
 
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.h b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
index abde6cb93ef3..16ff5dc67a69 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.h
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
@@ -26,7 +26,9 @@ class RemoteQueryExecutorReadContext : public AsyncTaskExecutor
 {
 public:
     explicit RemoteQueryExecutorReadContext(
-        RemoteQueryExecutor & executor_, bool suspend_when_query_sent_, bool read_packet_type_separately_);
+        RemoteQueryExecutor & executor_,
+        bool suspend_when_query_sent_,
+        bool read_packet_type_separately_);
 
     ~RemoteQueryExecutorReadContext() override;
 
@@ -85,6 +87,7 @@ class RemoteQueryExecutorReadContext : public AsyncTaskExecutor
     /// None -> Type -> Body -> None
     /// None -> Body -> None
     std::atomic<PacketPart> has_read_packet_part = PacketPart::None;
+    std::atomic_bool has_data_packets = false;
     Packet packet;
 
     RemoteQueryExecutor & executor;
diff --git a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
index 02e8d6614aa6..9f8ac2320b2d 100644
--- a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
+++ b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
@@ -82,8 +82,18 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
 
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
-    auto transform = std::make_shared<MergingSortedTransform>(pipe.getSharedHeader(), pipe.numOutputPorts(), sort_description,
-        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, true);
+    auto transform = std::make_shared<MergingSortedTransform>(
+        pipe.getSharedHeader(),
+        pipe.numOutputPorts(),
+        sort_description,
+        /*max_block_size_rows=*/ 8192,
+        /*max_block_size_bytes=*/ 0,
+        /*max_dynamic_subcolumns=*/ std::nullopt,
+        SortingQueueStrategy::Batch,
+        /*limit=*/ 0,
+        /*always_read_till_end=*/ false,
+        /*out_row_sources_buf=*/ nullptr,
+        /*use_average_block_sizes=*/ true);
 
     pipe.addTransform(std::move(transform));
 
@@ -124,8 +134,18 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
 
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
-    auto transform = std::make_shared<MergingSortedTransform>(pipe.getSharedHeader(), pipe.numOutputPorts(), sort_description,
-        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, true);
+    auto transform = std::make_shared<MergingSortedTransform>(
+        pipe.getSharedHeader(),
+        pipe.numOutputPorts(),
+        sort_description,
+        /*max_block_size_rows=*/ 8192,
+        /*max_block_size_bytes=*/ 0,
+        /*max_dynamic_subcolumns=*/ std::nullopt,
+        SortingQueueStrategy::Batch,
+        /*limit=*/ 0,
+        /*always_read_till_end=*/ false,
+        /*out_row_sources_buf=*/ nullptr,
+        /*use_average_block_sizes=*/ true);
 
     pipe.addTransform(std::move(transform));
 
diff --git a/src/Server/ArrowFlightHandler.cpp b/src/Server/ArrowFlightHandler.cpp
index 437fa1878533..4cc248651069 100644
--- a/src/Server/ArrowFlightHandler.cpp
+++ b/src/Server/ArrowFlightHandler.cpp
@@ -172,6 +172,8 @@ std::unique_ptr<Session> ArrowFlightHandler::createSession(const arrow::flight::
 
 void ArrowFlightHandler::start()
 {
+    chassert(!initialized && !stopped);
+
     bool use_tls = server.config().getBool("arrowflight.enable_ssl", false);
 
     arrow::Result<arrow::flight::Location> parse_location_status;
@@ -215,11 +217,15 @@ void ArrowFlightHandler::start()
         throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Failed init Arrow Flight Server: {}", init_status.ToString());
     }
 
+    initialized = true;
+
     server_thread.emplace([this]
     {
         try
         {
             setThreadName("ArrowFlightSrv");
+            if (stopped)
+                return;
             auto serve_status = Serve();
             if (!serve_status.ok())
                 LOG_ERROR(log, "Failed to serve Arrow Flight: {}", serve_status.ToString());
@@ -235,13 +241,27 @@ ArrowFlightHandler::~ArrowFlightHandler() = default;
 
 void ArrowFlightHandler::stop()
 {
-    auto status = Shutdown();
-    if (!status.ok())
+    if (!initialized)
+        return;
+
+    if (!stopped.exchange(true))
     {
-        throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Failed shutdown Arrow Flight: {}", status.ToString());
+        try
+        {
+            auto status = Shutdown();
+            if (!status.ok())
+                LOG_ERROR(log, "Failed to shutdown Arrow Flight: {}", status.ToString());
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Failed to shutdown Arrow Flight");
+        }
+        if (server_thread)
+        {
+            server_thread->join();
+            server_thread.reset();
+        }
     }
-    server_thread->join();
-    server_thread.reset();
 }
 
 UInt16 ArrowFlightHandler::portNumber() const
diff --git a/src/Server/ArrowFlightHandler.h b/src/Server/ArrowFlightHandler.h
index bcd3f812c604..68956c688ab7 100644
--- a/src/Server/ArrowFlightHandler.h
+++ b/src/Server/ArrowFlightHandler.h
@@ -100,6 +100,8 @@ class ArrowFlightHandler : public IGRPCServer, public arrow::flight::FlightServe
     arrow::flight::Location location;
     const Poco::Net::SocketAddress address_to_listen;
     std::optional<ThreadFromGlobalPool> server_thread;
+    bool initialized = false;
+    std::atomic<bool> stopped = false;
 
     virtual std::unique_ptr<Session> createSession(const arrow::flight::ServerCallContext & context);
 };
diff --git a/src/Server/HTTP/authenticateUserByHTTP.cpp b/src/Server/HTTP/authenticateUserByHTTP.cpp
index c956ef4489c9..74838f941b37 100644
--- a/src/Server/HTTP/authenticateUserByHTTP.cpp
+++ b/src/Server/HTTP/authenticateUserByHTTP.cpp
@@ -1,3 +1,4 @@
+#include <Access/AccessControl.h>
 #include <Access/Authentication.h>
 #include <Access/Credentials.h>
 #include <Access/ExternalAuthenticators.h>
@@ -16,7 +17,6 @@
 #    include <Common/Crypto/X509Certificate.h>
 #endif
 
-
 namespace DB
 {
 
@@ -77,6 +77,8 @@ bool authenticateUserByHTTP(
     bool has_http_credentials = request.hasCredentials() && request.get("Authorization") != "never";
     bool has_credentials_in_query_params = params.has("user") || params.has("password");
 
+    String bearer_token;
+
     std::string spnego_challenge;
 #if USE_SSL
     X509Certificate::Subjects certificate_subjects;
@@ -155,6 +157,12 @@ bool authenticateUserByHTTP(
             if (spnego_challenge.empty())
                 throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Invalid authentication: SPNEGO challenge is empty");
         }
+        else if (Poco::icompare(scheme, "Bearer") == 0)
+        {
+            bearer_token = auth_info;
+            if (bearer_token.empty())
+                throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Invalid authentication: Bearer token is empty");
+        }
         else
         {
             throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Invalid authentication: '{}' HTTP Authorization scheme is not supported", scheme);
@@ -212,6 +220,20 @@ bool authenticateUserByHTTP(
         }
     }
 #endif
+    else if (!bearer_token.empty())
+    {
+        const auto & access_control = global_context->getAccessControl();
+        if (!access_control.isTokenAuthEnabled())
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Token authentication is disabled");
+
+        const auto token_credentials = TokenCredentials(bearer_token);
+        const auto & external_authenticators = access_control.getExternalAuthenticators();
+
+        if (!external_authenticators.checkTokenCredentials(token_credentials))
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Invalid authentication: Token could not be verified.");
+
+        current_credentials = std::make_unique<TokenCredentials>(token_credentials);
+    }
     else // I.e., now using user name and password strings ("Basic").
     {
         if (!current_credentials)
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 37872f47ae6f..acb46c38a2d5 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -387,7 +387,7 @@ void HTTPHandler::processQuery(
             auto tmp_data = server.context()->getTempDataOnDisk();
             cascade_buffers_lazy.emplace_back([tmp_data](const WriteBufferPtr &) -> WriteBufferPtr
             {
-                return std::make_unique<TemporaryDataBuffer>(tmp_data.get());
+                return std::make_unique<TemporaryDataBuffer>(tmp_data);
             });
         }
         else
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index 7e90bc880262..0d3ff2fd78f7 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -61,8 +61,6 @@ void InterserverIOHTTPHandler::processQuery(HTTPServerRequest & request, HTTPSer
     String endpoint_name = params.get("endpoint");
     bool compress = params.get("compress") == "true";
 
-    auto input_stream_with_body = request.getStream();
-
     auto endpoint = server.context()->getInterserverIOHandler().getEndpoint(endpoint_name);
     /// Locked for read while query processing
     std::shared_lock lock(endpoint->rwlock);
@@ -72,13 +70,15 @@ void InterserverIOHTTPHandler::processQuery(HTTPServerRequest & request, HTTPSer
     if (compress)
     {
         CompressedWriteBuffer compressed_out(*output);
-        endpoint->processQuery(params, *input_stream_with_body, compressed_out, response);
+        endpoint->processQuery(params, request.getStream(), compressed_out, response);
         compressed_out.finalize();
     }
     else
     {
-        endpoint->processQuery(params, *input_stream_with_body, *output, response);
+        endpoint->processQuery(params, request.getStream(), *output, response);
     }
+    /// Make sure that request stream is not used after this function.
+    assert(request.getStream().use_count() == 2);
 }
 
 
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index a44a02f26ae6..4129144deea5 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -55,7 +55,7 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
         bool ok = true;
         WriteBufferFromOwnString message;
 
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
 
         /// Iterate through all the replicated tables.
         for (const auto & db : databases)
diff --git a/src/Server/SSH/SSHPtyHandler.cpp b/src/Server/SSH/SSHPtyHandler.cpp
index 9e70077e69db..105b39fdd1ec 100644
--- a/src/Server/SSH/SSHPtyHandler.cpp
+++ b/src/Server/SSH/SSHPtyHandler.cpp
@@ -479,7 +479,9 @@ SSHPtyHandler::~SSHPtyHandler()
 void SSHPtyHandler::run()
 {
     ::ssh::SSHEvent event;
-    SessionCallback sdata(session, server, socket().peerAddress(), options);
+    auto peer_addr = socket().peerAddress();
+    socket().close();
+    SessionCallback sdata(session, server, peer_addr, options);
     session.handleKeyExchange();
     event.addSession(session);
     int max_iterations = options.auth_timeout_seconds * 1000 / options.event_poll_interval_milliseconds;
diff --git a/src/Server/SSH/SSHPtyHandlerFactory.h b/src/Server/SSH/SSHPtyHandlerFactory.h
index f02a554804b2..1865bb57c744 100644
--- a/src/Server/SSH/SSHPtyHandlerFactory.h
+++ b/src/Server/SSH/SSHPtyHandlerFactory.h
@@ -5,6 +5,7 @@
 #if USE_SSH && defined(OS_LINUX)
 
 #include <optional>
+#include <unistd.h>
 
 #include <Core/ServerSettings.h>
 #include <Server/SSH/SSHPtyHandler.h>
@@ -28,6 +29,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
+    extern const int SSH_EXCEPTION;
 }
 
 class SSHPtyHandlerFactory : public TCPServerConnectionFactory
@@ -79,9 +81,11 @@ class SSHPtyHandlerFactory : public TCPServerConnectionFactory
         LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
         ::ssh::libsshLogger::initialize();
         ::ssh::SSHSession session;
-        session.disableSocketOwning();
         session.disableDefaultConfig();
-        ssh_bind.acceptFd(session, socket.sockfd());
+        int duplicated_fd = dup(socket.sockfd());
+        if (duplicated_fd == -1)
+            throw Exception(ErrorCodes::SSH_EXCEPTION, "Failed to duplicate socket file descriptor");
+        ssh_bind.acceptFd(session, duplicated_fd);
 
         auto options = SSHPtyHandler::Options
         {
diff --git a/src/Server/SSH/SSHSession.cpp b/src/Server/SSH/SSHSession.cpp
index 8227b0d495d4..de0cd39ce4c7 100644
--- a/src/Server/SSH/SSHSession.cpp
+++ b/src/Server/SSH/SSHSession.cpp
@@ -3,6 +3,7 @@
 #if USE_SSH && defined(OS_LINUX)
 
 #include <fmt/format.h>
+#include <mutex>
 #include <Common/Exception.h>
 #include <Common/clibssh.h>
 
@@ -19,7 +20,7 @@ namespace ErrorCodes
 namespace ssh
 {
 
-SSHSession::SSHSession() : session(ssh_new())
+SSHSession::SSHSession() : session(ssh_new()), disconnected(false)
 {
     if (!session)
         throw DB::Exception(DB::ErrorCodes::SSH_EXCEPTION, "Failed to create ssh_session");
@@ -39,7 +40,9 @@ SSHSession::SSHSession(SSHSession && rhs) noexcept
 SSHSession & SSHSession::operator=(SSHSession && rhs) noexcept
 {
     this->session = rhs.session;
+    this->disconnected = rhs.disconnected;
     rhs.session = nullptr;
+    rhs.disconnected = true;
     return *this;
 }
 
@@ -64,14 +67,6 @@ void SSHSession::disableDefaultConfig()
         throw DB::Exception(DB::ErrorCodes::SSH_EXCEPTION, "Failed disabling default config for ssh session due due to {}", getError());
 }
 
-void SSHSession::disableSocketOwning()
-{
-    bool owns_socket = false;
-    int rc = ssh_options_set(session, SSH_OPTIONS_OWNS_SOCKET, &owns_socket);
-    if (rc != SSH_OK)
-        throw DB::Exception(DB::ErrorCodes::SSH_EXCEPTION, "Failed disabling socket owning for ssh session due to {}", getError());
-}
-
 void SSHSession::setPeerHost(const String & host)
 {
     int rc = ssh_options_set(session, SSH_OPTIONS_HOST, host.c_str());
@@ -106,7 +101,17 @@ void SSHSession::handleKeyExchange()
 
 void SSHSession::disconnect()
 {
-    ssh_disconnect(session);
+    std::lock_guard<std::mutex> lock(disconnect_mutex);
+    if (!disconnected)
+    {
+        // Ensure disconnect is called only once per session
+        disconnected = true;
+        // Use global mutex to prevent concurrent ssh_disconnect() calls across ALL sessions
+        // because libssh has shared global state that is not thread-safe
+        static std::mutex global_disconnect_mutex;
+        std::lock_guard<std::mutex> global_lock(global_disconnect_mutex);
+        ssh_disconnect(session);
+    }
 }
 
 String SSHSession::getError()
diff --git a/src/Server/SSH/SSHSession.h b/src/Server/SSH/SSHSession.h
index 93736b19a354..43765b98b2d5 100644
--- a/src/Server/SSH/SSHSession.h
+++ b/src/Server/SSH/SSHSession.h
@@ -5,6 +5,7 @@
 #if USE_SSH && defined(OS_LINUX)
 
 #include <memory>
+#include <mutex>
 #include <base/types.h>
 
 struct ssh_session_struct;
@@ -30,8 +31,6 @@ class SSHSession
 
     /// Disable reading default libssh configuration
     void disableDefaultConfig();
-    /// Disable session from closing socket. Can be used when a socket is passed.
-    void disableSocketOwning();
 
     /// Connect / disconnect
     void connect();
@@ -53,6 +52,8 @@ class SSHSession
 
 private:
     SessionPtr session = nullptr;
+    bool disconnected = false;
+    std::mutex disconnect_mutex;
 };
 
 }
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 1d59f6ad3259..646641bb4e60 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -25,6 +25,7 @@
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
+#include <Interpreters/ClusterFunctionReadTask.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
@@ -36,13 +37,13 @@
 #include <Parsers/ASTInsertQuery.h>
 #include <Server/TCPServer.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
-#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <base/defines.h>
 #include <base/scope_guard.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/Util/LayeredConfiguration.h>
+#include <Access/ExternalAuthenticators.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/CurrentThread.h>
@@ -522,7 +523,7 @@ void TCPHandler::runImpl()
         /// the MemoryTracker will be wrong for possible deallocations.
         /// (i.e. deallocations from the Aggregator with two-level aggregation)
         /// Also it resets socket's timeouts.
-        std::optional<QueryState> query_state;
+        std::shared_ptr<QueryState> query_state;
 
         try
         {
@@ -538,7 +539,7 @@ void TCPHandler::runImpl()
             if (part_uuids_to_ignore.has_value() && !receivePacketsExpectQuery(query_state))
                 continue;
 
-            chassert(query_state.has_value());
+            chassert(query_state);
 
             if (connectionLimitReached())
             {
@@ -556,7 +557,7 @@ void TCPHandler::runImpl()
             query_scope.emplace(query_state->query_context, /* fatal_error_callback */ [this, &query_state]
             {
                 std::lock_guard lock(callback_mutex);
-                sendLogs(query_state.value());
+                sendLogs(*query_state);
             });
 
             /// If query received, then settings in query_context has been updated.
@@ -567,7 +568,7 @@ void TCPHandler::runImpl()
             /// It should be reset at the end of query.
             query_state->timeout_setter = std::make_unique<TimeoutSetter>(socket(), send_timeout, receive_timeout);
 
-            SCOPE_EXIT(logQueryDuration(query_state.value()));
+            SCOPE_EXIT(logQueryDuration(*query_state));
 
             /// Should we send internal logs to client?
             const auto client_logs_level = query_state->query_context->getSettingsRef()[Setting::send_logs_level];
@@ -612,10 +613,10 @@ void TCPHandler::runImpl()
 
                 std::lock_guard lock(callback_mutex);
 
-                checkIfQueryCanceled(query_state.value());
+                checkIfQueryCanceled(*query_state);
 
                 /// Get blocks of temporary tables
-                readTemporaryTables(query_state.value());
+                readTemporaryTables(*query_state);
 
                 /// Reset the input stream, as we received an empty block while receiving external table data.
                 /// So, the stream has been marked as cancelled and we can't read from it anymore.
@@ -634,7 +635,7 @@ void TCPHandler::runImpl()
 
                 std::lock_guard lock(callback_mutex);
 
-                checkIfQueryCanceled(query_state.value());
+                checkIfQueryCanceled(*query_state);
 
                 query_state->need_receive_data_for_input = true;
 
@@ -642,13 +643,13 @@ void TCPHandler::runImpl()
                 if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_COLUMN_DEFAULTS_METADATA
                     && query_state->query_context->getSettingsRef()[Setting::input_format_defaults_for_omitted_fields])
                 {
-                    sendTableColumns(query_state.value(), metadata_snapshot->getColumns());
+                    sendTableColumns(*query_state, metadata_snapshot->getColumns());
                 }
 
                 /// Send block to the client - input storage structure.
                 query_state->input_header = metadata_snapshot->getSampleBlock();
-                sendData(query_state.value(), query_state->input_header);
-                sendTimezone(query_state.value());
+                sendData(*query_state, query_state->input_header);
+                sendTimezone(*query_state);
 
                 /// Update flag after reading external tables
                 query_state->read_all_data = false;
@@ -661,9 +662,9 @@ void TCPHandler::runImpl()
 
                 std::lock_guard lock(callback_mutex);
 
-                checkIfQueryCanceled(query_state.value());
+                checkIfQueryCanceled(*query_state);
 
-                if (receivePacketsExpectData(query_state.value()))
+                if (receivePacketsExpectData(*query_state))
                     return query_state->block_for_input;
 
                 query_state->block_in.reset();
@@ -681,13 +682,13 @@ void TCPHandler::runImpl()
 
                 std::lock_guard lock(callback_mutex);
 
-                checkIfQueryCanceled(query_state.value());
+                checkIfQueryCanceled(*query_state);
 
                 sendReadTaskRequest();
 
                 ProfileEvents::increment(ProfileEvents::ReadTaskRequestsSent);
 
-                auto res = receiveClusterFunctionReadTaskResponse(query_state.value());
+                auto res = receiveClusterFunctionReadTaskResponse(*query_state);
 
                 ProfileEvents::increment(ProfileEvents::ReadTaskRequestsSentElapsedMicroseconds, watch.elapsedMicroseconds());
 
@@ -701,9 +702,9 @@ void TCPHandler::runImpl()
 
                 std::lock_guard lock(callback_mutex);
 
-                checkIfQueryCanceled(query_state.value());
+                checkIfQueryCanceled(*query_state);
 
-                sendMergeTreeAllRangesAnnouncement(query_state.value(), announcement);
+                sendMergeTreeAllRangesAnnouncement(*query_state, announcement);
                 ProfileEvents::increment(ProfileEvents::MergeTreeAllRangesAnnouncementsSent);
                 ProfileEvents::increment(ProfileEvents::MergeTreeAllRangesAnnouncementsSentElapsedMicroseconds, watch.elapsedMicroseconds());
             });
@@ -720,7 +721,7 @@ void TCPHandler::runImpl()
                 sendMergeTreeReadTaskRequest(std::move(request));
 
                 ProfileEvents::increment(ProfileEvents::MergeTreeReadTaskRequestsSent);
-                auto res = receivePartitionMergeTreeReadTaskResponse(query_state.value());
+                auto res = receivePartitionMergeTreeReadTaskResponse(*query_state);
                 ProfileEvents::increment(ProfileEvents::MergeTreeReadTaskRequestsSentElapsedMicroseconds, watch.elapsedMicroseconds());
                 return res;
             });
@@ -745,12 +746,12 @@ void TCPHandler::runImpl()
             {
                 /// FIXME: check explicitly that insert query suggests to receive data via native protocol,
                 query_state->need_receive_data_for_insert = true;
-                processInsertQuery(query_state.value());
+                processInsertQuery(*query_state);
                 query_state->io.onFinish();
             }
             else if (query_state->io.pipeline.pulling())
             {
-                processOrdinaryQuery(query_state.value());
+                processOrdinaryQuery(*query_state);
                 query_state->io.onFinish();
             }
             else if (query_state->io.pipeline.completed())
@@ -765,14 +766,14 @@ void TCPHandler::runImpl()
                         {
                             std::lock_guard lock(callback_mutex);
 
-                            receivePacketsExpectCancel(query_state.value());
+                            receivePacketsExpectCancel(*query_state);
 
                             if (query_state->stop_read_return_partial_result)
                                 return true;
 
-                            sendProgress(query_state.value());
-                            sendSelectProfileEvents(query_state.value());
-                            sendLogs(query_state.value());
+                            sendProgress(*query_state);
+                            sendSelectProfileEvents(*query_state);
+                            sendLogs(*query_state);
                             return false;
                         };
 
@@ -789,8 +790,8 @@ void TCPHandler::runImpl()
                 /// NOTE: we cannot send Progress for regular INSERT (with VALUES)
                 /// without breaking protocol compatibility, but it can be done
                 /// by increasing revision.
-                sendProgress(query_state.value());
-                sendSelectProfileEvents(query_state.value());
+                sendProgress(*query_state);
+                sendSelectProfileEvents(*query_state);
             }
             else
             {
@@ -800,8 +801,8 @@ void TCPHandler::runImpl()
             /// Do it before sending end of stream, to have a chance to show log message in client.
             query_scope->logPeakMemoryUsage();
 
-            sendLogs(query_state.value());
-            sendEndOfStream(query_state.value());
+            sendLogs(*query_state);
+            sendEndOfStream(*query_state);
 
             query_state->finalizeOut(out);
         }
@@ -818,7 +819,7 @@ void TCPHandler::runImpl()
 #ifdef DEBUG_OR_SANITIZER_BUILD
         catch (const std::logic_error & e)
         {
-            if (query_state.has_value())
+            if (query_state)
                 query_state->io.onException();
             exception = std::make_unique<DB::Exception>(Exception::CreateFromSTDTag{}, e);
             sendException(*exception, send_exception_with_stack_trace);
@@ -838,7 +839,7 @@ void TCPHandler::runImpl()
         {
             auto exception_code = exception->code();
 
-            if (!query_state.has_value())
+            if (!query_state)
                 return;
 
             try
@@ -893,17 +894,17 @@ void TCPHandler::runImpl()
 
                 /// Try to send logs to client, but it could be risky too
                 /// Assume that we can't break output here
-                sendLogs(query_state.value());
+                sendLogs(*query_state);
 
                 if (exception_code == ErrorCodes::QUERY_WAS_CANCELLED_BY_CLIENT)
-                    sendEndOfStream(query_state.value());
+                    sendEndOfStream(*query_state);
                 else
                     sendException(*exception, send_exception_with_stack_trace);
 
                 /// A query packet is always followed by one or more data packets.
                 /// If some of those data packets are left, try to skip them.
                 if (!query_state->read_all_data)
-                    skipData(query_state.value());
+                    skipData(*query_state);
 
                 LOG_TRACE(log, "Logs and exception has been sent. The connection is preserved.");
             }
@@ -956,7 +957,7 @@ void TCPHandler::extractConnectionSettingsFromContext(const ContextPtr & context
 }
 
 
-bool TCPHandler::receivePacketsExpectQuery(std::optional<QueryState> & state)
+bool TCPHandler::receivePacketsExpectQuery(std::shared_ptr<QueryState> & state)
 {
     UInt64 packet_type = 0;
     readVarUInt(packet_type, *in);
@@ -1782,6 +1783,10 @@ void TCPHandler::receiveHello()
     if (is_ssh_based_auth)
         user.erase(0, std::string_view(EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER).size());
 
+    is_jwt_based_auth = user.starts_with(EncodedUserInfo::JWT_AUTHENTICAION_MARKER);
+    if (is_jwt_based_auth)
+        user.erase(0, std::string_view(EncodedUserInfo::JWT_AUTHENTICAION_MARKER).size());
+
     session = makeSession();
     const auto & client_info = session->getClientInfo();
 
@@ -1869,6 +1874,23 @@ void TCPHandler::receiveHello()
     }
 #endif
 
+    if (is_jwt_based_auth)
+    {
+        const auto & access_control = server.context()->getAccessControl();
+        if (!access_control.isTokenAuthEnabled())
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Token authentication is disabled");
+
+        auto credentials = TokenCredentials(password);
+
+        const auto & external_authenticators = access_control.getExternalAuthenticators();
+
+        if (!external_authenticators.checkTokenCredentials(credentials))
+            throw Exception(ErrorCodes::AUTHENTICATION_FAILED, "Token is invalid");
+
+        session->authenticate(credentials, getClientAddress(client_info));
+        return;
+    }
+
     session->authenticate(user, password, getClientAddress(client_info));
 }
 
@@ -2043,12 +2065,13 @@ void TCPHandler::processClusterNameAndSalt()
 }
 
 
-void TCPHandler::processQuery(std::optional<QueryState> & state)
+void TCPHandler::processQuery(std::shared_ptr<QueryState> & state)
 {
     UInt64 stage = 0;
     UInt64 compression = 0;
 
-    state.emplace();
+    chassert(!state);
+    state = std::make_shared<QueryState>();
 
     if (part_uuids_to_ignore.has_value())
         state->part_uuids_to_ignore = std::move(part_uuids_to_ignore);
@@ -2211,19 +2234,36 @@ void TCPHandler::processQuery(std::optional<QueryState> & state)
     if (state->part_uuids_to_ignore)
         state->query_context->getIgnoredPartUUIDs()->add(*state->part_uuids_to_ignore);
 
+    std::weak_ptr<QueryState> state_wptr = state;
+
     state->query_context->setProgressCallback(
-        [this, &state] (const Progress & value) { this->updateProgress(state.value(), value); });
+        [this, state_wptr](const Progress & value)
+        {
+            auto current_state = state_wptr.lock();
+            if (!current_state)
+                return;
+            this->updateProgress(*current_state, value);
+        });
     state->query_context->setFileProgressCallback(
-        [this, &state](const FileProgress & value) { this->updateProgress(state.value(), Progress(value)); });
+        [this, state_wptr](const FileProgress & value)
+        {
+            auto current_state = state_wptr.lock();
+            if (!current_state)
+                return;
+            this->updateProgress(*current_state, Progress(value));
+        });
 
     state->query_context->setBlockMarshallingCallback(
-        [this, &state](const Block & block)
+        [this, &state_wptr](const Block & block)
         {
+            auto current_state = state_wptr.lock();
+            if (!current_state)
+                return block;
             return convertColumnsToBLOBs(
                 block,
-                getCompressionCodec(state->query_context->getSettingsRef(), state->compression),
+                getCompressionCodec(current_state->query_context->getSettingsRef(), current_state->compression),
                 client_tcp_protocol_version,
-                getFormatSettings(state->query_context));
+                getFormatSettings(current_state->query_context));
         });
 
     ///
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index 36a2bf8eb583..82aecc284b33 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -237,6 +237,7 @@ class TCPHandler : public Poco::Net::TCPServerConnection
     String default_database;
 
     bool is_ssh_based_auth = false; /// authentication is via SSH pub-key challenge
+    bool is_jwt_based_auth = false; /// authentication is via JWT
     /// For inter-server secret (remote_server.*.secret)
     bool is_interserver_mode = false;
     bool is_interserver_authenticated = false;
@@ -275,7 +276,7 @@ class TCPHandler : public Poco::Net::TCPServerConnection
     void receiveHello();
     bool receiveQueryPlan(QueryState & state);
     void receiveAddendum();
-    bool receivePacketsExpectQuery(std::optional<QueryState> & state);
+    bool receivePacketsExpectQuery(std::shared_ptr<QueryState> & state);
     bool receivePacketsExpectData(QueryState & state) TSA_REQUIRES(callback_mutex);
     bool receivePacketsExpectDataConcurrentWithExecutor(QueryState & state);
     void receivePacketsExpectCancel(QueryState & state) TSA_REQUIRES(callback_mutex);
@@ -285,7 +286,7 @@ class TCPHandler : public Poco::Net::TCPServerConnection
     std::optional<ParallelReadResponse> receivePartitionMergeTreeReadTaskResponse(QueryState & state) TSA_REQUIRES(callback_mutex);
 
     void processCancel(QueryState & state) TSA_REQUIRES(callback_mutex);
-    void processQuery(std::optional<QueryState> & state);
+    void processQuery(std::shared_ptr<QueryState> & state);
     void processIgnoredPartUUIDs();
     bool processData(QueryState & state, bool scalar) TSA_REQUIRES(callback_mutex);
     void processClusterNameAndSalt();
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index e7b53c887eb5..14b6fd6134ab 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -1697,6 +1697,7 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
             {
                 if (from_nested_table_name != to_nested_table_name)
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot rename column from one nested name to another");
+                all_columns.rename(command.column_name, command.rename_to);
             }
             else if (!from_nested && !to_nested)
             {
diff --git a/src/Storages/Cache/ObjectStorageListObjectsCache.cpp b/src/Storages/Cache/ObjectStorageListObjectsCache.cpp
new file mode 100644
index 000000000000..a7aec57d9161
--- /dev/null
+++ b/src/Storages/Cache/ObjectStorageListObjectsCache.cpp
@@ -0,0 +1,210 @@
+#include <Storages/Cache/ObjectStorageListObjectsCache.h>
+#include <Common/TTLCachePolicy.h>
+#include <Common/ProfileEvents.h>
+#include <boost/functional/hash.hpp>
+
+namespace ProfileEvents
+{
+extern const Event ObjectStorageListObjectsCacheHits;
+extern const Event ObjectStorageListObjectsCacheMisses;
+extern const Event ObjectStorageListObjectsCacheExactMatchHits;
+extern const Event ObjectStorageListObjectsCachePrefixMatchHits;
+}
+
+namespace DB
+{
+
+template <typename Key, typename Mapped, typename HashFunction, typename WeightFunction, typename IsStaleFunction>
+class ObjectStorageListObjectsCachePolicy : public TTLCachePolicy<Key, Mapped, HashFunction, WeightFunction, IsStaleFunction>
+{
+public:
+    using BasePolicy = TTLCachePolicy<Key, Mapped, HashFunction, WeightFunction, IsStaleFunction>;
+    using typename BasePolicy::MappedPtr;
+    using typename BasePolicy::KeyMapped;
+    using BasePolicy::cache;
+
+    ObjectStorageListObjectsCachePolicy()
+        : BasePolicy(CurrentMetrics::end(), CurrentMetrics::end(), std::make_unique<NoCachePolicyUserQuota>())
+    {
+    }
+
+    std::optional<KeyMapped> getWithKey(const Key & key) override
+    {
+        if (const auto it = cache.find(key); it != cache.end())
+        {
+            if (!IsStaleFunction()(it->first))
+            {
+                return std::make_optional<KeyMapped>({it->first, it->second});
+            }
+            // found a stale entry, remove it but don't return. We still want to perform the prefix matching search
+            BasePolicy::remove(it->first);
+        }
+
+        if (const auto it = findBestMatchingPrefixAndRemoveExpiredEntries(key); it != cache.end())
+        {
+            return std::make_optional<KeyMapped>({it->first, it->second});
+        }
+
+        return std::nullopt;
+    }
+
+private:
+    auto findBestMatchingPrefixAndRemoveExpiredEntries(Key key)
+    {
+        while (!key.prefix.empty())
+        {
+            if (const auto it = cache.find(key); it != cache.end())
+            {
+                if (IsStaleFunction()(it->first))
+                {
+                    BasePolicy::remove(it->first);
+                }
+                else
+                {
+                    return it;
+                }
+            }
+
+            key.prefix.pop_back();
+        }
+
+        return cache.end();
+    }
+};
+
+ObjectStorageListObjectsCache::Key::Key(
+    const String & storage_description_,
+    const String & bucket_,
+    const String & prefix_,
+    const std::chrono::steady_clock::time_point & expires_at_,
+    std::optional<UUID> user_id_)
+    : storage_description(storage_description_), bucket(bucket_), prefix(prefix_), expires_at(expires_at_), user_id(user_id_) {}
+
+bool ObjectStorageListObjectsCache::Key::operator==(const Key & other) const
+{
+    return storage_description == other.storage_description && bucket == other.bucket && prefix == other.prefix;
+}
+
+size_t ObjectStorageListObjectsCache::KeyHasher::operator()(const Key & key) const
+{
+    std::size_t seed = 0;
+
+    boost::hash_combine(seed, key.storage_description);
+    boost::hash_combine(seed, key.bucket);
+    boost::hash_combine(seed, key.prefix);
+
+    return seed;
+}
+
+bool ObjectStorageListObjectsCache::IsStale::operator()(const Key & key) const
+{
+    return key.expires_at < std::chrono::steady_clock::now();
+}
+
+size_t ObjectStorageListObjectsCache::WeightFunction::operator()(const Value & value) const
+{
+    std::size_t weight = 0;
+
+    for (const auto & object : value)
+    {
+        const auto object_metadata = object->metadata;
+        weight += object->relative_path.capacity() + sizeof(object_metadata);
+
+        // variable size
+        if (object_metadata)
+        {
+            weight += object_metadata->etag.capacity();
+            weight += object_metadata->attributes.size() * (sizeof(std::string) * 2);
+
+            for (const auto & [k, v] : object_metadata->attributes)
+            {
+                weight += k.capacity() + v.capacity();
+            }
+        }
+    }
+
+    return weight;
+}
+
+ObjectStorageListObjectsCache::ObjectStorageListObjectsCache()
+    : cache(std::make_unique<ObjectStorageListObjectsCachePolicy<Key, Value, KeyHasher, WeightFunction, IsStale>>())
+{
+}
+
+void ObjectStorageListObjectsCache::set(
+    const Key & key,
+    const std::shared_ptr<Value> & value)
+{
+    auto key_with_ttl = key;
+    key_with_ttl.expires_at = std::chrono::steady_clock::now() + std::chrono::seconds(ttl_in_seconds);
+
+    cache.set(key_with_ttl, value);
+}
+
+void ObjectStorageListObjectsCache::clear()
+{
+    cache.clear();
+}
+
+std::optional<ObjectStorageListObjectsCache::Value> ObjectStorageListObjectsCache::get(const Key & key, bool filter_by_prefix)
+{
+    const auto pair = cache.getWithKey(key);
+
+    if (!pair)
+    {
+        ProfileEvents::increment(ProfileEvents::ObjectStorageListObjectsCacheMisses);
+        return {};
+    }
+
+    ProfileEvents::increment(ProfileEvents::ObjectStorageListObjectsCacheHits);
+
+    if (pair->key == key)
+    {
+        ProfileEvents::increment(ProfileEvents::ObjectStorageListObjectsCacheExactMatchHits);
+        return *pair->mapped;
+    }
+
+    ProfileEvents::increment(ProfileEvents::ObjectStorageListObjectsCachePrefixMatchHits);
+
+    if (!filter_by_prefix)
+    {
+        return *pair->mapped;
+    }
+
+    Value filtered_objects;
+
+    filtered_objects.reserve(pair->mapped->size());
+
+    for (const auto & object : *pair->mapped)
+    {
+        if (object->relative_path.starts_with(key.prefix))
+        {
+            filtered_objects.push_back(object);
+        }
+    }
+
+    return filtered_objects;
+}
+
+void ObjectStorageListObjectsCache::setMaxSizeInBytes(std::size_t size_in_bytes_)
+{
+    cache.setMaxSizeInBytes(size_in_bytes_);
+}
+
+void ObjectStorageListObjectsCache::setMaxCount(std::size_t count)
+{
+    cache.setMaxCount(count);
+}
+
+void ObjectStorageListObjectsCache::setTTL(std::size_t ttl_in_seconds_)
+{
+    ttl_in_seconds = ttl_in_seconds_;
+}
+
+ObjectStorageListObjectsCache & ObjectStorageListObjectsCache::instance()
+{
+    static ObjectStorageListObjectsCache instance;
+    return instance;
+}
+
+}
diff --git a/src/Storages/Cache/ObjectStorageListObjectsCache.h b/src/Storages/Cache/ObjectStorageListObjectsCache.h
new file mode 100644
index 000000000000..6cb6c3694d93
--- /dev/null
+++ b/src/Storages/Cache/ObjectStorageListObjectsCache.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include <chrono>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Common/CacheBase.h>
+
+namespace DB
+{
+
+class ObjectStorageListObjectsCache
+{
+    friend class ObjectStorageListObjectsCacheTest;
+public:
+    ObjectStorageListObjectsCache(const ObjectStorageListObjectsCache &) = delete;
+    ObjectStorageListObjectsCache(ObjectStorageListObjectsCache &&) noexcept = delete;
+
+    ObjectStorageListObjectsCache& operator=(const ObjectStorageListObjectsCache &) = delete;
+    ObjectStorageListObjectsCache& operator=(ObjectStorageListObjectsCache &&) noexcept = delete;
+
+    static ObjectStorageListObjectsCache & instance();
+
+    struct Key
+    {
+        Key(
+            const String & storage_description_,
+            const String & bucket_,
+            const String & prefix_,
+            const std::chrono::steady_clock::time_point & expires_at_ = std::chrono::steady_clock::now(),
+            std::optional<UUID> user_id_ = std::nullopt);
+
+        std::string storage_description;
+        std::string bucket;
+        std::string prefix;
+        std::chrono::steady_clock::time_point expires_at;
+        std::optional<UUID> user_id;
+
+        bool operator==(const Key & other) const;
+    };
+
+    using Value = StorageObjectStorage::ObjectInfos;
+    struct KeyHasher
+    {
+        size_t operator()(const Key & key) const;
+    };
+
+    struct IsStale
+    {
+        bool operator()(const Key & key) const;
+    };
+
+    struct WeightFunction
+    {
+        size_t operator()(const Value & value) const;
+    };
+
+    using Cache = CacheBase<Key, Value, KeyHasher, WeightFunction>;
+
+    void set(
+        const Key & key,
+        const std::shared_ptr<Value> & value);
+
+    std::optional<Value> get(const Key & key, bool filter_by_prefix = true);
+
+    void clear();
+
+    void setMaxSizeInBytes(std::size_t size_in_bytes_);
+    void setMaxCount(std::size_t count);
+    void setTTL(std::size_t ttl_in_seconds_);
+
+private:
+    ObjectStorageListObjectsCache();
+
+    Cache cache;
+    size_t ttl_in_seconds {0};
+};
+
+}
diff --git a/src/Storages/Cache/tests/gtest_object_storage_list_objects_cache.cpp b/src/Storages/Cache/tests/gtest_object_storage_list_objects_cache.cpp
new file mode 100644
index 000000000000..3b719d4df3e3
--- /dev/null
+++ b/src/Storages/Cache/tests/gtest_object_storage_list_objects_cache.cpp
@@ -0,0 +1,160 @@
+#include <gtest/gtest.h>
+#include <Storages/Cache/ObjectStorageListObjectsCache.h>
+#include <memory>
+#include <thread>
+
+namespace DB
+{
+
+class ObjectStorageListObjectsCacheTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        cache = std::unique_ptr<ObjectStorageListObjectsCache>(new ObjectStorageListObjectsCache());
+        cache->setTTL(3);
+        cache->setMaxCount(100);
+        cache->setMaxSizeInBytes(1000000);
+    }
+
+    std::unique_ptr<ObjectStorageListObjectsCache> cache;
+    static ObjectStorageListObjectsCache::Key default_key;
+
+    static std::shared_ptr<ObjectStorageListObjectsCache::Value> createTestValue(const std::vector<std::string>& paths)
+    {
+        auto value = std::make_shared<ObjectStorageListObjectsCache::Value>();
+        for (const auto & path : paths)
+        {
+            value->push_back(std::make_shared<ObjectInfo>(path));
+        }
+        return value;
+    }
+};
+
+ObjectStorageListObjectsCache::Key ObjectStorageListObjectsCacheTest::default_key {"default", "test-bucket", "test-prefix/"};
+
+TEST_F(ObjectStorageListObjectsCacheTest, BasicSetAndGet)
+{
+    cache->clear();
+    auto value = createTestValue({"test-prefix/file1.txt", "test-prefix/file2.txt"});
+
+    cache->set(default_key, value);
+    
+    auto result = cache->get(default_key).value();
+
+    ASSERT_EQ(result.size(), 2);
+    EXPECT_EQ(result[0]->getPath(), "test-prefix/file1.txt");
+    EXPECT_EQ(result[1]->getPath(), "test-prefix/file2.txt");
+}
+
+TEST_F(ObjectStorageListObjectsCacheTest, CacheMiss)
+{
+    cache->clear();
+
+    EXPECT_FALSE(cache->get(default_key));
+}
+
+TEST_F(ObjectStorageListObjectsCacheTest, ClearCache)
+{
+    cache->clear();
+    auto value = createTestValue({"test-prefix/file1.txt", "test-prefix/file2.txt"});
+
+    cache->set(default_key, value);
+    cache->clear();
+
+    EXPECT_FALSE(cache->get(default_key));
+}
+
+TEST_F(ObjectStorageListObjectsCacheTest, PrefixMatching)
+{
+    cache->clear();
+
+    auto short_prefix_key = default_key;
+    short_prefix_key.prefix = "parent/";
+
+    auto mid_prefix_key = default_key;
+    mid_prefix_key.prefix = "parent/child/";
+
+    auto long_prefix_key = default_key;
+    long_prefix_key.prefix = "parent/child/grandchild/";
+
+    auto value = createTestValue(
+    {
+        "parent/child/grandchild/file1.txt",
+        "parent/child/grandchild/file2.txt"});
+
+    cache->set(mid_prefix_key, value);
+
+    auto result1 = cache->get(mid_prefix_key).value();
+    EXPECT_EQ(result1.size(), 2);
+
+    auto result2 = cache->get(long_prefix_key).value();
+    EXPECT_EQ(result2.size(), 2);
+
+    EXPECT_FALSE(cache->get(short_prefix_key));
+}
+
+TEST_F(ObjectStorageListObjectsCacheTest, PrefixFiltering)
+{
+    cache->clear();
+
+    auto key_with_short_prefix = default_key;
+    key_with_short_prefix.prefix = "parent/";
+
+    auto key_with_mid_prefix = default_key;
+    key_with_mid_prefix.prefix = "parent/child1/";
+
+    auto value = createTestValue({
+        "parent/file1.txt",
+        "parent/child1/file2.txt",
+        "parent/child2/file3.txt"
+    });
+
+    cache->set(key_with_short_prefix, value);
+
+    auto result = cache->get(key_with_mid_prefix, true).value();
+    EXPECT_EQ(result.size(), 1);
+    EXPECT_EQ(result[0]->getPath(), "parent/child1/file2.txt");
+}
+
+TEST_F(ObjectStorageListObjectsCacheTest, TTLExpiration)
+{
+    cache->clear();
+    auto value = createTestValue({"test-prefix/file1.txt"});
+
+    cache->set(default_key, value);
+
+    // Verify we can get it immediately
+    auto result1 = cache->get(default_key).value();
+    EXPECT_EQ(result1.size(), 1);
+
+    std::this_thread::sleep_for(std::chrono::seconds(4));
+
+    EXPECT_FALSE(cache->get(default_key));
+}
+
+TEST_F(ObjectStorageListObjectsCacheTest, BestPrefixMatch)
+{
+    cache->clear();
+
+    auto short_prefix_key = default_key;
+    short_prefix_key.prefix = "a/b/";
+
+    auto mid_prefix_key = default_key;
+    mid_prefix_key.prefix = "a/b/c/";
+
+    auto long_prefix_key = default_key;
+    long_prefix_key.prefix = "a/b/c/d/";
+
+    auto short_prefix = createTestValue({"a/b/c/d/file1.txt", "a/b/c/file1.txt", "a/b/file2.txt"});
+    auto mid_prefix = createTestValue({"a/b/c/d/file1.txt", "a/b/c/file1.txt"});
+
+    cache->set(short_prefix_key, short_prefix);
+    cache->set(mid_prefix_key, mid_prefix);
+
+    // should pick mid_prefix, which has size 2. filter_by_prefix=false so we can assert by size
+    auto result = cache->get(long_prefix_key, false).value();
+    EXPECT_EQ(result.size(), 2u);
+}
+
+}
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index 8c72d47f0865..2bfb9dda0f35 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -469,6 +469,15 @@ NamesAndTypesList ColumnsDescription::getInsertable() const
     return ret;
 }
 
+NamesAndTypesList ColumnsDescription::getReadable() const
+{
+    NamesAndTypesList ret;
+    for (const auto & col : columns)
+        if (col.default_desc.kind != ColumnDefaultKind::Ephemeral)
+            ret.emplace_back(col.name, col.type);
+    return ret;
+}
+
 NamesAndTypesList ColumnsDescription::getMaterialized() const
 {
     NamesAndTypesList ret;
@@ -610,13 +619,8 @@ bool ColumnsDescription::hasSubcolumn(const String & column_name) const
         return true;
 
     /// Check for dynamic subcolumns
-    auto [ordinary_column_name, dynamic_subcolumn_name] = Nested::splitName(column_name);
-    auto it = columns.get<1>().find(ordinary_column_name);
-    if (it != columns.get<1>().end() && it->type->hasDynamicSubcolumns() && !dynamic_subcolumn_name.empty())
-    {
-        if (auto /*dynamic_subcolumn_type*/ _ = it->type->tryGetSubcolumnType(dynamic_subcolumn_name))
-            return true;
-    }
+    if (tryGetDynamicSubcolumn(column_name))
+        return true;
 
     return false;
 }
@@ -692,13 +696,11 @@ std::optional<NameAndTypePair> ColumnsDescription::tryGetColumn(const GetColumns
         if (jt != subcolumns.get<0>().end())
             return *jt;
 
-        /// Check for dynamic subcolumns.
-        auto [ordinary_column_name, dynamic_subcolumn_name] = Nested::splitName(column_name);
-        it = columns.get<1>().find(ordinary_column_name);
-        if (it != columns.get<1>().end() && it->type->hasDynamicSubcolumns())
+        if (options.with_dynamic_subcolumns)
         {
-            if (auto dynamic_subcolumn_type = it->type->tryGetSubcolumnType(dynamic_subcolumn_name))
-                return NameAndTypePair(ordinary_column_name, dynamic_subcolumn_name, it->type, dynamic_subcolumn_type);
+            /// Check for dynamic subcolumns.
+            if (auto dynamic_subcolumn = tryGetDynamicSubcolumn(column_name))
+                return dynamic_subcolumn;
         }
     }
 
@@ -791,15 +793,6 @@ bool ColumnsDescription::hasColumnOrSubcolumn(GetColumnsOptions::Kind kind, cons
     if ((it != columns.get<1>().end() && (defaultKindToGetKind(it->default_desc.kind) & kind)) || hasSubcolumn(column_name))
         return true;
 
-    /// Check for dynamic subcolumns.
-    auto [ordinary_column_name, dynamic_subcolumn_name] = Nested::splitName(column_name);
-    it = columns.get<1>().find(ordinary_column_name);
-    if (it != columns.get<1>().end() && it->type->hasDynamicSubcolumns())
-    {
-        if (auto /*dynamic_subcolumn_type*/ _ = it->type->hasSubcolumn(dynamic_subcolumn_name))
-            return true;
-    }
-
     return false;
 }
 
@@ -851,7 +844,6 @@ std::optional<ColumnDefault> ColumnsDescription::getDefault(const String & colum
     return {};
 }
 
-
 bool ColumnsDescription::hasCompressionCodec(const String & column_name) const
 {
     const auto it = columns.get<1>().find(column_name);
@@ -955,6 +947,22 @@ std::vector<String> ColumnsDescription::getAllRegisteredNames() const
     return names;
 }
 
+std::optional<NameAndTypePair> ColumnsDescription::tryGetDynamicSubcolumn(const String & column_name) const
+{
+    for (auto [ordinary_column_name, dynamic_subcolumn_name] : Nested::getAllColumnAndSubcolumnPairs(column_name))
+    {
+        auto it = columns.get<1>().find(String(ordinary_column_name));
+        if (it != columns.get<1>().end() && it->type->hasDynamicSubcolumns())
+        {
+            if (auto dynamic_subcolumn_type = it->type->tryGetSubcolumnType(dynamic_subcolumn_name))
+                return NameAndTypePair(String(ordinary_column_name), String(dynamic_subcolumn_name), it->type, dynamic_subcolumn_type);
+        }
+    }
+
+    return std::nullopt;
+}
+
+
 void getDefaultExpressionInfoInto(const ASTColumnDeclaration & col_decl, const DataTypePtr & data_type, DefaultExpressionsInfo & info)
 {
     if (!col_decl.default_expression)
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index af0d2be4c7f9..597080d49786 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -55,6 +55,13 @@ struct GetColumnsOptions
     GetColumnsOptions(Kind kind_) : kind(kind_) {} /// NOLINT(google-explicit-constructor)
 
     GetColumnsOptions & withSubcolumns(bool value = true)
+    {
+        with_subcolumns = value;
+        with_dynamic_subcolumns = value;
+        return *this;
+    }
+
+    GetColumnsOptions & withRegularSubcolumns(bool value = true)
     {
         with_subcolumns = value;
         return *this;
@@ -76,6 +83,7 @@ struct GetColumnsOptions
     VirtualsKind virtuals_kind = VirtualsKind::None;
 
     bool with_subcolumns = false;
+    bool with_dynamic_subcolumns = false;
     bool with_extended_objects = false;
 };
 
@@ -149,6 +157,7 @@ class ColumnsDescription : public IHints<>
     NamesAndTypesList getOrdinary() const;
     NamesAndTypesList getMaterialized() const;
     NamesAndTypesList getInsertable() const; /// ordinary + ephemeral
+    NamesAndTypesList getReadable() const; /// ordinary + materialized + aliases (no ephemeral)
     NamesAndTypesList getAliases() const;
     NamesAndTypesList getEphemeral() const;
     NamesAndTypesList getAllPhysical() const; /// ordinary + materialized.
@@ -266,6 +275,8 @@ class ColumnsDescription : public IHints<>
 
     void addSubcolumns(const String & name_in_storage, const DataTypePtr & type_in_storage);
     void removeSubcolumns(const String & name_in_storage);
+
+    std::optional<NameAndTypePair> tryGetDynamicSubcolumn(const String & column_name) const;
 };
 
 class ASTColumnDeclaration;
diff --git a/src/Storages/ExportReplicatedMergeTreePartitionManifest.h b/src/Storages/ExportReplicatedMergeTreePartitionManifest.h
new file mode 100644
index 000000000000..7c18b8a881c2
--- /dev/null
+++ b/src/Storages/ExportReplicatedMergeTreePartitionManifest.h
@@ -0,0 +1,191 @@
+#pragma once
+
+#include <base/types.h>
+#include <Interpreters/StorageID.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Array.h>
+#include <Poco/JSON/Parser.h>
+#include <Storages/MergeTree/MergeTreePartExportManifest.h>
+
+namespace DB
+{
+
+struct ExportReplicatedMergeTreePartitionProcessingPartEntry
+{
+
+    enum class Status
+    {
+        PENDING,
+        COMPLETED,
+        FAILED
+    };
+
+    String part_name;
+    Status status;
+    size_t retry_count;
+    String finished_by;
+
+    std::string toJsonString() const
+    {
+        Poco::JSON::Object json;
+
+        json.set("part_name", part_name);
+        json.set("status", String(magic_enum::enum_name(status)));
+        json.set("retry_count", retry_count);
+        json.set("finished_by", finished_by);
+        std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        oss.exceptions(std::ios::failbit);
+        Poco::JSON::Stringifier::stringify(json, oss);
+
+        return oss.str();
+    }
+
+    static ExportReplicatedMergeTreePartitionProcessingPartEntry fromJsonString(const std::string & json_string)
+    {
+        Poco::JSON::Parser parser;
+        auto json = parser.parse(json_string).extract<Poco::JSON::Object::Ptr>();
+        chassert(json);
+
+        ExportReplicatedMergeTreePartitionProcessingPartEntry entry;
+
+        entry.part_name = json->getValue<String>("part_name");
+        entry.status = magic_enum::enum_cast<Status>(json->getValue<String>("status")).value();
+        entry.retry_count = json->getValue<size_t>("retry_count");
+        if (json->has("finished_by"))
+        {
+            entry.finished_by = json->getValue<String>("finished_by");
+        }
+        return entry;
+    }
+};
+
+struct ExportReplicatedMergeTreePartitionProcessedPartEntry
+{
+    String part_name;
+    std::vector<String> paths_in_destination;
+    String finished_by;
+
+    std::string toJsonString() const
+    {
+        Poco::JSON::Object json;
+        json.set("part_name", part_name);
+        json.set("paths_in_destination", paths_in_destination);
+        json.set("finished_by", finished_by);
+        std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        oss.exceptions(std::ios::failbit);
+        Poco::JSON::Stringifier::stringify(json, oss);
+        return oss.str();
+    }
+
+    static ExportReplicatedMergeTreePartitionProcessedPartEntry fromJsonString(const std::string & json_string)
+    {
+        Poco::JSON::Parser parser;
+        auto json = parser.parse(json_string).extract<Poco::JSON::Object::Ptr>();
+        chassert(json);
+
+        ExportReplicatedMergeTreePartitionProcessedPartEntry entry;
+
+        entry.part_name = json->getValue<String>("part_name");
+
+        const auto paths_in_destination_array = json->getArray("paths_in_destination");
+        for (size_t i = 0; i < paths_in_destination_array->size(); ++i)
+            entry.paths_in_destination.emplace_back(paths_in_destination_array->getElement<String>(static_cast<unsigned int>(i)));
+
+        entry.finished_by = json->getValue<String>("finished_by");
+
+        return entry;
+    }
+};
+
+struct ExportReplicatedMergeTreePartitionManifest
+{
+    String transaction_id;
+    String query_id;
+    String partition_id;
+    String destination_database;
+    String destination_table;
+    String source_replica;
+    size_t number_of_parts;
+    std::vector<String> parts;
+    time_t create_time;
+    size_t max_retries;
+    size_t ttl_seconds;
+    size_t max_threads;
+    bool parallel_formatting;
+    bool parquet_parallel_encoding;
+    size_t max_bytes_per_file;
+    size_t max_rows_per_file;
+    MergeTreePartExportManifest::FileAlreadyExistsPolicy file_already_exists_policy;
+
+    std::string toJsonString() const
+    {
+        Poco::JSON::Object json;
+        json.set("transaction_id", transaction_id);
+        json.set("query_id", query_id);
+        json.set("partition_id", partition_id);
+        json.set("destination_database", destination_database);
+        json.set("destination_table", destination_table);
+        json.set("source_replica", source_replica);
+        json.set("number_of_parts", number_of_parts);
+        
+        Poco::JSON::Array::Ptr parts_array = new Poco::JSON::Array();
+        for (const auto & part : parts)
+            parts_array->add(part);
+        json.set("parts", parts_array);
+        json.set("parallel_formatting", parallel_formatting);
+        json.set("max_threads", max_threads);
+        json.set("parquet_parallel_encoding", parquet_parallel_encoding);
+        json.set("max_bytes_per_file", max_bytes_per_file);
+        json.set("max_rows_per_file", max_rows_per_file);
+        json.set("file_already_exists_policy", String(magic_enum::enum_name(file_already_exists_policy)));
+        json.set("create_time", create_time);
+        json.set("max_retries", max_retries);
+        json.set("ttl_seconds", ttl_seconds);
+        std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        oss.exceptions(std::ios::failbit);
+        Poco::JSON::Stringifier::stringify(json, oss);
+        return oss.str();
+    }
+
+    static ExportReplicatedMergeTreePartitionManifest fromJsonString(const std::string & json_string)
+    {
+        Poco::JSON::Parser parser;
+        auto json = parser.parse(json_string).extract<Poco::JSON::Object::Ptr>();
+        chassert(json);
+
+        ExportReplicatedMergeTreePartitionManifest manifest;
+        manifest.transaction_id = json->getValue<String>("transaction_id");
+        manifest.query_id = json->getValue<String>("query_id");
+        manifest.partition_id = json->getValue<String>("partition_id");
+        manifest.destination_database = json->getValue<String>("destination_database");
+        manifest.destination_table = json->getValue<String>("destination_table");
+        manifest.source_replica = json->getValue<String>("source_replica");
+        manifest.number_of_parts = json->getValue<size_t>("number_of_parts");
+        manifest.max_retries = json->getValue<size_t>("max_retries");
+        auto parts_array = json->getArray("parts");
+        for (size_t i = 0; i < parts_array->size(); ++i)
+            manifest.parts.push_back(parts_array->getElement<String>(static_cast<unsigned int>(i)));
+        
+        manifest.create_time = json->getValue<time_t>("create_time");
+        manifest.ttl_seconds = json->getValue<size_t>("ttl_seconds");
+        manifest.max_threads = json->getValue<size_t>("max_threads");
+        manifest.parallel_formatting = json->getValue<bool>("parallel_formatting");
+        manifest.parquet_parallel_encoding = json->getValue<bool>("parquet_parallel_encoding");
+        manifest.max_bytes_per_file = json->getValue<size_t>("max_bytes_per_file");
+        manifest.max_rows_per_file = json->getValue<size_t>("max_rows_per_file");
+        if (json->has("file_already_exists_policy"))
+        {
+            const auto file_already_exists_policy = magic_enum::enum_cast<MergeTreePartExportManifest::FileAlreadyExistsPolicy>(json->getValue<String>("file_already_exists_policy"));
+            if (file_already_exists_policy)
+            {
+                manifest.file_already_exists_policy = file_already_exists_policy.value();
+            }
+
+            /// what to do if it's not a valid value?
+        }
+
+        return manifest;
+    }
+};
+
+}
diff --git a/src/Storages/ExportReplicatedMergeTreePartitionTaskEntry.h b/src/Storages/ExportReplicatedMergeTreePartitionTaskEntry.h
new file mode 100644
index 000000000000..76674bfc4a92
--- /dev/null
+++ b/src/Storages/ExportReplicatedMergeTreePartitionTaskEntry.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include <Storages/ExportReplicatedMergeTreePartitionManifest.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include "Core/QualifiedTableName.h"
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/mem_fun.hpp>
+
+namespace DB
+{
+struct ExportReplicatedMergeTreePartitionTaskEntry
+{
+    using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
+    ExportReplicatedMergeTreePartitionManifest manifest;
+
+    enum class Status
+    {
+        PENDING,
+        COMPLETED,
+        FAILED,
+        KILLED
+    };
+
+    /// Allows us to skip completed / failed entries during scheduling
+    mutable Status status;
+
+    /// References to the parts that should be exported
+    /// This is used to prevent the parts from being deleted before finishing the export operation
+    /// It does not mean this replica will export all the parts
+    /// There is also a chance this replica does not contain a given part and it is totally ok.
+    std::vector<DataPartPtr> part_references;
+
+    std::string getCompositeKey() const
+    {
+        const auto qualified_table_name = QualifiedTableName {manifest.destination_database, manifest.destination_table};
+        return manifest.partition_id + "_" + qualified_table_name.getFullName();
+    }
+
+    std::string getTransactionId() const
+    {
+        return manifest.transaction_id;
+    }
+
+    /// Get create_time for sorted iteration
+    time_t getCreateTime() const
+    {
+        return manifest.create_time;
+    }
+};
+
+struct ExportPartitionTaskEntryTagByCompositeKey {};
+struct ExportPartitionTaskEntryTagByCreateTime {};
+struct ExportPartitionTaskEntryTagByTransactionId {};
+
+// Multi-index container for export partition task entries
+// - Index 0 (TagByCompositeKey): hashed_unique on composite key for O(1) lookup
+// - Index 1 (TagByCreateTime): ordered_non_unique on create_time for sorted iteration
+using ExportPartitionTaskEntriesContainer = boost::multi_index_container<
+    ExportReplicatedMergeTreePartitionTaskEntry,
+    boost::multi_index::indexed_by<
+        boost::multi_index::hashed_unique<
+            boost::multi_index::tag<ExportPartitionTaskEntryTagByCompositeKey>,
+            boost::multi_index::const_mem_fun<ExportReplicatedMergeTreePartitionTaskEntry, std::string, &ExportReplicatedMergeTreePartitionTaskEntry::getCompositeKey>
+        >,
+        boost::multi_index::ordered_non_unique<
+            boost::multi_index::tag<ExportPartitionTaskEntryTagByCreateTime>,
+            boost::multi_index::const_mem_fun<ExportReplicatedMergeTreePartitionTaskEntry, time_t, &ExportReplicatedMergeTreePartitionTaskEntry::getCreateTime>
+        >,
+        boost::multi_index::hashed_unique<
+            boost::multi_index::tag<ExportPartitionTaskEntryTagByTransactionId>,
+            boost::multi_index::const_mem_fun<ExportReplicatedMergeTreePartitionTaskEntry, std::string, &ExportReplicatedMergeTreePartitionTaskEntry::getTransactionId>
+        >
+    >
+>;
+
+}
diff --git a/src/Storages/HivePartitioningUtils.cpp b/src/Storages/HivePartitioningUtils.cpp
index a7496cb98cc0..05e0cd2ee7fd 100644
--- a/src/Storages/HivePartitioningUtils.cpp
+++ b/src/Storages/HivePartitioningUtils.cpp
@@ -3,11 +3,13 @@
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/convertFieldToType.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <Functions/keyvaluepair/impl/KeyValuePairExtractorBuilder.h>
 #include <Functions/keyvaluepair/impl/DuplicateKeyFoundException.h>
 #include <Formats/EscapingRuleUtils.h>
 #include <Formats/FormatFactory.h>
 #include <Processors/Chunk.h>
+#include <DataTypes/IDataType.h>
 
 namespace DB
 {
@@ -20,6 +22,7 @@ namespace Setting
 namespace ErrorCodes
 {
     extern const int INCORRECT_DATA;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace HivePartitioningUtils
@@ -83,7 +86,14 @@ NamesAndTypesList extractHivePartitionColumnsFromPath(
         {
             if (const auto type = tryInferDataTypeByEscapingRule(value, format_settings ? *format_settings : getFormatSettings(context), FormatSettings::EscapingRule::Raw))
             {
-                hive_partition_columns_to_read_from_file_path.emplace_back(key, type);
+                if (type->canBeInsideLowCardinality() && isStringOrFixedString(type))
+                {
+                    hive_partition_columns_to_read_from_file_path.emplace_back(key, std::make_shared<DataTypeLowCardinality>(type));
+                }
+                else
+                {
+                    hive_partition_columns_to_read_from_file_path.emplace_back(key, type);
+                }
             }
             else
             {
@@ -122,6 +132,29 @@ void addPartitionColumnsToChunk(
     }
 }
 
+void sanityCheckSchemaAndHivePartitionColumns(const NamesAndTypesList & hive_partition_columns_to_read_from_file_path, const ColumnsDescription & storage_columns)
+{
+    for (const auto & column : hive_partition_columns_to_read_from_file_path)
+    {
+        if (!storage_columns.has(column.name))
+        {
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "All hive partitioning columns must be present in the schema. Missing column: {}. "
+                "If you do not want to use hive partitioning, try `use_hive_partitioning=0` and/or `partition_strategy != hive`",
+                column.name);
+        }
+    }
+
+    if (storage_columns.size() == hive_partition_columns_to_read_from_file_path.size())
+    {
+        throw Exception(
+            ErrorCodes::INCORRECT_DATA,
+            "A hive partitioned file can't contain only partition columns. "
+            "Try reading it with `use_hive_partitioning=0` and/or `partition_strategy != hive`");
+    }
+}
+
 void extractPartitionColumnsFromPathAndEnrichStorageColumns(
     ColumnsDescription & storage_columns,
     NamesAndTypesList & hive_partition_columns_to_read_from_file_path,
@@ -144,13 +177,96 @@ void extractPartitionColumnsFromPathAndEnrichStorageColumns(
             }
         }
     }
+}
 
-    if (hive_partition_columns_to_read_from_file_path.size() == storage_columns.size())
+HivePartitionColumnsWithFileColumnsPair setupHivePartitioningForObjectStorage(
+    ColumnsDescription & columns,
+    const StorageObjectStorageConfigurationPtr & configuration,
+    const std::string & sample_path,
+    bool inferred_schema,
+    std::optional<FormatSettings> format_settings,
+    ContextPtr context)
+{
+    NamesAndTypesList hive_partition_columns_to_read_from_file_path;
+    NamesAndTypesList file_columns;
+
+    /*
+     * If `partition_strategy=hive`, the partition columns shall be extracted from the `PARTITION BY` expression.
+     * There is no need to read from the file's path.
+     *
+     * Otherwise, in case `use_hive_partitioning=1`, we can keep the old behavior of extracting it from the sample path.
+     * And if the schema was inferred (not specified in the table definition), we need to enrich it with the path partition columns
+     */
+     if (configuration->getPartitionStrategy() && configuration->getPartitionStrategyType() == PartitionStrategyFactory::StrategyType::HIVE)
+     {
+         hive_partition_columns_to_read_from_file_path = configuration->getPartitionStrategy()->getPartitionColumns();
+     }
+     else if (context->getSettingsRef()[Setting::use_hive_partitioning])
+     {
+        extractPartitionColumnsFromPathAndEnrichStorageColumns(
+            columns,
+            hive_partition_columns_to_read_from_file_path,
+            sample_path,
+            inferred_schema,
+            format_settings,
+            context);
+     }
+
+     sanityCheckSchemaAndHivePartitionColumns(hive_partition_columns_to_read_from_file_path, columns);
+
+     if (configuration->getPartitionColumnsInDataFile())
+     {
+         file_columns = columns.getAllPhysical();
+     }
+     else
+     {
+         std::unordered_set<String> hive_partition_columns_to_read_from_file_path_set;
+
+         for (const auto & [name, type] : hive_partition_columns_to_read_from_file_path)
+         {
+             hive_partition_columns_to_read_from_file_path_set.insert(name);
+         }
+
+         for (const auto & [name, type] : columns.getAllPhysical())
+         {
+             if (!hive_partition_columns_to_read_from_file_path_set.contains(name))
+             {
+                file_columns.emplace_back(name, type);
+             }
+         }
+     }
+
+     return {hive_partition_columns_to_read_from_file_path, file_columns};
+}
+
+HivePartitionColumnsWithFileColumnsPair setupHivePartitioningForFileURLLikeStorage(
+    ColumnsDescription & columns,
+    const std::string & sample_path,
+    bool inferred_schema,
+    std::optional<FormatSettings> format_settings,
+    ContextPtr context)
+{
+    NamesAndTypesList hive_partition_columns_to_read_from_file_path;
+    NamesAndTypesList file_columns;
+
+    if (context->getSettingsRef()[Setting::use_hive_partitioning])
     {
-        throw Exception(
-            ErrorCodes::INCORRECT_DATA,
-            "A hive partitioned file can't contain only partition columns. Try reading it with `use_hive_partitioning=0`");
+        extractPartitionColumnsFromPathAndEnrichStorageColumns(
+            columns,
+            hive_partition_columns_to_read_from_file_path,
+            sample_path,
+            inferred_schema,
+            format_settings,
+            context);
     }
+
+    sanityCheckSchemaAndHivePartitionColumns(hive_partition_columns_to_read_from_file_path, columns);
+
+    /// Partition strategy is not implemented for File/URL storages,
+    /// so there is no option to set whether hive partition columns are in the data file or not.
+    file_columns = columns.getAllPhysical();
+
+    return {hive_partition_columns_to_read_from_file_path, file_columns};
 }
 
 }
diff --git a/src/Storages/HivePartitioningUtils.h b/src/Storages/HivePartitioningUtils.h
index b532aee67a13..dc1be7cb886c 100644
--- a/src/Storages/HivePartitioningUtils.h
+++ b/src/Storages/HivePartitioningUtils.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <absl/container/flat_hash_map.h>
 #include <Storages/ColumnsDescription.h>
+#include <Storages/ObjectStorage/StorageObjectStorageConfiguration.h>
+#include <Core/NamesAndTypes.h>
 
 namespace DB
 {
@@ -10,7 +11,7 @@ class Chunk;
 
 namespace HivePartitioningUtils
 {
-using HivePartitioningKeysAndValues = absl::flat_hash_map<std::string_view, std::string_view>;
+using HivePartitioningKeysAndValues = std::map<std::string_view, std::string_view>;
 
 HivePartitioningKeysAndValues parseHivePartitioningKeysAndValues(const std::string & path);
 
@@ -19,10 +20,20 @@ void addPartitionColumnsToChunk(
     const NamesAndTypesList & hive_partition_columns_to_read_from_file_path,
     const std::string & path);
 
-void extractPartitionColumnsFromPathAndEnrichStorageColumns(
-    ColumnsDescription & storage_columns,
-    NamesAndTypesList & hive_partition_columns_to_read_from_file_path,
-    const std::string & path,
+/// Hive partition columns and file columns (Note that file columns might not contain the hive partition columns)
+using HivePartitionColumnsWithFileColumnsPair = std::pair<NamesAndTypesList, NamesAndTypesList>;
+
+HivePartitionColumnsWithFileColumnsPair setupHivePartitioningForObjectStorage(
+    ColumnsDescription & columns,
+    const StorageObjectStorageConfigurationPtr & configuration,
+    const std::string & sample_path,
+    bool inferred_schema,
+    std::optional<FormatSettings> format_settings,
+    ContextPtr context);
+
+HivePartitionColumnsWithFileColumnsPair setupHivePartitioningForFileURLLikeStorage(
+    ColumnsDescription & columns,
+    const std::string & sample_path,
     bool inferred_schema,
     std::optional<FormatSettings> format_settings,
     ContextPtr context);
diff --git a/src/Storages/IPartitionStrategy.cpp b/src/Storages/IPartitionStrategy.cpp
index 5ebdb249e661..0e2f897fb617 100644
--- a/src/Storages/IPartitionStrategy.cpp
+++ b/src/Storages/IPartitionStrategy.cpp
@@ -118,7 +118,7 @@ namespace
 
         if (file_format.empty() || file_format == "auto")
         {
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "File format can't be empty for hive style partitioning");
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "File format can't be empty for hive style partitioning");
         }
 
         const auto partition_key_description = KeyDescription::getKeyFromAST(partition_by, ColumnsDescription::fromNamesAndTypes(sample_block.getNamesAndTypes()), context);
@@ -232,8 +232,16 @@ std::shared_ptr<IPartitionStrategy> PartitionStrategyFactory::get(StrategyType s
                 globbed_path,
                 partition_columns_in_data_file);
         case StrategyType::NONE:
+        {
+            if (!partition_columns_in_data_file && strategy == PartitionStrategyFactory::StrategyType::NONE)
+            {
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Partition strategy `none` cannot be used with partition_columns_in_data_file=0");
+            }
             /// Unreachable for plain object storage, used only by Data Lakes for now
             return nullptr;
+        }
     }
 }
 
@@ -256,19 +264,6 @@ ColumnPtr WildcardPartitionStrategy::computePartitionKey(const Chunk & chunk)
     return block_with_partition_by_expr.getByName(actions_with_column_name.column_name).column;
 }
 
-std::string WildcardPartitionStrategy::getPathForRead(
-    const std::string & prefix)
-{
-    return prefix;
-}
-
-std::string WildcardPartitionStrategy::getPathForWrite(
-    const std::string & prefix,
-    const std::string & partition_key)
-{
-    return PartitionedSink::replaceWildcards(prefix, partition_key);
-}
-
 HiveStylePartitionStrategy::HiveStylePartitionStrategy(
     KeyDescription partition_key_description_,
     const Block & sample_block_,
@@ -288,41 +283,6 @@ HiveStylePartitionStrategy::HiveStylePartitionStrategy(
     block_without_partition_columns = buildBlockWithoutPartitionColumns(sample_block, partition_columns_name_set);
 }
 
-std::string HiveStylePartitionStrategy::getPathForRead(const std::string & prefix)
-{
-    return prefix + "**." + Poco::toLower(file_format);
-}
-
-std::string HiveStylePartitionStrategy::getPathForWrite(
-    const std::string & prefix,
-    const std::string & partition_key)
-{
-    std::string path;
-
-    if (!prefix.empty())
-    {
-        path += prefix;
-        if (path.back() != '/')
-        {
-            path += '/';
-        }
-    }
-
-    /// Not adding '/' because buildExpressionHive() always adds a trailing '/'
-    path += partition_key;
-
-    /*
-     * File extension is toLower(format)
-     * This isn't ideal, but I guess multiple formats can be specified and introduced.
-     * So I think it is simpler to keep it this way.
-     *
-     * Or perhaps implement something like `IInputFormat::getFileExtension()`
-     */
-    path += std::to_string(generateSnowflakeID()) + "." + Poco::toLower(file_format);
-
-    return path;
-}
-
 ColumnPtr HiveStylePartitionStrategy::computePartitionKey(const Chunk & chunk)
 {
     Block block_with_partition_by_expr = sample_block.cloneWithoutColumns();
diff --git a/src/Storages/IPartitionStrategy.h b/src/Storages/IPartitionStrategy.h
index bc90d7f03461..606122b4ae71 100644
--- a/src/Storages/IPartitionStrategy.h
+++ b/src/Storages/IPartitionStrategy.h
@@ -29,8 +29,12 @@ struct IPartitionStrategy
 
     virtual ColumnPtr computePartitionKey(const Chunk & chunk) = 0;
 
-    virtual std::string getPathForRead(const std::string & prefix) = 0;
-    virtual std::string getPathForWrite(const std::string & prefix, const std::string & partition_key) = 0;
+    ColumnPtr computePartitionKey(Block & block) const
+    {
+        actions_with_column_name.actions->execute(block);
+
+        return block.getByName(actions_with_column_name.column_name).column;
+    }
 
     virtual ColumnRawPtrs getFormatChunkColumns(const Chunk & chunk)
     {
@@ -53,6 +57,7 @@ struct IPartitionStrategy
     const KeyDescription partition_key_description;
     const Block sample_block;
     ContextPtr context;
+    PartitionExpressionActionsAndColumnName actions_with_column_name;
 };
 
 /*
@@ -89,11 +94,6 @@ struct WildcardPartitionStrategy : IPartitionStrategy
     WildcardPartitionStrategy(KeyDescription partition_key_description_, const Block & sample_block_, ContextPtr context_);
 
     ColumnPtr computePartitionKey(const Chunk & chunk) override;
-    std::string getPathForRead(const std::string & prefix) override;
-    std::string getPathForWrite(const std::string & prefix, const std::string & partition_key) override;
-
-private:
-    PartitionExpressionActionsAndColumnName actions_with_column_name;
 };
 
 /*
@@ -111,8 +111,6 @@ struct HiveStylePartitionStrategy : IPartitionStrategy
         bool partition_columns_in_data_file_);
 
     ColumnPtr computePartitionKey(const Chunk & chunk) override;
-    std::string getPathForRead(const std::string & prefix) override;
-    std::string getPathForWrite(const std::string & prefix, const std::string & partition_key) override;
 
     ColumnRawPtrs getFormatChunkColumns(const Chunk & chunk) override;
     Block getFormatHeader() override;
@@ -121,7 +119,6 @@ struct HiveStylePartitionStrategy : IPartitionStrategy
     const std::string file_format;
     const bool partition_columns_in_data_file;
     std::unordered_set<std::string> partition_columns_name_set;
-    PartitionExpressionActionsAndColumnName actions_with_column_name;
     Block block_without_partition_columns;
 };
 
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 215c832624c1..3766afafe6b9 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -321,6 +321,11 @@ CancellationCode IStorage::killPartMoveToShard(const UUID & /*task_uuid*/)
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Part moves between shards are not supported by storage {}", getName());
 }
 
+CancellationCode IStorage::killExportPartition(const String & /*transaction_id*/)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Export partition is not supported by storage {}", getName());
+}
+
 StorageID IStorage::getStorageID() const
 {
     std::lock_guard lock(id_mutex);
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 0fe6668ff8a2..5d23fec9c2ac 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -68,6 +68,9 @@ class RestorerFromBackup;
 
 class ConditionSelectivityEstimator;
 
+class IObjectStorage;
+using ObjectStoragePtr = std::shared_ptr<IObjectStorage>;
+
 class ActionsDAG;
 
 /** Storage. Describes the table. Responsible for
@@ -409,6 +412,7 @@ class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromo
         size_t /*max_block_size*/,
         size_t /*num_streams*/);
 
+public:
     /// Should we process blocks of data returned by the storage in parallel
     /// even when the storage returned only one stream of data for reading?
     /// It is beneficial, for example, when you read from a file quickly,
@@ -419,7 +423,6 @@ class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromo
     /// useless).
     virtual bool parallelizeOutputAfterReading(ContextPtr) const { return !isSystemStorage(); }
 
-public:
     /// Other version of read which adds reading step to query plan.
     /// Default implementation creates ReadFromStorageStep and uses usual read.
     /// Can be called after `shutdown`, but not after `drop`.
@@ -450,6 +453,39 @@ class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromo
         ContextPtr /*context*/,
         bool /*async_insert*/);
 
+    virtual bool supportsImport() const
+    {
+      return false;
+    }
+
+    /*
+It is currently only implemented in StorageObjectStorage.
+      It is meant to be used to import merge tree data parts into object storage. It is similar to the write API,
+      but it won't re-partition the data and should allow the filename to be set by the caller.
+    */
+    virtual SinkToStoragePtr import(
+        const std::string & /* file_name */,
+        Block & /* block_with_partition_values */,
+        const std::function<void(const std::string &)> & /* new_file_path_callback */,
+        bool /* overwrite_if_exists */,
+        std::size_t /* max_bytes_per_file */,
+        std::size_t /* max_rows_per_file */,
+        const std::optional<FormatSettings> & /* format_settings */,
+        ContextPtr /* context */)
+    {
+      throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Import is not implemented for storage {}", getName());
+    }
+
+    virtual void commitExportPartitionTransaction(
+      const String & /* transaction_id */,
+      const String & /* partition_id */,
+      const Strings & /* exported_paths */,
+      ContextPtr /* local_context */)
+  {
+      throw Exception(ErrorCodes::NOT_IMPLEMENTED, "commitExportPartitionTransaction is not implemented for storage type {}", getName());
+  }
+    
+
     /** Writes the data to a table in distributed manner.
       * It is supposed that implementation looks into SELECT part of the query and executes distributed
       * INSERT SELECT if it is possible with current storage as a receiver and query SELECT part as a producer.
@@ -558,6 +594,9 @@ class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromo
 
     virtual void setMutationCSN(const String & /*mutation_id*/, UInt64 /*csn*/);
 
+    /// Cancel a replicated partition export by transaction id.
+    virtual CancellationCode killExportPartition(const String & /*transaction_id*/);
+
     /// Cancel a part move to shard.
     virtual CancellationCode killPartMoveToShard(const UUID & /*task_uuid*/);
 
diff --git a/src/Storages/IStorageCluster.cpp b/src/Storages/IStorageCluster.cpp
index 8d9cfe3674d5..7d0c6fb97177 100644
--- a/src/Storages/IStorageCluster.cpp
+++ b/src/Storages/IStorageCluster.cpp
@@ -1,5 +1,8 @@
 #include <Storages/IStorageCluster.h>
 
+#include <pcg_random.hpp>
+#include <Common/randomSeed.h>
+
 #include <Common/Exception.h>
 #include <Core/Settings.h>
 #include <Core/QueryProcessingStage.h>
@@ -13,9 +16,9 @@
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Planner/Utils.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/RemoteSource.h>
-#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <QueryPipeline/narrowPipe.h>
 #include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
@@ -23,6 +26,16 @@
 #include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageDictionary.h>
+#include <Storages/extractTableFunctionFromSelectQuery.h>
+#include <Planner/Utils.h>
+#include <Analyzer/QueryTreeBuilder.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/JoinNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/Utils.h>
+#include <Storages/StorageDistributed.h>
+#include <TableFunctions/TableFunctionFactory.h>
 
 #include <algorithm>
 #include <memory>
@@ -40,6 +53,20 @@ namespace Setting
     extern const SettingsBool parallel_replicas_local_plan;
     extern const SettingsString cluster_for_parallel_replicas;
     extern const SettingsNonZeroUInt64 max_parallel_replicas;
+    extern const SettingsObjectStorageClusterJoinMode object_storage_cluster_join_mode;
+    extern const SettingsUInt64 object_storage_max_nodes;
+    extern const SettingsBool object_storage_remote_initiator;
+}
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+}
+
+namespace ErrorCodes
+{
+    extern const int ALL_CONNECTION_TRIES_FAILED;
 }
 
 IStorageCluster::IStorageCluster(
@@ -52,51 +79,6 @@ IStorageCluster::IStorageCluster(
 {
 }
 
-class ReadFromCluster : public SourceStepWithFilter
-{
-public:
-    std::string getName() const override { return "ReadFromCluster"; }
-    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters(ActionDAGNodes added_filter_nodes) override;
-
-    ReadFromCluster(
-        const Names & column_names_,
-        const SelectQueryInfo & query_info_,
-        const StorageSnapshotPtr & storage_snapshot_,
-        const ContextPtr & context_,
-        SharedHeader sample_block,
-        std::shared_ptr<IStorageCluster> storage_,
-        ASTPtr query_to_send_,
-        QueryProcessingStage::Enum processed_stage_,
-        ClusterPtr cluster_,
-        LoggerPtr log_)
-        : SourceStepWithFilter(
-            std::move(sample_block),
-            column_names_,
-            query_info_,
-            storage_snapshot_,
-            context_)
-        , storage(std::move(storage_))
-        , query_to_send(std::move(query_to_send_))
-        , processed_stage(processed_stage_)
-        , cluster(std::move(cluster_))
-        , log(log_)
-    {
-    }
-
-private:
-    std::shared_ptr<IStorageCluster> storage;
-    ASTPtr query_to_send;
-    QueryProcessingStage::Enum processed_stage;
-    ClusterPtr cluster;
-    LoggerPtr log;
-
-    std::optional<RemoteQueryExecutor::Extension> extension;
-
-    void createExtension(const ActionsDAG::Node * predicate);
-    ContextPtr updateSettings(const Settings & settings);
-};
-
 void ReadFromCluster::applyFilters(ActionDAGNodes added_filter_nodes)
 {
     SourceStepWithFilter::applyFilters(std::move(added_filter_nodes));
@@ -120,6 +102,202 @@ void ReadFromCluster::createExtension(const ActionsDAG::Node * predicate)
         cluster);
 }
 
+namespace
+{
+
+/*
+Helping class to find in query tree first node of required type
+*/
+class SearcherVisitor : public InDepthQueryTreeVisitorWithContext<SearcherVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<SearcherVisitor>;
+    using Base::Base;
+
+    explicit SearcherVisitor(std::unordered_set<QueryTreeNodeType> types_, ContextPtr context) : Base(context), types(types_) {}
+
+    bool needChildVisit(QueryTreeNodePtr &, QueryTreeNodePtr & /*child*/)
+    {
+        return !passed_node;
+    }
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        if (passed_node)
+            return;
+
+        auto node_type = node->getNodeType();
+
+        if (types.contains(node_type))
+        {
+            passed_node = node;
+            passed_type = node_type;
+        }
+    }
+
+    QueryTreeNodePtr getNode() const { return passed_node; }
+    std::optional<QueryTreeNodeType> getType() const { return passed_type; }
+
+private:
+    std::unordered_set<QueryTreeNodeType> types;
+    QueryTreeNodePtr passed_node;
+    std::optional<QueryTreeNodeType> passed_type;
+};
+
+/*
+Helping class to find all used columns with specific source
+*/
+class CollectUsedColumnsForSourceVisitor : public InDepthQueryTreeVisitorWithContext<CollectUsedColumnsForSourceVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<CollectUsedColumnsForSourceVisitor>;
+    using Base::Base;
+
+    explicit CollectUsedColumnsForSourceVisitor(
+        QueryTreeNodePtr source_,
+        ContextPtr context,
+        bool collect_columns_from_other_sources_ = false)
+        : Base(context)
+        , source(source_)
+        , collect_columns_from_other_sources(collect_columns_from_other_sources_)
+        {}
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        auto node_type = node->getNodeType();
+
+        if (node_type != QueryTreeNodeType::COLUMN)
+            return;
+
+        auto & column_node = node->as<ColumnNode &>();
+        auto column_source = column_node.getColumnSourceOrNull();
+        if (!column_source)
+            return;
+
+        if ((column_source == source) != collect_columns_from_other_sources)
+        {
+            const auto & name = column_node.getColumnName();
+            if (!names.count(name))
+            {
+                columns.emplace_back(column_node.getColumn());
+                names.insert(name);
+            }
+        }
+    }
+
+    const NamesAndTypes & getColumns() const { return columns; }
+
+private:
+    std::unordered_set<std::string> names;
+    QueryTreeNodePtr source;
+    NamesAndTypes columns;
+    bool collect_columns_from_other_sources;
+};
+
+};
+
+/*
+Try to make subquery to send on nodes
+Converts
+
+  SELECT s3.c1, s3.c2, t.c3
+  FROM
+    s3Cluster(...) AS s3
+  JOIN
+    localtable as t
+  ON s3.key == t.key
+
+to
+
+  SELECT s3.c1, s3.c2, s3.key
+  FROM
+    s3Cluster(...) AS s3
+*/
+void IStorageCluster::updateQueryWithJoinToSendIfNeeded(
+    ASTPtr & query_to_send,
+    QueryTreeNodePtr query_tree,
+    const ContextPtr & context)
+{
+    auto object_storage_cluster_join_mode = context->getSettingsRef()[Setting::object_storage_cluster_join_mode];
+    switch (object_storage_cluster_join_mode)
+    {
+    case ObjectStorageClusterJoinMode::LOCAL:
+    {
+        auto info = getQueryTreeInfo(query_tree, context);
+
+        if (info.has_join || info.has_cross_join || info.has_local_columns_in_where)
+        {
+            auto modified_query_tree = query_tree->clone();
+
+            SearcherVisitor left_table_expression_searcher({QueryTreeNodeType::TABLE, QueryTreeNodeType::TABLE_FUNCTION}, context);
+            left_table_expression_searcher.visit(modified_query_tree);
+            auto table_function_node = left_table_expression_searcher.getNode();
+            if (!table_function_node)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't find table function node");
+
+            QueryTreeNodePtr query_tree_distributed;
+
+            auto & query_node = modified_query_tree->as<QueryNode &>();
+
+            if (info.has_join)
+            {
+                auto join_node = query_node.getJoinTree();
+                query_tree_distributed = join_node->as<JoinNode>()->getLeftTableExpression()->clone();
+            }
+            else if (info.has_cross_join)
+            {
+                SearcherVisitor join_searcher({QueryTreeNodeType::CROSS_JOIN}, context);
+                join_searcher.visit(modified_query_tree);
+                auto cross_join_node = join_searcher.getNode();
+                if (!cross_join_node)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't find CROSS JOIN node");
+                // CrossJoinNode contains vector of nodes. 0 is left expression, always exists.
+                query_tree_distributed = cross_join_node->as<CrossJoinNode>()->getTableExpressions()[0]->clone();
+            }
+
+            // Find add used columns from table function to make proper projection list
+            // Need to do before changing WHERE condition
+            CollectUsedColumnsForSourceVisitor collector(table_function_node, context);
+            collector.visit(modified_query_tree);
+            const auto & columns = collector.getColumns();
+
+            query_node.resolveProjectionColumns(columns);
+            auto column_nodes_to_select = std::make_shared<ListNode>();
+            column_nodes_to_select->getNodes().reserve(columns.size());
+            for (auto & column : columns)
+                column_nodes_to_select->getNodes().emplace_back(std::make_shared<ColumnNode>(column, table_function_node));
+            query_node.getProjectionNode() = column_nodes_to_select;
+
+            if (info.has_local_columns_in_where)
+            {
+                if (query_node.getPrewhere())
+                    removeExpressionsThatDoNotDependOnTableIdentifiers(query_node.getPrewhere(), table_function_node, context);
+                if (query_node.getWhere())
+                    removeExpressionsThatDoNotDependOnTableIdentifiers(query_node.getWhere(), table_function_node, context);
+            }
+
+            query_node.getOrderByNode() = std::make_shared<ListNode>();
+            query_node.getGroupByNode() = std::make_shared<ListNode>();
+
+            if (query_tree_distributed)
+            {
+                // Left only table function to send on cluster nodes
+                modified_query_tree = modified_query_tree->cloneAndReplace(query_node.getJoinTree(), query_tree_distributed);
+            }
+
+            query_to_send = queryNodeToDistributedSelectQuery(modified_query_tree);
+        }
+
+        return;
+    }
+    case ObjectStorageClusterJoinMode::GLOBAL:
+        // TODO
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "`Global` mode for `object_storage_cluster_join_mode` setting is unimplemented for now");
+    case ObjectStorageClusterJoinMode::ALLOW: // Do nothing special
+        return;
+    }
+}
+
 /// The code executes on initiator
 void IStorageCluster::read(
     QueryPlan & query_plan,
@@ -128,34 +306,58 @@ void IStorageCluster::read(
     SelectQueryInfo & query_info,
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
-    size_t /*max_block_size*/,
-    size_t /*num_streams*/)
+    size_t max_block_size,
+    size_t num_streams)
 {
+    auto cluster_name_from_settings = getClusterName(context);
+
+    if (cluster_name_from_settings.empty())
+    {
+        readFallBackToPure(query_plan, column_names, storage_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+        return;
+    }
+
+    updateConfigurationIfNeeded(context);
+
     storage_snapshot->check(column_names);
 
-    updateBeforeRead(context);
-    auto cluster = getCluster(context);
+    const auto & settings = context->getSettingsRef();
+
+    auto cluster = getClusterImpl(context, cluster_name_from_settings, settings[Setting::object_storage_max_nodes]);
 
     /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
 
     SharedHeader sample_block;
     ASTPtr query_to_send = query_info.query;
 
-    if (context->getSettingsRef()[Setting::allow_experimental_analyzer])
+    updateQueryWithJoinToSendIfNeeded(query_to_send, query_info.query_tree, context);
+
+    if (settings[Setting::allow_experimental_analyzer])
     {
-        sample_block = InterpreterSelectQueryAnalyzer::getSampleBlock(query_info.query, context, SelectQueryOptions(processed_stage));
+        sample_block = InterpreterSelectQueryAnalyzer::getSampleBlock(query_to_send, context, SelectQueryOptions(processed_stage));
     }
     else
     {
-        auto interpreter = InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze());
+        auto interpreter = InterpreterSelectQuery(query_to_send, context, SelectQueryOptions(processed_stage).analyze());
         sample_block = interpreter.getSampleBlock();
         query_to_send = interpreter.getQueryInfo().query->clone();
     }
 
     updateQueryToSendIfNeeded(query_to_send, storage_snapshot, context);
 
+    if (settings[Setting::object_storage_remote_initiator])
+    {
+        auto storage_and_context = convertToRemote(cluster, context, cluster_name_from_settings, query_to_send);
+        auto src_distributed = std::dynamic_pointer_cast<StorageDistributed>(storage_and_context.storage);
+        auto modified_query_info = query_info;
+        modified_query_info.cluster = src_distributed->getCluster();
+        auto new_storage_snapshot = storage_and_context.storage->getStorageSnapshot(storage_snapshot->metadata, storage_and_context.context);
+        storage_and_context.storage->read(query_plan, column_names, new_storage_snapshot, modified_query_info, storage_and_context.context, processed_stage, max_block_size, num_streams);
+        return;
+    }
+
     RestoreQualifiedNamesVisitor::Data data;
-    data.distributed_table = DatabaseAndTableWithAlias(*getTableExpression(query_info.query->as<ASTSelectQuery &>(), 0));
+    data.distributed_table = DatabaseAndTableWithAlias(*getTableExpression(query_to_send->as<ASTSelectQuery &>(), 0));
     data.remote_table.database = context->getCurrentDatabase();
     data.remote_table.table = getName();
     RestoreQualifiedNamesVisitor(data).visit(query_to_send);
@@ -181,6 +383,76 @@ void IStorageCluster::read(
     query_plan.addStep(std::move(reading));
 }
 
+IStorageCluster::RemoteCallVariables IStorageCluster::convertToRemote(
+    ClusterPtr cluster,
+    ContextPtr context,
+    const std::string & cluster_name_from_settings,
+    ASTPtr query_to_send)
+{
+    auto host_addresses = cluster->getShardsAddresses();
+    if (host_addresses.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty cluster {}", cluster_name_from_settings);
+
+    static pcg64 rng(randomSeed());
+    size_t shard_num = rng() % host_addresses.size();
+    auto shard_addresses = host_addresses[shard_num];
+    /// After getClusterImpl each shard must have exactly 1 replica
+    if (shard_addresses.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of shard {} in cluster {} is not equal 1", shard_num, cluster_name_from_settings);
+    auto host_name = shard_addresses[0].toString();
+
+    LOG_INFO(log, "Choose remote initiator '{}'", host_name);
+
+    bool secure = shard_addresses[0].secure == Protocol::Secure::Enable;
+    std::string remote_function_name = secure ? "remoteSecure" : "remote";
+
+    /// Clean object_storage_remote_initiator setting to avoid infinite remote call
+    auto new_context = Context::createCopy(context);
+    new_context->setSetting("object_storage_remote_initiator", false);
+
+    auto * select_query = query_to_send->as<ASTSelectQuery>();
+    if (!select_query)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query");
+
+    auto query_settings = select_query->settings();
+    if (query_settings)
+    {
+        auto & settings_ast = query_settings->as<ASTSetQuery &>();
+        if (settings_ast.changes.removeSetting("object_storage_remote_initiator") && settings_ast.changes.empty())
+        {
+            select_query->setExpression(ASTSelectQuery::Expression::SETTINGS, {});
+        }
+    }
+
+    ASTTableExpression * table_expression = extractTableExpressionASTPtrFromSelectQuery(query_to_send);
+    if (!table_expression)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't find table expression");
+
+    auto remote_query = makeASTFunction(remote_function_name, std::make_shared<ASTLiteral>(host_name), table_expression->table_function);
+
+    table_expression->table_function = remote_query;
+
+    auto remote_function = TableFunctionFactory::instance().get(remote_query, new_context);
+
+    auto storage = remote_function->execute(query_to_send, new_context, remote_function_name);
+
+    return RemoteCallVariables{storage, new_context};
+}
+
+SinkToStoragePtr IStorageCluster::write(
+    const ASTPtr & query,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    bool async_insert)
+{
+    auto cluster_name_from_settings = getClusterName(context);
+
+    if (cluster_name_from_settings.empty())
+        return writeFallBackToPure(query, metadata_snapshot, context, async_insert);
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method write is not supported by storage {}", getName());
+}
+
 void ReadFromCluster::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     const Scalars & scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
@@ -239,19 +511,72 @@ void ReadFromCluster::initializePipeline(QueryPipelineBuilder & pipeline, const
         pipes.emplace_back(std::move(pipe));
     }
 
-    auto pipe = Pipe::unitePipes(std::move(pipes));
-    if (pipe.empty())
-        pipe = Pipe(std::make_shared<NullSource>(getOutputHeader()));
+    if (pipes.empty())
+        throw Exception(ErrorCodes::ALL_CONNECTION_TRIES_FAILED, "Cannot connect to any replica for query execution");
 
+    auto pipe = Pipe::unitePipes(std::move(pipes));
     for (const auto & processor : pipe.getProcessors())
         processors.emplace_back(processor);
 
     pipeline.init(std::move(pipe));
 }
 
+IStorageCluster::QueryTreeInfo IStorageCluster::getQueryTreeInfo(QueryTreeNodePtr query_tree, ContextPtr context)
+{
+    QueryTreeInfo info;
+
+    SearcherVisitor join_searcher({QueryTreeNodeType::JOIN, QueryTreeNodeType::CROSS_JOIN}, context);
+    join_searcher.visit(query_tree);
+
+    if (join_searcher.getNode())
+    {
+        if (join_searcher.getType() == QueryTreeNodeType::JOIN)
+            info.has_join = true;
+        else
+            info.has_cross_join = true;
+    }
+
+    SearcherVisitor left_table_expression_searcher({QueryTreeNodeType::TABLE, QueryTreeNodeType::TABLE_FUNCTION}, context);
+    left_table_expression_searcher.visit(query_tree);
+    auto table_function_node = left_table_expression_searcher.getNode();
+    if (!table_function_node)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't find table or table function node");
+
+    auto & query_node = query_tree->as<QueryNode &>();
+    if (query_node.hasWhere() || query_node.hasPrewhere())
+    {
+        CollectUsedColumnsForSourceVisitor collector_where(table_function_node, context, true);
+        if (query_node.hasPrewhere())
+            collector_where.visit(query_node.getPrewhere());
+        if (query_node.hasWhere())
+            collector_where.visit(query_node.getWhere());
+
+        // SELECT x FROM datalake.table WHERE x IN local.table.
+        // Need to modify 'WHERE' on remote node if it contains columns from other sources
+        // because remote node might not have those sources.
+        if (!collector_where.getColumns().empty())
+            info.has_local_columns_in_where = true;
+    }
+
+    return info;
+}
+
 QueryProcessingStage::Enum IStorageCluster::getQueryProcessingStage(
-    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageSnapshotPtr &, SelectQueryInfo &) const
+    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageSnapshotPtr &, SelectQueryInfo & query_info) const
 {
+    auto object_storage_cluster_join_mode = context->getSettingsRef()[Setting::object_storage_cluster_join_mode];
+
+    if (object_storage_cluster_join_mode != ObjectStorageClusterJoinMode::ALLOW)
+    {
+        if (!context->getSettingsRef()[Setting::allow_experimental_analyzer])
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                "object_storage_cluster_join_mode!='allow' is not supported without allow_experimental_analyzer=true");
+
+        auto info = getQueryTreeInfo(query_info.query_tree, context);
+        if (info.has_join || info.has_cross_join || info.has_local_columns_in_where)
+            return QueryProcessingStage::Enum::FetchColumns;
+    }
+
     /// Initiator executes query on remote node.
     if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
         if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
@@ -273,9 +598,9 @@ ContextPtr ReadFromCluster::updateSettings(const Settings & settings)
     return new_context;
 }
 
-ClusterPtr IStorageCluster::getCluster(ContextPtr context) const
+ClusterPtr IStorageCluster::getClusterImpl(ContextPtr context, const String & cluster_name_, size_t max_hosts)
 {
-    return context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
+    return context->getCluster(cluster_name_)->getClusterWithReplicasAsShards(context->getSettingsRef(), /* max_replicas_from_shard */ 0, max_hosts);
 }
 
 }
diff --git a/src/Storages/IStorageCluster.h b/src/Storages/IStorageCluster.h
index a4b63adad48b..b9f739ccad34 100644
--- a/src/Storages/IStorageCluster.h
+++ b/src/Storages/IStorageCluster.h
@@ -3,6 +3,7 @@
 #include <Storages/IStorage.h>
 #include <Interpreters/ActionsDAG.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 
 namespace DB
 {
@@ -30,10 +31,16 @@ class IStorageCluster : public IStorage
         SelectQueryInfo & query_info,
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
-        size_t /*max_block_size*/,
-        size_t /*num_streams*/) override;
+        size_t max_block_size,
+        size_t num_streams) override;
 
-    ClusterPtr getCluster(ContextPtr context) const;
+    SinkToStoragePtr write(
+        const ASTPtr & query,
+        const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr context,
+        bool async_insert) override;
+
+    ClusterPtr getCluster(ContextPtr context) const { return getClusterImpl(context, cluster_name); }
 
     /// Query is needed for pruning by virtual columns (_file, _path)
     virtual RemoteQueryExecutor::Extension getTaskIteratorExtension(
@@ -49,14 +56,109 @@ class IStorageCluster : public IStorage
     bool supportsOptimizationToSubcolumns() const override { return false; }
     bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
+    const String & getOriginalClusterName() const { return cluster_name; }
+    virtual String getClusterName(ContextPtr /* context */) const { return getOriginalClusterName(); }
+
 protected:
-    virtual void updateBeforeRead(const ContextPtr &) {}
     virtual void updateQueryToSendIfNeeded(ASTPtr & /*query*/, const StorageSnapshotPtr & /*storage_snapshot*/, const ContextPtr & /*context*/) {}
+    void updateQueryWithJoinToSendIfNeeded(ASTPtr & query_to_send, QueryTreeNodePtr query_tree, const ContextPtr & context);
+
+    struct RemoteCallVariables
+    {
+        StoragePtr storage;
+        ContextPtr context;
+    };
+
+    RemoteCallVariables convertToRemote(
+        ClusterPtr cluster,
+        ContextPtr context,
+        const std::string & cluster_name_from_settings,
+        ASTPtr query_to_send);
+
+    virtual void readFallBackToPure(
+        QueryPlan & /* query_plan */,
+        const Names & /* column_names */,
+        const StorageSnapshotPtr & /* storage_snapshot */,
+        SelectQueryInfo & /* query_info */,
+        ContextPtr /* context */,
+        QueryProcessingStage::Enum /* processed_stage */,
+        size_t /* max_block_size */,
+        size_t /* num_streams */)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method readFallBackToPure is not supported by storage {}", getName());
+    }
+    
+    virtual SinkToStoragePtr writeFallBackToPure(
+        const ASTPtr & /*query*/,
+        const StorageMetadataPtr & /*metadata_snapshot*/,
+        ContextPtr /*context*/,
+        bool /*async_insert*/)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method writeFallBackToPure is not supported by storage {}", getName());
+    }
+
+    virtual void updateConfigurationIfNeeded(ContextPtr /* context */) {}
 
 private:
+    static ClusterPtr getClusterImpl(ContextPtr context, const String & cluster_name_, size_t max_hosts = 0);
+
     LoggerPtr log;
     String cluster_name;
+
+    struct QueryTreeInfo
+    {
+        bool has_join = false;
+        bool has_cross_join = false;
+        bool has_local_columns_in_where = false;
+    };
+
+    static QueryTreeInfo getQueryTreeInfo(QueryTreeNodePtr query_tree, ContextPtr context);
 };
 
 
+class ReadFromCluster : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromCluster"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+    ReadFromCluster(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        SharedHeader sample_block,
+        std::shared_ptr<IStorageCluster> storage_,
+        ASTPtr query_to_send_,
+        QueryProcessingStage::Enum processed_stage_,
+        ClusterPtr cluster_,
+        LoggerPtr log_)
+        : SourceStepWithFilter(
+            std::move(sample_block),
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , storage(std::move(storage_))
+        , query_to_send(std::move(query_to_send_))
+        , processed_stage(processed_stage_)
+        , cluster(std::move(cluster_))
+        , log(log_)
+    {
+    }
+
+private:
+    std::shared_ptr<IStorageCluster> storage;
+    ASTPtr query_to_send;
+    QueryProcessingStage::Enum processed_stage;
+    ClusterPtr cluster;
+    LoggerPtr log;
+
+    std::optional<RemoteQueryExecutor::Extension> extension;
+
+    void createExtension(const ActionsDAG::Node * predicate);
+    ContextPtr updateSettings(const Settings & settings);
+};
+
 }
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index 890ac41a2723..dc81421539e0 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -267,9 +267,6 @@ void StorageLiveView::checkTableCanBeDropped([[ maybe_unused ]] ContextPtr query
 
 void StorageLiveView::drop()
 {
-    auto table_id = getStorageID();
-    DatabaseCatalog::instance().removeViewDependency(select_query_description.select_table_id, table_id);
-
     std::lock_guard lock(mutex);
     condition.notify_all();
 }
@@ -661,11 +658,6 @@ QueryPipelineBuilder StorageLiveView::completeQuery(Pipes pipes)
         builder = interpreter.buildQueryPipeline();
     }
 
-    builder.addSimpleTransform([&](const SharedHeader & cur_header)
-    {
-        return std::make_shared<MaterializingTransform>(cur_header);
-    });
-
     /// Squashing is needed here because the view query can generate a lot of blocks
     /// even when only one block is inserted into the parent table (e.g. if the query is a GROUP BY
     /// and two-level aggregation is triggered).
diff --git a/src/Storages/MaterializedView/RefreshSet.cpp b/src/Storages/MaterializedView/RefreshSet.cpp
index 944dab6acbc4..3c6c7faad536 100644
--- a/src/Storages/MaterializedView/RefreshSet.cpp
+++ b/src/Storages/MaterializedView/RefreshSet.cpp
@@ -203,7 +203,7 @@ bool RefreshSet::refreshesStopped() const
     return refreshes_stopped.load();
 }
 
-void RefreshSet::joinBackgroundTasks(std::chrono::steady_clock::time_point deadline)
+bool RefreshSet::joinBackgroundTasks(std::chrono::steady_clock::time_point deadline)
 {
     std::vector<RefreshTaskPtr> remaining_tasks;
     std::chrono::steady_clock::time_point stopped_at;
@@ -234,7 +234,11 @@ void RefreshSet::joinBackgroundTasks(std::chrono::steady_clock::time_point deadl
             names += remaining_tasks[i]->getInfo().view_id.getNameForLogs();
         }
         LOG_ERROR(getLogger("RefreshSet"), "{} view refreshes failed to stop in {:.3}s: {}", remaining_tasks.size(), elapsed_seconds, names);
+
+        return false;
     }
+
+    return true;
 }
 
 RefreshSet::Handle::Handle(RefreshSet * parent_set_, StorageID id_, std::optional<StorageID> inner_table_id_, RefreshTaskList::iterator iter_, RefreshTaskList::iterator inner_table_iter_, std::vector<StorageID> dependencies_)
diff --git a/src/Storages/MaterializedView/RefreshSet.h b/src/Storages/MaterializedView/RefreshSet.h
index 083ccf2b8f04..fc8f645a4653 100644
--- a/src/Storages/MaterializedView/RefreshSet.h
+++ b/src/Storages/MaterializedView/RefreshSet.h
@@ -68,7 +68,8 @@ class RefreshSet
     bool refreshesStopped() const;
 
     /// Called during shutdown, after setRefreshesStopped(true).
-    void joinBackgroundTasks(std::chrono::steady_clock::time_point deadline);
+    /// Returns false if some tasks are still running after deadline.
+    bool joinBackgroundTasks(std::chrono::steady_clock::time_point deadline);
 
 private:
     using TaskMap = std::unordered_map<StorageID, RefreshTaskList, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
diff --git a/src/Storages/MaterializedView/RefreshTask.cpp b/src/Storages/MaterializedView/RefreshTask.cpp
index 1e74b3cc7c6f..15882eae0f88 100644
--- a/src/Storages/MaterializedView/RefreshTask.cpp
+++ b/src/Storages/MaterializedView/RefreshTask.cpp
@@ -78,7 +78,7 @@ namespace ErrorCodes
 
 namespace FailPoints
 {
-extern const char refresh_task_delay_update_coordination_state_running[];
+extern const char refresh_task_stop_racing_for_running_refresh[];
 }
 
 RefreshTask::RefreshTask(
@@ -729,30 +729,34 @@ std::optional<UUID> RefreshTask::executeRefreshUnlocked(bool append, int32_t roo
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR, "Pipeline for view {} refresh must be completed", view_storage_id.getFullTableName());
 
-            PipelineExecutor executor(pipeline.processors, pipeline.process_list_element);
-            executor.setReadProgressCallback(pipeline.getReadProgressCallback());
-
             {
-                std::unique_lock exec_lock(execution.executor_mutex);
+                PipelineExecutor executor(pipeline.processors, pipeline.process_list_element);
+                executor.setReadProgressCallback(pipeline.getReadProgressCallback());
+
+                {
+                    std::unique_lock exec_lock(execution.executor_mutex);
+                    if (execution.interrupt_execution.load())
+                        throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Refresh for view {} cancelled", view_storage_id.getFullTableName());
+                    execution.executor = &executor;
+                }
+                SCOPE_EXIT({
+                    std::unique_lock exec_lock(execution.executor_mutex);
+                    execution.executor = nullptr;
+                });
+
+                executor.execute(pipeline.getNumThreads(), pipeline.getConcurrencyControl());
+
+                /// A cancelled PipelineExecutor may return without exception but with incomplete results.
+                /// In this case make sure to:
+                ///  * report exception rather than success,
+                ///  * do it before destroying the QueryPipeline; otherwise it may fail assertions about
+                ///    being unexpectedly destroyed before completion and without uncaught exception
+                ///    (specifically, the assert in ~WriteBuffer()).
                 if (execution.interrupt_execution.load())
                     throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Refresh for view {} cancelled", view_storage_id.getFullTableName());
-                execution.executor = &executor;
-            }
-            SCOPE_EXIT({
-                std::unique_lock exec_lock(execution.executor_mutex);
-                execution.executor = nullptr;
-            });
-
-            executor.execute(pipeline.getNumThreads(), pipeline.getConcurrencyControl());
 
-            /// A cancelled PipelineExecutor may return without exception but with incomplete results.
-            /// In this case make sure to:
-            ///  * report exception rather than success,
-            ///  * do it before destroying the QueryPipeline; otherwise it may fail assertions about
-            ///    being unexpectedly destroyed before completion and without uncaught exception
-            ///    (specifically, the assert in ~WriteBuffer()).
-            if (execution.interrupt_execution.load())
-                throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Refresh for view {} cancelled", view_storage_id.getFullTableName());
+                /// `executor` must be destroyed before `pipeline`!
+            }
 
             logQueryFinish(*query_log_elem, refresh_context, refresh_query, std::move(pipeline), /*pulling_pipeline=*/false, query_span, QueryResultCacheUsage::None, /*internal=*/false);
             query_log_elem = std::nullopt;
@@ -996,10 +1000,11 @@ bool RefreshTask::updateCoordinationState(CoordinationZnode root, bool running,
         ops.emplace_back(zkutil::makeSetRequest(coordination.path, root.toString(), root.version));
         if (running)
         {
-            fiu_do_on(FailPoints::refresh_task_delay_update_coordination_state_running, {
-                std::chrono::milliseconds sleep_time{3000 + thread_local_rng() % 2000};
-                std::this_thread::sleep_for(sleep_time);
-            });
+            bool stop_racing_for_running_refresh = false;
+            fiu_do_on(FailPoints::refresh_task_stop_racing_for_running_refresh, { stop_racing_for_running_refresh = true; });
+            if (stop_racing_for_running_refresh)
+                return false;
+
             ops.emplace_back(
                 zkutil::makeCreateRequest(coordination.path + "/running", coordination.replica_name, zkutil::CreateMode::Ephemeral));
         }
@@ -1047,7 +1052,7 @@ void RefreshTask::interruptExecution()
     if (execution.executor)
     {
         execution.executor->cancel();
-        LOG_DEBUG(log, "Cancelling refresh");
+        LOG_DEBUG(log, "Cancelling refresh in {}", set_handle.getID().getFullNameNotQuoted());
     }
 }
 
diff --git a/src/Storages/MergeTree/Compaction/MergeSelectorApplier.cpp b/src/Storages/MergeTree/Compaction/MergeSelectorApplier.cpp
index 49bf49795af9..b9685195c77e 100644
--- a/src/Storages/MergeTree/Compaction/MergeSelectorApplier.cpp
+++ b/src/Storages/MergeTree/Compaction/MergeSelectorApplier.cpp
@@ -7,6 +7,8 @@
 
 #include <Common/logger_useful.h>
 
+#include <limits>
+
 namespace DB
 {
 
@@ -67,10 +69,10 @@ MergeSelectorChoices tryChooseTTLMerge(const ChooseContext & ctx)
     /// Delete parts - 1 priority
     if (!ctx.max_merge_sizes.empty())
     {
-        std::vector<size_t> max_sizes(ctx.max_merge_sizes.size(), ctx.merge_tree_settings[MergeTreeSetting::max_bytes_to_merge_at_max_space_in_pool]);
+        /// The size of the completely expired part of TTL drop is not affected by the merge pressure and the size of the storage space
+        std::vector<size_t> max_sizes(ctx.max_merge_sizes.size(), std::numeric_limits<size_t>::max());
         TTLPartDeleteMergeSelector drop_ttl_selector(ctx.next_delete_times, ctx.current_time);
 
-        /// The size of the completely expired part of TTL drop is not affected by the merge pressure and the size of the storage space
         if (auto merge_ranges = drop_ttl_selector.select(ctx.ranges, max_sizes, ctx.range_filter); !merge_ranges.empty())
             return pack(ctx, std::move(merge_ranges), MergeType::TTLDelete);
     }
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
index bf2fa8136576..9d0e0bf9dd43 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
@@ -728,6 +728,15 @@ void DataPartStorageOnDiskBase::remove(
                 disk->removeSharedRecursive(
                     fs::path(to) / "", !can_remove_description->can_remove_anything, can_remove_description->files_not_to_remove);
             }
+            catch (const fs::filesystem_error & e)
+            {
+                if (e.code() == std::errc::no_such_file_or_directory)
+                {
+                    /// If the directory was already removed (e.g. by clearOldTemporaryDirectories), nothing to do.
+                }
+                else
+                    throw;
+            }
             catch (...)
             {
                 LOG_ERROR(
@@ -748,7 +757,9 @@ void DataPartStorageOnDiskBase::remove(
         try
         {
             disk->moveDirectory(from, to);
-            part_dir = part_dir_without_slash;
+            /// NOTE: we intentionally don't update part_dir here because it would cause a data race
+            /// with concurrent readers (e.g. system.parts table queries calling getFullPath()).
+            /// The part is being removed anyway, so the path doesn't need to be updated.
         }
         catch (const Exception & e)
         {
@@ -859,7 +870,19 @@ void DataPartStorageOnDiskBase::clearDirectory(
     if (checksums.empty() || incomplete_temporary_part)
     {
         /// 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);
+        try
+        {
+            disk->removeSharedRecursive(fs::path(dir) / "", !can_remove_shared_data, names_not_to_remove);
+        }
+        catch (const fs::filesystem_error & e)
+        {
+            if (e.code() == std::errc::no_such_file_or_directory)
+            {
+                /// If the directory was already removed (e.g. by clearOldTemporaryDirectories), nothing to do.
+            }
+            else
+                throw;
+        }
         return;
     }
 
@@ -895,7 +918,19 @@ void DataPartStorageOnDiskBase::clearDirectory(
         /// Recursive directory removal does many excessive "stat" syscalls under the hood.
 
         LOG_ERROR(log, "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: {}", fullPath(disk, dir), getCurrentExceptionMessage(false));
-        disk->removeSharedRecursive(fs::path(dir) / "", !can_remove_shared_data, names_not_to_remove);
+        try
+        {
+            disk->removeSharedRecursive(fs::path(dir) / "", !can_remove_shared_data, names_not_to_remove);
+        }
+        catch (const fs::filesystem_error & e)
+        {
+            if (e.code() == std::errc::no_such_file_or_directory)
+            {
+                /// If the directory was already removed (e.g. by clearOldTemporaryDirectories), nothing to do.
+            }
+            else
+                throw;
+        }
     }
 }
 
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 6c73693307f0..15df3bfca504 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -123,8 +123,11 @@ std::string Service::getId(const std::string & node_id) const
     return getEndpointId(node_id);
 }
 
-void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, WriteBuffer & out, HTTPServerResponse & response)
+void Service::processQuery(const HTMLForm & params, ReadBufferPtr body, WriteBuffer & out, HTTPServerResponse & response)
 {
+    // nothing to read from body
+    body.reset();
+
     int client_protocol_version = parse<int>(params.get("client_protocol_version", "0"));
 
     String part_name = params.get("part");
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index 817b63fa4dca..6e79d67d5714 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -9,6 +9,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <Common/Throttler.h>
 #include <Common/ActionBlocker.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace zkutil
@@ -37,7 +38,7 @@ class Service final : public InterserverIOEndpoint
     Service & operator=(const Service &) = delete;
 
     std::string getId(const std::string & node_id) const override;
-    void processQuery(const HTMLForm & params, ReadBuffer & body, WriteBuffer & out, HTTPServerResponse & response) override;
+    void processQuery(const HTMLForm & params, ReadBufferPtr body, WriteBuffer & out, HTTPServerResponse & response) override;
 
 private:
     MergeTreeData::DataPartPtr findPart(const String & name);
diff --git a/src/Storages/MergeTree/ExportList.cpp b/src/Storages/MergeTree/ExportList.cpp
new file mode 100644
index 000000000000..018c1f091ef9
--- /dev/null
+++ b/src/Storages/MergeTree/ExportList.cpp
@@ -0,0 +1,74 @@
+#include <Storages/MergeTree/ExportList.h>
+
+namespace DB
+{
+
+ExportsListElement::ExportsListElement(
+    const StorageID & source_table_id_,
+    const StorageID & destination_table_id_,
+    UInt64 part_size_,
+    const String & part_name_,
+    const std::vector<String> & destination_file_paths_,
+    UInt64 total_rows_to_read_,
+    UInt64 total_size_bytes_compressed_,
+    UInt64 total_size_bytes_uncompressed_,
+    time_t create_time_,
+    const String & query_id_,
+    const ContextPtr & context)
+: source_table_id(source_table_id_)
+, destination_table_id(destination_table_id_)
+, part_size(part_size_)
+, part_name(part_name_)
+, destination_file_paths(destination_file_paths_)
+, total_rows_to_read(total_rows_to_read_)
+, total_size_bytes_compressed(total_size_bytes_compressed_)
+, total_size_bytes_uncompressed(total_size_bytes_uncompressed_)
+, create_time(create_time_)
+, query_id(query_id_)
+{
+    thread_group = ThreadGroup::createForMergeMutate(context);
+}
+
+ExportsListElement::~ExportsListElement()
+{
+    background_memory_tracker.adjustOnBackgroundTaskEnd(&thread_group->memory_tracker);
+}
+
+ExportInfo ExportsListElement::getInfo() const
+{
+    ExportInfo res;
+    res.source_database = source_table_id.database_name;
+    res.source_table = source_table_id.table_name;
+    res.destination_database = destination_table_id.database_name;
+    res.destination_table = destination_table_id.table_name;
+    res.part_name = part_name;
+
+    {
+        std::shared_lock lock(destination_file_paths_mutex);
+        res.destination_file_paths = destination_file_paths;
+    }
+
+    res.rows_read = rows_read.load(std::memory_order_relaxed);
+    res.total_rows_to_read = total_rows_to_read;
+    res.total_size_bytes_compressed = total_size_bytes_compressed;
+    res.total_size_bytes_uncompressed = total_size_bytes_uncompressed;
+    res.bytes_read_uncompressed = bytes_read_uncompressed.load(std::memory_order_relaxed);
+    res.memory_usage = getMemoryUsage();
+    res.peak_memory_usage = getPeakMemoryUsage();
+    res.create_time = create_time;
+    res.elapsed = watch.elapsedSeconds();
+    res.query_id = query_id;
+    return res;
+}
+
+UInt64 ExportsListElement::getMemoryUsage() const
+{
+    return thread_group->memory_tracker.get();
+}
+
+UInt64 ExportsListElement::getPeakMemoryUsage() const
+{
+    return thread_group->memory_tracker.getPeak();
+}
+
+}
diff --git a/src/Storages/MergeTree/ExportList.h b/src/Storages/MergeTree/ExportList.h
new file mode 100644
index 000000000000..4a02826dfe44
--- /dev/null
+++ b/src/Storages/MergeTree/ExportList.h
@@ -0,0 +1,96 @@
+#pragma once
+
+#include <Storages/MergeTree/BackgroundProcessList.h>
+#include <Interpreters/StorageID.h>
+#include <Common/Stopwatch.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ThreadStatus.h>
+#include <Poco/URI.h>
+#include <boost/noncopyable.hpp>
+#include <shared_mutex>
+
+namespace CurrentMetrics
+{
+    extern const Metric Export;
+}
+
+namespace DB
+{
+
+struct ExportInfo
+{
+    String source_database;
+    String source_table;
+    String destination_database;
+    String destination_table;
+    String part_name;
+    std::vector<String> destination_file_paths;
+    UInt64 rows_read;
+    UInt64 total_rows_to_read;
+    UInt64 total_size_bytes_compressed;
+    UInt64 total_size_bytes_uncompressed;
+    UInt64 bytes_read_uncompressed;
+    UInt64 memory_usage;
+    UInt64 peak_memory_usage;
+    time_t create_time = 0;
+    Float64 elapsed;
+    String query_id;
+};
+
+struct ExportsListElement : private boost::noncopyable
+{
+    const StorageID source_table_id;
+    const StorageID destination_table_id;
+    const UInt64 part_size;
+    const String part_name;
+
+    /// see destination_file_paths_mutex
+    std::vector<String> destination_file_paths;
+    std::atomic<UInt64> rows_read {0};
+    UInt64 total_rows_to_read {0};
+    UInt64 total_size_bytes_compressed {0};
+    UInt64 total_size_bytes_uncompressed {0};
+    std::atomic<UInt64> bytes_read_uncompressed {0};
+    time_t create_time {0};
+    String query_id;
+
+    Stopwatch watch;
+    ThreadGroupPtr thread_group;
+    mutable std::shared_mutex destination_file_paths_mutex;
+
+    ExportsListElement(
+        const StorageID & source_table_id_,
+        const StorageID & destination_table_id_,
+        UInt64 part_size_,
+        const String & part_name_,
+        const std::vector<String> & destination_file_paths_,
+        UInt64 total_rows_to_read_,
+        UInt64 total_size_bytes_compressed_,
+        UInt64 total_size_bytes_uncompressed_,
+        time_t create_time_,
+        const String & query_id_,
+        const ContextPtr & context);
+
+    ~ExportsListElement();
+
+    ExportInfo getInfo() const;
+
+    UInt64 getMemoryUsage() const;
+    UInt64 getPeakMemoryUsage() const;
+};
+
+
+class ExportsList final : public BackgroundProcessList<ExportsListElement, ExportInfo>
+{
+private:
+    using Parent = BackgroundProcessList<ExportsListElement, ExportInfo>;
+
+public:
+    ExportsList()
+        : Parent(CurrentMetrics::Export)
+    {}
+};
+
+using ExportsListEntry = BackgroundProcessListEntry<ExportsListElement, ExportInfo>;
+
+}
diff --git a/src/Storages/MergeTree/ExportPartTask.cpp b/src/Storages/MergeTree/ExportPartTask.cpp
new file mode 100644
index 000000000000..f506ebad4bbe
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartTask.cpp
@@ -0,0 +1,329 @@
+#include <mutex>
+#include <Storages/MergeTree/ExportPartTask.h>
+#include <Storages/MergeTree/MergeTreeSequentialSource.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/inplaceBlockConversions.h>
+#include <Core/Settings.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Common/Exception.h>
+#include <Common/ProfileEventsScope.h>
+#include <Storages/MergeTree/ExportList.h>
+#include <Formats/FormatFactory.h>
+#include <Databases/enableAllExperimentalSettings.h>
+
+namespace ProfileEvents
+{
+    extern const Event PartsExportDuplicated;
+    extern const Event PartsExportFailures;
+    extern const Event PartsExports;
+    extern const Event PartsExportTotalMilliseconds;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_TABLE;
+    extern const int FILE_ALREADY_EXISTS;
+    extern const int LOGICAL_ERROR;
+    extern const int QUERY_WAS_CANCELLED;
+}
+
+namespace Setting
+{
+    extern const SettingsUInt64 min_bytes_to_use_direct_io;
+    extern const SettingsUInt64 export_merge_tree_part_max_bytes_per_file;
+    extern const SettingsUInt64 export_merge_tree_part_max_rows_per_file;
+}
+
+namespace
+{
+    void materializeSpecialColumns(
+        const SharedHeader & header,
+        const StorageMetadataPtr & storage_metadata,
+        const ContextPtr & local_context,
+        QueryPlan & plan_for_part
+    )
+    {
+        const auto readable_columns = storage_metadata->getColumns().getReadable();
+
+        // Enable all experimental settings for default expressions
+        // (same pattern as in IMergeTreeReader::evaluateMissingDefaults)
+        auto context_for_defaults = Context::createCopy(local_context);
+        enableAllExperimentalSettings(context_for_defaults);
+        
+        auto defaults_dag = evaluateMissingDefaults(
+            *header,
+            readable_columns,
+            storage_metadata->getColumns(),
+            context_for_defaults);
+
+        if (defaults_dag)
+        {
+            /// Ensure columns are in the correct order matching readable_columns
+            defaults_dag->removeUnusedActions(readable_columns.getNames(), false);
+            defaults_dag->addMaterializingOutputActions(/*materialize_sparse=*/ false);
+            
+            auto expression_step = std::make_unique<ExpressionStep>(
+                header,
+                std::move(*defaults_dag));
+            expression_step->setStepDescription("Compute alias and default expressions for export");
+            plan_for_part.addStep(std::move(expression_step));
+        }
+    }
+}
+
+ExportPartTask::ExportPartTask(MergeTreeData & storage_, const MergeTreePartExportManifest & manifest_)
+    : storage(storage_),
+    manifest(manifest_)
+{
+}
+
+bool ExportPartTask::executeStep()
+{
+    auto local_context = Context::createCopy(storage.getContext());
+    local_context->makeQueryContextForExportPart();
+    local_context->setCurrentQueryId(manifest.query_id);
+    local_context->setBackgroundOperationTypeForContext(ClientInfo::BackgroundOperationType::EXPORT_PART);
+    local_context->setSettings(manifest.settings);
+
+    const auto & metadata_snapshot = manifest.metadata_snapshot;
+
+    /// Read only physical columns from the part
+    const auto columns_to_read = metadata_snapshot->getColumns().getNamesOfPhysical();
+
+    MergeTreeSequentialSourceType read_type = MergeTreeSequentialSourceType::Export;
+
+    Block block_with_partition_values;
+    if (metadata_snapshot->hasPartitionKey())
+    {
+        /// todo arthur do I need to init minmax_idx?
+        block_with_partition_values = manifest.data_part->minmax_idx->getBlock(storage);
+    }
+
+    const auto & destination_storage = manifest.destination_storage_ptr;
+    const auto destination_storage_id = destination_storage->getStorageID();
+
+    auto exports_list_entry = storage.getContext()->getExportsList().insert(
+        getStorageID(),
+        destination_storage_id,
+        manifest.data_part->getBytesOnDisk(),
+        manifest.data_part->name,
+        std::vector<std::string>{},
+        manifest.data_part->rows_count,
+        manifest.data_part->getBytesOnDisk(),
+        manifest.data_part->getBytesUncompressedOnDisk(),
+        manifest.create_time,
+        manifest.query_id,
+        local_context);
+
+    SinkToStoragePtr sink;
+
+    const auto new_file_path_callback = [&exports_list_entry](const std::string & file_path)
+    {
+        std::unique_lock lock((*exports_list_entry)->destination_file_paths_mutex);
+        (*exports_list_entry)->destination_file_paths.push_back(file_path);
+    };
+
+    try
+    {
+        sink = destination_storage->import(
+            manifest.data_part->name + "_" + manifest.data_part->checksums.getTotalChecksumHex(),
+            block_with_partition_values,
+            new_file_path_callback,
+            manifest.file_already_exists_policy == MergeTreePartExportManifest::FileAlreadyExistsPolicy::overwrite,
+            manifest.settings[Setting::export_merge_tree_part_max_bytes_per_file],
+            manifest.settings[Setting::export_merge_tree_part_max_rows_per_file],
+            getFormatSettings(local_context),
+            local_context);
+
+        bool apply_deleted_mask = true;
+        bool read_with_direct_io = local_context->getSettingsRef()[Setting::min_bytes_to_use_direct_io] > manifest.data_part->getBytesOnDisk();
+        bool prefetch = false;
+
+        MergeTreeData::IMutationsSnapshot::Params mutations_snapshot_params
+        {
+            .metadata_version = metadata_snapshot->getMetadataVersion(),
+            .min_part_metadata_version = manifest.data_part->getMetadataVersion()
+        };
+
+        auto mutations_snapshot = storage.getMutationsSnapshot(mutations_snapshot_params);
+        auto alter_conversions = MergeTreeData::getAlterConversionsForPart(
+            manifest.data_part,
+            mutations_snapshot,
+            local_context);
+
+        QueryPlan plan_for_part;
+
+        createReadFromPartStep(
+            read_type,
+            plan_for_part,
+            storage,
+            storage.getStorageSnapshot(metadata_snapshot, local_context),
+            RangesInDataPart(manifest.data_part),
+            alter_conversions,
+            nullptr,
+            columns_to_read,
+            nullptr,
+            apply_deleted_mask,
+            std::nullopt,
+            read_with_direct_io,
+            prefetch,
+            local_context,
+            getLogger("ExportPartition"));
+
+        /// We need to support exporting materialized and alias columns to object storage. For some reason, object storage engines don't support them.
+        /// This is a hack that materializes the columns before the export so they can be exported to tables that have matching columns
+        materializeSpecialColumns(plan_for_part.getCurrentHeader(), metadata_snapshot, local_context, plan_for_part);
+
+        ThreadGroupSwitcher switcher((*exports_list_entry)->thread_group, "");
+
+        QueryPlanOptimizationSettings optimization_settings(local_context);
+        auto pipeline_settings = BuildQueryPipelineSettings(local_context);
+        auto builder = plan_for_part.buildQueryPipeline(optimization_settings, pipeline_settings);
+
+        builder->setProgressCallback([&exports_list_entry](const Progress & progress)
+        {
+            (*exports_list_entry)->bytes_read_uncompressed += progress.read_bytes;
+            (*exports_list_entry)->rows_read += progress.read_rows;
+        });
+
+        pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
+
+        pipeline.complete(sink);
+
+        CompletedPipelineExecutor exec(pipeline);
+
+        auto is_cancelled_callback = [this]()
+        {
+            return isCancelled();
+        };
+
+        exec.setCancelCallback(is_cancelled_callback, 100);
+
+        exec.execute();
+
+        if (isCancelled())
+        {
+            throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Export part was cancelled");
+        }
+
+        std::lock_guard inner_lock(storage.export_manifests_mutex);
+        storage.writePartLog(
+            PartLogElement::Type::EXPORT_PART,
+            {},
+            (*exports_list_entry)->watch.elapsed(),
+            manifest.data_part->name,
+            manifest.data_part,
+            {manifest.data_part},
+            nullptr,
+            nullptr,
+            exports_list_entry.get());
+
+        storage.export_manifests.erase(manifest);
+
+        ProfileEvents::increment(ProfileEvents::PartsExports);
+        ProfileEvents::increment(ProfileEvents::PartsExportTotalMilliseconds, (*exports_list_entry)->watch.elapsedMilliseconds());
+
+        if (manifest.completion_callback)
+            manifest.completion_callback(MergeTreePartExportManifest::CompletionCallbackResult::createSuccess((*exports_list_entry)->destination_file_paths));
+    }
+    catch (const Exception & e)
+    {
+        if (e.code() == ErrorCodes::FILE_ALREADY_EXISTS)
+        {
+            ProfileEvents::increment(ProfileEvents::PartsExportDuplicated);
+
+            /// File already exists and the policy is NO_OP, treat it as success.
+            if (manifest.file_already_exists_policy == MergeTreePartExportManifest::FileAlreadyExistsPolicy::skip)
+            {
+                storage.writePartLog(
+                    PartLogElement::Type::EXPORT_PART,
+                    {},
+                    (*exports_list_entry)->watch.elapsed(),
+                    manifest.data_part->name,
+                    manifest.data_part,
+                    {manifest.data_part},
+                    nullptr,
+                    nullptr,
+                    exports_list_entry.get());
+
+                std::lock_guard inner_lock(storage.export_manifests_mutex);
+                storage.export_manifests.erase(manifest);
+
+                ProfileEvents::increment(ProfileEvents::PartsExports);
+                ProfileEvents::increment(ProfileEvents::PartsExportTotalMilliseconds, (*exports_list_entry)->watch.elapsedMilliseconds());
+
+                if (manifest.completion_callback)
+                {
+                    manifest.completion_callback(MergeTreePartExportManifest::CompletionCallbackResult::createSuccess((*exports_list_entry)->destination_file_paths));
+                }
+                    
+                return false;
+            }
+        }
+
+        ProfileEvents::increment(ProfileEvents::PartsExportFailures);
+
+        storage.writePartLog(
+            PartLogElement::Type::EXPORT_PART,
+            ExecutionStatus::fromCurrentException("", true),
+            (*exports_list_entry)->watch.elapsed(),
+            manifest.data_part->name,
+            manifest.data_part,
+            {manifest.data_part},
+            nullptr,
+            nullptr,
+            exports_list_entry.get());
+
+        std::lock_guard inner_lock(storage.export_manifests_mutex);
+        storage.export_manifests.erase(manifest);
+
+        if (manifest.completion_callback)
+            manifest.completion_callback(MergeTreePartExportManifest::CompletionCallbackResult::createFailure(e));
+        return false;
+    }
+
+    return false;
+}
+
+void ExportPartTask::cancel() noexcept
+{
+    cancel_requested.store(true);
+    pipeline.cancel();
+}
+
+bool ExportPartTask::isCancelled() const
+{
+    return cancel_requested.load() || storage.parts_mover.moves_blocker.isCancelled();
+}
+
+void ExportPartTask::onCompleted()
+{
+}
+
+StorageID ExportPartTask::getStorageID() const
+{
+    return storage.getStorageID();
+}
+
+Priority ExportPartTask::getPriority() const
+{
+    return Priority{};
+}
+
+String ExportPartTask::getQueryId() const
+{
+    return manifest.query_id;
+}
+
+}
diff --git a/src/Storages/MergeTree/ExportPartTask.h b/src/Storages/MergeTree/ExportPartTask.h
new file mode 100644
index 000000000000..9c8fa6cc01dd
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartTask.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTreePartExportManifest.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+
+namespace DB
+{
+
+class ExportPartTask : public IExecutableTask
+{
+public:
+    explicit ExportPartTask(
+        MergeTreeData & storage_,
+        const MergeTreePartExportManifest & manifest_);
+    bool executeStep() override;
+    void onCompleted() override;
+    StorageID getStorageID() const override;
+    Priority getPriority() const override;
+    String getQueryId() const override;
+
+    void cancel() noexcept override;
+
+private:
+    MergeTreeData & storage;
+    MergeTreePartExportManifest manifest;
+    QueryPipeline pipeline;
+    std::atomic<bool> cancel_requested = false;
+
+    bool isCancelled() const;
+};
+
+}
diff --git a/src/Storages/MergeTree/ExportPartitionManifestUpdatingTask.cpp b/src/Storages/MergeTree/ExportPartitionManifestUpdatingTask.cpp
new file mode 100644
index 000000000000..79b92663b7bf
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartitionManifestUpdatingTask.cpp
@@ -0,0 +1,310 @@
+#include <Storages/MergeTree/ExportPartitionManifestUpdatingTask.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/ExportReplicatedMergeTreePartitionTaskEntry.h>
+#include "Storages/MergeTree/ExportPartitionUtils.h"
+#include "Common/logger_useful.h"
+#include <Common/ZooKeeper/Types.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Interpreters/DatabaseCatalog.h>
+
+namespace DB
+{
+namespace
+{
+    /*
+        Remove expired entries and fix non-committed exports that have already exported all parts.
+
+        Return values:
+        - true: the cleanup was successful, the entry is removed from the entries_by_key container and the function returns true. Proceed to the next entry.
+        - false: the cleanup was not successful, the entry is not removed from the entries_by_key container and the function returns false.
+    */
+    bool tryCleanup(
+        const zkutil::ZooKeeperPtr & zk,
+        const std::string & entry_path,
+        const LoggerPtr & log,
+        const ContextPtr & context,
+        const std::string & key,
+        const ExportReplicatedMergeTreePartitionManifest & metadata,
+        const time_t now,
+        const bool is_pending,
+        auto & entries_by_key
+    )
+    {
+        bool has_expired = metadata.create_time < now - static_cast<time_t>(metadata.ttl_seconds);
+
+        if (has_expired && !is_pending)
+        {
+            zk->tryRemoveRecursive(fs::path(entry_path));
+            auto it = entries_by_key.find(key);
+            if (it != entries_by_key.end())
+                entries_by_key.erase(it);
+            LOG_INFO(log, "ExportPartition Manifest Updating Task: Removed {}: expired", key);
+
+            return true;
+        }
+        else if (is_pending)
+        {
+            std::vector<std::string> parts_in_processing_or_pending;
+            if (Coordination::Error::ZOK != zk->tryGetChildren(fs::path(entry_path) / "processing", parts_in_processing_or_pending))
+            {
+                LOG_INFO(log, "ExportPartition Manifest Updating Task: Failed to get parts in processing or pending, skipping");
+                return false;
+            }
+
+            if (parts_in_processing_or_pending.empty())
+            {
+                LOG_INFO(log, "ExportPartition Manifest Updating Task: Cleanup found PENDING for {} with all parts exported, try to fix it by committing the export", entry_path);
+    
+                const auto destination_storage_id = StorageID(QualifiedTableName {metadata.destination_database, metadata.destination_table});
+                const auto destination_storage = DatabaseCatalog::instance().tryGetTable(destination_storage_id, context);
+                if (!destination_storage)
+                {
+                    LOG_INFO(log, "ExportPartition Manifest Updating Task: Failed to reconstruct destination storage: {}, skipping", destination_storage_id.getNameForLogs());
+                    return false;
+                }
+
+                /// it sounds like a replica exported the last part, but was not able to commit the export. Try to fix it
+                ExportPartitionUtils::commit(metadata, destination_storage, zk, log, entry_path, context);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
+
+ExportPartitionManifestUpdatingTask::ExportPartitionManifestUpdatingTask(StorageReplicatedMergeTree & storage_)
+    : storage(storage_)
+{
+}
+
+void ExportPartitionManifestUpdatingTask::poll()
+{
+    std::lock_guard lock(storage.export_merge_tree_partition_mutex);
+
+    LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Polling for new entries for table {}. Current number of entries: {}", storage.getStorageID().getNameForLogs(), storage.export_merge_tree_partition_task_entries_by_key.size());
+
+    auto zk = storage.getZooKeeper();
+    
+    const std::string exports_path = fs::path(storage.zookeeper_path) / "exports";
+    const std::string cleanup_lock_path = fs::path(storage.zookeeper_path) / "exports_cleanup_lock";
+
+    auto cleanup_lock = zkutil::EphemeralNodeHolder::tryCreate(cleanup_lock_path, *zk, storage.replica_name);
+    if (cleanup_lock)
+    {
+        LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Cleanup lock acquired, will remove stale entries");
+    }
+
+    Coordination::Stat stat;
+    const auto children = zk->getChildrenWatch(exports_path, &stat, storage.export_merge_tree_partition_watch_callback);
+    const std::unordered_set<std::string> zk_children(children.begin(), children.end());
+
+    const auto now = time(nullptr);
+
+    auto & entries_by_key = storage.export_merge_tree_partition_task_entries_by_key;
+
+    /// Load new entries
+    /// If we have the cleanup lock, also remove stale entries from zk and local
+    /// Upload dangling commit files if any
+    for (const auto & key : zk_children)
+    {
+        const std::string entry_path = fs::path(exports_path) / key;
+
+        std::string metadata_json;
+        if (!zk->tryGet(fs::path(entry_path) / "metadata.json", metadata_json))
+        {
+            LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Skipping {}: missing metadata.json", key);
+            continue;
+        }
+
+        const auto metadata = ExportReplicatedMergeTreePartitionManifest::fromJsonString(metadata_json);
+
+        const auto local_entry = entries_by_key.find(key);
+
+        /// If the zk entry has been replaced with export_merge_tree_partition_force_export, checking only for the export key is not enough
+        /// we need to make sure it is the same transaction id. If it is not, it needs to be replaced.
+        bool has_local_entry_and_is_up_to_date = local_entry != entries_by_key.end()
+            && local_entry->manifest.transaction_id == metadata.transaction_id;
+
+        /// If the entry is up to date and we don't have the cleanup lock, early exit, nothing to be done.
+        if (!cleanup_lock && has_local_entry_and_is_up_to_date)
+            continue;
+
+        std::weak_ptr<ExportPartitionManifestUpdatingTask> weak_manifest_updater = storage.export_merge_tree_partition_manifest_updater;
+
+        auto status_watch_callback = std::make_shared<Coordination::WatchCallback>([weak_manifest_updater, key](const Coordination::WatchResponse &)
+        {
+            /// If the table is dropped but the watch is not removed, we need to prevent use after free
+            /// below code assumes that if manifest updater is still alive, the status handling task is also alive
+            if (auto manifest_updater = weak_manifest_updater.lock())
+            {
+                manifest_updater->addStatusChange(key);
+                manifest_updater->storage.export_merge_tree_partition_status_handling_task->schedule();
+            }
+        });
+
+        std::string status;
+        if (!zk->tryGetWatch(fs::path(entry_path) / "status", status, nullptr, status_watch_callback))
+        {
+            LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Skipping {}: missing status", key);
+            continue;
+        }
+
+        bool is_pending = status == "PENDING";
+
+        /// if we have the cleanup lock, try to cleanup
+        /// if we successfully cleaned it up, early exit
+        if (cleanup_lock)
+        {
+            bool cleanup_successful = tryCleanup(
+                zk,
+                entry_path,
+                storage.log.load(),
+                storage.getContext(),
+                key,
+                metadata,
+                now,
+                is_pending, entries_by_key);
+
+            if (cleanup_successful)
+                continue;
+        }
+
+        if (!is_pending)
+        {
+            LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Skipping {}: status is not PENDING", key);
+            continue;
+        }
+
+        if (has_local_entry_and_is_up_to_date)
+        {
+            LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Skipping {}: already exists", key);
+            continue;
+        }
+
+        addTask(metadata, key, entries_by_key);
+    }
+
+    /// Remove entries that were deleted by someone else
+    removeStaleEntries(zk_children, entries_by_key);
+
+    LOG_INFO(storage.log, "ExportPartition Manifest Updating task: finished polling for new entries. Number of entries: {}", entries_by_key.size());
+
+    storage.export_merge_tree_partition_select_task->schedule();
+}
+
+void ExportPartitionManifestUpdatingTask::addTask(
+    const ExportReplicatedMergeTreePartitionManifest & metadata,
+    const std::string & key,
+    auto & entries_by_key
+)
+{
+    std::vector<DataPartPtr> part_references;
+
+    for (const auto & part_name : metadata.parts)
+    {
+        if (const auto part = storage.getPartIfExists(part_name, {MergeTreeDataPartState::Active, MergeTreeDataPartState::Outdated}))
+        {
+            part_references.push_back(part);
+        }
+    }
+
+    /// Insert or update entry. The multi_index container automatically maintains both indexes.
+    auto entry = ExportReplicatedMergeTreePartitionTaskEntry {metadata, ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING, std::move(part_references)};
+    auto it = entries_by_key.find(key);
+    if (it != entries_by_key.end())
+        entries_by_key.replace(it, entry);
+    else
+        entries_by_key.insert(entry);
+}
+
+void ExportPartitionManifestUpdatingTask::removeStaleEntries(
+    const std::unordered_set<std::string> & zk_children,
+    auto & entries_by_key
+)
+{
+    for (auto it = entries_by_key.begin(); it != entries_by_key.end();)
+    {
+        const auto & key = it->getCompositeKey();
+        if (zk_children.contains(key))
+        {
+            ++it;
+            continue;
+        }
+
+        const auto & transaction_id = it->manifest.transaction_id;
+        LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Export task {} was deleted, calling killExportPartition for transaction {}", key, transaction_id);
+        
+        try
+        {
+            storage.killExportPart(transaction_id);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(storage.log, __PRETTY_FUNCTION__);
+        }
+
+        it = entries_by_key.erase(it);
+    }
+}
+
+void ExportPartitionManifestUpdatingTask::addStatusChange(const std::string & key)
+{
+    std::lock_guard lock(status_changes_mutex);
+    status_changes.emplace(key);
+}
+
+void ExportPartitionManifestUpdatingTask::handleStatusChanges()
+{
+    std::lock_guard lock(status_changes_mutex);
+    std::lock_guard task_entries_lock(storage.export_merge_tree_partition_mutex);
+    auto zk = storage.getZooKeeper();
+
+    LOG_INFO(storage.log, "ExportPartition Manifest Updating task: handling status changes. Number of status changes: {}", status_changes.size());
+
+    while (!status_changes.empty())
+    {
+        LOG_INFO(storage.log, "ExportPartition Manifest Updating task: handling status change for task {}", status_changes.front());
+        const auto key = status_changes.front();
+        status_changes.pop();
+
+        auto it = storage.export_merge_tree_partition_task_entries_by_key.find(key);
+        if (it == storage.export_merge_tree_partition_task_entries_by_key.end())
+            continue;
+
+        /// get new status from zk
+        std::string new_status_string;
+        if (!zk->tryGet(fs::path(storage.zookeeper_path) / "exports" / key / "status", new_status_string))
+        {
+            LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Failed to get new status for task {}, skipping", key);
+            continue;
+        }
+
+        const auto new_status = magic_enum::enum_cast<ExportReplicatedMergeTreePartitionTaskEntry::Status>(new_status_string);
+        if (!new_status)
+        {
+            LOG_INFO(storage.log, "ExportPartition Manifest Updating Task: Invalid status {} for task {}, skipping", new_status_string, key);
+            continue;
+        }
+
+        LOG_INFO(storage.log, "ExportPartition Manifest Updating task: status changed for task {}. New status: {}", key, magic_enum::enum_name(*new_status).data());
+
+        /// If status changed to KILLED, cancel local export operations
+        if (*new_status == ExportReplicatedMergeTreePartitionTaskEntry::Status::KILLED)
+        {
+            try
+            {
+                storage.killExportPart(it->manifest.transaction_id);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(storage.log, __PRETTY_FUNCTION__);
+            }
+        }
+
+        it->status = *new_status;
+    }
+}
+
+}
diff --git a/src/Storages/MergeTree/ExportPartitionManifestUpdatingTask.h b/src/Storages/MergeTree/ExportPartitionManifestUpdatingTask.h
new file mode 100644
index 000000000000..ea52f679d654
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartitionManifestUpdatingTask.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <mutex>
+#include <queue>
+#include <string>
+#include <unordered_set>
+namespace DB
+{
+
+class StorageReplicatedMergeTree;
+struct ExportReplicatedMergeTreePartitionManifest;
+
+class ExportPartitionManifestUpdatingTask
+{
+public:
+    ExportPartitionManifestUpdatingTask(StorageReplicatedMergeTree & storage);
+
+    void poll();
+
+    void handleStatusChanges();
+
+    void addStatusChange(const std::string & key);
+
+private:
+    StorageReplicatedMergeTree & storage;
+
+    void addTask(
+        const ExportReplicatedMergeTreePartitionManifest & metadata,
+        const std::string & key,
+        auto & entries_by_key
+    );
+
+    void removeStaleEntries(
+        const std::unordered_set<std::string> & zk_children,
+        auto & entries_by_key
+    );
+
+    std::mutex status_changes_mutex;
+    std::queue<std::string> status_changes;
+};
+
+}
diff --git a/src/Storages/MergeTree/ExportPartitionTaskScheduler.cpp b/src/Storages/MergeTree/ExportPartitionTaskScheduler.cpp
new file mode 100644
index 000000000000..925d7eafe412
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartitionTaskScheduler.cpp
@@ -0,0 +1,402 @@
+#include <Storages/MergeTree/ExportPartitionTaskScheduler.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Common/Exception.h>
+#include <Common/ZooKeeper/Types.h>
+#include "Storages/MergeTree/ExportPartitionUtils.h"
+#include "Storages/MergeTree/MergeTreePartExportManifest.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int QUERY_WAS_CANCELLED;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    ContextPtr getContextCopyWithTaskSettings(const ContextPtr & context, const ExportReplicatedMergeTreePartitionManifest & manifest)
+    {
+        auto context_copy = Context::createCopy(context);
+        context_copy->makeQueryContextForExportPart();
+        context_copy->setCurrentQueryId(manifest.query_id);
+        context_copy->setSetting("output_format_parallel_formatting", manifest.parallel_formatting);
+        context_copy->setSetting("output_format_parquet_parallel_encoding", manifest.parquet_parallel_encoding);
+        context_copy->setSetting("max_threads", manifest.max_threads);
+        context_copy->setSetting("export_merge_tree_part_file_already_exists_policy", String(magic_enum::enum_name(manifest.file_already_exists_policy)));
+        context_copy->setSetting("export_merge_tree_part_max_bytes_per_file", manifest.max_bytes_per_file);
+        context_copy->setSetting("export_merge_tree_part_max_rows_per_file", manifest.max_rows_per_file);
+
+        /// always skip pending mutations and patch parts because we already validated the parts during query processing
+        context_copy->setSetting("export_merge_tree_part_throw_on_pending_mutations", false);
+        context_copy->setSetting("export_merge_tree_part_throw_on_pending_patch_parts", false);
+
+        return context_copy;
+    }
+}
+
+ExportPartitionTaskScheduler::ExportPartitionTaskScheduler(StorageReplicatedMergeTree & storage_)
+    : storage(storage_)
+{
+}
+
+void ExportPartitionTaskScheduler::run()
+{
+    std::lock_guard lock(storage.export_merge_tree_partition_mutex);
+
+    auto zk = storage.getZooKeeper();
+
+    // Iterate sorted by create_time
+    for (auto & entry : storage.export_merge_tree_partition_task_entries_by_create_time)
+    {
+        const auto & manifest = entry.manifest;
+        const auto key = entry.getCompositeKey();
+        const auto database = storage.getContext()->resolveDatabase(manifest.destination_database);
+        const auto & table = manifest.destination_table;
+
+        /// No need to query zk for status if the local one is not PENDING
+        if (entry.status != ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING)
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Skipping... Local status is {}", magic_enum::enum_name(entry.status).data());
+            continue;
+        }
+
+        const auto destination_storage_id = StorageID(QualifiedTableName {database, table});
+
+        const auto destination_storage = DatabaseCatalog::instance().tryGetTable(destination_storage_id, storage.getContext());
+
+        if (!destination_storage)
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to reconstruct destination storage: {}, skipping", destination_storage_id.getNameForLogs());
+            continue;
+        }
+
+        std::string status_in_zk_string;
+        if (!zk->tryGet(fs::path(storage.zookeeper_path) / "exports" / key / "status", status_in_zk_string))
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to get status, skipping");
+            continue;
+        }
+
+        const auto status_in_zk = magic_enum::enum_cast<ExportReplicatedMergeTreePartitionTaskEntry::Status>(status_in_zk_string);
+
+        if (!status_in_zk)
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to get status from zk, skipping");
+            continue;
+        }
+
+        if (status_in_zk.value() != ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING)
+        {
+            entry.status = status_in_zk.value();
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Skipping... Status from zk is {}", entry.status);
+            continue;
+        }
+
+        std::vector<std::string> parts_in_processing_or_pending;
+        
+        if (Coordination::Error::ZOK != zk->tryGetChildren(fs::path(storage.zookeeper_path) / "exports" / key / "processing", parts_in_processing_or_pending))
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to get parts in processing or pending, skipping");
+            continue;
+        }
+
+        if (parts_in_processing_or_pending.empty())
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: No parts in processing or pending, skipping");
+            continue;
+        }
+
+        std::vector<std::string> locked_parts;
+
+        if (Coordination::Error::ZOK != zk->tryGetChildren(fs::path(storage.zookeeper_path) / "exports" / key / "locks", locked_parts))
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to get locked parts, skipping");
+            continue;
+        }
+
+        std::unordered_set<std::string> locked_parts_set(locked_parts.begin(), locked_parts.end());
+
+        for (const auto & zk_part_name : parts_in_processing_or_pending)
+        {
+            if (locked_parts_set.contains(zk_part_name))
+            {
+                LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} is locked, skipping", zk_part_name);
+                continue;
+            }
+
+            const auto part = storage.getPartIfExists(zk_part_name, {MergeTreeDataPartState::Active, MergeTreeDataPartState::Outdated});
+            if (!part)
+            {
+                LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} not found locally, skipping", zk_part_name);
+                continue;
+            }
+
+            if (Coordination::Error::ZOK != zk->tryCreate(fs::path(storage.zookeeper_path) / "exports" / key / "locks" / zk_part_name, storage.replica_name, zkutil::CreateMode::Ephemeral))
+            {
+                LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to lock part {}, skipping", zk_part_name);
+                continue;
+            }
+
+            try
+            {
+                storage.exportPartToTable(
+                    part->name,
+                    destination_storage_id,
+                    manifest.transaction_id,
+                    getContextCopyWithTaskSettings(storage.getContext(), manifest),
+                    /*allow_outdated_parts*/ true,
+                    [this, key, zk_part_name, manifest, destination_storage]
+                    (MergeTreePartExportManifest::CompletionCallbackResult result)
+                    {
+                        handlePartExportCompletion(key, zk_part_name, manifest, destination_storage, result);
+                    });
+            }
+            catch (const Exception &)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+                zk->tryRemove(fs::path(storage.zookeeper_path) / "exports" / key / "locks" / zk_part_name);
+                /// we should not increment retry_count because the node might just be full
+            }
+        }
+    }
+
+    /// maybe we failed to schedule or failed to export, need to retry eventually
+    storage.export_merge_tree_partition_select_task->scheduleAfter(1000 * 5);
+}
+
+void ExportPartitionTaskScheduler::handlePartExportCompletion(
+    const std::string & export_key,
+    const std::string & part_name,
+    const ExportReplicatedMergeTreePartitionManifest & manifest,
+    const StoragePtr & destination_storage,
+    const MergeTreePartExportManifest::CompletionCallbackResult & result)
+{
+    const auto export_path = fs::path(storage.zookeeper_path) / "exports" / export_key;
+    const auto processing_parts_path = export_path / "processing";
+    const auto processed_part_path = export_path / "processed" / part_name;
+    const auto zk = storage.getZooKeeper();
+
+    if (result.success)
+    {
+        handlePartExportSuccess(manifest, destination_storage, processing_parts_path, processed_part_path, part_name, export_path, zk, result.relative_paths_in_destination_storage);
+    }
+    else
+    {
+        handlePartExportFailure(processing_parts_path, part_name, export_path, zk, result.exception, manifest.max_retries);
+    }
+}
+
+void ExportPartitionTaskScheduler::handlePartExportSuccess(
+    const ExportReplicatedMergeTreePartitionManifest & manifest,
+    const StoragePtr & destination_storage,
+    const std::filesystem::path & processing_parts_path,
+    const std::filesystem::path & processed_part_path,
+    const std::string & part_name,
+    const std::filesystem::path & export_path,
+    const zkutil::ZooKeeperPtr & zk,
+    const std::vector<String> & relative_paths_in_destination_storage
+)
+{
+    LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} exported successfully, paths size: {}", part_name, relative_paths_in_destination_storage.size());
+
+    for (const auto & relative_path_in_destination_storage : relative_paths_in_destination_storage)
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: {}", relative_path_in_destination_storage);
+    }
+
+    if (!tryToMovePartToProcessed(export_path, processing_parts_path, processed_part_path, part_name, relative_paths_in_destination_storage, zk))
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to move part to processed, will not commit export partition");
+        return;
+    }
+
+    LOG_INFO(storage.log, "ExportPartition scheduler task: Marked part export {} as completed", part_name);
+
+    if (!areAllPartsProcessed(export_path, zk))
+    {
+        return;
+    }
+
+    LOG_INFO(storage.log, "ExportPartition scheduler task: All parts are processed, will try to commit export partition");
+
+    ExportPartitionUtils::commit(manifest, destination_storage, zk, storage.log.load(), export_path, storage.getContext());
+}
+
+void ExportPartitionTaskScheduler::handlePartExportFailure(
+    const std::filesystem::path & processing_parts_path,
+    const std::string & part_name,
+    const std::filesystem::path & export_path,
+    const zkutil::ZooKeeperPtr & zk,
+    const std::optional<Exception> & exception,
+    size_t max_retries
+)
+{
+    if (!exception)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "ExportPartition scheduler task: No exception provided for error handling. Sounds like a bug");
+    }
+
+    /// Early exit if the query was cancelled - no need to increment error counts
+    if (exception->code() == ErrorCodes::QUERY_WAS_CANCELLED)
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} export was cancelled, skipping error handling", part_name);
+        return;
+    }
+
+    Coordination::Stat locked_by_stat;
+    std::string locked_by;
+
+    if (!zk->tryGet(export_path / "locks" / part_name, locked_by, &locked_by_stat))
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} is not locked by any replica, will not increment error counts", part_name);
+        return;
+    }
+
+    if (locked_by != storage.replica_name)
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} is locked by another replica, will not increment error counts", part_name);
+        return;
+    }
+
+    Coordination::Requests ops;
+
+    const auto processing_part_path = processing_parts_path / part_name;
+
+    std::string processing_part_string;
+
+    if (!zk->tryGet(processing_part_path, processing_part_string))
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to get processing part, will not increment error counts");
+        return;
+    }
+
+    /// todo arthur could this have been cached?
+    auto processing_part_entry = ExportReplicatedMergeTreePartitionProcessingPartEntry::fromJsonString(processing_part_string);
+
+    processing_part_entry.retry_count++;
+
+    if (processing_part_entry.retry_count)
+    {
+        ops.emplace_back(zkutil::makeRemoveRequest(export_path / "locks" / part_name, locked_by_stat.version));
+        ops.emplace_back(zkutil::makeSetRequest(processing_part_path, processing_part_entry.toJsonString(), -1));
+
+        if (processing_part_entry.retry_count >= max_retries)
+        {
+            /// just set status in processing_part_path and finished_by
+            processing_part_entry.status = ExportReplicatedMergeTreePartitionProcessingPartEntry::Status::FAILED;
+            processing_part_entry.finished_by = storage.replica_name;
+
+            ops.emplace_back(zkutil::makeSetRequest(export_path / "status", String(magic_enum::enum_name(ExportReplicatedMergeTreePartitionTaskEntry::Status::FAILED)).data(), -1));
+            LOG_INFO(storage.log, "ExportPartition scheduler task: Retry count limit exceeded for part {}, will try to fail the entire task", part_name);
+        }
+
+        std::size_t num_exceptions = 0;
+    
+        const auto exceptions_per_replica_path = export_path / "exceptions_per_replica" / storage.replica_name;
+        const auto count_path = exceptions_per_replica_path / "count";
+        const auto last_exception_path = exceptions_per_replica_path / "last_exception";
+
+        if (zk->exists(exceptions_per_replica_path))
+        {
+            std::string num_exceptions_string;
+            zk->tryGet(count_path, num_exceptions_string);
+            num_exceptions = std::stoull(num_exceptions_string.c_str());
+
+            ops.emplace_back(zkutil::makeSetRequest(last_exception_path / "part", part_name, -1));
+            ops.emplace_back(zkutil::makeSetRequest(last_exception_path / "exception", exception->message(), -1));
+        }
+        else
+        {
+            ops.emplace_back(zkutil::makeCreateRequest(exceptions_per_replica_path, "", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(count_path, "0", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(last_exception_path, "", zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(last_exception_path / "part", part_name, zkutil::CreateMode::Persistent));
+            ops.emplace_back(zkutil::makeCreateRequest(last_exception_path / "exception", exception->message(), zkutil::CreateMode::Persistent));
+        }
+
+        num_exceptions++;
+        ops.emplace_back(zkutil::makeSetRequest(count_path, std::to_string(num_exceptions), -1));
+
+        Coordination::Responses responses;
+        if (Coordination::Error::ZOK != zk->tryMulti(ops, responses))
+        {
+            LOG_INFO(storage.log, "ExportPartition scheduler task: All failure mechanism failed, will not try to update it");
+            return;
+        }
+    }
+}
+
+bool ExportPartitionTaskScheduler::tryToMovePartToProcessed(
+    const std::filesystem::path & export_path,
+    const std::filesystem::path & processing_parts_path,
+    const std::filesystem::path & processed_part_path,
+    const std::string & part_name,
+    const std::vector<String> & relative_paths_in_destination_storage,
+    const zkutil::ZooKeeperPtr & zk
+)
+{
+    Coordination::Stat locked_by_stat;
+    std::string locked_by;
+
+    if (!zk->tryGet(export_path / "locks" / part_name, locked_by, &locked_by_stat))
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} is not locked by any replica, will not commit or set it as completed", part_name);
+        return false;
+    }
+
+    /// Is this a good idea? what if the file we just pushed to s3 ends up triggering an exception in the replica that actually locks the part and it does not commit?
+    /// I guess we should not throw if file already exists for export partition, hard coded.
+    if (locked_by != storage.replica_name)
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Part {} is locked by another replica, will not commit or set it as completed", part_name);
+        return false;
+    }
+
+    Coordination::Requests requests;
+
+    ExportReplicatedMergeTreePartitionProcessedPartEntry processed_part_entry;
+    processed_part_entry.part_name = part_name;
+    processed_part_entry.paths_in_destination = relative_paths_in_destination_storage;
+    processed_part_entry.finished_by = storage.replica_name;
+
+    requests.emplace_back(zkutil::makeRemoveRequest(processing_parts_path / part_name, -1));
+    requests.emplace_back(zkutil::makeCreateRequest(processed_part_path, processed_part_entry.toJsonString(), zkutil::CreateMode::Persistent));
+    requests.emplace_back(zkutil::makeRemoveRequest(export_path / "locks" / part_name, locked_by_stat.version));
+
+    Coordination::Responses responses;
+    if (Coordination::Error::ZOK != zk->tryMulti(requests, responses))
+    {
+        /// todo  arthur remember what to do here
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to update export path, skipping");
+        return false;
+    }
+
+    return true;
+}
+
+bool ExportPartitionTaskScheduler::areAllPartsProcessed(
+    const std::filesystem::path & export_path,
+    const zkutil::ZooKeeperPtr & zk)
+{
+    Strings parts_in_processing_or_pending;
+    if (Coordination::Error::ZOK != zk->tryGetChildren(export_path / "processing", parts_in_processing_or_pending))
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: Failed to get parts in processing or pending, will not try to commit export partition");
+        return false;
+    }
+
+    if (!parts_in_processing_or_pending.empty())
+    {
+        LOG_INFO(storage.log, "ExportPartition scheduler task: There are still parts in processing or pending, will not try to commit export partition");
+        return false;
+    }
+
+    return true;
+}
+
+}
diff --git a/src/Storages/MergeTree/ExportPartitionTaskScheduler.h b/src/Storages/MergeTree/ExportPartitionTaskScheduler.h
new file mode 100644
index 000000000000..29a41fde1cb9
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartitionTaskScheduler.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <Storages/MergeTree/MergeTreePartExportManifest.h>
+#include <filesystem>
+
+namespace DB
+{
+
+class Exception;
+class StorageReplicatedMergeTree;
+
+struct ExportReplicatedMergeTreePartitionManifest;
+
+/// todo arthur remember to add check(lock, version) when updating stuff because maybe if we believe we have the lock, we might not actually have it
+class ExportPartitionTaskScheduler
+{
+public:
+    ExportPartitionTaskScheduler(StorageReplicatedMergeTree & storage);
+
+    void run();
+private:
+    StorageReplicatedMergeTree & storage;
+
+    /// todo  arthur maybe it is invalid to grab the manifst here
+    void handlePartExportCompletion(
+        const std::string & export_key,
+        const std::string & part_name,
+        const ExportReplicatedMergeTreePartitionManifest & manifest,
+        const StoragePtr & destination_storage,
+        const MergeTreePartExportManifest::CompletionCallbackResult & result);
+
+    void handlePartExportSuccess(
+        const ExportReplicatedMergeTreePartitionManifest & manifest,
+        const StoragePtr & destination_storage,
+        const std::filesystem::path & processing_parts_path,
+        const std::filesystem::path & processed_part_path,
+        const std::string & part_name,
+        const std::filesystem::path & export_path,
+        const zkutil::ZooKeeperPtr & zk,
+        const std::vector<String> & relative_paths_in_destination_storage
+    );
+
+    void handlePartExportFailure(
+        const std::filesystem::path & processing_parts_path,
+        const std::string & part_name,
+        const std::filesystem::path & export_path,
+        const zkutil::ZooKeeperPtr & zk,
+        const std::optional<Exception> & exception,
+        size_t max_retries);
+
+    bool tryToMovePartToProcessed(
+        const std::filesystem::path & export_path,
+        const std::filesystem::path & processing_parts_path,
+        const std::filesystem::path & processed_part_path,
+        const std::string & part_name,
+        const std::vector<String> & relative_paths_in_destination_storage,
+        const zkutil::ZooKeeperPtr & zk
+    );
+
+    bool areAllPartsProcessed(
+        const std::filesystem::path & export_path,
+        const zkutil::ZooKeeperPtr & zk
+    );
+};
+
+}
diff --git a/src/Storages/MergeTree/ExportPartitionUtils.cpp b/src/Storages/MergeTree/ExportPartitionUtils.cpp
new file mode 100644
index 000000000000..51ed72b7f6f6
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartitionUtils.cpp
@@ -0,0 +1,104 @@
+#include <Storages/MergeTree/ExportPartitionUtils.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/logger_useful.h>
+#include "Storages/ExportReplicatedMergeTreePartitionManifest.h"
+#include "Storages/ExportReplicatedMergeTreePartitionTaskEntry.h"
+#include <filesystem>
+
+namespace DB
+{
+
+namespace fs = std::filesystem;
+
+namespace ExportPartitionUtils
+{
+    /// Collect all the exported paths from the processed parts
+    /// If multiRead is supported by the keeper implementation, it is done in a single request
+    /// Otherwise, multiple async requests are sent
+    std::vector<std::string> getExportedPaths(const LoggerPtr & log, const zkutil::ZooKeeperPtr & zk, const std::string & export_path)
+    {
+        std::vector<std::string> exported_paths;
+
+        LOG_INFO(log, "ExportPartition: Getting exported paths for {}", export_path);
+
+        const auto processed_parts_path = fs::path(export_path) / "processed";
+
+        std::vector<std::string> processed_parts;
+        if (Coordination::Error::ZOK != zk->tryGetChildren(processed_parts_path, processed_parts))
+        {
+            /// todo arthur do something here
+            LOG_INFO(log, "ExportPartition: Failed to get parts children, exiting");
+            return {};
+        }
+
+        std::vector<std::string> get_paths;
+
+        for (const auto & processed_part : processed_parts)
+        {
+            get_paths.emplace_back(processed_parts_path / processed_part);
+        }
+
+        auto responses = zk->tryGet(get_paths);
+
+        responses.waitForResponses();
+
+        for (size_t i = 0; i < responses.size(); ++i)
+        {
+            if (responses[i].error != Coordination::Error::ZOK)
+            {
+                /// todo arthur what to do in this case?
+                /// It could be that zk is corrupt, in that case we should fail the task
+                /// but it can also be some temporary network issue? not sure
+                LOG_INFO(log, "ExportPartition: Failed to get exported path, exiting");
+                return {};
+            }
+
+            const auto processed_part_entry = ExportReplicatedMergeTreePartitionProcessedPartEntry::fromJsonString(responses[i].data);
+
+            for (const auto & path_in_destination : processed_part_entry.paths_in_destination)
+            {
+                exported_paths.emplace_back(path_in_destination);
+            }
+        }
+
+        return exported_paths;
+    }
+
+    void commit(
+        const ExportReplicatedMergeTreePartitionManifest & manifest,
+        const StoragePtr & destination_storage,
+        const zkutil::ZooKeeperPtr & zk,
+        const LoggerPtr & log,
+        const std::string & entry_path,
+        const ContextPtr & context)
+    {
+        const auto exported_paths = ExportPartitionUtils::getExportedPaths(log, zk, entry_path);
+
+        if (exported_paths.empty())
+        {
+            LOG_WARNING(log, "ExportPartition: No exported paths found, will not commit export. This might be a bug");
+            return;
+        }
+
+        //// not checking for an exact match because a single part might generate multiple files
+        if (exported_paths.size() < manifest.parts.size())
+        {
+            LOG_WARNING(log, "ExportPartition: Reached the commit phase, but exported paths size is less than the number of parts, will not commit export. This might be a bug");
+            return;
+        }
+
+        destination_storage->commitExportPartitionTransaction(manifest.transaction_id, manifest.partition_id, exported_paths, context);
+
+        LOG_INFO(log, "ExportPartition: Committed export, mark as completed");
+        if (Coordination::Error::ZOK == zk->trySet(fs::path(entry_path) / "status", String(magic_enum::enum_name(ExportReplicatedMergeTreePartitionTaskEntry::Status::COMPLETED)).data(), -1))
+        {
+            LOG_INFO(log, "ExportPartition: Marked export as completed");
+        }
+        else
+        {
+            LOG_INFO(log, "ExportPartition: Failed to mark export as completed, will not try to fix it");
+        }
+    }
+}
+
+}
diff --git a/src/Storages/MergeTree/ExportPartitionUtils.h b/src/Storages/MergeTree/ExportPartitionUtils.h
new file mode 100644
index 000000000000..40fe04a5bfd3
--- /dev/null
+++ b/src/Storages/MergeTree/ExportPartitionUtils.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <Common/Logger.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include "Storages/IStorage.h"
+
+namespace DB
+{
+
+struct ExportReplicatedMergeTreePartitionManifest;
+
+namespace ExportPartitionUtils
+{
+    std::vector<std::string> getExportedPaths(const LoggerPtr & log, const zkutil::ZooKeeperPtr & zk, const std::string & export_path);
+
+    void commit(
+        const ExportReplicatedMergeTreePartitionManifest & manifest,
+        const StoragePtr & destination_storage,
+        const zkutil::ZooKeeperPtr & zk,
+        const LoggerPtr & log,
+        const std::string & entry_path,
+        const ContextPtr & context
+    );
+}
+
+}
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 1052674c8151..63d2d0177fb6 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -10,6 +10,7 @@
 #include <Compression/getCompressionCodecForFile.h>
 #include <Core/Defines.h>
 #include <Core/NamesAndTypes.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/NestedUtils.h>
 #include <IO/HashingWriteBuffer.h>
@@ -89,6 +90,11 @@ namespace MergeTreeSetting
     extern const MergeTreeSettingsBool columns_and_secondary_indices_sizes_lazy_calculation;
 }
 
+namespace Setting
+{
+    extern const SettingsBool merge_tree_use_prefixes_deserialization_thread_pool;
+}
+
 namespace ErrorCodes
 {
     extern const int CANNOT_READ_ALL_DATA;
@@ -279,6 +285,42 @@ String IMergeTreeDataPart::MinMaxIndex::getFileColumnName(const String & column_
     return stream_name;
 }
 
+Block IMergeTreeDataPart::MinMaxIndex::getBlock(const MergeTreeData & data) const
+{
+    if (!initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to get block from uninitialized MinMax index.");
+
+    Block block;
+
+    const auto metadata_snapshot = data.getInMemoryMetadataPtr();
+    const auto & partition_key = metadata_snapshot->getPartitionKey();
+
+    const auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
+    const auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
+    const auto minmax_idx_size = minmax_column_types.size();
+
+    for (size_t i = 0; i < minmax_idx_size; ++i)
+    {
+        const auto & data_type = minmax_column_types[i];
+        const auto & column_name = minmax_column_names[i];
+
+        const auto column = data_type->createColumn();
+
+        auto range = hyperrectangle.at(i);
+        range.shrinkToIncludedIfPossible();
+
+        const auto & min_val = range.left;
+        const auto & max_val = range.right;
+
+        column->insert(min_val);
+        column->insert(max_val);
+
+        block.insert(ColumnWithTypeAndName(column->getPtr(), data_type, column_name));
+    }
+
+    return block;
+}
+
 void IMergeTreeDataPart::incrementStateMetric(MergeTreeDataPartState state_) const
 {
     switch (state_)
@@ -558,14 +600,16 @@ void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns, const
     serialization_infos = new_infos;
     metadata_version = new_metadata_version;
 
+    serializations.clear();
     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)
@@ -576,7 +620,9 @@ void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns, const
         IDataType::forEachSubcolumn([&](const auto &, const auto & subname, const auto & subdata)
         {
             auto full_name = Nested::concatenateName(column.name, subname);
-            serializations.emplace(full_name, subdata.serialization);
+            /// Don't override the column serialization with subcolumn serialization if column with the same name exists.
+            if (!column_name_to_position.contains(full_name))
+                serializations.emplace(full_name, subdata.serialization);
         }, ISerialization::SubstreamData(serialization));
     }
 
@@ -2654,7 +2700,8 @@ ColumnPtr IMergeTreeDataPart::getColumnSample(const NameAndTypePair & column) co
     settings.can_read_part_without_marks = true;
     /// Use prefixes deserialization thread pool to read prefixes faster.
     /// In JSON type there might be hundreds of small files that needs to be read.
-    settings.use_prefixes_deserialization_thread_pool = true;
+    /// Set this to value from storage settings rather than true by default as this could cause starvation on huge JSON.
+    settings.use_prefixes_deserialization_thread_pool = storage.getContext()->getSettingsRef()[Setting::merge_tree_use_prefixes_deserialization_thread_pool];
 
     auto alter_conversions = std::make_shared<AlterConversions>();
     auto part_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this(), alter_conversions);
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index dfb086929172..14286d751704 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -362,6 +362,8 @@ class IMergeTreeDataPart : public std::enable_shared_from_this<IMergeTreeDataPar
         static String getFileColumnName(const String & column_name, const MergeTreeSettingsPtr & storage_settings_);
         /// For Load
         static String getFileColumnName(const String & column_name, const Checksums & checksums_);
+
+        Block getBlock(const MergeTreeData & data) const;
     };
 
     using MinMaxIndexPtr = std::shared_ptr<MinMaxIndex>;
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
index eb904a8e2ef7..bc71cfe2f79d 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
@@ -38,11 +38,10 @@ IMergedBlockOutputStream::IMergedBlockOutputStream(
 NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
     const MergeTreeDataPartPtr & data_part,
     NamesAndTypesList & columns,
+    const NameSet & empty_columns,
     SerializationInfoByName & serialization_infos,
     MergeTreeData::DataPart::Checksums & checksums)
 {
-    const NameSet & empty_columns = data_part->expired_columns;
-
     /// For compact part we have to override whole file with data, it's not
     /// worth it
     if (empty_columns.empty() || isCompactPart(data_part))
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.h b/src/Storages/MergeTree/IMergedBlockOutputStream.h
index efc5784dd43c..7a9d23e627f0 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.h
@@ -46,11 +46,12 @@ class IMergedBlockOutputStream
     }
 
 protected:
-    /// Remove all columns marked expired in data_part. Also, clears checksums
+    /// Remove all columns in @empty_columns. Also, clears checksums
     /// and columns array. Return set of removed files names.
     NameSet removeEmptyColumnsFromPart(
         const MergeTreeDataPartPtr & data_part,
         NamesAndTypesList & columns,
+        const NameSet & empty_columns,
         SerializationInfoByName & serialization_infos,
         MergeTreeData::DataPart::Checksums & checksums);
 
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 4e822452ed12..a1282c4b2ab7 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -53,6 +53,7 @@ namespace Setting
 {
     extern const SettingsBool analyze_index_with_space_filling_curves;
     extern const SettingsDateTimeOverflowBehavior date_time_overflow_behavior;
+    extern const SettingsTimezone session_timezone;
 }
 
 namespace ErrorCodes
@@ -720,11 +721,19 @@ static const ActionsDAG::Node & cloneDAGWithInversionPushDown(
             {
                 /// Remove "materialize" from index analysis.
                 res = &cloneDAGWithInversionPushDown(*node.children.front(), inverted_dag, inputs_mapping, context, need_inversion);
+
+                /// `need_inversion` was already pushed into the child; avoid adding an extra `not()` wrapper
+                /// Without this, we could add an extra `not()` here (double inversion), e.g. `NOT materialize(x = 0)` -> `not(notEquals(x, 0))`.
+                handled_inversion = true;
             }
             else if (isTrivialCast(node))
             {
                 /// Remove trivial cast and keep its first argument.
                 res = &cloneDAGWithInversionPushDown(*node.children.front(), inverted_dag, inputs_mapping, context, need_inversion);
+
+                /// `need_inversion` was already pushed into the child; avoid adding an extra `not()` wrapper
+                /// Without this, we could add an extra `not()` here (double inversion), e.g. `NOT CAST(x = 0, 'UInt8')` -> `not(notEquals(x, 0))`.
+                handled_inversion = true;
             }
             else if (need_inversion && (name == "and" || name == "or"))
             {
@@ -1093,7 +1102,7 @@ bool applyFunctionChainToColumn(
     }
 
     // And cast it to the argument type of the first function in the chain
-    auto in_argument_type = getArgumentTypeOfMonotonicFunction(*functions[0]);
+    auto in_argument_type = removeLowCardinality(getArgumentTypeOfMonotonicFunction(*functions[0]));
     if (canBeSafelyCast(result_type, in_argument_type))
     {
         result_column = castColumnAccurate({result_column, result_type, ""}, in_argument_type);
@@ -1122,13 +1131,15 @@ bool applyFunctionChainToColumn(
         if (func->getArgumentTypes().empty())
             return false;
 
-        auto argument_type = getArgumentTypeOfMonotonicFunction(*func);
+        auto argument_type = removeLowCardinality(getArgumentTypeOfMonotonicFunction(*func));
         if (!canBeSafelyCast(result_type, argument_type))
             return false;
 
         result_column = castColumnAccurate({result_column, result_type, ""}, argument_type);
-        result_column = func->execute({{result_column, argument_type, ""}}, func->getResultType(), result_column->size(), /* dry_run = */ false);
-        result_type = func->getResultType();
+        auto func_result_type = func->getResultType();
+        result_column = func->execute({{result_column, argument_type, ""}}, func_result_type, result_column->size(), /* dry_run = */ false);
+        result_column = result_column->convertToFullColumnIfLowCardinality();
+        result_type = removeLowCardinality(func_result_type);
 
         // Transforming nullable columns to the nested ones, in case no nulls found
         if (result_column->isNullable())
@@ -1141,7 +1152,7 @@ bool applyFunctionChainToColumn(
                     return false;
             }
             result_column = result_column_nullable.getNestedColumnPtr();
-            result_type = removeNullable(func->getResultType());
+            result_type = removeNullable(result_type);
         }
     }
     out_column = result_column;
@@ -1903,48 +1914,57 @@ bool KeyCondition::extractMonotonicFunctionsChainFromKey(
                     auto func_name = func->function_base->getName();
                     auto func_base = func->function_base;
 
-                    ColumnsWithTypeAndName arguments;
                     ColumnWithTypeAndName const_arg;
                     FunctionWithOptionalConstArg::Kind kind = FunctionWithOptionalConstArg::Kind::NO_CONST;
 
                     if (date_time_parsing_functions.contains(func_name))
                     {
-                        const auto & arg_types = func_base->getArgumentTypes();
-                        if (!arg_types.empty() && isStringOrFixedString(arg_types[0]))
-                            func_name = func_name + "OrNull";
-                    }
+                        const auto & func_arg_types = func_base->getArgumentTypes();
 
-                    auto func_builder = FunctionFactory::instance().tryGet(func_name, context);
+                        const bool has_string_argument = !func_arg_types.empty() && isStringOrFixedString(func_arg_types[0]);
+                        const bool has_session_timezone = !context->getSettingsRef()[Setting::session_timezone].value.empty();
 
-                    if (func->children.size() == 1)
-                    {
-                        arguments.push_back({nullptr, removeLowCardinality(func->children[0]->result_type), ""});
+                        // Skipping analysis in case when is requires parsing datetime from string
+                        // with `session_timezone` specified
+                        if (has_string_argument && has_session_timezone)
+                            return false;
+
+                        // Otherwise, in case when datetime parsing is required, rebuilding the function,
+                        // to get its "-OrNull" version required for safe parsing, and not failing on
+                        // values with incorrect format
+                        if (has_string_argument)
+                        {
+                            ColumnsWithTypeAndName new_args;
+                            for (const auto & type : func->function_base->getArgumentTypes())
+                                new_args.push_back({nullptr, type, ""});
+
+                            const auto func_builder = FunctionFactory::instance().tryGet(func_name + "OrNull", context);
+                            func_base = func_builder->build(new_args);
+                        }
                     }
-                    else if (func->children.size() == 2)
+
+                    // For single argument functions, the input may be used as-is, for binary functions,
+                    // we'll produce a partially applied version of `func` with the reduced arity
+                    if (func->children.size() == 2)
                     {
                         const auto * left = func->children[0];
                         const auto * right = func->children[1];
                         if (left->column && isColumnConst(*left->column))
                         {
                             const_arg = {left->result_type->createColumnConst(0, (*left->column)[0]), left->result_type, ""};
-                            arguments.push_back(const_arg);
-                            arguments.push_back({nullptr, removeLowCardinality(right->result_type), ""});
                             kind = FunctionWithOptionalConstArg::Kind::LEFT_CONST;
                         }
                         else
                         {
                             const_arg = {right->result_type->createColumnConst(0, (*right->column)[0]), right->result_type, ""};
-                            arguments.push_back({nullptr, removeLowCardinality(left->result_type), ""});
-                            arguments.push_back(const_arg);
                             kind = FunctionWithOptionalConstArg::Kind::RIGHT_CONST;
                         }
                     }
 
-                    auto out_func = func_builder->build(arguments);
                     if (kind == FunctionWithOptionalConstArg::Kind::NO_CONST)
-                        out_functions_chain.push_back(out_func);
+                        out_functions_chain.push_back(func_base);
                     else
-                        out_functions_chain.push_back(std::make_shared<FunctionWithOptionalConstArg>(out_func, const_arg, kind));
+                        out_functions_chain.push_back(std::make_shared<FunctionWithOptionalConstArg>(func_base, const_arg, kind));
                 }
 
                 out_key_column_num = it->second;
@@ -2979,6 +2999,10 @@ bool KeyCondition::matchesExactContinuousRange() const
 
         if (element.function == RPNElement::Function::FUNCTION_IN_SET && element.set_index && element.set_index->size() == 1)
         {
+            /// TODO: Fix MergeTreeSetIndex::checkInRange handling per-column inclusive/exclusive ranges, then remove this check.
+            if (element.set_index->getIndexesMapping().size() != 1)
+                return false;
+
             for (const auto & mapping : element.set_index->getIndexesMapping())
             {
                 auto [is_chain_always_monotonic, is_chain_strict] = check_monotonicity_of_chain(mapping.functions);
@@ -3284,6 +3308,16 @@ BoolMask KeyCondition::checkInHyperrectangle(
                 rpn_stack.back().can_be_true = mayExistOnBloomFilter(*element.bloom_filter_data, column_index_to_column_bf);
             }
 
+            /// If the condition is relaxed, the `can_be_false` branch is no longer reliable; it may have false negatives.
+            /// If `element.range` is relaxed (and thus wider) and contains `key_range`, then `can_be_false` becomes false.
+            /// However, in reality `can_be_false` may be true, because the actual range of element may be stricter than `element.range`.
+            /// For example, for `match(...)`, a false negative here (i.e. `can_be_false` is false) would make
+            /// `not match(...)` set `can_be_true = false`, causing us to skip the granule, which would be incorrect.
+            /// Therefore, we must set `can_be_false = true` to be safe.
+            /// Additionally, when `KeyCondition::isRelaxed()` is true, the caller should ignore `can_be_false` anyway.
+            if (element.relaxed)
+                rpn_stack.back().can_be_false = true;
+
             if (element.function == RPNElement::FUNCTION_NOT_IN_RANGE)
                 rpn_stack.back() = !rpn_stack.back();
         }
diff --git a/src/Storages/MergeTree/MarkRange.h b/src/Storages/MergeTree/MarkRange.h
index 9ecc2bfb9576..3ea0c97b2db6 100644
--- a/src/Storages/MergeTree/MarkRange.h
+++ b/src/Storages/MergeTree/MarkRange.h
@@ -2,6 +2,7 @@
 
 #include <cstddef>
 #include <deque>
+#include <Common/AllocatorWithMemoryTracking.h>
 #include <Processors/Chunk.h>
 #include <fmt/format.h>
 #include <base/types.h>
@@ -30,7 +31,7 @@ struct MarkRange
     bool operator<(const MarkRange & rhs) const;
 };
 
-struct MarkRanges : public std::deque<MarkRange>
+struct MarkRanges : public std::deque<MarkRange, AllocatorWithMemoryTracking<MarkRange>>
 {
     enum class SearchAlgorithm : uint8_t
     {
@@ -39,7 +40,7 @@ struct MarkRanges : public std::deque<MarkRange>
         GenericExclusionSearch,
     };
 
-    using std::deque<MarkRange>::deque; /// NOLINT(modernize-type-traits)
+    using std::deque<MarkRange, AllocatorWithMemoryTracking<MarkRange>>::deque; /// NOLINT(modernize-type-traits)
 
     size_t getNumberOfMarks() const;
     bool isOneRangeForWholePart(size_t num_marks_in_part) const;
diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index b71f0ce9b4e2..ab68394d62dc 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -74,7 +74,7 @@ MergeListElement::MergeListElement(const StorageID & table_id_, FutureMergedMuta
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Got {} source parts for mutation {}: {}", future_part->parts.size(),
                         result_part_info.getPartNameV1(), fmt::join(source_part_names, ", "));
 
-    thread_group = ThreadGroup::createForBackgroundProcess(context);
+    thread_group = ThreadGroup::createForMergeMutate(context);
 }
 
 MergeInfo MergeListElement::getInfo() const
diff --git a/src/Storages/MergeTree/MergeProjectionPartsTask.h b/src/Storages/MergeTree/MergeProjectionPartsTask.h
index b881f368330d..ff8cd1656730 100644
--- a/src/Storages/MergeTree/MergeProjectionPartsTask.h
+++ b/src/Storages/MergeTree/MergeProjectionPartsTask.h
@@ -50,7 +50,10 @@ class MergeProjectionPartsTask : public IExecutableTask
         }
 
     void onCompleted() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
-    void cancel() noexcept override { chassert(false, "Not implemented"); }
+    void cancel() noexcept override
+    {
+        /// FIXME: See `executeHere` from MergeTask.h called in executeStep
+    }
     StorageID getStorageID() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
     Priority getPriority() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
     String getQueryId() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index 7c19fd476780..5b8df976d475 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -119,6 +119,7 @@ namespace MergeTreeSetting
     extern const MergeTreeSettingsBool use_const_adaptive_granularity;
     extern const MergeTreeSettingsUInt64 max_merge_delayed_streams_for_parallel_write;
     extern const MergeTreeSettingsBool ttl_only_drop_parts;
+    extern const MergeTreeSettingsUInt64Auto merge_max_dynamic_subcolumns_in_wide_part;
 }
 
 namespace ErrorCodes
@@ -180,7 +181,7 @@ class RowsSourcesTemporaryFile : public ITemporaryFileLookup
         if (tmp_data_buffer)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary file was already requested for writing, there musto be only one writer");
 
-        tmp_data_buffer = std::make_unique<TemporaryDataBuffer>(temporary_data_on_disk.get());
+        tmp_data_buffer = std::make_unique<TemporaryDataBuffer>(temporary_data_on_disk);
         return *tmp_data_buffer;
     }
 
@@ -266,7 +267,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
     Names sort_key_columns_vec = sorting_key_expr->getRequiredColumns();
 
     /// Collect columns used in the sorting key expressions.
-    std::set<String> key_columns;
+    NameSet key_columns;
     auto storage_columns = global_ctx->storage_columns.getNameSet();
     for (const auto & name : sort_key_columns_vec)
     {
@@ -274,7 +275,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
             key_columns.insert(name);
         /// If we don't have this column in storage columns, it must be a subcolumn of one of the storage columns.
         else
-            key_columns.insert(Nested::splitName(name).first);
+            key_columns.insert(String(Nested::getColumnFromSubcolumn(name, storage_columns)));
     }
 
     /// Force sign column for Collapsing mode
@@ -292,6 +293,15 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
     if (global_ctx->merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
         key_columns.emplace(global_ctx->merging_params.sign_column);
 
+    /// Force all columns params of Graphite mode
+    if (global_ctx->merging_params.mode == MergeTreeData::MergingParams::Graphite)
+    {
+        key_columns.emplace(global_ctx->merging_params.graphite_params.path_column_name);
+        key_columns.emplace(global_ctx->merging_params.graphite_params.time_column_name);
+        key_columns.emplace(global_ctx->merging_params.graphite_params.value_column_name);
+        key_columns.emplace(global_ctx->merging_params.graphite_params.version_column_name);
+    }
+
     /// Force to merge at least one column in case of empty key
     if (key_columns.empty())
         key_columns.emplace(global_ctx->storage_columns.front().name);
@@ -303,6 +313,11 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
         key_columns.insert(minmax_columns.begin(), minmax_columns.end());
     }
 
+    key_columns.insert(global_ctx->deduplicate_by_columns.begin(), global_ctx->deduplicate_by_columns.end());
+
+    /// Key columns required for merge, must not be expired early.
+    global_ctx->merge_required_key_columns = key_columns;
+
     const auto & skip_indexes = global_ctx->metadata_snapshot->getSecondaryIndices();
 
     for (const auto & index : skip_indexes)
@@ -316,8 +331,9 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
             const auto & column_name = index_columns.front();
             if (storage_columns.contains(column_name))
                 global_ctx->skip_indexes_by_column[column_name].push_back(index);
+            /// If we don't have this column in storage columns, it must be a subcolumn of one of the storage columns.
             else
-                global_ctx->skip_indexes_by_column[Nested::splitName(column_name).first].push_back(index);
+                global_ctx->skip_indexes_by_column[String(Nested::getColumnFromSubcolumn(column_name, storage_columns))].push_back(index);
         }
         else
         {
@@ -327,7 +343,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
                     key_columns.insert(index_column);
                 /// If we don't have this column in storage columns, it must be a subcolumn of one of the storage columns.
                 else
-                    key_columns.insert(Nested::splitName(index_column).first);
+                    key_columns.insert(String(Nested::getColumnFromSubcolumn(index_column, storage_columns)));
             }
 
             global_ctx->merging_skip_indexes.push_back(index);
@@ -336,9 +352,13 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
 
     for (const auto * projection : global_ctx->projections_to_rebuild)
     {
-        Names projection_columns_vec = projection->getRequiredColumns();
-        std::copy(projection_columns_vec.cbegin(), projection_columns_vec.cend(),
-                  std::inserter(key_columns, key_columns.end()));
+        for (const auto & column : projection->getRequiredColumns())
+        {
+            if (projection->with_parent_part_offset && column == "_part_offset")
+                continue;
+
+            key_columns.insert(column);
+        }
     }
 
     /// TODO: also force "summing" and "aggregating" columns to make Horizontal merge only for such columns
@@ -468,23 +488,37 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
 
     const auto & patch_parts = global_ctx->future_part->patch_parts;
 
-    /// Skip fully expired columns manually, since in case of
-    /// need_remove_expired_values is not set, TTLTransform will not be used,
-    /// and columns that had been removed by TTL (via TTLColumnAlgorithm) will
-    /// be added again with default values.
+    /// Determine columns that are absent in all source parts—either fully expired or never written—and mark them as
+    /// expired to avoid unnecessary reads or writes during merges.
     ///
-    /// Also note, that it is better to do this here, since in other places it
-    /// will be too late (i.e. they will be written, and we will burn CPU/disk
-    /// resources for this).
-    if (!ctx->need_remove_expired_values)
+    /// NOTE:
+    /// Handling missing columns that have default expressions is non-trivial and currently unresolved
+    /// (see https://github.com/ClickHouse/ClickHouse/issues/91127).
+    /// For now, we conservatively avoid expiring such columns.
+    ///
+    /// The main challenges include:
+    /// 1. A default expression may depend on other columns, which themselves may be missing or expired,
+    ///    making it unclear whether the default should be materialized or recomputed.
+    /// 2. Default expressions may introduce semantic changes if re-evaluated during merges, leading to
+    ///    non-deterministic results across parts.
     {
-        for (auto & [column_name, ttl] : global_ctx->new_data_part->ttl_infos.columns_ttl)
+        NameSet columns_present_in_parts;
+        columns_present_in_parts.reserve(global_ctx->storage_columns.size());
+
+        /// Collect all column names that actually exist in the source parts
+        for (const auto & part : global_ctx->future_part->parts)
         {
-            if (ttl.finished())
-            {
-                global_ctx->new_data_part->expired_columns.insert(column_name);
-                LOG_TRACE(ctx->log, "Adding expired column {} for part {}", column_name, global_ctx->new_data_part->name);
-            }
+            for (const auto & col : part->getColumns())
+                columns_present_in_parts.emplace(col.name);
+        }
+
+        const auto & columns_desc = global_ctx->metadata_snapshot->getColumns();
+
+        /// Any storage column not present in any part and without a default expression is considered expired
+        for (const auto & storage_column : global_ctx->storage_columns)
+        {
+            if (!columns_present_in_parts.contains(storage_column.name) && !columns_desc.getDefault(storage_column.name))
+                global_ctx->new_data_part->expired_columns.emplace(storage_column.name);
         }
     }
 
@@ -509,17 +543,28 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
     const auto & expired_columns = global_ctx->new_data_part->expired_columns;
     if (!expired_columns.empty())
     {
-        auto part_serialization_infos = global_ctx->new_data_part->getSerializationInfos();
-        for (const auto & expired_column : expired_columns)
-            part_serialization_infos.erase(expired_column);
-
         global_ctx->gathering_columns = global_ctx->gathering_columns.eraseNames(expired_columns);
-        global_ctx->merging_columns = global_ctx->merging_columns.eraseNames(expired_columns);
-        global_ctx->storage_columns = global_ctx->storage_columns.eraseNames(expired_columns);
-        global_ctx->new_data_part->setColumns(
-            global_ctx->storage_columns,
-            part_serialization_infos,
-            global_ctx->metadata_snapshot->getMetadataVersion());
+
+        auto filter_columns = [&](const NamesAndTypesList & input, NamesAndTypesList & expired_out)
+        {
+            NamesAndTypesList result;
+            for (const auto & column : input)
+            {
+                bool is_expired = expired_columns.contains(column.name);
+                bool is_required_for_merge = global_ctx->merge_required_key_columns.contains(column.name);
+
+                if (is_expired)
+                    expired_out.push_back(column);
+
+                if (!is_expired || is_required_for_merge)
+                    result.push_back(column);
+            }
+
+            return result;
+        };
+
+        global_ctx->merging_columns = filter_columns(global_ctx->merging_columns, global_ctx->merging_columns_expired_by_ttl);
+        global_ctx->storage_columns = filter_columns(global_ctx->storage_columns, global_ctx->storage_columns_expired_by_ttl);
     }
 
     global_ctx->new_data_part->uuid = global_ctx->future_part->uuid;
@@ -620,6 +665,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
         case MergeAlgorithm::Horizontal:
         {
             global_ctx->merging_columns = global_ctx->storage_columns;
+            global_ctx->merging_columns_expired_by_ttl = global_ctx->storage_columns_expired_by_ttl;
             global_ctx->merging_skip_indexes = global_ctx->metadata_snapshot->getSecondaryIndices();
             global_ctx->gathering_columns.clear();
             global_ctx->skip_indexes_by_column.clear();
@@ -846,12 +892,15 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::prepareProjectionsToMergeAndRe
 }
 
 
-void MergeTask::ExecuteAndFinalizeHorizontalPart::calculateProjections(const Block & block) const
+void MergeTask::ExecuteAndFinalizeHorizontalPart::calculateProjections(const Block & block, UInt64 starting_offset) const
 {
     for (size_t i = 0, size = global_ctx->projections_to_rebuild.size(); i < size; ++i)
     {
         const auto & projection = *global_ctx->projections_to_rebuild[i];
-        Block block_to_squash = projection.calculate(block, global_ctx->context);
+        Block block_to_squash = projection.calculate(block, starting_offset, global_ctx->context);
+        /// Avoid replacing the projection squash header if nothing was generated (it used to return an empty block)
+        if (block_to_squash.rows() == 0)
+            return;
         auto & projection_squash_plan = ctx->projection_squashes[i];
         projection_squash_plan.setHeader(block_to_squash.cloneEmpty());
         Chunk squashed_chunk = Squashing::squash(projection_squash_plan.add({block_to_squash.getColumns(), block_to_squash.rows()}));
@@ -964,6 +1013,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl() const
             }
         }
 
+        size_t starting_offset = global_ctx->rows_written;
         global_ctx->rows_written += block.rows();
         const_cast<MergedBlockOutputStream &>(*global_ctx->to).write(block);
 
@@ -973,7 +1023,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl() const
                 block, MergeTreeData::getMinMaxColumnsNames(global_ctx->metadata_snapshot->getPartitionKey()));
         }
 
-        calculateProjections(block);
+        calculateProjections(block, starting_offset);
 
         UInt64 result_rows = 0;
         UInt64 result_bytes = 0;
@@ -1064,11 +1114,13 @@ class ColumnGathererStep : public ITransformingStep
         const String & rows_sources_temporary_file_name_,
         UInt64 merge_block_size_rows_,
         UInt64 merge_block_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         bool is_result_sparse_)
         : ITransformingStep(input_header_, input_header_, getTraits())
         , rows_sources_temporary_file_name(rows_sources_temporary_file_name_)
         , merge_block_size_rows(merge_block_size_rows_)
         , merge_block_size_bytes(merge_block_size_bytes_)
+        , max_dynamic_subcolumns(max_dynamic_subcolumns_)
         , is_result_sparse(is_result_sparse_)
     {}
 
@@ -1090,6 +1142,7 @@ class ColumnGathererStep : public ITransformingStep
             std::move(rows_sources_read_buf),
             merge_block_size_rows,
             merge_block_size_bytes,
+            max_dynamic_subcolumns,
             is_result_sparse);
 
         pipeline.addTransform(std::move(transform));
@@ -1120,6 +1173,7 @@ class ColumnGathererStep : public ITransformingStep
     const String rows_sources_temporary_file_name;
     const UInt64 merge_block_size_rows;
     const UInt64 merge_block_size_bytes;
+    const std::optional<size_t> max_dynamic_subcolumns;
     const bool is_result_sparse;
 };
 
@@ -1170,11 +1224,16 @@ MergeTask::VerticalMergeStage::createPipelineForReadingOneColumn(const String &
     {
         bool is_result_sparse = global_ctx->new_data_part->getSerialization(column_name)->getKind() == ISerialization::Kind::SPARSE;
         const auto merge_tree_settings = global_ctx->data->getSettings();
+        std::optional<size_t> max_dynamic_subcolumns = std::nullopt;
+        if (global_ctx->future_part->part_format.part_type == MergeTreeDataPartType::Wide)
+            max_dynamic_subcolumns = (*merge_tree_settings)[MergeTreeSetting::merge_max_dynamic_subcolumns_in_wide_part].valueOrNullopt();
+
         auto merge_step = std::make_unique<ColumnGathererStep>(
             merge_column_query_plan.getCurrentHeader(),
             RowsSourcesTemporaryFile::FILE_ID,
             (*merge_tree_settings)[MergeTreeSetting::merge_max_block_size],
             (*merge_tree_settings)[MergeTreeSetting::merge_max_block_size_bytes],
+            max_dynamic_subcolumns,
             is_result_sparse);
         merge_step->setStepDescription("Gather column");
         merge_column_query_plan.addStep(std::move(merge_step));
@@ -1381,16 +1440,6 @@ bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() c
             projection_parts.front()->name,
             projection_parts.back()->name);
 
-        /// Skip parts with empty parent parts.
-        chassert(global_ctx->future_part->parts.size() == projection_parts.size());
-        std::erase_if(
-            projection_parts,
-            [&](const auto & part)
-            {
-                size_t index = &part - projection_parts.data();
-                return global_ctx->future_part->parts[index]->isEmpty();
-            });
-
         auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
         projection_future_part->assign(std::move(projection_parts), /*patch_parts_=*/ {});
         projection_future_part->name = projection->name;
@@ -1476,7 +1525,7 @@ bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
         global_ctx->cached_marks.emplace(name, std::move(marks));
 
     global_ctx->new_data_part->getDataPartStorage().precommitTransaction();
-    global_ctx->promise.set_value(global_ctx->new_data_part);
+    global_ctx->promise.set_value(std::exchange(global_ctx->new_data_part, nullptr));
 
     return false;
 }
@@ -1637,6 +1686,9 @@ void MergeTask::cancel() noexcept
 
     if (global_ctx->to)
         global_ctx->to->cancel();
+
+    if (global_ctx->new_data_part)
+        global_ctx->new_data_part->removeIfNeeded();
 }
 
 
@@ -1652,6 +1704,7 @@ class MergePartsStep : public ITransformingStep
         const String & rows_sources_temporary_file_name_,
         UInt64 merge_block_size_rows_,
         UInt64 merge_block_size_bytes_,
+        std::optional<size_t> max_dynamic_subcolumns_,
         bool blocks_are_granules_size_,
         bool cleanup_,
         time_t time_of_merge_)
@@ -1662,6 +1715,7 @@ class MergePartsStep : public ITransformingStep
         , rows_sources_temporary_file_name(rows_sources_temporary_file_name_)
         , merge_block_size_rows(merge_block_size_rows_)
         , merge_block_size_bytes(merge_block_size_bytes_)
+        , max_dynamic_subcolumns(max_dynamic_subcolumns_)
         , blocks_are_granules_size(blocks_are_granules_size_)
         , cleanup(cleanup_)
         , time_of_merge(time_of_merge_)
@@ -1696,6 +1750,7 @@ class MergePartsStep : public ITransformingStep
                     sort_description,
                     merge_block_size_rows,
                     merge_block_size_bytes,
+                    max_dynamic_subcolumns,
                     SortingQueueStrategy::Default,
                     /* limit_= */0,
                     /* always_read_till_end_= */false,
@@ -1706,40 +1761,40 @@ class MergePartsStep : public ITransformingStep
             case MergeTreeData::MergingParams::Collapsing:
                 merged_transform = std::make_shared<CollapsingSortedTransform>(
                     header, input_streams_count, sort_description, merging_params.sign_column, false,
-                    merge_block_size_rows, merge_block_size_bytes, rows_sources_write_buf, blocks_are_granules_size);
+                    merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns, rows_sources_write_buf, blocks_are_granules_size);
                 break;
 
             case MergeTreeData::MergingParams::Summing:
                 merged_transform = std::make_shared<SummingSortedTransform>(
-                    header, input_streams_count, sort_description, merging_params.columns_to_sum, partition_and_sorting_required_columns, merge_block_size_rows, merge_block_size_bytes);
+                    header, input_streams_count, sort_description, merging_params.columns_to_sum, partition_and_sorting_required_columns, merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns);
                 break;
 
             case MergeTreeData::MergingParams::Aggregating:
-                merged_transform = std::make_shared<AggregatingSortedTransform>(header, input_streams_count, sort_description, merge_block_size_rows, merge_block_size_bytes);
+                merged_transform = std::make_shared<AggregatingSortedTransform>(header, input_streams_count, sort_description, merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns);
                 break;
 
             case MergeTreeData::MergingParams::Replacing:
                 merged_transform = std::make_shared<ReplacingSortedTransform>(
                     header, input_streams_count, sort_description, merging_params.is_deleted_column, merging_params.version_column,
-                    merge_block_size_rows, merge_block_size_bytes, rows_sources_write_buf, blocks_are_granules_size,
+                    merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns, rows_sources_write_buf, blocks_are_granules_size,
                     cleanup);
                 break;
 
             case MergeTreeData::MergingParams::Coalescing:
                 merged_transform = std::make_shared<CoalescingSortedTransform>(
-                    header, input_streams_count, sort_description, merging_params.columns_to_sum, partition_and_sorting_required_columns, merge_block_size_rows, merge_block_size_bytes);
+                    header, input_streams_count, sort_description, merging_params.columns_to_sum, partition_and_sorting_required_columns, merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns);
                 break;
 
             case MergeTreeData::MergingParams::Graphite:
                 merged_transform = std::make_shared<GraphiteRollupSortedTransform>(
-                    header, input_streams_count, sort_description, merge_block_size_rows, merge_block_size_bytes,
+                    header, input_streams_count, sort_description, merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns,
                     merging_params.graphite_params, time_of_merge);
                 break;
 
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 merged_transform = std::make_shared<VersionedCollapsingTransform>(
                     header, input_streams_count, sort_description, merging_params.sign_column,
-                    merge_block_size_rows, merge_block_size_bytes, rows_sources_write_buf, blocks_are_granules_size);
+                    merge_block_size_rows, merge_block_size_bytes, max_dynamic_subcolumns, rows_sources_write_buf, blocks_are_granules_size);
                 break;
         }
 
@@ -1784,6 +1839,7 @@ class MergePartsStep : public ITransformingStep
     const String rows_sources_temporary_file_name;
     const UInt64 merge_block_size_rows;
     const UInt64 merge_block_size_bytes;
+    const std::optional<size_t> max_dynamic_subcolumns;
     const bool blocks_are_granules_size;
     const bool cleanup{false};
     const time_t time_of_merge{0};
@@ -1798,11 +1854,13 @@ class TTLStep : public ITransformingStep
         const MergeTreeData & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         const MergeTreeData::MutableDataPartPtr & data_part_,
+        const NamesAndTypesList & expired_columns_,
         time_t current_time,
         bool force_)
-        : ITransformingStep(input_header_, input_header_, getTraits())
+        : ITransformingStep(input_header_, TTLTransform::addExpiredColumnsToBlock(input_header_, expired_columns_), getTraits())
     {
-        transform = std::make_shared<TTLTransform>(context_, input_header_, storage_, metadata_snapshot_, data_part_, current_time, force_);
+        transform = std::make_shared<TTLTransform>(
+            context_, input_header_, storage_, metadata_snapshot_, data_part_, expired_columns_, current_time, force_);
         subqueries_for_sets = transform->getSubqueries();
     }
 
@@ -1981,6 +2039,10 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
 
         bool cleanup = global_ctx->cleanup && global_ctx->future_part->final;
 
+        std::optional<size_t> max_dynamic_subcolumns = std::nullopt;
+        if (global_ctx->future_part->part_format.part_type == MergeTreeDataPartType::Wide)
+            max_dynamic_subcolumns = (*merge_tree_settings)[MergeTreeSetting::merge_max_dynamic_subcolumns_in_wide_part].valueOrNullopt();
+
         auto merge_step = std::make_unique<MergePartsStep>(
             merge_parts_query_plan.getCurrentHeader(),
             sort_description,
@@ -1989,6 +2051,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
             (is_vertical_merge ? RowsSourcesTemporaryFile::FILE_ID : ""), /// rows_sources' temporary file is used only for vertical merge
             (*merge_tree_settings)[MergeTreeSetting::merge_max_block_size],
             (*merge_tree_settings)[MergeTreeSetting::merge_max_block_size_bytes],
+            max_dynamic_subcolumns,
             ctx->blocks_are_granules_size,
             cleanup,
             global_ctx->time_of_merge);
@@ -2026,10 +2089,17 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
     PreparedSets::Subqueries subqueries;
 
     /// TTL step
-    if (ctx->need_remove_expired_values)
+    if (ctx->need_remove_expired_values || !global_ctx->merging_columns_expired_by_ttl.empty())
     {
         auto ttl_step = std::make_unique<TTLStep>(
-            merge_parts_query_plan.getCurrentHeader(), global_ctx->context, *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->new_data_part, global_ctx->time_of_merge, ctx->force_ttl);
+            merge_parts_query_plan.getCurrentHeader(),
+            global_ctx->context,
+            *global_ctx->data,
+            global_ctx->metadata_snapshot,
+            global_ctx->new_data_part,
+            global_ctx->merging_columns_expired_by_ttl,
+            global_ctx->time_of_merge,
+            ctx->force_ttl);
         subqueries = ttl_step->getSubqueries();
         ttl_step->setStepDescription("TTL step");
         merge_parts_query_plan.addStep(std::move(ttl_step));
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
index b4f9618d8a3a..208a0cc1985a 100644
--- a/src/Storages/MergeTree/MergeTask.h
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -197,8 +197,11 @@ class MergeTask
         bool cleanup{false};
 
         NamesAndTypesList gathering_columns{};
+        NameSet merge_required_key_columns{};
         NamesAndTypesList merging_columns{};
+        NamesAndTypesList merging_columns_expired_by_ttl{};
         NamesAndTypesList storage_columns{};
+        NamesAndTypesList storage_columns_expired_by_ttl{};
         MergeTreeData::DataPart::Checksums checksums_gathered_columns{};
         ColumnsSubstreams gathered_columns_substreams{};
 
@@ -311,7 +314,7 @@ class MergeTask
         ExecuteAndFinalizeHorizontalPartSubtasks::const_iterator subtasks_iterator = subtasks.begin();
 
         void prepareProjectionsToMergeAndRebuild() const;
-        void calculateProjections(const Block & block) const;
+        void calculateProjections(const Block & block, UInt64 starting_offset) const;
         void finalizeProjections() const;
         void constructTaskForProjectionPartsMerge() const;
         bool executeMergeProjections() const;
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
index d66111ea406a..dab0c54729fb 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/BackgroundJobsAssignee.h>
 
 #include <algorithm>
+#include <optional>
 
 #include <Common/ThreadPool.h>
 #include <Common/setThreadName.h>
@@ -44,6 +45,10 @@ MergeTreeBackgroundExecutor<Queue>::MergeTreeBackgroundExecutor(
     size_t max_tasks_count_,
     CurrentMetrics::Metric metric_,
     CurrentMetrics::Metric max_tasks_metric_,
+    ProfileEvents::Event execute_profile_event_,
+    ProfileEvents::Event cancel_profile_event_,
+    ProfileEvents::Event reset_profile_event_,
+    ProfileEvents::Event wait_profile_event_,
     std::string_view policy)
     : name(name_)
     , threads_count(threads_count_)
@@ -56,6 +61,11 @@ MergeTreeBackgroundExecutor<Queue>::MergeTreeBackgroundExecutor(
     if (max_tasks_count == 0)
         throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Task count for MergeTreeBackgroundExecutor must not be zero");
 
+    task_events.execute_ms = execute_profile_event_;
+    task_events.cancel_ms = cancel_profile_event_;
+    task_events.reset_ms = reset_profile_event_;
+    task_events.wait_ms = wait_profile_event_;
+
     pending.setCapacity(max_tasks_count);
     active.set_capacity(max_tasks_count);
 
@@ -148,7 +158,7 @@ bool MergeTreeBackgroundExecutor<Queue>::trySchedule(ExecutableTaskPtr task)
     if (value.load() >= static_cast<int64_t>(max_tasks_count))
         return false;
 
-    pending.push(std::make_shared<TaskRuntimeData>(std::move(task), metric));
+    pending.push(std::make_shared<TaskRuntimeData>(std::move(task), metric, task_events));
 
     has_tasks.notify_one();
     return true;
@@ -210,14 +220,14 @@ void MergeTreeBackgroundExecutor<Queue>::removeTasksCorrespondingToStorage(Stora
 
     for (auto & item : tasks_to_cancel)
     {
-        item->task->cancel();
+        item->cancel();
         item.reset();
     }
 
     /// Wait for each task to be executed
     for (auto & item : tasks_to_wait)
     {
-        item->is_done.wait();
+        item->wait();
         item.reset();
     }
 }
@@ -235,19 +245,45 @@ void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
         active.erase(std::remove(active.begin(), active.end(), item_), active.end());
     };
 
-    auto release_task = [] (TaskRuntimeDataPtr && item_) TSA_REQUIRES(mutex)
+    auto release_task = [this] (TaskRuntimeDataPtr && item_) TSA_REQUIRES(mutex)
     {
         /// We have to call reset() under a lock, otherwise a race is possible.
         /// Imagine, that task is finally completed (last execution returned false),
         /// we removed the task from both queues, but still have pointer.
         /// The thread that shutdowns storage will scan queues in order to find some tasks to wait for, but will find nothing.
         /// So, the destructor of a task and the destructor of a storage will be executed concurrently.
+        std::optional<String> captured_storage_id;
+        std::optional<String> captured_query_id;
+        bool captured_was_deleting = item_->is_currently_deleting;
+
+        Stopwatch destruction_watch;
+
         NOEXCEPT_SCOPE({
             ALLOW_ALLOCATIONS_IN_SCOPE;
-            item_->task.reset();
+            if (item_->task)
+            {
+                captured_storage_id = item_->task->getStorageID().getNameForLogs();
+                captured_query_id = item_->task->getQueryId();
+            }
+            item_->resetTask();
         });
         item_->is_done.set();
         item_.reset();
+
+        UInt64 elapsed_ms = destruction_watch.elapsedMilliseconds();
+        NOEXCEPT_SCOPE({
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            if (elapsed_ms > 60ULL * 1000ULL)
+            {
+                LOG_WARNING(log,
+                    "Releasing background task runtime data took {:.3f} seconds (> 60s), executor={}, storage={}, query_id={}, deleting={}",
+                    static_cast<double>(elapsed_ms) / 1000.0,
+                    name,
+                    captured_storage_id.value_or("unknown"),
+                    captured_query_id.value_or("unknown"),
+                    captured_was_deleting);
+            }
+        });
     };
 
     /// No TSA because of unique_lock
@@ -261,7 +297,7 @@ void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
             guard.unlock();
             {
                 ALLOW_ALLOCATIONS_IN_SCOPE;
-                item_->task->cancel();
+                item_->cancel();
             }
             guard.lock();
             release_task(std::move(item_));
@@ -302,7 +338,7 @@ void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
     {
         ALLOW_ALLOCATIONS_IN_SCOPE;
         query_id = item->task->getQueryId();
-        need_execute_again = item->task->executeStep();
+        need_execute_again = item->executeStep();
 
         if (!need_execute_again)
         {
@@ -321,7 +357,7 @@ void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
         try
         {
             ALLOW_ALLOCATIONS_IN_SCOPE;
-            item->task->cancel();
+            item->cancel();
         }
         catch (...)
         {
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
index 4b67d50a49bb..d5d55a61d731 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -14,14 +14,24 @@
 
 #include <Storages/MergeTree/IExecutableTask.h>
 #include <base/defines.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Logger.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
 #include <Common/ThreadPool_fwd.h>
 
 namespace DB
 {
 
 struct TaskRuntimeData;
+struct TaskProfileEvents
+{
+    ProfileEvents::Event execute_ms = ProfileEvents::end();
+    ProfileEvents::Event cancel_ms = ProfileEvents::end();
+    ProfileEvents::Event reset_ms = ProfileEvents::end();
+    ProfileEvents::Event wait_ms = ProfileEvents::end();
+};
 using TaskRuntimeDataPtr = std::shared_ptr<TaskRuntimeData>;
 
 /**
@@ -30,9 +40,10 @@ using TaskRuntimeDataPtr = std::shared_ptr<TaskRuntimeData>;
  */
 struct TaskRuntimeData
 {
-    TaskRuntimeData(ExecutableTaskPtr && task_, CurrentMetrics::Metric metric_)
+    TaskRuntimeData(ExecutableTaskPtr && task_, CurrentMetrics::Metric metric_, TaskProfileEvents events_)
         : task(std::move(task_))
         , metric(metric_)
+        , events(events_)
     {
         /// Increment and decrement a metric with sequentially consistent memory order
         /// This is needed, because in unit test this metric is read from another thread
@@ -46,8 +57,35 @@ struct TaskRuntimeData
         CurrentMetrics::values[metric].fetch_sub(1);
     }
 
+    void cancel() const
+    {
+        ProfileEventTimeIncrement<Microseconds> watch(events.cancel_ms);
+        if (task)
+            task->cancel();
+    }
+
+    void wait()
+    {
+        ProfileEventTimeIncrement<Microseconds> watch(events.wait_ms);
+        is_done.wait();
+    }
+
+    bool executeStep() const
+    {
+        ProfileEventTimeIncrement<Microseconds> watch(events.execute_ms);
+        return task->executeStep();
+    }
+
+    void resetTask()
+    {
+        ProfileEventTimeIncrement<Microseconds> watch(events.reset_ms);
+        if (task)
+            task.reset();
+    }
+
     ExecutableTaskPtr task;
     CurrentMetrics::Metric metric;
+    TaskProfileEvents events;
     /// Guarded by MergeTreeBackgroundExecutor<>::mutex
     bool is_currently_deleting{false};
     /// Actually autoreset=false is needed only for unit test
@@ -257,6 +295,18 @@ template <class Queue>
 class MergeTreeBackgroundExecutor final : boost::noncopyable
 {
 public:
+    MergeTreeBackgroundExecutor(
+        String name_,
+        size_t threads_count_,
+        size_t max_tasks_count_,
+        CurrentMetrics::Metric metric_,
+        CurrentMetrics::Metric max_tasks_metric_,
+        ProfileEvents::Event execute_profile_event_,
+        ProfileEvents::Event cancel_profile_event_,
+        ProfileEvents::Event reset_profile_event_,
+        ProfileEvents::Event wait_profile_event_,
+        std::string_view policy = {});
+
     MergeTreeBackgroundExecutor(
         String name_,
         size_t threads_count_,
@@ -310,6 +360,7 @@ class MergeTreeBackgroundExecutor final : boost::noncopyable
     bool shutdown TSA_GUARDED_BY(mutex) = false;
     std::unique_ptr<ThreadPool> pool;
     LoggerPtr log = getLogger("MergeTreeBackgroundExecutor");
+    TaskProfileEvents task_events;
 };
 
 extern template class MergeTreeBackgroundExecutor<RoundRobinRuntimeQueue>;
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 570b3361ec25..63c09ad78d56 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1,7 +1,9 @@
 #include <Storages/PartitionCommands.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 
+#include <Storages/MergeTree/ExportList.h>
 #include <Access/AccessControl.h>
+#include <TableFunctions/TableFunctionFactory.h>
 #include <AggregateFunctions/AggregateFunctionCount.h>
 #include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/Utils.h>
@@ -23,6 +25,11 @@
 #include <Common/scope_guard_safe.h>
 #include <Common/typeid_cast.h>
 #include <Common/thread_local_rng.h>
+#include "Storages/MergeTree/ExportPartTask.h"
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Storages/MergeTree/MergeTreeSequentialSource.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Settings.h>
 #include <Core/ServerSettings.h>
@@ -42,6 +49,7 @@
 #include <Disks/SingleDiskVolume.h>
 #include <Disks/TemporaryFileOnDisk.h>
 #include <Disks/createVolume.h>
+#include <Formats/FormatFactory.h>
 #include <IO/Operators.h>
 #include <IO/S3Common.h>
 #include <IO/SharedThreadPools.h>
@@ -96,6 +104,7 @@
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularityAdaptive.h>
+#include <Functions/generateSnowflakeID.h>
 
 #include <boost/algorithm/string/join.hpp>
 
@@ -114,6 +123,7 @@
 #include <thread>
 #include <unordered_set>
 #include <filesystem>
+#include <utility>
 
 #include <fmt/format.h>
 #include <Poco/Logger.h>
@@ -156,6 +166,10 @@ namespace ProfileEvents
     extern const Event LoadedDataPartsMicroseconds;
     extern const Event RestorePartsSkippedFiles;
     extern const Event RestorePartsSkippedBytes;
+    extern const Event PartsExports;
+    extern const Event PartsExportTotalMilliseconds;
+    extern const Event PartsExportFailures;
+    extern const Event PartsExportDuplicated;
 }
 
 namespace CurrentMetrics
@@ -199,6 +213,13 @@ namespace Setting
     extern const SettingsUInt64 min_insert_block_size_rows;
     extern const SettingsUInt64 min_insert_block_size_bytes;
     extern const SettingsBool apply_patch_parts;
+    extern const SettingsBool allow_experimental_export_merge_tree_part;
+    extern const SettingsUInt64 min_bytes_to_use_direct_io;
+    extern const SettingsMergeTreePartExportFileAlreadyExistsPolicy export_merge_tree_part_file_already_exists_policy;
+    extern const SettingsBool output_format_parallel_formatting;
+    extern const SettingsBool output_format_parquet_parallel_encoding;
+    extern const SettingsBool export_merge_tree_part_throw_on_pending_mutations;
+    extern const SettingsBool export_merge_tree_part_throw_on_pending_patch_parts;
 }
 
 namespace MergeTreeSetting
@@ -316,6 +337,9 @@ namespace ErrorCodes
     extern const int CANNOT_FORGET_PARTITION;
     extern const int DATA_TYPE_CANNOT_BE_USED_IN_KEY;
     extern const int TOO_LARGE_LIGHTWEIGHT_UPDATES;
+    extern const int UNKNOWN_TABLE;
+    extern const int FILE_ALREADY_EXISTS;
+    extern const int PENDING_MUTATIONS_NOT_ALLOWED;
 }
 
 static void checkSuspiciousIndices(const ASTFunction * index_function)
@@ -4018,6 +4042,11 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
     /// Columns to check that the type change is safe for partition key.
     NameSet columns_alter_type_check_safe_for_partition;
 
+    /// Columns with subcolumns used in primary key or partition key.
+    std::unordered_map<String, std::vector<String>> column_to_subcolumns_used_in_keys;
+
+    const auto & old_columns = old_metadata.getColumns();
+
     if (old_metadata.hasPartitionKey())
     {
         /// Forbid altering columns inside partition key expressions because it can change partition ID format.
@@ -4030,7 +4059,13 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
 
         /// But allow to alter columns without expressions under certain condition.
         for (const String & col : partition_key_expr->getRequiredColumns())
-            columns_alter_type_check_safe_for_partition.insert(col);
+        {
+            auto storage_column = old_columns.tryGetColumnOrSubcolumn(GetColumnsOptions::All, col);
+            if (storage_column && storage_column->isSubcolumn())
+                column_to_subcolumns_used_in_keys[storage_column->getNameInStorage()].push_back(backQuoteIfNeed(col));
+            else
+                columns_alter_type_check_safe_for_partition.insert(col);
+        }
     }
 
     if (old_metadata.hasSortingKey())
@@ -4042,7 +4077,13 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
                 columns_alter_type_forbidden.insert(child->result_name);
         }
         for (const String & col : sorting_key_expr->getRequiredColumns())
-            columns_alter_type_metadata_only.insert(col);
+        {
+            auto storage_column = old_columns.tryGetColumnOrSubcolumn(GetColumnsOptions::All, col);
+            if (storage_column && storage_column->isSubcolumn())
+                column_to_subcolumns_used_in_keys[storage_column->getNameInStorage()].push_back(backQuoteIfNeed(col));
+            else
+                columns_alter_type_metadata_only.insert(col);
+        }
 
         /// We don't process sample_by_ast separately because it must be among the primary key columns
         /// and we don't process primary_key_expr separately because it is a prefix of sorting_key_expr.
@@ -4172,6 +4213,15 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
                                 backQuoteIfNeed(command.column_name));
             }
 
+            if (column_to_subcolumns_used_in_keys.contains(command.column_name))
+            {
+                throw Exception(
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
+                    "Trying to ALTER RENAME column {} whose subcolumns ({}) are part of key expression",
+                    backQuoteIfNeed(command.column_name),
+                    boost::join(column_to_subcolumns_used_in_keys[command.column_name], ", "));
+            }
+
             /// Don't check columns in indices here. RENAME works fine with index columns.
 
             if (auto it = columns_in_projections.find(command.column_name); it != columns_in_projections.end())
@@ -4191,6 +4241,15 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
                     "Trying to ALTER DROP key {} column which is a part of key expression", backQuoteIfNeed(command.column_name));
             }
 
+            if (column_to_subcolumns_used_in_keys.contains(command.column_name))
+            {
+                throw Exception(
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
+                    "Trying to ALTER DROP column {} whose subcolumns ({}) are part of key expression",
+                    backQuoteIfNeed(command.column_name),
+                    boost::join(column_to_subcolumns_used_in_keys[command.column_name], ", "));
+            }
+
             /// Don't check columns in indices or projections here. If required columns of indices
             /// or projections get dropped, it will be checked later in AlterCommands::apply. This
             /// allows projections with * to drop columns. One example can be found in
@@ -4239,6 +4298,15 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
                 throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN, "ALTER of key column {} is forbidden",
                     backQuoteIfNeed(command.column_name));
 
+            if (column_to_subcolumns_used_in_keys.contains(command.column_name))
+            {
+                throw Exception(
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
+                    "Trying to ALTER column {} whose subcolumns ({}) are part of key expression",
+                    backQuoteIfNeed(command.column_name),
+                    boost::join(column_to_subcolumns_used_in_keys[command.column_name], ", "));
+            }
+
             if (auto it = columns_in_indices.find(command.column_name); it != columns_in_indices.end())
             {
                 throw Exception(
@@ -4446,8 +4514,6 @@ void MergeTreeData::changeSettings(
 {
     if (new_settings)
     {
-        bool has_storage_policy_changed = false;
-
         const auto & new_changes = new_settings->as<const ASTSetQuery &>().changes;
         StoragePolicyPtr new_storage_policy = nullptr;
 
@@ -4486,8 +4552,6 @@ void MergeTreeData::changeSettings(
                         disk->createDirectories(fs::path(relative_data_path) / DETACHED_DIR_NAME);
                     }
                     /// FIXME how would that be done while reloading configuration???
-
-                    has_storage_policy_changed = true;
                 }
             }
         }
@@ -4504,9 +4568,6 @@ void MergeTreeData::changeSettings(
         StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
         new_metadata.setSettingsChanges(new_settings);
         setInMemoryMetadata(new_metadata);
-
-        if (has_storage_policy_changed)
-            startBackgroundMovesIfNeeded();
     }
 }
 
@@ -6145,6 +6206,189 @@ void MergeTreeData::movePartitionToTable(const PartitionCommand & command, Conte
     movePartitionToTable(dest_storage, command.partition, query_context);
 }
 
+void MergeTreeData::exportPartToTable(const PartitionCommand & command, ContextPtr query_context)
+{
+    if (!query_context->getSettingsRef()[Setting::allow_experimental_export_merge_tree_part])
+    {
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Exporting merge tree part is experimental. Set `allow_experimental_export_merge_tree_part` to enable it");
+    }
+
+    const auto part_name = command.partition->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (!command.to_table_function)
+    {
+        const auto database_name = query_context->resolveDatabase(command.to_database);
+        exportPartToTable(part_name, StorageID{database_name, command.to_table}, generateSnowflakeIDString(), query_context);
+
+        return;
+    }
+
+    auto table_function_ast = command.to_table_function;
+    auto table_function_ptr = TableFunctionFactory::instance().get(command.to_table_function, query_context);
+
+    if (table_function_ptr->needStructureHint())
+    {
+        const auto source_metadata_ptr = getInMemoryMetadataPtr();
+
+        /// Grab only the readable columns from the source metadata to skip ephemeral columns
+        const auto readable_columns = ColumnsDescription(source_metadata_ptr->getColumns().getReadable());
+        table_function_ptr->setStructureHint(readable_columns);
+    }
+
+    if (command.partition_by_expr)
+    {
+        table_function_ptr->setPartitionBy(command.partition_by_expr);
+    }
+
+    auto dest_storage = table_function_ptr->execute(
+        table_function_ast,
+        query_context,
+        table_function_ptr->getName(),
+        /* cached_columns */ {},
+        /* use_global_context */ false,
+        /* is_insert_query */ true);
+
+    if (!dest_storage)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Failed to reconstruct destination storage");
+    }
+
+    exportPartToTable(part_name, dest_storage, generateSnowflakeIDString(), query_context);
+}
+
+void MergeTreeData::exportPartToTable(
+    const std::string & part_name,
+    const StorageID & destination_storage_id,
+    const String & transaction_id,
+    ContextPtr query_context,
+    bool allow_outdated_parts,
+    std::function<void(MergeTreePartExportManifest::CompletionCallbackResult)> completion_callback)
+{
+    auto dest_storage = DatabaseCatalog::instance().getTable(destination_storage_id, query_context);
+
+    if (destination_storage_id == this->getStorageID())
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Exporting to the same table is not allowed");
+    }
+
+    exportPartToTable(part_name, dest_storage, transaction_id, query_context, allow_outdated_parts, completion_callback);
+}
+
+void MergeTreeData::exportPartToTable(
+    const std::string & part_name,
+    const StoragePtr & dest_storage,
+    const String & transaction_id,
+    ContextPtr query_context,
+    bool allow_outdated_parts,
+    std::function<void(MergeTreePartExportManifest::CompletionCallbackResult)> completion_callback)
+{
+    if (!dest_storage->supportsImport())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Destination storage {} does not support MergeTree parts or uses unsupported partitioning", dest_storage->getName());
+
+    auto query_to_string = [] (const ASTPtr & ast)
+    {
+        return ast ? ast->formatWithSecretsOneLine() : "";
+    };
+
+    auto source_metadata_ptr = getInMemoryMetadataPtr();
+    auto destination_metadata_ptr = dest_storage->getInMemoryMetadataPtr();
+
+    const auto & source_columns = source_metadata_ptr->getColumns();
+
+    const auto & destination_columns = destination_metadata_ptr->getColumns();
+
+    /// compare all source readable columns with all destination insertable columns
+    /// this allows us to skip ephemeral columns
+    if (source_columns.getReadable().sizeOfDifference(destination_columns.getInsertable()))
+        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Tables have different structure");
+
+    if (query_to_string(source_metadata_ptr->getPartitionKeyAST()) != query_to_string(destination_metadata_ptr->getPartitionKeyAST()))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Tables have different partition key");
+
+    auto part = getPartIfExists(part_name, {MergeTreeDataPartState::Active, MergeTreeDataPartState::Outdated});
+
+    if (!part)
+        throw Exception(ErrorCodes::NO_SUCH_DATA_PART, "No such data part '{}' to export in table '{}'",
+                        part_name, getStorageID().getFullTableName());
+
+    if (part->getState() == MergeTreeDataPartState::Outdated && !allow_outdated_parts)
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Part {} is in the outdated state and cannot be exported",
+            part_name);
+
+    const bool throw_on_pending_mutations = query_context->getSettingsRef()[Setting::export_merge_tree_part_throw_on_pending_mutations];
+    const bool throw_on_pending_patch_parts = query_context->getSettingsRef()[Setting::export_merge_tree_part_throw_on_pending_patch_parts];
+
+    MergeTreeData::IMutationsSnapshot::Params mutations_snapshot_params
+    {
+        .metadata_version = source_metadata_ptr->getMetadataVersion(),
+        .min_part_metadata_version = part->getMetadataVersion(),
+        .need_data_mutations = throw_on_pending_mutations,
+        .need_alter_mutations = throw_on_pending_mutations || throw_on_pending_patch_parts,
+        .need_patch_parts = throw_on_pending_patch_parts,
+    };
+
+    const auto mutations_snapshot = getMutationsSnapshot(mutations_snapshot_params);
+
+    const auto alter_conversions = getAlterConversionsForPart(part, mutations_snapshot, query_context);
+
+    /// re-check `throw_on_pending_mutations` because `pending_mutations` might have been filled due to `throw_on_pending_patch_parts`
+    if (throw_on_pending_mutations && alter_conversions->hasMutations())
+    {
+        throw Exception(ErrorCodes::PENDING_MUTATIONS_NOT_ALLOWED,
+            "Part {} can not be exported because there are pending mutations. Either wait for the mutations to be applied or set `export_merge_tree_part_throw_on_pending_mutations` to false",
+            part_name);
+    }
+
+    if (alter_conversions->hasPatches())
+    {
+        throw Exception(ErrorCodes::PENDING_MUTATIONS_NOT_ALLOWED,
+            "Part {} can not be exported because there are pending patch parts. Either wait for the patch parts to be applied or set `export_merge_tree_part_throw_on_pending_patch_parts` to false",
+            part_name);
+    }
+
+    {
+        const auto format_settings = getFormatSettings(query_context);
+        MergeTreePartExportManifest manifest(
+            dest_storage,
+            part,
+            transaction_id,
+            query_context->getCurrentQueryId(),
+            query_context->getSettingsRef()[Setting::export_merge_tree_part_file_already_exists_policy].value,
+            query_context->getSettingsCopy(),
+            source_metadata_ptr,
+            completion_callback);
+
+        std::lock_guard lock(export_manifests_mutex);
+
+        if (!export_manifests.emplace(std::move(manifest)).second)
+        {
+            throw Exception(ErrorCodes::ABORTED, "Data part '{}' is already being exported", part_name);
+        }
+    }
+
+    background_moves_assignee.trigger();
+}
+
+void MergeTreeData::killExportPart(const String & transaction_id)
+{
+    std::lock_guard lock(export_manifests_mutex);
+
+    std::erase_if(export_manifests, [&](const auto & manifest)
+    {
+        if (manifest.transaction_id == transaction_id)
+        {
+            if (manifest.task)
+                manifest.task->cancel();
+
+            return true;
+        }
+        return false;
+    });
+}
+
 void MergeTreeData::movePartitionToShard(const ASTPtr & /*partition*/, bool /*move_part*/, const String & /*to*/, ContextPtr /*query_context*/)
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MOVE PARTITION TO SHARD is not supported by storage {}", getName());
@@ -6196,6 +6440,17 @@ Pipe MergeTreeData::alterPartition(
                 }
             }
             break;
+            case PartitionCommand::EXPORT_PART:
+            {
+                exportPartToTable(command, query_context);
+                break;
+            }
+
+            case PartitionCommand::EXPORT_PARTITION:
+            {
+                exportPartitionToTable(command, query_context);
+                break;
+            }
 
             case PartitionCommand::DROP_DETACHED_PARTITION:
                 dropDetached(command.partition, command.part, query_context);
@@ -8131,7 +8386,8 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
         {
             for (const auto & part : real_parts)
             {
-                const auto & primary_key_column = *part->getIndex()->at(0);
+                auto index = part->getIndex();
+                const auto & primary_key_column = *index->at(0);
                 auto & min_column = assert_cast<ColumnAggregateFunction &>(*partition_minmax_count_columns[pos]);
                 insert(min_column, primary_key_column[0]);
             }
@@ -8142,7 +8398,8 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
         {
             for (const auto & part : real_parts)
             {
-                const auto & primary_key_column = *part->getIndex()->at(0);
+                auto index = part->getIndex();
+                const auto & primary_key_column = *index->at(0);
                 auto & max_column = assert_cast<ColumnAggregateFunction &>(*partition_minmax_count_columns[pos]);
                 insert(max_column, primary_key_column[primary_key_column.size() - 1]);
             }
@@ -8527,6 +8784,33 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
     return std::make_pair(dst_data_part, std::move(temporary_directory_lock));
 }
 
+std::vector<MergeTreeExportStatus> MergeTreeData::getExportsStatus() const
+{
+    std::lock_guard lock(export_manifests_mutex);
+    std::vector<MergeTreeExportStatus> result;
+
+    auto source_database = getStorageID().database_name;
+    auto source_table = getStorageID().table_name;
+
+    for (const auto & manifest : export_manifests)
+    {
+        MergeTreeExportStatus status;
+
+        status.source_database = source_database;
+        status.source_table = source_table;
+        const auto destination_storage_id = manifest.destination_storage_ptr->getStorageID();
+        status.destination_database = destination_storage_id.database_name;
+        status.destination_table = destination_storage_id.table_name;
+        status.create_time = manifest.create_time;
+        status.part_name = manifest.data_part->name;
+
+        result.emplace_back(std::move(status));
+    }
+
+    return result;
+}
+
+
 bool MergeTreeData::canUseAdaptiveGranularity() const
 {
     const auto settings = getSettings();
@@ -8804,7 +9088,8 @@ void MergeTreeData::writePartLog(
     const DataPartPtr & result_part,
     const DataPartsVector & source_parts,
     const MergeListEntry * merge_entry,
-    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters)
+    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters,
+    const ExportsListEntry * exports_entry)
 try
 {
     auto table_id = getStorageID();
@@ -8872,6 +9157,16 @@ try
         part_log_elem.rows = (*merge_entry)->rows_written;
         part_log_elem.peak_memory_usage = (*merge_entry)->getMemoryTracker().getPeak();
     }
+    else if (exports_entry)
+    {
+        part_log_elem.rows_read = (*exports_entry)->rows_read;
+        part_log_elem.bytes_read_uncompressed = (*exports_entry)->bytes_read_uncompressed;
+        part_log_elem.peak_memory_usage = (*exports_entry)->getPeakMemoryUsage();
+        part_log_elem.query_id = (*exports_entry)->query_id;
+
+        /// no need to lock because at this point no one is writing to the destination file paths
+        part_log_elem.remote_file_paths = (*exports_entry)->destination_file_paths;
+    }
 
     if (profile_counters)
     {
@@ -8913,21 +9208,46 @@ MergeTreeData::CurrentlyMovingPartsTagger::~CurrentlyMovingPartsTagger()
 
 bool MergeTreeData::scheduleDataMovingJob(BackgroundJobsAssignee & assignee)
 {
-    if (parts_mover.moves_blocker.isCancelled())
-        return false;
+    if (!parts_mover.moves_blocker.isCancelled())
+    {
+        auto moving_tagger = selectPartsForMove();
+        if (!moving_tagger->parts_to_move.empty())
+        {
+            assignee.scheduleMoveTask(std::make_shared<ExecutableLambdaAdapter>(
+                [this, moving_tagger] () mutable
+                {
+                    ReadSettings read_settings = Context::getGlobalContextInstance()->getReadSettings();
+                    WriteSettings write_settings = Context::getGlobalContextInstance()->getWriteSettings();
+                    return moveParts(moving_tagger, read_settings, write_settings, /* wait_for_move_if_zero_copy= */ false) == MovePartsOutcome::PartsMoved;
+                }, moves_assignee_trigger, getStorageID()));
+            return true;
+        }
+    }
 
-    auto moving_tagger = selectPartsForMove();
-    if (moving_tagger->parts_to_move.empty())
-        return false;
+    std::lock_guard lock(export_manifests_mutex);
 
-    assignee.scheduleMoveTask(std::make_shared<ExecutableLambdaAdapter>(
-        [this, moving_tagger] () mutable
+    for (auto & manifest : export_manifests)
+    {
+        if (manifest.in_progress)
         {
-            ReadSettings read_settings = Context::getGlobalContextInstance()->getReadSettings();
-            WriteSettings write_settings = Context::getGlobalContextInstance()->getWriteSettings();
-            return moveParts(moving_tagger, read_settings, write_settings, /* wait_for_move_if_zero_copy= */ false) == MovePartsOutcome::PartsMoved;
-        }, moves_assignee_trigger, getStorageID()));
-    return true;
+            continue;
+        }
+
+        auto task = std::make_shared<ExportPartTask>(*this, manifest);
+
+        manifest.in_progress = assignee.scheduleMoveTask(task);
+
+        if (!manifest.in_progress)
+        {
+            continue;
+        }
+
+        manifest.task = task;
+
+        return true;
+    }
+
+    return false;
 }
 
 bool MergeTreeData::areBackgroundMovesNeeded() const
@@ -9145,6 +9465,10 @@ bool MergeTreeData::canUsePolymorphicParts() const
     return canUsePolymorphicParts(*getSettings(), unused);
 }
 
+void MergeTreeData::startBackgroundMoves()
+{
+    background_moves_assignee.start();
+}
 
 void MergeTreeData::checkDropOrRenameCommandDoesntAffectInProgressMutations(
     const AlterCommand & command, const std::map<std::string, MutationCommands> & unfinished_mutations, ContextPtr local_context) const
@@ -9818,7 +10142,7 @@ StorageSnapshotPtr MergeTreeData::createStorageSnapshot(const StorageMetadataPtr
         .metadata_version = metadata_snapshot->getMetadataVersion(),
         .min_part_metadata_version = getMinMetadataVersion(parts),
         .min_part_data_versions = getMinDataVersionForEachPartition(parts),
-        .max_mutation_versions = query_context->getPartitionIdToMaxBlock(),
+        .max_mutation_versions = query_context->getPartitionIdToMaxBlock(getStorageID().uuid),
         .need_data_mutations = apply_mutations_on_fly,
         .need_alter_mutations = apply_mutations_on_fly || apply_patch_parts,
         .need_patch_parts = apply_patch_parts,
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 2cd69c086473..d56277d176a9 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -19,6 +19,7 @@
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
 #include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/ExportList.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataPartBuilder.h>
 #include <Storages/MergeTree/MergeTreePartsMover.h>
@@ -37,6 +38,8 @@
 #include <Poco/Timestamp.h>
 #include <Common/threadPoolCallbackRunner.h>
 #include <Storages/MergeTree/PatchParts/PatchPartsUtils.h>
+#include <Storages/MergeTree/MergeTreePartExportStatus.h>
+#include <Storages/MergeTree/MergeTreePartExportManifest.h>
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -979,6 +982,31 @@ class MergeTreeData : public IStorage, public WithMutableContext
     /// Moves partition to specified Table
     void movePartitionToTable(const PartitionCommand & command, ContextPtr query_context);
 
+    void exportPartToTable(const PartitionCommand & command, ContextPtr query_context);
+
+    void exportPartToTable(
+        const std::string & part_name,
+        const StoragePtr & destination_storage,
+        const String & transaction_id,
+        ContextPtr query_context,
+        bool allow_outdated_parts = false,
+        std::function<void(MergeTreePartExportManifest::CompletionCallbackResult)> completion_callback = {});
+
+    void exportPartToTable(
+        const std::string & part_name,
+        const StorageID & destination_storage_id,
+        const String & transaction_id,
+        ContextPtr query_context,
+        bool allow_outdated_parts = false,
+        std::function<void(MergeTreePartExportManifest::CompletionCallbackResult)> completion_callback = {});
+
+    void killExportPart(const String & transaction_id);
+
+    virtual void exportPartitionToTable(const PartitionCommand &, ContextPtr)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "EXPORT PARTITION is not implemented for engine {}", getName());
+    }
+
     /// Checks that Partition could be dropped right now
     /// Otherwise - throws an exception with detailed information.
     /// We do not use mutex because it is not very important that the size could change during the operation.
@@ -1056,6 +1084,7 @@ class MergeTreeData : public IStorage, public WithMutableContext
         const WriteSettings & write_settings);
 
     virtual std::vector<MergeTreeMutationStatus> getMutationsStatus() const = 0;
+    std::vector<MergeTreeExportStatus> getExportsStatus() const;
 
     /// Returns true if table can create new parts with adaptive granularity
     /// Has additional constraint in replicated version
@@ -1241,6 +1270,10 @@ class MergeTreeData : public IStorage, public WithMutableContext
     /// Mutex for currently_moving_parts
     mutable std::mutex moving_parts_mutex;
 
+    mutable std::mutex export_manifests_mutex;
+
+    std::set<MergeTreePartExportManifest> export_manifests;
+
     PinnedPartUUIDsPtr getPinnedPartUUIDs() const;
 
     /// Schedules background job to like merge/mutate/fetch an executor
@@ -1334,6 +1367,7 @@ class MergeTreeData : public IStorage, public WithMutableContext
     friend class MergeTask;
     friend class IPartMetadataManager;
     friend class IMergedBlockOutputStream; // for access to log
+    friend class ExportPartTask;
 
     bool require_part_metadata;
 
@@ -1359,6 +1393,8 @@ class MergeTreeData : public IStorage, public WithMutableContext
         are_columns_and_secondary_indices_sizes_calculated = false;
     }
 
+    void startBackgroundMoves();
+
     /// Engine-specific methods
     BrokenPartCallback broken_part_callback;
 
@@ -1614,7 +1650,8 @@ class MergeTreeData : public IStorage, public WithMutableContext
         const DataPartPtr & result_part,
         const DataPartsVector & source_parts,
         const MergeListEntry * merge_entry,
-        std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters);
+        std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters,
+        const ExportsListEntry * exports_entry = nullptr);
 
     /// If part is assigned to merge or mutation (possibly replicated)
     /// Should be overridden by children, because they can have different
@@ -1825,8 +1862,6 @@ class MergeTreeData : public IStorage, public WithMutableContext
 
     bool canUsePolymorphicParts(const MergeTreeSettings & settings, String & out_reason) const;
 
-    virtual void startBackgroundMovesIfNeeded() = 0;
-
     bool allow_nullable_key = false;
     bool allow_reverse_key = false;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index 73af75859859..3a406fe1219f 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -503,7 +503,11 @@ void MergeTreeDataPartWriterCompact::ColumnsBuffer::add(MutableColumns && column
     else
     {
         for (size_t i = 0; i < columns.size(); ++i)
+        {
+            /// Fix dynamic structure so it won't changed after insertion of new rows.
+            accumulated_columns[i]->fixDynamicStructure();
             accumulated_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
+        }
     }
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index f870b4d1fe46..f53d53f09cb7 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -601,7 +601,7 @@ void MergeTreeDataPartWriterOnDisk::initOrAdjustDynamicStructureIfNeeded(Block &
                 /// and insert data into it. Resulting column will have required dynamic structure and the content
                 /// of the column in current block.
                 auto new_column = sample_column.type->createColumn();
-                new_column->takeDynamicStructureFromSourceColumns({sample_column.column});
+                new_column->takeDynamicStructureFromColumn(sample_column.column);
                 new_column->insertRangeFrom(*column.column, 0, column.column->size());
                 column.column = std::move(new_column);
             }
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 2a8d178a5425..9f6f19239945 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -1721,7 +1721,7 @@ std::pair<MarkRanges, RangesInDataPartReadHints> MergeTreeDataSelectExecutor::fi
     VectorSimilarityIndexCache * vector_similarity_index_cache,
     LoggerPtr log)
 {
-    if (!index_helper->getDeserializedFormat(part->getDataPartStorage(), index_helper->getFileName()))
+    if (!index_helper->getDeserializedFormat(part->checksums, index_helper->getFileName()))
     {
         LOG_DEBUG(log, "File for index {} does not exist ({}.*). Skipping it.", backQuote(index_helper->index.name),
             (fs::path(part->getDataPartStorage().getFullPath()) / index_helper->getFileName()).string());
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 1cf7966dddc0..a6181c302d5a 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -175,6 +175,8 @@ void updateTTL(
         subquery->buildSetInplace(context);
 
     auto ttl_column = ITTLAlgorithm::executeExpressionAndGetColumn(expr_and_set.expression, block, ttl_entry.result_column);
+    /// In some cases block can contain Sparse columns (for example, during direct deserialization into Sparse in input formats).
+    ttl_column = ttl_column->convertToFullColumnIfSparse();
 
     if (const ColumnUInt16 * column_date = typeid_cast<const ColumnUInt16 *>(ttl_column.get()))
     {
@@ -448,34 +450,34 @@ Block MergeTreeDataWriter::mergeBlock(
                 return nullptr;
             case MergeTreeData::MergingParams::Replacing:
                 return std::make_shared<ReplacingSortedAlgorithm>(
-                    header, 1, sort_description, merging_params.is_deleted_column, merging_params.version_column, block_size + 1, /*block_size_bytes=*/0);
+                    header, 1, sort_description, merging_params.is_deleted_column, merging_params.version_column, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt);
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedAlgorithm>(
                     header, 1, sort_description, merging_params.sign_column,
-                    false, block_size + 1, /*block_size_bytes=*/0, getLogger("MergeTreeDataWriter"), /*out_row_sources_buf_=*/ nullptr,
+                    false, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt, getLogger("MergeTreeDataWriter"), /*out_row_sources_buf_=*/ nullptr,
                     /*use_average_block_sizes=*/ false, /*throw_if_invalid_sign=*/ true);
             case MergeTreeData::MergingParams::Summing: {
                 auto required_columns = metadata_snapshot->getPartitionKey().expression->getRequiredColumns();
                 required_columns.append_range(metadata_snapshot->getSortingKey().expression->getRequiredColumns());
                 return std::make_shared<SummingSortedAlgorithm>(
                     header, 1, sort_description, merging_params.columns_to_sum,
-                    required_columns, block_size + 1, /*block_size_bytes=*/0, "sumWithOverflow", "sumMapWithOverflow", true, false);
+                    required_columns, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt, "sumWithOverflow", "sumMapWithOverflow", true, false);
             }
             case MergeTreeData::MergingParams::Aggregating:
-                return std::make_shared<AggregatingSortedAlgorithm>(header, 1, sort_description, block_size + 1, /*block_size_bytes=*/0);
+                return std::make_shared<AggregatingSortedAlgorithm>(header, 1, sort_description, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt);
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 return std::make_shared<VersionedCollapsingAlgorithm>(
-                    header, 1, sort_description, merging_params.sign_column, block_size + 1, /*block_size_bytes=*/0);
+                    header, 1, sort_description, merging_params.sign_column, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt);
             case MergeTreeData::MergingParams::Graphite:
                 return std::make_shared<GraphiteRollupSortedAlgorithm>(
-                    header, 1, sort_description, block_size + 1, /*block_size_bytes=*/0, merging_params.graphite_params, time(nullptr));
+                    header, 1, sort_description, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt, merging_params.graphite_params, time(nullptr));
             case MergeTreeData::MergingParams::Coalescing:
             {
                 auto required_columns = metadata_snapshot->getPartitionKey().expression->getRequiredColumns();
                 required_columns.append_range(metadata_snapshot->getSortingKey().expression->getRequiredColumns());
                 return std::make_shared<SummingSortedAlgorithm>(
                     header, 1, sort_description, merging_params.columns_to_sum,
-                    required_columns, block_size + 1, /*block_size_bytes=*/0, "last_value", "last_value", false, true);
+                    required_columns, block_size + 1, /*block_size_bytes=*/0, /*max_dynamic_subcolumns=*/std::nullopt, "last_value", "last_value", false, true);
             }
         }
     };
@@ -806,7 +808,7 @@ MergeTreeTemporaryPartPtr MergeTreeDataWriter::writeTempPartImpl(
         Block projection_block;
         {
             ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataWriterProjectionsCalculationMicroseconds);
-            projection_block = projection.calculate(block, context, perm_ptr);
+            projection_block = projection.calculate(block, 0, context, perm_ptr);
             LOG_DEBUG(
                 log, "Spent {} ms calculating projection {} for the part {}", watch.elapsed() / 1000, projection.name, new_data_part->name);
         }
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index dcbb11304246..05c3683fedbe 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -216,11 +216,11 @@ MergeTreeIndexConditionPtr MergeTreeIndexMinMax::createIndexCondition(
     return std::make_shared<MergeTreeIndexConditionMinMax>(index, filter_dag, context);
 }
 
-MergeTreeIndexFormat MergeTreeIndexMinMax::getDeserializedFormat(const IDataPartStorage & data_part_storage, const std::string & relative_path_prefix) const
+MergeTreeIndexFormat MergeTreeIndexMinMax::getDeserializedFormat(const MergeTreeDataPartChecksums & checksums, const std::string & relative_path_prefix) const
 {
-    if (data_part_storage.existsFile(relative_path_prefix + ".idx2"))
+    if (checksums.files.contains(relative_path_prefix + ".idx2"))
         return {2, ".idx2"};
-    if (data_part_storage.existsFile(relative_path_prefix + ".idx"))
+    if (checksums.files.contains(relative_path_prefix + ".idx"))
         return {1, ".idx"};
     return {0 /* unknown */, ""};
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.h b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
index 049219fb1c0e..c5aa4166b8d4 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.h
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
@@ -82,7 +82,7 @@ class MergeTreeIndexMinMax : public IMergeTreeIndex
         const ActionsDAG::Node * predicate, ContextPtr context) const override;
 
     const char* getSerializedFileExtension() const override { return ".idx2"; }
-    MergeTreeIndexFormat getDeserializedFormat(const IDataPartStorage & data_part_storage, const std::string & path_prefix) const override; /// NOLINT
+    MergeTreeIndexFormat getDeserializedFormat(const MergeTreeDataPartChecksums & checksums, const std::string & path_prefix) const override; /// NOLINT
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexReader.cpp b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
index b4968673e3df..355a080ac92c 100644
--- a/src/Storages/MergeTree/MergeTreeIndexReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
@@ -72,7 +72,7 @@ void MergeTreeIndexReader::initStreamIfNeeded()
     if (stream)
         return;
 
-    auto index_format = index->getDeserializedFormat(part->getDataPartStorage(), index->getFileName());
+    auto index_format = index->getDeserializedFormat(part->checksums, index->getFileName());
 
     stream = makeIndexReader(
         index_format.extension,
@@ -134,6 +134,7 @@ void MergeTreeIndexReader::read(size_t mark, size_t current_granule_num, MergeTr
         stream->seekToMark(mark);
 
     granules->deserializeBinary(current_granule_num, *stream->getDataBuffer(), version);
+    stream_mark = mark + 1;
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index 81bd48f616f1..5fe191e906d7 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -104,7 +104,10 @@ void MergeTreeIndexGranuleSet::deserializeBinary(ReadBuffer & istr, MergeTreeInd
     UInt64 rows_to_read = 0;
     readBinary(rows_to_read, istr);
     if (rows_to_read == 0)
+    {
+        block.clear();
         return;
+    }
 
     ISerialization::DeserializeBinaryBulkSettings settings;
     settings.getter = [&](ISerialization::SubstreamPath) -> ReadBuffer * { return &istr; };
diff --git a/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp b/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp
index c32c7cd09cbb..f2a9d57ff2c0 100644
--- a/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp
@@ -128,8 +128,17 @@ void USearchIndexWithSerialization::serialize(WriteBuffer & ostr) const
 {
     auto callback = [&ostr](void * from, size_t n)
     {
-        ostr.write(reinterpret_cast<const char *>(from), n);
-        return true;
+        /// USearch may call callback from noexcept function
+        try
+        {
+            ostr.write(reinterpret_cast<const char *>(from), n);
+            return true;
+        }
+        catch (...)
+        {
+            tryLogCurrentException("VectorSimilarityIndex", "An error while serializing USearch index");
+            return false;
+        }
     };
 
     if (auto result = Base::save_to_stream(callback); !result)
@@ -140,8 +149,17 @@ void USearchIndexWithSerialization::deserialize(ReadBuffer & istr)
 {
     auto callback = [&istr](void * from, size_t n)
     {
-        istr.readStrict(reinterpret_cast<char *>(from), n);
-        return true;
+        /// USearch may call callback from noexcept function
+        try
+        {
+            istr.readStrict(reinterpret_cast<char *>(from), n);
+            return true;
+        }
+        catch (...)
+        {
+            tryLogCurrentException("VectorSimilarityIndex", "An error while deserializing USearch index");
+            return false;
+        }
     };
 
     if (auto result = Base::load_from_stream(callback); !result)
diff --git a/src/Storages/MergeTree/MergeTreeIndices.cpp b/src/Storages/MergeTree/MergeTreeIndices.cpp
index 5145da4bb778..39d849188b01 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndices.cpp
@@ -1,3 +1,4 @@
+#include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 
 #include <Columns/IColumn.h>
@@ -23,9 +24,9 @@ Names IMergeTreeIndex::getColumnsRequiredForIndexCalc() const
 }
 
 MergeTreeIndexFormat
-IMergeTreeIndex::getDeserializedFormat(const IDataPartStorage & data_part_storage, const std::string & relative_path_prefix) const
+IMergeTreeIndex::getDeserializedFormat(const MergeTreeDataPartChecksums & checksums, const std::string & relative_path_prefix) const
 {
-    if (data_part_storage.existsFile(relative_path_prefix + ".idx"))
+    if (checksums.files.contains(relative_path_prefix + ".idx"))
         return {1, ".idx"};
     return {0 /*unknown*/, ""};
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index 73434c34cc74..9850b0981ce6 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -70,9 +70,9 @@ evalOrRpnIndexStates(RPNEvaluationIndexUsefulnessState lhs, RPNEvaluationIndexUs
 
 class ActionsDAG;
 class Block;
-class IDataPartStorage;
 struct MergeTreeWriterSettings;
 struct SelectQueryInfo;
+struct MergeTreeDataPartChecksums;
 
 class GinIndexStore;
 using GinIndexStorePtr = std::shared_ptr<GinIndexStore>;
@@ -318,7 +318,7 @@ struct IMergeTreeIndex
     ///
     /// Return pair<extension, version>.
     virtual MergeTreeIndexFormat
-    getDeserializedFormat(const IDataPartStorage & data_part_storage, const std::string & relative_path_prefix) const;
+    getDeserializedFormat(const MergeTreeDataPartChecksums & checksums, const std::string & relative_path_prefix) const;
 
     virtual MergeTreeIndexGranulePtr createIndexGranule() const = 0;
 
diff --git a/src/Storages/MergeTree/MergeTreeLazilyReader.cpp b/src/Storages/MergeTree/MergeTreeLazilyReader.cpp
index d4cede36c409..20bcc397f888 100644
--- a/src/Storages/MergeTree/MergeTreeLazilyReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeLazilyReader.cpp
@@ -263,11 +263,10 @@ void MergeTreeLazilyReader::transformLazyColumns(
     const size_t rows_size = row_num_column->size();
 
     ReadSettings read_settings;
-    read_settings.direct_io_threshold = 1;
     MergeTreeReaderSettings reader_settings =
     {
         .read_settings = read_settings,
-        .save_marks_in_cache = false,
+        .save_marks_in_cache = true,
     };
 
     MutableColumns lazily_read_columns;
diff --git a/src/Storages/MergeTree/MergeTreePartExportManifest.h b/src/Storages/MergeTree/MergeTreePartExportManifest.h
new file mode 100644
index 000000000000..b9527d5140f6
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreePartExportManifest.h
@@ -0,0 +1,94 @@
+#pragma once
+
+#include <Interpreters/StorageID.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/StorageSnapshot.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <optional>
+#include <Core/Settings.h>
+#include <Storages/IStorage.h>
+
+namespace DB
+{
+
+class Exception;
+
+class ExportPartTask;
+
+struct MergeTreePartExportManifest
+{
+    using FileAlreadyExistsPolicy = MergeTreePartExportFileAlreadyExistsPolicy;
+
+    using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
+
+    struct CompletionCallbackResult
+    {
+    private:
+        CompletionCallbackResult(bool success_, const std::vector<String> & relative_paths_in_destination_storage_, std::optional<Exception> exception_)
+            : success(success_), relative_paths_in_destination_storage(relative_paths_in_destination_storage_), exception(std::move(exception_)) {}
+    public:
+
+        static CompletionCallbackResult createSuccess(const std::vector<String> & relative_paths_in_destination_storage_)
+        {
+            return CompletionCallbackResult(true, relative_paths_in_destination_storage_, std::nullopt);
+        }
+
+        static CompletionCallbackResult createFailure(Exception exception_)
+        {
+            return CompletionCallbackResult(false, {}, std::move(exception_));
+        }
+
+        bool success = false;
+        std::vector<String> relative_paths_in_destination_storage;
+        std::optional<Exception> exception;
+    };
+
+    MergeTreePartExportManifest(
+        const StoragePtr destination_storage_ptr_,
+        const DataPartPtr & data_part_,
+        const String & transaction_id_,
+        const String & query_id_,
+        FileAlreadyExistsPolicy file_already_exists_policy_,
+        const Settings & settings_,
+        const StorageMetadataPtr & metadata_snapshot_,
+        std::function<void(CompletionCallbackResult)> completion_callback_ = {})
+        : destination_storage_ptr(destination_storage_ptr_),
+          data_part(data_part_),
+          transaction_id(transaction_id_),
+          query_id(query_id_),
+          file_already_exists_policy(file_already_exists_policy_),
+          settings(settings_),
+          metadata_snapshot(metadata_snapshot_),
+          completion_callback(completion_callback_),
+          create_time(time(nullptr)) {}
+
+    StoragePtr destination_storage_ptr;
+    DataPartPtr data_part;
+    /// Used for killing the export.
+    String transaction_id;
+    String query_id;
+    FileAlreadyExistsPolicy file_already_exists_policy;
+    Settings settings;
+
+    /// Metadata snapshot captured at the time of query validation to prevent race conditions with mutations
+    /// Otherwise the export could fail if the schema changes between validation and execution
+    StorageMetadataPtr metadata_snapshot;
+
+    std::function<void(CompletionCallbackResult)> completion_callback;
+
+    time_t create_time;
+    mutable bool in_progress = false;
+    mutable std::shared_ptr<ExportPartTask> task = nullptr;
+
+    bool operator<(const MergeTreePartExportManifest & rhs) const 
+    {
+        return data_part->name < rhs.data_part->name;
+    }
+
+    bool operator==(const MergeTreePartExportManifest & rhs) const 
+    {
+        return data_part->name == rhs.data_part->name;
+    }
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreePartExportStatus.h b/src/Storages/MergeTree/MergeTreePartExportStatus.h
new file mode 100644
index 000000000000..e71a2f15e6ed
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreePartExportStatus.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <base/types.h>
+#include <ctime>
+
+
+namespace DB
+{
+
+struct MergeTreeExportStatus
+{
+    String source_database;
+    String source_table;
+    String destination_database;
+    String destination_table;
+    time_t create_time = 0;
+    std::string part_name;
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index a4ab9066bb33..3037f67b23ac 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -466,6 +466,22 @@ void MergeTreePartition::create(const StorageMetadataPtr & metadata_snapshot, Bl
     }
 }
 
+Block MergeTreePartition::getBlockWithPartitionValues(const NamesAndTypesList & partition_columns) const
+{
+    chassert(partition_columns.size() == value.size());
+
+    Block result;
+
+    std::size_t i = 0;
+    for (const auto & partition_column : partition_columns)
+    {
+        auto column = partition_column.type->createColumnConst(1, value[i++]);
+        result.insert({column, partition_column.type, partition_column.name});
+    }
+
+    return result;
+}
+
 NamesAndTypesList MergeTreePartition::executePartitionByExpression(const StorageMetadataPtr & metadata_snapshot, Block & block, ContextPtr context)
 {
     auto adjusted_partition_key = adjustPartitionKey(metadata_snapshot, context);
diff --git a/src/Storages/MergeTree/MergeTreePartition.h b/src/Storages/MergeTree/MergeTreePartition.h
index 4338b216cdb8..811cfdc2a90c 100644
--- a/src/Storages/MergeTree/MergeTreePartition.h
+++ b/src/Storages/MergeTree/MergeTreePartition.h
@@ -60,6 +60,8 @@ struct MergeTreePartition
 
     void create(const StorageMetadataPtr & metadata_snapshot, Block block, size_t row, ContextPtr context);
 
+    Block getBlockWithPartitionValues(const NamesAndTypesList & partition_columns) const;
+
     /// Adjust partition key and execute its expression on block. Return sample block according to used expression.
     static NamesAndTypesList executePartitionByExpression(const StorageMetadataPtr & metadata_snapshot, Block & block, ContextPtr context);
 
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index c52ab6725abc..ad75db7166fd 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -212,11 +212,11 @@ MergeTreeRangeReader::Stream::Stream(size_t from_mark, size_t to_mark, size_t cu
     size_t marks_count = index_granularity->getMarksCount();
     if (from_mark >= marks_count)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying create stream to read from mark №{} but total marks count is {}",
-            toString(current_mark), toString(marks_count));
+            toString(from_mark), toString(marks_count));
 
     if (last_mark > marks_count)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying create stream to read to mark №{} but total marks count is {}",
-            toString(current_mark), toString(marks_count));
+            toString(last_mark), toString(marks_count));
 }
 
 void MergeTreeRangeReader::Stream::checkNotFinished() const
diff --git a/src/Storages/MergeTree/MergeTreeReadTask.cpp b/src/Storages/MergeTree/MergeTreeReadTask.cpp
index 2da717539d77..0e8b05ba7957 100644
--- a/src/Storages/MergeTree/MergeTreeReadTask.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadTask.cpp
@@ -255,7 +255,12 @@ MergeTreeReadTask::BlockAndProgress MergeTreeReadTask::read()
     if (read_result.num_rows != 0)
     {
         for (const auto & column : read_result.columns)
-            column->assumeMutableRef().shrinkToFit();
+        {
+            /// We may have columns that has other references, usually it is a constant column that has been created during analysis
+            /// (that will not be const here anymore, i.e. after materialize()), and we do not need to shrink it anyway.
+            if (column->use_count() == 1)
+                column->assumeMutableRef().shrinkToFit();
+        }
         block = sample_block.cloneWithColumns(read_result.columns);
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 7ff964cba8a0..7938bc0b4422 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -23,6 +23,11 @@ namespace
     constexpr auto DATA_FILE_EXTENSION = ".bin";
 }
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 MergeTreeReaderWide::MergeTreeReaderWide(
     MergeTreeDataPartInfoForReaderPtr data_part_info_,
     NamesAndTypesList columns_,
@@ -324,7 +329,21 @@ ReadBuffer * MergeTreeReaderWide::getStream(
 
     auto stream_name = IMergeTreeDataPart::getStreamNameForColumn(name_and_type, substream_path, checksums);
     if (!stream_name)
+    {
+        /// We allow missing streams only for columns/subcolumns that are not present in this part.
+        auto column = data_part_info_for_read->getColumnsDescription().tryGetColumn(GetColumnsOptions::AllPhysical, name_and_type.getNameInStorage());
+        if (column && (!name_and_type.isSubcolumn() || column->type->hasSubcolumn(name_and_type.getSubcolumnName())))
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Stream {} for column {} with type {} is not found",
+                ISerialization::getFileNameForStream(name_and_type.type->getName(), substream_path),
+                name_and_type.name,
+                column->type->getName());
+        }
+
         return nullptr;
+    }
 
     auto it = streams.find(*stream_name);
     if (it == streams.end())
diff --git a/src/Storages/MergeTree/MergeTreeReadersChain.cpp b/src/Storages/MergeTree/MergeTreeReadersChain.cpp
index 18eeca592550..360fcc74ce88 100644
--- a/src/Storages/MergeTree/MergeTreeReadersChain.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadersChain.cpp
@@ -152,17 +152,25 @@ void MergeTreeReadersChain::executeActionsBeforePrewhere(
     }
 
     auto patch_max_version = getMaxPatchVersionForStep(range_reader);
+    const auto & result_header = range_reader.getReadSampleBlock();
+    auto columns_for_patches = getColumnsForPatches(result_header, read_columns);
 
-    /// Apply patches without min version for new columns because
-    /// if column is read on this step, it is not used by previous steps.
-    applyPatches(
-        range_reader.getReadSampleBlock(),
-        read_columns,
-        result.patch_versions_block,
-        /*min_version=*/ {},
-        patch_max_version,
-        /*after_conversions=*/ false,
-        result.columns_for_patches);
+    auto apply_patches = [&](ColumnForPatch::Order order)
+    {
+        /// Apply patches without min version for new columns because
+        /// if column is read on this step, it is not used by previous steps.
+        applyPatches(
+            result_header,
+            read_columns,
+            result.patch_versions_block,
+            /*min_version=*/ {},
+            patch_max_version,
+            columns_for_patches,
+            {order},
+            result.columns_for_patches);
+    };
+
+    apply_patches(ColumnForPatch::Order::BeforeConversions);
 
     /// If columns not empty, then apply on-fly alter conversions if any required
     if (!prewhere_info || prewhere_info->perform_alter_conversions)
@@ -170,14 +178,7 @@ void MergeTreeReadersChain::executeActionsBeforePrewhere(
         merge_tree_reader->performRequiredConversions(read_columns);
     }
 
-    applyPatches(
-        range_reader.getReadSampleBlock(),
-        read_columns,
-        result.patch_versions_block,
-        /*min_version=*/ {},
-        patch_max_version,
-        /*after_conversions=*/ true,
-        result.columns_for_patches);
+    apply_patches(ColumnForPatch::Order::AfterConversions);
 
     /// If some columns absent in part, then evaluate default values
     if (should_evaluate_missing_defaults)
@@ -192,6 +193,8 @@ void MergeTreeReadersChain::executeActionsBeforePrewhere(
         addDummyColumnWithRowCount(additional_columns, result.num_rows);
         merge_tree_reader->evaluateMissingDefaults(additional_columns, read_columns);
     }
+
+    apply_patches(ColumnForPatch::Order::AfterEvaluatingDefaults);
 }
 
 void MergeTreeReadersChain::executePrewhereActions(MergeTreeRangeReader & reader, ReadResult & result, const Block & previous_header, bool is_last_reader)
@@ -258,8 +261,57 @@ void MergeTreeReadersChain::readPatches(const Block & result_header, std::vector
     }
 }
 
+ColumnsForPatches MergeTreeReadersChain::getColumnsForPatches(const Block & header, const Columns & columns) const
+{
+    ColumnsForPatches res;
+    auto block = header.cloneWithColumns(columns);
+    using enum ColumnForPatch::Order;
+
+    for (const auto & patch_reader : patch_readers)
+    {
+        const auto & patch = patch_reader->getPatchPart();
+        const auto & patch_columns = patch.part->getColumnsDescription();
+        const auto & alter_conversions = patch.part->getAlterConversions();
+        auto & columns_for_patch = res.emplace_back();
+
+        for (const auto & column : block)
+        {
+            if (isPatchPartSystemColumn(column.name))
+                continue;
+
+            String column_name_in_patch = column.name;
+            if (alter_conversions && alter_conversions->isColumnRenamed(column.name))
+                column_name_in_patch = alter_conversions->getColumnOldName(column.name);
+
+            if (!patch_columns.hasColumnOrSubcolumn(GetColumnsOptions::All, column_name_in_patch))
+                continue;
+
+            /// Add requested column name, not the column name in patch, for correct applying patches.
+            /// This column name is translated to the column name in patch in MergeTree reader.
+            /// If columns is not created at this stage, it will be filled with defaults at the latest stage of reading.
+            if (!column.column)
+            {
+                columns_for_patch.emplace_back(column.name, AfterEvaluatingDefaults);
+            }
+            else if (patch.perform_alter_conversions)
+            {
+                columns_for_patch.emplace_back(column.name, AfterConversions);
+            }
+            else
+            {
+                columns_for_patch.emplace_back(column.name, BeforeConversions);
+            }
+        }
+    }
+
+    return res;
+}
+
 void MergeTreeReadersChain::applyPatchesAfterReader(ReadResult & result, size_t reader_index)
 {
+    if (patch_readers.empty() || result.num_rows == 0 || result.columns.empty())
+        return;
+
     auto & current_reader = range_readers.at(reader_index);
 
     std::optional<UInt64> min_version = getMaxPatchVersionForStep(current_reader);
@@ -277,45 +329,33 @@ void MergeTreeReadersChain::applyPatchesAfterReader(ReadResult & result, size_t
             column.column = ColumnUInt64::create(result.patch_versions_block.rows(), *min_version);
     }
 
+    const auto & result_header = current_reader.getSampleBlock();
+    auto columns_for_patches = getColumnsForPatches(result_header, result.columns);
+
+    using enum ColumnForPatch::Order;
+    std::set<ColumnForPatch::Order> suitable_orders = {AfterConversions, AfterEvaluatingDefaults};
+
     applyPatches(
-        current_reader.getSampleBlock(),
+        result_header,
         result.columns,
         result.patch_versions_block,
         min_version,
         max_version,
-        /*after_conversions=*/ true,
+        columns_for_patches,
+        suitable_orders,
         result.columns_for_patches);
 }
 
-static UInt128 getColumnsHash(const Names & column_names)
-{
-    SipHash hash;
-    for (const auto & column_name : column_names)
-        hash.update(column_name);
-    return hash.get128();
-}
-
-Names getUpdatedColumns(const Block & block, const IMergeTreeDataPartInfoForReader & patch)
+struct NamesHash
 {
-    Names res;
-    const auto & patch_columns = patch.getColumnsDescription();
-    const auto & alter_conversions = patch.getAlterConversions();
-
-    for (const auto & column : block)
+    size_t operator()(const Names & column_names) const
     {
-        if (isPatchPartSystemColumn(column.name))
-            continue;
-
-        String column_name = column.name;
-        if (alter_conversions && alter_conversions->isColumnRenamed(column_name))
-            column_name = alter_conversions->getColumnOldName(column_name);
-
-        if (patch_columns.hasColumnOrSubcolumn(GetColumnsOptions::All, column_name))
-            res.push_back(std::move(column_name));
+        SipHash hash;
+        for (const auto & column_name : column_names)
+            hash.update(column_name);
+        return hash.get64();
     }
-
-    return res;
-}
+};
 
 void MergeTreeReadersChain::applyPatches(
     const Block & result_header,
@@ -323,7 +363,8 @@ void MergeTreeReadersChain::applyPatches(
     Block & versions_block,
     std::optional<UInt64> min_version,
     std::optional<UInt64> max_version,
-    bool after_conversions,
+    const ColumnsForPatches & columns_for_patches,
+    const std::set<ColumnForPatch::Order> & suitable_orders,
     const Block & additional_columns) const
 {
     if (patch_readers.empty() || result_columns.empty())
@@ -333,7 +374,7 @@ void MergeTreeReadersChain::applyPatches(
     addPatchVirtuals(result_block, additional_columns);
 
     /// Combine patches with the same structure.
-    std::unordered_map<UInt128, PatchesToApply> patches_to_apply;
+    std::unordered_map<Names, PatchesToApply, NamesHash> patches_to_apply;
     UInt64 source_data_version = patch_readers.front()->getPatchPart().source_data_version;
 
     for (size_t i = 0; i < patch_readers.size(); ++i)
@@ -354,15 +395,17 @@ void MergeTreeReadersChain::applyPatches(
         if (max_version.has_value() && patchHasHigherDataVersion(*patch.part, *max_version))
             continue;
 
-        if (after_conversions != patch.perform_alter_conversions)
-            continue;
+        Names updated_columns;
+        for (const auto & columns_for_patch : columns_for_patches[i])
+        {
+            if (suitable_orders.contains(columns_for_patch.order))
+                updated_columns.push_back(columns_for_patch.column_name);
+        }
 
-        auto updated_columns = getUpdatedColumns(result_block, *patch.part);
         if (updated_columns.empty())
             continue;
 
         std::sort(updated_columns.begin(), updated_columns.end());
-        auto columns_hash = getColumnsHash(updated_columns);
 
         for (const auto & patch_result : patch_results)
         {
@@ -372,7 +415,7 @@ void MergeTreeReadersChain::applyPatches(
             for (auto & patch_to_apply : patches)
             {
                 if (!patch_to_apply->empty())
-                    patches_to_apply[columns_hash].push_back(std::move(patch_to_apply));
+                    patches_to_apply[updated_columns].push_back(std::move(patch_to_apply));
             }
         }
     }
@@ -380,8 +423,8 @@ void MergeTreeReadersChain::applyPatches(
     if (min_version.has_value())
         source_data_version = std::max(source_data_version, *min_version);
 
-    for (const auto & [_, patches] : patches_to_apply)
-        applyPatchesToBlock(result_block, versions_block, patches, source_data_version);
+    for (const auto & [updated_columns, patches] : patches_to_apply)
+        applyPatchesToBlock(result_block, versions_block, patches, updated_columns, source_data_version);
 
     result_columns = result_block.getColumns();
     result_columns.resize(result_header.columns());
diff --git a/src/Storages/MergeTree/MergeTreeReadersChain.h b/src/Storages/MergeTree/MergeTreeReadersChain.h
index 17d9aeff6fa4..3124b320f3f4 100644
--- a/src/Storages/MergeTree/MergeTreeReadersChain.h
+++ b/src/Storages/MergeTree/MergeTreeReadersChain.h
@@ -7,6 +7,27 @@ namespace DB
 
 using RangeReaders = std::vector<MergeTreeRangeReader>;
 
+struct ColumnForPatch
+{
+    enum class Order
+    {
+        /// Apply patch before converting the column to actual type.
+        BeforeConversions,
+        /// Apply patch after converting the column to actual type.
+        AfterConversions,
+        /// Apply patch after evaluating missing defaults for the column.
+        AfterEvaluatingDefaults,
+    };
+
+    ColumnForPatch(const String & column_name_, Order order_) : column_name(column_name_), order(order_) {}
+
+    String column_name;
+    Order order;
+};
+
+using ColumnsForPatch = std::vector<ColumnForPatch>;
+using ColumnsForPatches = std::vector<ColumnsForPatch>;
+
 class MergeTreeReadersChain
 {
 public:
@@ -44,6 +65,7 @@ class MergeTreeReadersChain
     void addPatchVirtuals(Block & to, const Block & from) const;
     void addPatchVirtuals(ReadResult & result, const Block & header) const;
     void applyPatchesAfterReader(ReadResult & result, size_t reader_index);
+    ColumnsForPatches getColumnsForPatches(const Block & header, const Columns & columns) const;
 
     void applyPatches(
         const Block & result_header,
@@ -51,7 +73,8 @@ class MergeTreeReadersChain
         Block & versions_block,
         std::optional<UInt64> min_version,
         std::optional<UInt64> max_version,
-        bool after_conversions,
+        const ColumnsForPatches & columns_for_patches,
+        const std::set<ColumnForPatch::Order> & suitable_orders,
         const Block & additional_columns) const;
 
     RangeReaders range_readers;
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index d0385d1c7d33..56613657e68a 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -168,6 +168,10 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
             addThrottler(read_settings.remote_throttler, context->getMergesThrottler());
             addThrottler(read_settings.local_throttler, context->getMergesThrottler());
             break;
+        case Export:
+            addThrottler(read_settings.local_throttler, context->getExportsThrottler());
+            addThrottler(read_settings.remote_throttler, context->getExportsThrottler());
+            break;
     }
 
     MergeTreeReaderSettings reader_settings =
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.h b/src/Storages/MergeTree/MergeTreeSequentialSource.h
index abba230d9e79..a858adf33bb5 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.h
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.h
@@ -15,6 +15,7 @@ enum MergeTreeSequentialSourceType
 {
     Mutation,
     Merge,
+    Export,
 };
 
 /// Create stream for reading single part from MergeTree.
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index dc8d0ac205ae..d7d1136f1e4f 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -293,6 +293,13 @@ namespace ErrorCodes
     Enables writing marks per each substream instead of per each column in Compact parts.
     It allows to read individual subcolumns from the data part efficiently.
     )", 0) \
+    DECLARE(UInt64Auto, merge_max_dynamic_subcolumns_in_wide_part, Field("auto"), R"(
+    The maximum number of dynamic subcolumns that can be created in every column in the Wide data part after merge.
+    It allows to reduce number of files created in Wide data part regardless of dynamic parameters specified in the data type.
+
+    For example, if the table has a column with the JSON(max_dynamic_paths=1024) type and the setting merge_max_dynamic_subcolumns_in_wide_part is set to 128,
+    after merge into the Wide data part number of dynamic paths will be decreased to 128 in this part and only 128 paths will be written as dynamic subcolumns.
+    )", 0) \
     \
     /** Merge selector settings. */ \
     DECLARE(UInt64, merge_selector_blurry_base_scale_factor, 0, R"(
@@ -1921,6 +1928,7 @@ namespace ErrorCodes
     MAKE_OBSOLETE_MERGE_TREE_SETTING(M, Seconds, replicated_fetches_http_receive_timeout, 0) \
     MAKE_OBSOLETE_MERGE_TREE_SETTING(M, UInt64, replicated_max_parallel_fetches_for_host, DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT) \
     MAKE_OBSOLETE_MERGE_TREE_SETTING(M, CleanDeletedRows, clean_deleted_rows, CleanDeletedRows::Never) \
+    MAKE_OBSOLETE_MERGE_TREE_SETTING(M, UInt64, max_digestion_size_per_segment, 256_MiB) \
     MAKE_OBSOLETE_MERGE_TREE_SETTING(M, UInt64, kill_delay_period, 30) \
     MAKE_OBSOLETE_MERGE_TREE_SETTING(M, UInt64, kill_delay_period_random_add, 10) \
     MAKE_OBSOLETE_MERGE_TREE_SETTING(M, UInt64, kill_threads, 128) \
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index fdefe6b8df92..c9580863b3bd 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -49,6 +49,7 @@ struct MutableColumnsAndConstraints;
     M(CLASS_NAME, Seconds) \
     M(CLASS_NAME, String) \
     M(CLASS_NAME, UInt64) \
+    M(CLASS_NAME, UInt64Auto) \
     M(CLASS_NAME, MergeTreeObjectSerializationVersion) \
     M(CLASS_NAME, MergeTreeObjectSharedDataSerializationVersion) \
     M(CLASS_NAME, MergeTreeDynamicSerializationVersion) \
diff --git a/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp b/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
index 1ac4241ea707..b762a929dcda 100644
--- a/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
+++ b/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
@@ -157,7 +157,7 @@ const ActionsDAG::Node & addCast(
         const ActionsDAG::Node & node_to_cast,
         const DataTypePtr & to_type)
 {
-    if (!node_to_cast.result_type->equals(*to_type))
+    if (node_to_cast.result_type->equals(*to_type))
         return node_to_cast;  /// NOLINT(bugprone-return-const-ref-from-parameter)
 
     const auto & new_node = dag->addCast(node_to_cast, to_type, {});
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 040c8c39934c..240380c7bd02 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -231,7 +231,8 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
         auto serialization_infos = new_part->getSerializationInfos();
 
         serialization_infos.replaceData(new_serialization_infos);
-        files_to_remove_after_sync = removeEmptyColumnsFromPart(new_part, part_columns, serialization_infos, checksums);
+        files_to_remove_after_sync
+            = removeEmptyColumnsFromPart(new_part, part_columns, new_part->expired_columns, serialization_infos, checksums);
 
         new_part->setColumns(part_columns, serialization_infos, metadata_snapshot->getMetadataVersion());
     }
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index e653ce21b5be..35cb644957d3 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -97,7 +97,13 @@ MergedColumnOnlyOutputStream::fillChecksums(
     auto serialization_infos = new_part->getSerializationInfos();
     serialization_infos.replaceData(new_serialization_infos);
 
-    auto removed_files = removeEmptyColumnsFromPart(new_part, columns, serialization_infos, checksums);
+    NameSet empty_columns;
+    for (const auto & column : writer->getColumnsSample())
+    {
+        if (new_part->expired_columns.contains(column.name))
+            empty_columns.emplace(column.name);
+    }
+    auto removed_files = removeEmptyColumnsFromPart(new_part, columns, empty_columns, serialization_infos, checksums);
 
     for (const String & removed_file : removed_files)
     {
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index e7ec0a46c87a..02f24454ef5b 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -336,12 +336,20 @@ static void splitAndModifyMutationCommands(
                 || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
                 || command.type == MutationCommand::Type::MATERIALIZE_TTL
                 || command.type == MutationCommand::Type::DELETE
-                || command.type == MutationCommand::Type::UPDATE
                 || command.type == MutationCommand::Type::APPLY_DELETED_MASK
                 || command.type == MutationCommand::Type::APPLY_PATCHES)
             {
                 for_interpreter.push_back(command);
             }
+            else if (command.type == MutationCommand::Type::UPDATE)
+            {
+                for_interpreter.push_back(command);
+
+                /// Update column can change the set of substreams for column if it
+                /// changes serialization (for example from Sparse to not Sparse).
+                /// We add it "for renames" because these set of commands also removes redundant files
+                for_file_renames.push_back(command);
+            }
             else if (command.type == MutationCommand::Type::DROP_INDEX
                      || command.type == MutationCommand::Type::DROP_PROJECTION
                      || command.type == MutationCommand::Type::DROP_STATISTICS)
@@ -980,7 +988,7 @@ static NameToNameVector collectFilesForRenames(
                 if (source_part->checksums.has(STATS_FILE_PREFIX + command.column_name + STATS_FILE_SUFFIX))
                     add_rename(STATS_FILE_PREFIX + command.column_name + STATS_FILE_SUFFIX, STATS_FILE_PREFIX + command.rename_to + STATS_FILE_SUFFIX);
             }
-            else if (command.type == MutationCommand::Type::READ_COLUMN || command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
+            else if (command.type == MutationCommand::Type::UPDATE || command.type == MutationCommand::Type::READ_COLUMN || command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
             {
                 /// Remove files for streams that exist in source_part,
                 /// but were removed in new_part by MODIFY COLUMN or MATERIALIZE COLUMN from
@@ -1361,13 +1369,14 @@ bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
         if (ctx->count_lightweight_deleted_rows)
             existing_rows_count += MutationHelpers::getExistingRowsCount(cur_block);
 
+        UInt64 starting_offset = (*ctx->mutate_entry)->rows_written;
         for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
         {
             Chunk squashed_chunk;
 
             {
                 ProfileEventTimeIncrement<Microseconds> projection_watch(ProfileEvents::MutateTaskProjectionsCalculationMicroseconds);
-                Block block_to_squash = ctx->projections_to_build[i]->calculate(cur_block, ctx->context);
+                Block block_to_squash = ctx->projections_to_build[i]->calculate(cur_block, starting_offset, ctx->context);
 
                 /// Everything is deleted by lighweight delete
                 if (block_to_squash.rows() == 0)
@@ -1722,7 +1731,15 @@ class MutateAllPartColumnsTask : public IExecutableTask
 
         if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
         {
-            auto transform = std::make_shared<TTLTransform>(ctx->context, builder->getSharedHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+            auto transform = std::make_shared<TTLTransform>(
+                ctx->context,
+                builder->getSharedHeader(),
+                *ctx->data,
+                ctx->metadata_snapshot,
+                ctx->new_data_part,
+                NamesAndTypesList{} /*expired_columns*/,
+                ctx->time_of_mutation,
+                true);
             subqueries = transform->getSubqueries();
             builder->addTransform(std::move(transform));
         }
@@ -1988,7 +2005,15 @@ class MutateSomePartColumnsTask : public IExecutableTask
 
             if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
             {
-                auto transform = std::make_shared<TTLTransform>(ctx->context, builder->getSharedHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+                auto transform = std::make_shared<TTLTransform>(
+                    ctx->context,
+                    builder->getSharedHeader(),
+                    *ctx->data,
+                    ctx->metadata_snapshot,
+                    ctx->new_data_part,
+                    NamesAndTypesList{} /*expired_columns*/,
+                    ctx->time_of_mutation,
+                    true);
                 subqueries = transform->getSubqueries();
                 builder->addTransform(std::move(transform));
             }
@@ -2233,7 +2258,7 @@ bool MutateTask::execute()
             //
             // Fetching a byte-identical part (in case of checksum mismatches) will fail with
             // `Part ... should be deleted after previous attempt before fetch`.
-            promise.set_value(std::move(ctx->new_data_part));
+            promise.set_value(std::exchange(ctx->new_data_part, nullptr));
             return false;
         }
     }
@@ -2244,6 +2269,9 @@ void MutateTask::cancel() noexcept
 {
     if (task)
         task->cancel();
+
+    if (ctx->new_data_part)
+        ctx->new_data_part->removeIfNeeded();
 }
 
 void MutateTask::updateProfileEvents() const
diff --git a/src/Storages/MergeTree/PatchParts/RangesInPatchParts.cpp b/src/Storages/MergeTree/PatchParts/RangesInPatchParts.cpp
index d2a14279567c..035a98b35545 100644
--- a/src/Storages/MergeTree/PatchParts/RangesInPatchParts.cpp
+++ b/src/Storages/MergeTree/PatchParts/RangesInPatchParts.cpp
@@ -267,7 +267,7 @@ MaybeMinMaxStats getPatchMinMaxStats(const DataPartPtr & patch_part, const MarkR
 
     auto index_ptr = MergeTreeIndexFactory::instance().get(*it);
     /// Check that index exists in data part. It may be absent for parts created in earlier versions.
-    if (!index_ptr->getDeserializedFormat(patch_part->getDataPartStorage(), index_ptr->getFileName()))
+    if (!index_ptr->getDeserializedFormat(patch_part->checksums, index_ptr->getFileName()))
         return {};
 
     size_t total_marks_without_final = patch_part->index_granularity->getMarksCountWithoutFinal();
diff --git a/src/Storages/MergeTree/PatchParts/applyPatches.cpp b/src/Storages/MergeTree/PatchParts/applyPatches.cpp
index 0d0914cb5565..6b5149b92844 100644
--- a/src/Storages/MergeTree/PatchParts/applyPatches.cpp
+++ b/src/Storages/MergeTree/PatchParts/applyPatches.cpp
@@ -249,7 +249,7 @@ IColumn::Patch CombinedPatchBuilder::createPatchForColumn(const String & column_
     };
 }
 
-Block getUpdatedHeader(const PatchesToApply & patches, const Block & result_block)
+Block getUpdatedHeader(const PatchesToApply & patches, const NameSet & updated_columns)
 {
     std::vector<Block> headers;
 
@@ -266,9 +266,8 @@ Block getUpdatedHeader(const PatchesToApply & patches, const Block & result_bloc
 
         for (const auto & column : patch->patch_blocks[0])
         {
-            /// System columns may differ in patches because we allow to apply combined patches
-            /// with different modes. Ignore columns that are not present in result block.
-            if (isPatchPartSystemColumn(column.name) || !result_block.has(column.name))
+            /// Ignore columns that are not updated.
+            if (!updated_columns.contains(column.name))
                 header.erase(column.name);
         }
 
@@ -522,13 +521,15 @@ void applyPatchesToBlock(
     Block & result_block,
     Block & versions_block,
     const PatchesToApply & patches,
+    const Names & updated_columns,
     UInt64 source_data_version)
 {
     if (patches.empty())
         return;
 
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::ApplyPatchesMicroseconds);
-    auto updated_header = getUpdatedHeader(patches, result_block);
+    NameSet updated_columns_set(updated_columns.begin(), updated_columns.end());
+    auto updated_header = getUpdatedHeader(patches, updated_columns_set);
 
     if (canApplyPatchesRaw(patches))
         applyPatchesToBlockRaw(result_block, versions_block, patches, updated_header, source_data_version);
diff --git a/src/Storages/MergeTree/PatchParts/applyPatches.h b/src/Storages/MergeTree/PatchParts/applyPatches.h
index 646560bba88d..393dd6396cec 100644
--- a/src/Storages/MergeTree/PatchParts/applyPatches.h
+++ b/src/Storages/MergeTree/PatchParts/applyPatches.h
@@ -66,6 +66,7 @@ void applyPatchesToBlock(
     Block & result_block,
     Block & versions_block,
     const PatchesToApply & patches,
+    const Names & updated_columns,
     UInt64 source_data_version);
 
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 8420cd5738c2..aca997b1e443 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -11,6 +11,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/ServerUUID.h>
 #include <boost/algorithm/string/replace.hpp>
+#include <Core/ServerSettings.h>
 
 
 namespace CurrentMetrics
@@ -27,6 +28,11 @@ namespace MergeTreeSetting
     extern const MergeTreeSettingsSeconds zookeeper_session_expiration_check_period;
 }
 
+namespace ServerSetting
+{
+    extern const ServerSettingsBool enable_experimental_export_merge_tree_partition_feature;
+}
+
 namespace ErrorCodes
 {
     extern const int REPLICA_IS_ALREADY_ACTIVE;
@@ -171,10 +177,19 @@ bool ReplicatedMergeTreeRestartingThread::runImpl()
     storage.mutations_updating_task->activateAndSchedule();
     storage.mutations_finalizing_task->activateAndSchedule();
     storage.merge_selecting_task->activateAndSchedule();
+
+    if (storage.getContext()->getServerSettings()[ServerSetting::enable_experimental_export_merge_tree_partition_feature])
+    {
+        storage.export_merge_tree_partition_updating_task->activateAndSchedule();
+        storage.export_merge_tree_partition_select_task->activateAndSchedule();
+        storage.export_merge_tree_partition_status_handling_task->activateAndSchedule();
+    }
+
     storage.cleanup_thread.start();
     storage.async_block_ids_cache.start();
     storage.part_check_thread.start();
 
+
     LOG_DEBUG(log, "Table started successfully");
     return true;
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index b55f2e3c8aee..96f934fc6de1 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -52,6 +52,7 @@ namespace FailPoints
     extern const char replicated_merge_tree_insert_quorum_fail_0[];
     extern const char replicated_merge_tree_commit_zk_fail_when_recovering_from_hw_fault[];
     extern const char replicated_merge_tree_insert_retry_pause[];
+    extern const char rmt_delay_commit_part[];
 }
 
 namespace ErrorCodes
@@ -592,14 +593,34 @@ bool ReplicatedMergeTreeSinkImpl<false>::writeExistingPart(MergeTreeData::Mutabl
 
         int error = 0;
         /// Set a special error code if the block is duplicate
-        /// And remove attaching_ prefix
         if (deduplicate && deduplicated)
         {
             error = ErrorCodes::INSERT_WAS_DEDUPLICATED;
-            if (!endsWith(part->getDataPartStorage().getRelativePath(), "detached/attaching_" + part->name + "/"))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected relative path for a deduplicated part: {}", part->getDataPartStorage().getRelativePath());
-            fs::path new_relative_path = fs::path("detached") / part->getNewName(part->info);
-            part->renameTo(new_relative_path, false);
+
+            const auto & relative_path = part->getDataPartStorage().getRelativePath();
+            const auto part_dir = fs::path(relative_path).parent_path().filename().string();
+
+            if (relative_path.ends_with("detached/attaching_" + part->name + "/"))
+            {
+                /// Part came from ATTACH PART - rename back to detached/ (remove attaching_ prefix)
+                fs::path new_relative_path = fs::path("detached") / part->getNewName(part->info);
+                part->renameTo(new_relative_path, false);
+            }
+            else if (part_dir.starts_with("tmp_restore_" + part->name))
+            {
+                /// Part came from RESTORE with a temporary directory.
+                /// Just remove the temporary part since it's a duplicate.
+                LOG_DEBUG(log, "Removing deduplicated part {} from temporary path {}", part->name, relative_path);
+                part->removeIfNeeded();
+            }
+            else
+            {
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Unexpected deduplicated part with relative path '{}' and part directory '{}'. "
+                    "Expected relative path to end with 'detached/attaching_{}/' or part directory to start with 'tmp_restore_{}'.",
+                    relative_path, part_dir, part->name, part->name);
+            }
         }
         PartLog::addNewPart(storage.getContext(), PartLog::PartLogEntry(part, watch.elapsed(), profile_events_scope.getSnapshot()), ExecutionStatus(error));
         return deduplicated;
@@ -950,9 +971,10 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
 
         fiu_do_on(FailPoints::replicated_merge_tree_commit_zk_fail_after_op, { zookeeper->forceFailureAfterOperation(); });
 
+        fiu_do_on(FailPoints::rmt_delay_commit_part, { sleepForSeconds(5); });
+
         Coordination::Responses responses;
         Coordination::Error multi_code = zookeeper->tryMultiNoThrow(ops, responses, /* check_session_valid */ true); /// 1 RTT
-
         if (multi_code == Coordination::Error::ZOK)
         {
             part->new_part_was_committed_to_zookeeper_after_rename_on_disk = true;
diff --git a/src/Storages/MergeTree/tests/gtest_executor.cpp b/src/Storages/MergeTree/tests/gtest_executor.cpp
index 5b65410f87c0..00c75635b033 100644
--- a/src/Storages/MergeTree/tests/gtest_executor.cpp
+++ b/src/Storages/MergeTree/tests/gtest_executor.cpp
@@ -19,6 +19,14 @@ namespace CurrentMetrics
     extern const Metric BackgroundMergesAndMutationsPoolSize;
 }
 
+namespace ProfileEvents
+{
+    extern const Event CommonBackgroundExecutorTaskExecuteStepMicroseconds;
+    extern const Event CommonBackgroundExecutorTaskCancelMicroseconds;
+    extern const Event CommonBackgroundExecutorTaskResetMicroseconds;
+    extern const Event CommonBackgroundExecutorWaitMicroseconds;
+}
+
 std::random_device device;
 
 class FakeExecutableTask : public IExecutableTask
@@ -111,7 +119,11 @@ TEST(Executor, Simple)
         1, // threads
         100, // max_tasks
         CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
-        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize,
+        ProfileEvents::CommonBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorWaitMicroseconds
     );
 
     String schedule; // mutex is not required because we have a single worker
@@ -154,7 +166,11 @@ TEST(Executor, RemoveTasks)
         tasks_kinds,
         tasks_kinds * batch,
         CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
-        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize,
+        ProfileEvents::CommonBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorWaitMicroseconds
     );
 
     for (size_t i = 0; i < batch; ++i)
@@ -195,7 +211,11 @@ TEST(Executor, RemoveTasksStress)
         tasks_kinds,
         tasks_kinds * batch * (schedulers_count + removers_count),
         CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
-        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize,
+        ProfileEvents::CommonBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorWaitMicroseconds
     );
 
     std::barrier<std::__empty_completion> barrier(schedulers_count + removers_count);
@@ -246,7 +266,11 @@ TEST(Executor, UpdatePolicy)
         1, // threads
         100, // max_tasks
         CurrentMetrics::BackgroundMergesAndMutationsPoolTask,
-        CurrentMetrics::BackgroundMergesAndMutationsPoolSize
+        CurrentMetrics::BackgroundMergesAndMutationsPoolSize,
+        ProfileEvents::CommonBackgroundExecutorTaskExecuteStepMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskCancelMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorTaskResetMicroseconds,
+        ProfileEvents::CommonBackgroundExecutorWaitMicroseconds
     );
 
     String schedule; // mutex is not required because we have a single worker
diff --git a/src/Storages/MergeTree/tests/gtest_export_partition_ordering.cpp b/src/Storages/MergeTree/tests/gtest_export_partition_ordering.cpp
new file mode 100644
index 000000000000..c9e3ffd9eef9
--- /dev/null
+++ b/src/Storages/MergeTree/tests/gtest_export_partition_ordering.cpp
@@ -0,0 +1,75 @@
+#include <gtest/gtest.h>
+#include <Storages/ExportReplicatedMergeTreePartitionTaskEntry.h>
+
+namespace DB
+{
+
+class ExportPartitionOrderingTest : public ::testing::Test
+{
+protected:
+    ExportPartitionTaskEntriesContainer container;
+    ExportPartitionTaskEntriesContainer::index<ExportPartitionTaskEntryTagByCompositeKey>::type & by_key;
+    ExportPartitionTaskEntriesContainer::index<ExportPartitionTaskEntryTagByCreateTime>::type & by_create_time;
+
+    ExportPartitionOrderingTest()
+        : by_key(container.get<ExportPartitionTaskEntryTagByCompositeKey>())
+        , by_create_time(container.get<ExportPartitionTaskEntryTagByCreateTime>())
+    {
+    }
+};
+
+TEST_F(ExportPartitionOrderingTest, IterationOrderMatchesCreateTime)
+{
+    time_t base_time = 1000;
+    
+    ExportReplicatedMergeTreePartitionManifest manifest1;
+    manifest1.partition_id = "2020";
+    manifest1.destination_database = "db1";
+    manifest1.destination_table = "table1";
+    manifest1.transaction_id = "tx1";
+    manifest1.create_time = base_time + 300; // Latest
+    
+    ExportReplicatedMergeTreePartitionManifest manifest2;
+    manifest2.partition_id = "2021";
+    manifest2.destination_database = "db1";
+    manifest2.destination_table = "table1";
+    manifest2.transaction_id = "tx2";
+    manifest2.create_time = base_time + 100; // Middle
+    
+    ExportReplicatedMergeTreePartitionManifest manifest3;
+    manifest3.partition_id = "2022";
+    manifest3.destination_database = "db1";
+    manifest3.destination_table = "table1";
+    manifest3.transaction_id = "tx3";
+    manifest3.create_time = base_time; // Oldest
+
+    ExportReplicatedMergeTreePartitionTaskEntry entry1{manifest1, ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING, {}};
+    ExportReplicatedMergeTreePartitionTaskEntry entry2{manifest2, ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING, {}};
+    ExportReplicatedMergeTreePartitionTaskEntry entry3{manifest3, ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING, {}};
+
+    // Insert in reverse order
+    by_key.insert(entry1);
+    by_key.insert(entry2);
+    by_key.insert(entry3);
+
+    // Verify iteration order matches create_time (ascending)
+    auto it = by_create_time.begin();
+    ASSERT_NE(it, by_create_time.end());
+    EXPECT_EQ(it->manifest.partition_id, "2022"); // Oldest first
+    EXPECT_EQ(it->manifest.create_time, base_time);
+    
+    ++it;
+    ASSERT_NE(it, by_create_time.end());
+    EXPECT_EQ(it->manifest.partition_id, "2021");
+    EXPECT_EQ(it->manifest.create_time, base_time + 100);
+    
+    ++it;
+    ASSERT_NE(it, by_create_time.end());
+    EXPECT_EQ(it->manifest.partition_id, "2020");
+    EXPECT_EQ(it->manifest.create_time, base_time + 300);
+    
+    ++it;
+    EXPECT_EQ(it, by_create_time.end());
+}
+
+}
diff --git a/src/Storages/ObjectStorage/Azure/Configuration.cpp b/src/Storages/ObjectStorage/Azure/Configuration.cpp
index e6e24b16c83c..7271e52b5be1 100644
--- a/src/Storages/ObjectStorage/Azure/Configuration.cpp
+++ b/src/Storages/ObjectStorage/Azure/Configuration.cpp
@@ -61,9 +61,10 @@ const std::unordered_set<std::string_view> optional_configuration_keys = {
     "partition_columns_in_data_file",
     "client_id",
     "tenant_id",
+    "storage_type",
 };
 
-void StorageAzureConfiguration::check(ContextPtr context) const
+void StorageAzureConfiguration::check(ContextPtr context)
 {
     auto url = Poco::URI(connection_params.getConnectionURL());
     context->getGlobalContext()->getRemoteHostFilter().checkURL(url);
@@ -103,14 +104,14 @@ ObjectStoragePtr StorageAzureConfiguration::createObjectStorage(ContextPtr conte
         /*common_key_prefix*/ "");
 }
 
-static AzureBlobStorage::ConnectionParams getConnectionParams(
+AzureBlobStorage::ConnectionParams getAzureConnectionParams(
     const String & connection_url,
     const String & container_name,
     const std::optional<String> & account_name,
     const std::optional<String> & account_key,
     const std::optional<String> & client_id,
     const std::optional<String> & tenant_id,
-    const ContextPtr & local_context)
+    ContextPtr local_context)
 {
     AzureBlobStorage::ConnectionParams connection_params;
     auto request_settings = AzureBlobStorage::getRequestSettings(local_context->getSettingsRef());
@@ -156,10 +157,6 @@ void StorageAzureConfiguration::fromNamedCollection(const NamedCollection & coll
 
     String connection_url;
     String container_name;
-    std::optional<String> account_name;
-    std::optional<String> account_key;
-    std::optional<String> client_id;
-    std::optional<String> tenant_id;
 
     if (collection.has("connection_string"))
         connection_url = collection.get<String>("connection_string");
@@ -181,9 +178,9 @@ void StorageAzureConfiguration::fromNamedCollection(const NamedCollection & coll
     if (collection.has("tenant_id"))
         tenant_id = collection.get<String>("tenant_id");
 
-    structure = collection.getOrDefault<String>("structure", "auto");
-    format = collection.getOrDefault<String>("format", format);
-    compression_method = collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto"));
+    setStructure(collection.getOrDefault<String>("structure", "auto"));
+    setFormat(collection.getOrDefault<String>("format", getFormat()));
+    setCompressionMethod(collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto")));
 
     if (collection.has("partition_strategy"))
     {
@@ -195,13 +192,12 @@ void StorageAzureConfiguration::fromNamedCollection(const NamedCollection & coll
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Partition strategy {} is not supported", partition_strategy_name);
         }
 
-        partition_strategy_type = partition_strategy_type_opt.value();
+        setPartitionStrategyType(partition_strategy_type_opt.value());
     }
 
-    partition_columns_in_data_file = collection.getOrDefault<bool>("partition_columns_in_data_file", partition_strategy_type != PartitionStrategyFactory::StrategyType::HIVE);
-
+    setPartitionColumnsInDataFile(collection.getOrDefault<bool>("partition_columns_in_data_file", getPartitionStrategyType() != PartitionStrategyFactory::StrategyType::HIVE));
     blobs_paths = {blob_path};
-    connection_params = getConnectionParams(connection_url, container_name, account_name, account_key, client_id, tenant_id, context);
+    connection_params = getAzureConnectionParams(connection_url, container_name, account_name, account_key, client_id, tenant_id, context);
 }
 
 ASTPtr StorageAzureConfiguration::extractExtraCredentials(ASTs & args)
@@ -219,13 +215,13 @@ ASTPtr StorageAzureConfiguration::extractExtraCredentials(ASTs & args)
     return nullptr;
 }
 
-bool StorageAzureConfiguration::collectCredentials(ASTPtr maybe_credentials, std::optional<String> & client_id, std::optional<String> & tenant_id, ContextPtr local_context)
+bool StorageAzureConfiguration::collectCredentials(ASTPtr maybe_credentials, std::optional<String> & client_id_, std::optional<String> & tenant_id_, ContextPtr local_context)
 {
     if (!maybe_credentials)
         return false;
 
-    client_id = {};
-    tenant_id = {};
+    client_id_ = {};
+    tenant_id_ = {};
 
     const auto * credentials_ast_function = maybe_credentials->as<ASTFunction>();
     if (!credentials_ast_function || credentials_ast_function->name != "extra_credentials")
@@ -259,9 +255,9 @@ bool StorageAzureConfiguration::collectCredentials(ASTPtr maybe_credentials, std
         if (arg_value.getType() != Field::Types::Which::String)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected string as credential value");
         else if (arg_name == "client_id")
-            client_id = arg_value.safeGet<String>();
+            client_id_ = arg_value.safeGet<String>();
         else if (arg_name == "tenant_id")
-            tenant_id = arg_value.safeGet<String>();
+            tenant_id_ = arg_value.safeGet<String>();
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid credential argument found: {}", arg_name);
     }
@@ -287,16 +283,10 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
 
     std::unordered_map<std::string_view, size_t> engine_args_to_idx;
 
-
     String connection_url = checkAndGetLiteralArgument<String>(engine_args[0], "connection_string/storage_account_url");
     String container_name = checkAndGetLiteralArgument<String>(engine_args[1], "container");
     blob_path = checkAndGetLiteralArgument<String>(engine_args[2], "blobpath");
 
-    std::optional<String> account_name;
-    std::optional<String> account_key;
-    std::optional<String> client_id;
-    std::optional<String> tenant_id;
-
     collectCredentials(extra_credentials, client_id, tenant_id, context);
 
     auto is_format_arg = [] (const std::string & s) -> bool
@@ -309,12 +299,12 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "format/account_name");
         if (is_format_arg(fourth_arg))
         {
-            format = fourth_arg;
+            setFormat(fourth_arg);
         }
         else
         {
             if (with_structure)
-                structure = fourth_arg;
+                setStructure(fourth_arg);
             else
                 throw Exception(
                     ErrorCodes::BAD_ARGUMENTS,
@@ -326,8 +316,8 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "format/account_name");
         if (is_format_arg(fourth_arg))
         {
-            format = fourth_arg;
-            compression_method = checkAndGetLiteralArgument<String>(engine_args[4], "compression");
+            setFormat(fourth_arg);
+            setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[4], "compression"));
         }
         else
         {
@@ -340,19 +330,19 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "format/account_name");
         if (is_format_arg(fourth_arg))
         {
-            format = fourth_arg;
-            compression_method = checkAndGetLiteralArgument<String>(engine_args[4], "compression");
+            setFormat(fourth_arg);
+            setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[4], "compression"));
 
             auto sixth_arg = checkAndGetLiteralArgument<String>(engine_args[5], "partition_strategy/structure");
             if (magic_enum::enum_contains<PartitionStrategyFactory::StrategyType>(sixth_arg, magic_enum::case_insensitive))
             {
-                partition_strategy_type = magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(sixth_arg, magic_enum::case_insensitive).value();
+                setPartitionStrategyType(magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(sixth_arg, magic_enum::case_insensitive).value());
             }
             else
             {
                 if (with_structure)
                 {
-                    structure = sixth_arg;
+                    setStructure(sixth_arg);
                 }
                 else
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown partition strategy {}", sixth_arg);
@@ -365,12 +355,12 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
             auto sixth_arg = checkAndGetLiteralArgument<String>(engine_args[5], "format/structure");
             if (is_format_arg(sixth_arg))
             {
-                format = sixth_arg;
+                setFormat(sixth_arg);
             }
             else
             {
                 if (with_structure)
-                    structure = sixth_arg;
+                    setStructure(sixth_arg);
                 else
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown format {}", sixth_arg);
             }
@@ -382,8 +372,8 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
 
         if (is_format_arg(fourth_arg))
         {
-            format = fourth_arg;
-            compression_method = checkAndGetLiteralArgument<String>(engine_args[4], "compression");
+            setFormat(fourth_arg);
+            setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[4], "compression"));
             const auto partition_strategy_name = checkAndGetLiteralArgument<String>(engine_args[5], "partition_strategy");
             const auto partition_strategy_type_opt = magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(partition_strategy_name, magic_enum::case_insensitive);
 
@@ -392,14 +382,14 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown partition strategy {}", partition_strategy_name);
             }
 
-            partition_strategy_type = partition_strategy_type_opt.value();
+            setPartitionStrategyType(partition_strategy_type_opt.value());
 
             /// If it's of type String, then it is not `partition_columns_in_data_file`
             if (const auto seventh_arg = tryGetLiteralArgument<String>(engine_args[6], "structure/partition_columns_in_data_file"))
             {
                 if (with_structure)
                 {
-                    structure = seventh_arg.value();
+                    setStructure(seventh_arg.value());
                 }
                 else
                 {
@@ -408,7 +398,7 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
             }
             else
             {
-                partition_columns_in_data_file = checkAndGetLiteralArgument<bool>(engine_args[6], "partition_columns_in_data_file");
+                setPartitionColumnsInDataFile(checkAndGetLiteralArgument<bool>(engine_args[6], "partition_columns_in_data_file"));
             }
         }
         else
@@ -423,8 +413,8 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
             auto sixth_arg = checkAndGetLiteralArgument<String>(engine_args[5], "format/account_name");
             if (!is_format_arg(sixth_arg))
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown format {}", sixth_arg);
-            format = sixth_arg;
-            compression_method = checkAndGetLiteralArgument<String>(engine_args[6], "compression");
+            setFormat(sixth_arg);
+            setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[6], "compression"));
         }
     }
     else if (engine_args.size() == 8)
@@ -439,8 +429,8 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
                 /// When using a connection string, the function only accepts 8 arguments in case `with_structure=true`
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid sequence / combination of arguments");
             }
-            format = fourth_arg;
-            compression_method = checkAndGetLiteralArgument<String>(engine_args[4], "compression");
+            setFormat(fourth_arg);
+            setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[4], "compression"));
             const auto partition_strategy_name = checkAndGetLiteralArgument<String>(engine_args[5], "partition_strategy");
             const auto partition_strategy_type_opt = magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(partition_strategy_name, magic_enum::case_insensitive);
 
@@ -449,9 +439,9 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown partition strategy {}", partition_strategy_name);
             }
 
-            partition_strategy_type = partition_strategy_type_opt.value();
-            partition_columns_in_data_file = checkAndGetLiteralArgument<bool>(engine_args[6], "partition_columns_in_data_file");
-            structure = checkAndGetLiteralArgument<String>(engine_args[7], "structure");
+            setPartitionStrategyType(partition_strategy_type_opt.value());
+            setPartitionColumnsInDataFile(checkAndGetLiteralArgument<bool>(engine_args[6], "partition_columns_in_data_file"));
+            setStructure(checkAndGetLiteralArgument<String>(engine_args[7], "structure"));
         }
         else
         {
@@ -460,19 +450,19 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
             auto sixth_arg = checkAndGetLiteralArgument<String>(engine_args[5], "format");
             if (!is_format_arg(sixth_arg))
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown format {}", sixth_arg);
-            format = sixth_arg;
-            compression_method = checkAndGetLiteralArgument<String>(engine_args[6], "compression");
+            setFormat(sixth_arg);
+            setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[6], "compression"));
 
             auto eighth_arg = checkAndGetLiteralArgument<String>(engine_args[7], "partition_strategy/structure");
             if (magic_enum::enum_contains<PartitionStrategyFactory::StrategyType>(eighth_arg, magic_enum::case_insensitive))
             {
-                partition_strategy_type = magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(eighth_arg, magic_enum::case_insensitive).value();
+                setPartitionStrategyType(magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(eighth_arg, magic_enum::case_insensitive).value());
             }
             else
             {
                 if (with_structure)
                 {
-                    structure = eighth_arg;
+                    setStructure(eighth_arg);
                 }
                 else
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown partition strategy {}", eighth_arg);
@@ -487,8 +477,8 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         auto sixth_arg = checkAndGetLiteralArgument<String>(engine_args[5], "format");
         if (!is_format_arg(sixth_arg))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown format {}", sixth_arg);
-        format = sixth_arg;
-        compression_method = checkAndGetLiteralArgument<String>(engine_args[6], "compression");
+        setFormat(sixth_arg);
+        setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[6], "compression"));
 
         const auto partition_strategy_name = checkAndGetLiteralArgument<String>(engine_args[7], "partition_strategy");
         const auto partition_strategy_type_opt = magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(partition_strategy_name, magic_enum::case_insensitive);
@@ -497,13 +487,13 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown partition strategy {}", partition_strategy_name);
         }
-        partition_strategy_type = partition_strategy_type_opt.value();
+        setPartitionStrategyType(partition_strategy_type_opt.value());
         /// If it's of type String, then it is not `partition_columns_in_data_file`
         if (const auto nineth_arg = tryGetLiteralArgument<String>(engine_args[8], "structure/partition_columns_in_data_file"))
         {
             if (with_structure)
             {
-                structure = nineth_arg.value();
+                setStructure(nineth_arg.value());
             }
             else
             {
@@ -512,7 +502,7 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         }
         else
         {
-            partition_columns_in_data_file = checkAndGetLiteralArgument<bool>(engine_args[8], "partition_columns_in_data_file");
+            setPartitionColumnsInDataFile(checkAndGetLiteralArgument<bool>(engine_args[8], "partition_columns_in_data_file"));
         }
     }
     else if (engine_args.size() == 10 && with_structure)
@@ -523,8 +513,8 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         auto sixth_arg = checkAndGetLiteralArgument<String>(engine_args[5], "format");
         if (!is_format_arg(sixth_arg))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown format {}", sixth_arg);
-        format = sixth_arg;
-        compression_method = checkAndGetLiteralArgument<String>(engine_args[6], "compression");
+        setFormat(sixth_arg);
+        setCompressionMethod(checkAndGetLiteralArgument<String>(engine_args[6], "compression"));
 
         const auto partition_strategy_name = checkAndGetLiteralArgument<String>(engine_args[7], "partition_strategy");
         const auto partition_strategy_type_opt = magic_enum::enum_cast<PartitionStrategyFactory::StrategyType>(partition_strategy_name, magic_enum::case_insensitive);
@@ -533,13 +523,13 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown partition strategy {}", partition_strategy_name);
         }
-        partition_strategy_type = partition_strategy_type_opt.value();
-        partition_columns_in_data_file = checkAndGetLiteralArgument<bool>(engine_args[8], "partition_columns_in_data_file");
-        structure = checkAndGetLiteralArgument<String>(engine_args[9], "structure");
+        setPartitionStrategyType(partition_strategy_type_opt.value());
+        setPartitionColumnsInDataFile(checkAndGetLiteralArgument<bool>(engine_args[8], "partition_columns_in_data_file"));
+        setStructure(checkAndGetLiteralArgument<String>(engine_args[9], "structure"));
     }
 
     blobs_paths = {blob_path};
-    connection_params = getConnectionParams(connection_url, container_name, account_name, account_key, client_id, tenant_id, context);
+    connection_params = getAzureConnectionParams(connection_url, container_name, account_name, account_key, client_id, tenant_id, context);
 }
 
 void StorageAzureConfiguration::addStructureAndFormatToArgsIfNeeded(
@@ -706,6 +696,22 @@ void StorageAzureConfiguration::addStructureAndFormatToArgsIfNeeded(
     }
 }
 
+ASTPtr StorageAzureConfiguration::createArgsWithAccessData() const
+{
+    auto arguments = std::make_shared<ASTExpressionList>();
+
+    arguments->children.push_back(std::make_shared<ASTLiteral>(connection_params.endpoint.storage_account_url));
+    arguments->children.push_back(std::make_shared<ASTIdentifier>(connection_params.endpoint.container_name));
+    arguments->children.push_back(std::make_shared<ASTLiteral>(blob_path.path));
+    if (account_name && account_key)
+    {
+        arguments->children.push_back(std::make_shared<ASTLiteral>(*account_name));
+        arguments->children.push_back(std::make_shared<ASTLiteral>(*account_key));
+    }
+
+    return arguments;
+}
+
 }
 
 #endif
diff --git a/src/Storages/ObjectStorage/Azure/Configuration.h b/src/Storages/ObjectStorage/Azure/Configuration.h
index 52c432a9f655..134d0deedc18 100644
--- a/src/Storages/ObjectStorage/Azure/Configuration.h
+++ b/src/Storages/ObjectStorage/Azure/Configuration.h
@@ -12,6 +12,16 @@ namespace DB
 {
 class BackupFactory;
 
+/// Constructs Azure connection parameters from individual components.
+AzureBlobStorage::ConnectionParams getAzureConnectionParams(
+    const String & connection_url,
+    const String & container_name,
+    const std::optional<String> & account_name,
+    const std::optional<String> & account_key,
+    const std::optional<String> & client_id,
+    const std::optional<String> & tenant_id,
+    ContextPtr context);
+
 class StorageAzureConfiguration : public StorageObjectStorageConfiguration
 {
     friend class BackupReaderAzureBlobStorage;
@@ -75,7 +85,7 @@ class StorageAzureConfiguration : public StorageObjectStorageConfiguration
     String getDataSourceDescription() const override { return std::filesystem::path(connection_params.getConnectionURL()) / connection_params.getContainer(); }
     StorageObjectStorageQuerySettings getQuerySettings(const ContextPtr &) const override;
 
-    void check(ContextPtr context) const override;
+    void check(ContextPtr context) override;
 
     ObjectStoragePtr createObjectStorage(ContextPtr context, bool is_readonly) override;
 
@@ -86,15 +96,21 @@ class StorageAzureConfiguration : public StorageObjectStorageConfiguration
         ContextPtr context,
         bool with_structure) override;
 
+    ASTPtr createArgsWithAccessData() const override;
+
 protected:
     void fromNamedCollection(const NamedCollection & collection, ContextPtr context) override;
     void fromAST(ASTs & args, ContextPtr context, bool with_structure) override;
     ASTPtr extractExtraCredentials(ASTs & args);
-    bool collectCredentials(ASTPtr maybe_credentials, std::optional<String> & client_id, std::optional<String> & tenant_id, ContextPtr local_context);
+    bool collectCredentials(ASTPtr maybe_credentials, std::optional<String> & client_id_, std::optional<String> & tenant_id_, ContextPtr local_context);
 
     Path blob_path;
     Paths blobs_paths;
     AzureBlobStorage::ConnectionParams connection_params;
+    std::optional<std::string> account_name;
+    std::optional<std::string> account_key;
+    std::optional<std::string> client_id;
+    std::optional<std::string> tenant_id;
 };
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/Common.cpp b/src/Storages/ObjectStorage/DataLakes/Common.cpp
index 65041a470e4c..c292915f2e16 100644
--- a/src/Storages/ObjectStorage/DataLakes/Common.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Common.cpp
@@ -14,7 +14,7 @@ std::vector<String> listFiles(
     const String & prefix, const String & suffix)
 {
     auto key = std::filesystem::path(configuration.getPathForRead().path) / prefix;
-    RelativePathsWithMetadata files_with_metadata;
+    PathsWithMetadata files_with_metadata;
     object_storage.listObjects(key, files_with_metadata, 0);
     Strings res;
     for (const auto & file_with_metadata : files_with_metadata)
diff --git a/src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h b/src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h
index 503d6a52a466..5d521cb31ff2 100644
--- a/src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h
+++ b/src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/ObjectStorage/Azure/Configuration.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.h>
 #include <Storages/ObjectStorage/DataLakes/HudiMetadata.h>
@@ -10,11 +11,17 @@
 #include <Storages/ObjectStorage/HDFS/Configuration.h>
 #include <Storages/ObjectStorage/Local/Configuration.h>
 #include <Storages/ObjectStorage/S3/Configuration.h>
-#include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/ObjectStorage/StorageObjectStorageConfiguration.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/ColumnsDescription.h>
 #include <Formats/FormatFilterInfo.h>
 #include <Formats/FormatParserSharedResources.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Disks/DiskType.h>
+
 #include <memory>
 #include <string>
 
@@ -36,20 +43,22 @@ namespace ErrorCodes
 
 namespace DataLakeStorageSetting
 {
-    extern DataLakeStorageSettingsBool allow_dynamic_metadata_for_data_lakes;
-    extern DataLakeStorageSettingsDatabaseDataLakeCatalogType storage_catalog_type;
-    extern DataLakeStorageSettingsString object_storage_endpoint;
-    extern DataLakeStorageSettingsString storage_aws_access_key_id;
-    extern DataLakeStorageSettingsString storage_aws_secret_access_key;
-    extern DataLakeStorageSettingsString storage_region;
-    extern DataLakeStorageSettingsString storage_catalog_url;
-    extern DataLakeStorageSettingsString storage_warehouse;
-    extern DataLakeStorageSettingsString storage_catalog_credential;
-
-    extern DataLakeStorageSettingsString storage_auth_scope;
-    extern DataLakeStorageSettingsString storage_auth_header;
-    extern DataLakeStorageSettingsString storage_oauth_server_uri;
-    extern DataLakeStorageSettingsBool storage_oauth_server_use_request_body;
+    extern const DataLakeStorageSettingsBool allow_dynamic_metadata_for_data_lakes;
+    extern const DataLakeStorageSettingsDatabaseDataLakeCatalogType storage_catalog_type;
+    extern const DataLakeStorageSettingsString object_storage_endpoint;
+    extern const DataLakeStorageSettingsString storage_aws_access_key_id;
+    extern const DataLakeStorageSettingsString storage_aws_secret_access_key;
+    extern const DataLakeStorageSettingsString storage_region;
+    extern const DataLakeStorageSettingsString storage_catalog_url;
+    extern const DataLakeStorageSettingsString storage_warehouse;
+    extern const DataLakeStorageSettingsString storage_catalog_credential;
+    extern DataLakeStorageSettingsString storage_aws_role_arn;
+    extern DataLakeStorageSettingsString storage_aws_role_session_name;
+    extern const DataLakeStorageSettingsString storage_auth_scope;
+    extern const DataLakeStorageSettingsString storage_auth_header;
+    extern const DataLakeStorageSettingsString storage_oauth_server_uri;
+    extern const DataLakeStorageSettingsBool storage_oauth_server_use_request_body;
+    extern const DataLakeStorageSettingsString iceberg_metadata_file_path;
 }
 
 template <typename T>
@@ -89,7 +98,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
         {
             throw Exception(
                 ErrorCodes::FORMAT_VERSION_TOO_OLD,
-                "Metadata is not consinsent with the one which was used to infer table schema. "
+                "Metadata is not consistent with the one which was used to infer table schema. "
                 "Please, retry the query.");
         }
         return true;
@@ -121,7 +130,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
 
     bool supportsDelete() const override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->supportsDelete();
     }
 
@@ -132,32 +141,32 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
         std::shared_ptr<DataLake::ICatalog> catalog,
         const std::optional<FormatSettings> & format_settings) override
     {
-        assertInitialized();
+        assertInitializedDL();
         current_metadata->mutate(commands, context, storage_id, metadata_snapshot, catalog, format_settings);
     }
 
     void checkMutationIsPossible(const MutationCommands & commands) override
     {
-        assertInitialized();
+        assertInitializedDL();
         current_metadata->checkMutationIsPossible(commands);
     }
 
     void checkAlterIsPossible(const AlterCommands & commands) override
     {
-        assertInitialized();
+        assertInitializedDL();
         current_metadata->checkAlterIsPossible(commands);
     }
 
     void alter(const AlterCommands & params, ContextPtr context) override
     {
-        assertInitialized();
+        assertInitializedDL();
         current_metadata->alter(params, context);
 
     }
 
     std::optional<ColumnsDescription> tryGetTableStructureFromMetadata() const override
     {
-        assertInitialized();
+        assertInitializedDL();
         if (auto schema = current_metadata->getTableSchema(); !schema.empty())
             return ColumnsDescription(std::move(schema));
         return std::nullopt;
@@ -165,38 +174,38 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
 
     std::optional<size_t> totalRows(ContextPtr local_context) override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->totalRows(local_context);
     }
 
     std::optional<size_t> totalBytes(ContextPtr local_context) override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->totalBytes(local_context);
     }
 
     std::shared_ptr<NamesAndTypesList> getInitialSchemaByPath(ContextPtr local_context, ObjectInfoPtr object_info) const override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->getInitialSchemaByPath(local_context, object_info);
     }
 
     std::shared_ptr<const ActionsDAG> getSchemaTransformer(ContextPtr local_context, ObjectInfoPtr object_info) const override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->getSchemaTransformer(local_context, object_info);
     }
 
     bool hasExternalDynamicMetadata() override
     {
-        assertInitialized();
+        assertInitializedDL();
         return (*settings)[DataLakeStorageSetting::allow_dynamic_metadata_for_data_lakes]
             && current_metadata->supportsSchemaEvolution();
     }
 
     IDataLakeMetadata * getExternalMetadata() override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata.get();
     }
 
@@ -204,7 +213,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
 
     bool supportsWrites() const override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->supportsWrites();
     }
 
@@ -214,7 +223,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
         size_t list_batch_size,
         ContextPtr context) override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->iterate(filter_dag, callback, list_batch_size, context);
     }
 
@@ -226,7 +235,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
 #if USE_PARQUET && USE_AWS_S3
     DeltaLakePartitionColumns getDeltaLakePartitionColumns() const
     {
-        assertInitialized();
+        assertInitializedDL();
         const auto * delta_lake_metadata = dynamic_cast<const DeltaLakeMetadata *>(current_metadata.get());
         if (delta_lake_metadata)
             return delta_lake_metadata->getPartitionColumns();
@@ -234,15 +243,21 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
     }
 #endif
 
-    void modifyFormatSettings(FormatSettings & settings_) const override
+    void modifyFormatSettings(FormatSettings & settings_, const Context & local_context) const override
     {
-        assertInitialized();
-        current_metadata->modifyFormatSettings(settings_);
+        assertInitializedDL();
+        current_metadata->modifyFormatSettings(settings_, local_context);
     }
 
-    ColumnMapperPtr getColumnMapper() const override
+    ColumnMapperPtr getColumnMapperForObject(ObjectInfoPtr object_info) const override
+    {
+        assertInitializedDL();
+        return current_metadata->getColumnMapperForObject(object_info);
+    }
+    ColumnMapperPtr getColumnMapperForCurrentSchema() const override
     {
-        return current_metadata->getColumnMapper();
+        assertInitializedDL();
+        return current_metadata->getColumnMapperForCurrentSchema();
     }
 
     SinkToStoragePtr write(
@@ -273,6 +288,8 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
                 .aws_access_key_id = (*settings)[DataLakeStorageSetting::storage_aws_access_key_id].value,
                 .aws_secret_access_key = (*settings)[DataLakeStorageSetting::storage_aws_secret_access_key].value,
                 .region = (*settings)[DataLakeStorageSetting::storage_region].value,
+                .aws_role_arn = (*settings)[DataLakeStorageSetting::storage_aws_role_arn].value,
+                .aws_role_session_name = (*settings)[DataLakeStorageSetting::storage_aws_role_session_name].value
             };
 
             return std::make_shared<DataLake::GlueCatalog>(
@@ -303,7 +320,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
 
     bool optimize(const StorageMetadataPtr & metadata_snapshot, ContextPtr context, const std::optional<FormatSettings> & format_settings) override
     {
-        assertInitialized();
+        assertInitializedDL();
         return current_metadata->optimize(metadata_snapshot, context, format_settings);
     }
 
@@ -312,13 +329,50 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
         current_metadata->addDeleteTransformers(object_info, builder, format_settings, local_context);
     }
 
+    ASTPtr createArgsWithAccessData() const override
+    {
+        auto res = BaseStorageConfiguration::createArgsWithAccessData();
+
+        auto iceberg_metadata_file_path = (*settings)[DataLakeStorageSetting::iceberg_metadata_file_path];
+
+        if (iceberg_metadata_file_path.changed)
+        {
+            auto * arguments = res->template as<ASTExpressionList>();
+            if (!arguments)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Arguments are not an expression list");
+
+            bool has_settings = false;
+
+            for (auto & arg : arguments->children)
+            {
+                if (auto * settings_ast = arg->template as<ASTSetQuery>())
+                {
+                    has_settings = true;
+                    settings_ast->changes.setSetting("iceberg_metadata_file_path", iceberg_metadata_file_path.value);
+                    break;
+                }
+            }
+
+            if (!has_settings)
+            {
+                std::shared_ptr<ASTSetQuery> settings_ast = std::make_shared<ASTSetQuery>();
+                settings_ast->is_standalone = false;
+                settings_ast->changes.setSetting("iceberg_metadata_file_path", iceberg_metadata_file_path.value);
+                arguments->children.push_back(settings_ast);
+            }
+        }
+
+        return res;
+    }
+
 private:
     DataLakeMetadataPtr current_metadata;
     LoggerPtr log = getLogger("DataLakeConfiguration");
     const DataLakeStorageSettingsPtr settings;
 
-    void assertInitialized() const
+    void assertInitializedDL() const
     {
+        BaseStorageConfiguration::assertInitialized();
         if (!current_metadata)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Metadata is not initialized");
     }
@@ -380,15 +434,362 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
 using StorageS3IcebergConfiguration = DataLakeConfiguration<StorageS3Configuration, IcebergMetadata>;
 #endif
 
-#if USE_AZURE_BLOB_STORAGE
+#    if USE_AZURE_BLOB_STORAGE
 using StorageAzureIcebergConfiguration = DataLakeConfiguration<StorageAzureConfiguration, IcebergMetadata>;
 #endif
 
-#if USE_HDFS
+#    if USE_HDFS
 using StorageHDFSIcebergConfiguration = DataLakeConfiguration<StorageHDFSConfiguration, IcebergMetadata>;
 #endif
 
 using StorageLocalIcebergConfiguration = DataLakeConfiguration<StorageLocalConfiguration, IcebergMetadata>;
+
+/// Class detects storage type by `storage_type` parameter if exists
+/// and uses appropriate implementation - S3, Azure, HDFS or Local
+class StorageIcebergConfiguration : public StorageObjectStorageConfiguration, public std::enable_shared_from_this<StorageObjectStorageConfiguration>
+{
+    friend class StorageObjectStorageConfiguration;
+
+public:
+    explicit StorageIcebergConfiguration(DataLakeStorageSettingsPtr settings_) : settings(settings_) {}
+
+    ObjectStorageType getType() const override { return getImpl().getType(); }
+
+    std::string getTypeName() const override { return getImpl().getTypeName(); }
+    std::string getEngineName() const override { return getImpl().getEngineName(); }
+    std::string getNamespaceType() const override { return getImpl().getNamespaceType(); }
+
+    Path getRawPath() const override { return getImpl().getRawPath(); }
+    const String & getRawURI() const override { return getImpl().getRawURI(); }
+    const Path & getPathForRead() const override { return getImpl().getPathForRead(); }
+    Path getPathForWrite(const std::string & partition_id) const override { return getImpl().getPathForWrite(partition_id); }
+
+    void setPathForRead(const Path & path) override { getImpl().setPathForRead(path); }
+
+    const Paths & getPaths() const override { return getImpl().getPaths(); }
+    void setPaths(const Paths & paths) override { getImpl().setPaths(paths); }
+
+    String getDataSourceDescription() const override { return getImpl().getDataSourceDescription(); }
+    String getNamespace() const override { return getImpl().getNamespace(); }
+
+    StorageObjectStorageQuerySettings getQuerySettings(const ContextPtr & context) const override
+        { return getImpl().getQuerySettings(context); }
+
+    void addStructureAndFormatToArgsIfNeeded(
+        ASTs & args, const String & structure_, const String & format_, ContextPtr context, bool with_structure) override
+        { getImpl().addStructureAndFormatToArgsIfNeeded(args, structure_, format_, context, with_structure); }
+
+    bool isNamespaceWithGlobs() const override { return getImpl().isNamespaceWithGlobs(); }
+
+    bool isArchive() const override { return getImpl().isArchive(); }
+    bool isPathInArchiveWithGlobs() const override { return getImpl().isPathInArchiveWithGlobs(); }
+    std::string getPathInArchive() const override { return getImpl().getPathInArchive(); }
+
+    void check(ContextPtr context) override { getImpl().check(context); }
+    void validateNamespace(const String & name) const override { getImpl().validateNamespace(name); }
+
+    ObjectStoragePtr createObjectStorage(ContextPtr context, bool is_readonly) override
+        { return getImpl().createObjectStorage(context, is_readonly); }
+    bool isStaticConfiguration() const override { return getImpl().isStaticConfiguration(); }
+
+    bool isDataLakeConfiguration() const override { return getImpl().isDataLakeConfiguration(); }
+
+    std::optional<size_t> totalRows(ContextPtr context) override { return getImpl().totalRows(context); }
+    std::optional<size_t> totalBytes(ContextPtr context) override { return getImpl().totalBytes(context); }
+
+    bool hasExternalDynamicMetadata() override { return getImpl().hasExternalDynamicMetadata(); }
+
+    IDataLakeMetadata * getExternalMetadata() override { return getImpl().getExternalMetadata(); }
+
+    std::shared_ptr<NamesAndTypesList> getInitialSchemaByPath(ContextPtr context, ObjectInfoPtr object_info) const override
+        { return getImpl().getInitialSchemaByPath(context, object_info); }
+
+    std::shared_ptr<const ActionsDAG> getSchemaTransformer(ContextPtr context, ObjectInfoPtr object_info) const override
+        { return getImpl().getSchemaTransformer(context, object_info); }
+
+    void modifyFormatSettings(FormatSettings & settings_, const Context & local_context) const override { getImpl().modifyFormatSettings(settings_, local_context); }
+
+    void addDeleteTransformers(
+        ObjectInfoPtr object_info,
+        QueryPipelineBuilder & builder,
+        const std::optional<FormatSettings> & format_settings,
+        ContextPtr local_context) const override { getImpl().addDeleteTransformers(object_info, builder, format_settings, local_context); }
+
+    ReadFromFormatInfo prepareReadingFromFormat(
+        ObjectStoragePtr object_storage,
+        const Strings & requested_columns,
+        const StorageSnapshotPtr & storage_snapshot,
+        bool supports_subset_of_columns,
+        bool supports_tuple_elements,
+        ContextPtr local_context,
+        const PrepareReadingFromFormatHiveParams & hive_parameters) override
+    {
+        return getImpl().prepareReadingFromFormat(
+            object_storage,
+            requested_columns,
+            storage_snapshot,
+            supports_subset_of_columns,
+            supports_tuple_elements,
+            local_context,
+            hive_parameters);
+    }
+
+    void initPartitionStrategy(ASTPtr partition_by, const ColumnsDescription & columns, ContextPtr context) override
+        { getImpl().initPartitionStrategy(partition_by, columns, context); }
+
+    std::optional<ColumnsDescription> tryGetTableStructureFromMetadata() const override
+        { return getImpl().tryGetTableStructureFromMetadata(); }
+
+    bool supportsFileIterator() const override { return getImpl().supportsFileIterator(); }
+    bool supportsWrites() const override { return getImpl().supportsWrites(); }
+
+    bool supportsPartialPathPrefix() const override { return getImpl().supportsPartialPathPrefix(); }
+
+    ObjectIterator iterate(
+        const ActionsDAG * filter_dag,
+        std::function<void(FileProgress)> callback,
+        size_t list_batch_size,
+        ContextPtr context) override
+    {
+        return getImpl().iterate(filter_dag, callback, list_batch_size, context);
+    }
+
+    bool update(
+        ObjectStoragePtr object_storage_ptr,
+        ContextPtr context,
+        bool if_not_updated_before,
+        bool check_consistent_with_previous_metadata) override
+    {
+        return getImpl().update(object_storage_ptr, context, if_not_updated_before, check_consistent_with_previous_metadata);
+    }
+
+    void create(
+        ObjectStoragePtr object_storage,
+        ContextPtr local_context,
+        const std::optional<ColumnsDescription> & columns,
+        ASTPtr partition_by,
+        bool if_not_exists,
+        std::shared_ptr<DataLake::ICatalog> catalog,
+        const StorageID & table_id_) override
+    {
+        getImpl().create(object_storage, local_context, columns, partition_by, if_not_exists, catalog, table_id_);
+    }
+
+    SinkToStoragePtr write(
+        SharedHeader sample_block,
+        const StorageID & table_id,
+        ObjectStoragePtr object_storage,
+        const std::optional<FormatSettings> & format_settings,
+        ContextPtr context,
+        std::shared_ptr<DataLake::ICatalog> catalog) override
+    {
+        return getImpl().write(sample_block, table_id, object_storage, format_settings, context, catalog);
+    }
+
+    bool supportsDelete() const override { return getImpl().supportsDelete(); }
+    void mutate(const MutationCommands & commands,
+        ContextPtr context,
+        const StorageID & storage_id,
+        StorageMetadataPtr metadata_snapshot,
+        std::shared_ptr<DataLake::ICatalog> catalog,
+        const std::optional<FormatSettings> & format_settings) override
+    {
+        getImpl().mutate(commands, context, storage_id, metadata_snapshot, catalog, format_settings);
+    }
+
+    void checkMutationIsPossible(const MutationCommands & commands) override { getImpl().checkMutationIsPossible(commands); }
+
+    void checkAlterIsPossible(const AlterCommands & commands) override { getImpl().checkAlterIsPossible(commands); }
+
+    void alter(const AlterCommands & params, ContextPtr context) override { getImpl().alter(params, context); }
+
+    const DataLakeStorageSettings & getDataLakeSettings() const override { return getImpl().getDataLakeSettings(); }
+
+    void initialize(
+        ASTs & engine_args,
+        ContextPtr local_context,
+        bool with_table_structure) override
+    {
+        createDynamicConfiguration(engine_args, local_context);
+        getImpl().initialize(engine_args, local_context, with_table_structure);
+    }
+
+    ASTPtr createArgsWithAccessData() const override
+    {
+        return getImpl().createArgsWithAccessData();
+    }
+
+    void fromNamedCollection(const NamedCollection & collection, ContextPtr context) override
+        { getImpl().fromNamedCollection(collection, context); }
+    void fromAST(ASTs & args, ContextPtr context, bool with_structure) override
+        { getImpl().fromAST(args, context, with_structure); }
+
+    const String & getFormat() const override { return getImpl().getFormat(); }
+    const String & getCompressionMethod() const override { return getImpl().getCompressionMethod(); }
+    const String & getStructure() const override { return getImpl().getStructure(); }
+
+    PartitionStrategyFactory::StrategyType getPartitionStrategyType() const override { return getImpl().getPartitionStrategyType(); }
+    bool getPartitionColumnsInDataFile() const override { return getImpl().getPartitionColumnsInDataFile(); }
+    std::shared_ptr<IPartitionStrategy> getPartitionStrategy() const override { return getImpl().getPartitionStrategy(); }
+
+    void setFormat(const String & format_) override { getImpl().setFormat(format_); }
+    void setCompressionMethod(const String & compression_method_) override { getImpl().setCompressionMethod(compression_method_); }
+    void setStructure(const String & structure_) override { getImpl().setStructure(structure_); }
+
+    void setPartitionStrategyType(PartitionStrategyFactory::StrategyType partition_strategy_type_) override
+    {
+        getImpl().setPartitionStrategyType(partition_strategy_type_);
+    }
+    void setPartitionColumnsInDataFile(bool partition_columns_in_data_file_) override
+    {
+        getImpl().setPartitionColumnsInDataFile(partition_columns_in_data_file_);
+    }
+    void setPartitionStrategy(const std::shared_ptr<IPartitionStrategy> & partition_strategy_) override
+    {
+        getImpl().setPartitionStrategy(partition_strategy_);
+    }
+
+    ColumnMapperPtr getColumnMapperForObject(ObjectInfoPtr obj) const override { return getImpl().getColumnMapperForObject(obj); }
+
+    ColumnMapperPtr getColumnMapperForCurrentSchema() const override { return getImpl().getColumnMapperForCurrentSchema(); }
+
+    std::shared_ptr<DataLake::ICatalog> getCatalog(ContextPtr context, bool is_attach) const override
+    {
+        return getImpl().getCatalog(context, is_attach);
+    }
+
+    bool optimize(const StorageMetadataPtr & metadata_snapshot, ContextPtr context, const std::optional<FormatSettings> & format_settings) override
+    {
+        return getImpl().optimize(metadata_snapshot, context, format_settings);
+    }
+
+protected:
+    /// Find storage_type argument and remove it from args if exists.
+    /// Return storage type.
+    ObjectStorageType extractDynamicStorageType(ASTs & args, ContextPtr context, ASTPtr * type_arg) const override
+    {
+        static const auto * const storage_type_name = "storage_type";
+
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(args, context))
+        {
+            if (named_collection->has(storage_type_name))
+            {
+                return objectStorageTypeFromString(named_collection->get<String>(storage_type_name));
+            }
+        }
+
+        auto * type_it = args.end();
+
+        /// S3 by default for backward compatibility
+        /// Iceberg without storage_type == IcebergS3
+        ObjectStorageType type = ObjectStorageType::S3;
+
+        for (auto * arg_it = args.begin(); arg_it != args.end(); ++arg_it)
+        {
+            const auto * type_ast_function = (*arg_it)->as<ASTFunction>();
+
+            if (type_ast_function && type_ast_function->name == "equals"
+                && type_ast_function->arguments && type_ast_function->arguments->children.size() == 2)
+            {
+                auto * name = type_ast_function->arguments->children[0]->as<ASTIdentifier>();
+
+                if (name && name->name() == storage_type_name)
+                {
+                    if (type_it != args.end())
+                    {
+                        throw Exception(
+                            ErrorCodes::BAD_ARGUMENTS,
+                            "DataLake can have only one key-value argument: storage_type='type'.");
+                    }
+
+                    auto * value = type_ast_function->arguments->children[1]->as<ASTLiteral>();
+
+                    if (!value)
+                    {
+                        throw Exception(
+                            ErrorCodes::BAD_ARGUMENTS,
+                            "DataLake parameter 'storage_type' has wrong type, string literal expected.");
+                    }
+
+                    if (value->value.getType() != Field::Types::String)
+                    {
+                        throw Exception(
+                            ErrorCodes::BAD_ARGUMENTS,
+                            "DataLake parameter 'storage_type' has wrong value type, string expected.");
+                    }
+
+                    type = objectStorageTypeFromString(value->value.safeGet<String>());
+
+                    type_it = arg_it;
+                }
+            }
+        }
+
+        if (type_it != args.end())
+        {
+            if (type_arg)
+                *type_arg = *type_it;
+            args.erase(type_it);
+        }
+
+        return type;
+    }
+
+    void createDynamicConfiguration(ASTs & args, ContextPtr context)
+    {
+        ObjectStorageType type = extractDynamicStorageType(args, context, nullptr);
+        createDynamicStorage(type);
+    }
+
+    void assertInitialized() const override { getImpl().assertInitialized(); }
+
+private:
+    inline StorageObjectStorageConfiguration & getImpl() const
+    {
+        if (!impl)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dynamic DataLake storage not initialized");
+
+        return *impl;
+    }
+
+    void createDynamicStorage(ObjectStorageType type)
+    {
+        if (impl)
+        {
+            if (impl->getType() == type)
+                return;
+
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't change datalake engine storage");
+        }
+
+        switch (type)
+        {
+#    if USE_AWS_S3
+            case ObjectStorageType::S3:
+                impl = std::make_unique<StorageS3IcebergConfiguration>(settings);
+                break;
+#    endif
+#    if USE_AZURE_BLOB_STORAGE
+            case ObjectStorageType::Azure:
+                impl = std::make_unique<StorageAzureIcebergConfiguration>(settings);
+                break;
+#    endif
+#    if USE_HDFS
+            case ObjectStorageType::HDFS:
+                impl = std::make_unique<StorageHDFSIcebergConfiguration>(settings);
+                break;
+#    endif
+            case ObjectStorageType::Local:
+                impl = std::make_unique<StorageLocalIcebergConfiguration>(settings);
+                break;
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unsuported DataLake storage {}", type);
+        }
+    }
+
+    StorageObjectStorageConfigurationPtr impl;
+    DataLakeStorageSettingsPtr settings;
+};
 #endif
 
 #if USE_PARQUET
diff --git a/src/Storages/ObjectStorage/DataLakes/DataLakeStorageSettings.h b/src/Storages/ObjectStorage/DataLakes/DataLakeStorageSettings.h
index 740e8df331aa..13563d1dc0f3 100644
--- a/src/Storages/ObjectStorage/DataLakes/DataLakeStorageSettings.h
+++ b/src/Storages/ObjectStorage/DataLakes/DataLakeStorageSettings.h
@@ -61,12 +61,14 @@ If enabled, the engine would use the metadata file with the most recent last_upd
     DECLARE(Bool, iceberg_use_version_hint, false, R"(
 Get latest metadata path from version-hint.text file.
 )", 0) \
-    DECLARE(Int64, iceberg_format_version, 2, R"(
+    DECLARE(String, object_storage_cluster, "", R"(
+Cluster for distributed requests
+)", 0) \
+    DECLARE(NonZeroUInt64, iceberg_format_version, 2, R"(
 Metadata format version.
 )", 0) \
     DECLARE(DatabaseDataLakeCatalogType, storage_catalog_type, DatabaseDataLakeCatalogType::NONE, "Catalog type", 0) \
     DECLARE(String, storage_catalog_credential, "", "", 0)             \
-    DECLARE(Bool, storage_vended_credentials, true, "Use vended credentials (storage credentials) from catalog", 0)             \
     DECLARE(String, storage_auth_scope, "PRINCIPAL_ROLE:ALL", "Authorization scope for client credentials or token exchange", 0)             \
     DECLARE(String, storage_oauth_server_uri, "", "OAuth server uri", 0)             \
     DECLARE(Bool, storage_oauth_server_use_request_body, true, "Put parameters into request body or query params", 0)             \
@@ -75,6 +77,8 @@ Metadata format version.
     DECLARE(String, storage_aws_access_key_id, "", "Key for AWS connection for Glue catalog", 0)           \
     DECLARE(String, storage_aws_secret_access_key, "", "Key for AWS connection for Glue Catalog'", 0)           \
     DECLARE(String, storage_region, "", "Region for Glue catalog", 0)           \
+    DECLARE(String, storage_aws_role_arn, "", "Role arn for AWS connection for Glue catalog", 0) \
+    DECLARE(String, storage_aws_role_session_name, "", "Role session name for AWS connection for Glue catalog", 0) \
     DECLARE(String, object_storage_endpoint, "", "Object storage endpoint", 0) \
     DECLARE(String, storage_catalog_url, "", "Catalog url", 0) \
 
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.cpp
index 93e0fbedcb85..da222f531491 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.cpp
@@ -6,6 +6,7 @@
 #include <Common/Arena.h>
 #include <Common/PODArray.h>
 #include <Core/UUID.h>
+#include <Core/Settings.h>
 
 #include <Formats/FormatFactory.h>
 #include <Processors/Formats/IOutputFormat.h>
@@ -30,6 +31,12 @@ namespace ErrorCodes
     extern const int INCORRECT_DATA;
 }
 
+namespace Setting
+{
+    extern const SettingsNonZeroUInt64 delta_lake_insert_max_rows_in_data_file;
+    extern const SettingsNonZeroUInt64 delta_lake_insert_max_bytes_in_data_file;
+}
+
 namespace
 {
     /// Given partition columns list,
@@ -74,6 +81,8 @@ DeltaLakePartitionedSink::DeltaLakePartitionedSink(
     , object_storage(object_storage_)
     , format_settings(format_settings_)
     , configuration(configuration_)
+    , data_file_max_rows(context_->getSettingsRef()[Setting::delta_lake_insert_max_rows_in_data_file])
+    , data_file_max_bytes(context_->getSettingsRef()[Setting::delta_lake_insert_max_bytes_in_data_file])
     , partition_strategy(createPartitionStrategy(partition_columns, getHeader(), context_))
     , delta_transaction(delta_transaction_)
 {
@@ -131,7 +140,7 @@ void DeltaLakePartitionedSink::consume(Chunk & chunk)
                 partition_index_to_chunk.emplace_back(Columns(), partition_column->size());
         }
 
-        for (size_t partition_index = 0; partition_index  < partitions_size; ++partition_index)
+        for (size_t partition_index = 0; partition_index < partitions_size; ++partition_index)
         {
             auto & partition_chunk = partition_index_to_chunk[partition_index];
             partition_chunk.addColumn(std::move(partition_index_to_column_split[partition_index]));
@@ -140,68 +149,86 @@ void DeltaLakePartitionedSink::consume(Chunk & chunk)
 
     for (const auto & [partition_key, partition_index] : partition_id_to_chunk_index)
     {
-        auto partition_data = getPartitionDataForPartitionKey(partition_key);
+        auto & data_files = getPartitionDataForPartitionKey(partition_key)->data_files;
         auto & partition_chunk = partition_index_to_chunk[partition_index];
-        partition_data->sink->consume(partition_chunk);
-        partition_data->size += partition_chunk.bytes();
+
+        if (data_files.empty()
+            || data_files.back().written_rows >= data_file_max_rows
+            || data_files.back().written_bytes >= data_file_max_bytes)
+        {
+            data_files.emplace_back(createSinkForPartition(partition_key));
+            total_data_files_count += 1;
+        }
+        auto & data_file = data_files.back();
+        data_file.written_bytes += partition_chunk.bytes();
+        data_file.written_rows += partition_chunk.getNumRows();
+        data_file.sink->consume(partition_chunk);
     }
 }
 
-DeltaLakePartitionedSink::PartitionDataPtr
+DeltaLakePartitionedSink::PartitionInfoPtr
 DeltaLakePartitionedSink::getPartitionDataForPartitionKey(StringRef partition_key)
 {
-    auto it = partition_id_to_sink.find(partition_key);
-    if (it == partition_id_to_sink.end())
-    {
-        auto data = std::make_shared<PartitionData>();
-        auto data_prefix = std::filesystem::path(delta_transaction->getDataPath()) / partition_key.toString();
-        data->path = DeltaLake::generateWritePath(std::move(data_prefix), configuration->format);
-
-        data->sink = std::make_shared<StorageObjectStorageSink>(
-            data->path,
-            object_storage,
-            configuration,
-            format_settings,
-            std::make_shared<Block>(partition_strategy->getFormatHeader()),
-            getContext()
-        );
-        std::tie(it, std::ignore) = partition_id_to_sink.emplace(partition_key, std::move(data));
-    }
+    auto it = partitions_data.find(partition_key);
+    if (it == partitions_data.end())
+        std::tie(it, std::ignore) = partitions_data.emplace(partition_key, std::make_shared<PartitionInfo>(partition_key));
     return it->second;
 }
 
+DeltaLakePartitionedSink::StorageSinkPtr
+DeltaLakePartitionedSink::createSinkForPartition(StringRef partition_key)
+{
+    auto data_prefix = std::filesystem::path(delta_transaction->getDataPath()) / partition_key.toString();
+    return std::make_unique<StorageObjectStorageSink>(
+        DeltaLake::generateWritePath(std::move(data_prefix), configuration->getFormat()),
+        object_storage,
+        configuration,
+        format_settings,
+        std::make_shared<Block>(partition_strategy->getFormatHeader()),
+        getContext());
+}
+
 void DeltaLakePartitionedSink::onFinish()
 {
-    if (isCancelled() || partition_id_to_sink.empty())
+    if (isCancelled() || partitions_data.empty())
         return;
 
-    for (auto & [_, data] : partition_id_to_sink)
-        data->sink->onFinish();
-
-    LOG_TEST(log, "Written to {} sinks", partition_id_to_sink.size());
+    std::vector<DeltaLake::WriteTransaction::CommitFile> files;
+    files.reserve(total_data_files_count);
+    const auto data_prefix = delta_transaction->getDataPath();
 
-    try
+    for (auto & [_, partition_info] : partitions_data)
     {
-        std::vector<DeltaLake::WriteTransaction::CommitFile> files;
-        files.reserve(partition_id_to_sink.size());
-        const auto data_prefix = delta_transaction->getDataPath();
-        for (auto & [_, data] : partition_id_to_sink)
+        auto & [partition_key, data_files] = *partition_info;
+        auto partition_key_str = partition_key.toString();
+        auto keys_and_values = HivePartitioningUtils::parseHivePartitioningKeysAndValues(partition_key_str);
+        Map partition_values;
+        partition_values.reserve(keys_and_values.size());
+        for (const auto & [key, value] : keys_and_values)
+            partition_values.emplace_back(DB::Tuple({key, value}));
+
+        for (const auto & [sink, written_bytes, written_rows] : data_files)
         {
-            auto keys_and_values = HivePartitioningUtils::parseHivePartitioningKeysAndValues(data->path);
-            Map partition_values;
-            partition_values.reserve(keys_and_values.size());
-            for (const auto & [key, value] : keys_and_values)
-                partition_values.emplace_back(DB::Tuple({key, value}));
-
-            files.emplace_back(data->path.substr(data_prefix.size()), data->size, partition_values);
+            sink->onFinish();
+            files.emplace_back(
+                sink->getPath().substr(data_prefix.size()),
+                sink->getFileSize(),
+                partition_values);
         }
+    }
+
+    LOG_TEST(log, "Written {} data files", total_data_files_count);
+
+    try
+    {
         delta_transaction->commit(files);
     }
     catch (...)
     {
-        for (auto & [_, data] : partition_id_to_sink)
+        for (auto & [_, partition_info] : partitions_data)
         {
-            object_storage->removeObjectIfExists(StoredObject(data->path));
+            for (const auto & [sink, written_bytes, written_rows] : partition_info->data_files)
+                object_storage->removeObjectIfExists(StoredObject(sink->getPath()));
         }
         throw;
     }
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.h b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.h
index 002da7e0248d..116143af0b90 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.h
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.h
@@ -9,6 +9,7 @@
 #include <absl/container/flat_hash_map.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/ObjectStorage/IObjectIterator.h>
+#include <Storages/ObjectStorage/StorageObjectStorageSink.h>
 #include <Storages/IPartitionStrategy.h>
 
 
@@ -49,26 +50,42 @@ class DeltaLakePartitionedSink : public SinkToStorage, private WithContext
     void onFinish() override;
 
 private:
-    struct PartitionData
+    using StorageSinkPtr = std::unique_ptr<StorageObjectStorageSink>;
+
+    struct DataFileInfo
+    {
+        explicit DataFileInfo(StorageSinkPtr sink_) : sink(std::move(sink_)) {}
+
+        StorageSinkPtr sink;
+        size_t written_bytes = 0;
+        size_t written_rows = 0;
+    };
+    struct PartitionInfo
     {
-        SinkPtr sink;
-        std::string path;
-        size_t size = 0;
+        explicit PartitionInfo(StringRef partition_key_) : partition_key(partition_key_) {}
+
+        const StringRef partition_key;
+        std::vector<DataFileInfo> data_files;
     };
-    using PartitionDataPtr = std::shared_ptr<PartitionData>;
-    PartitionDataPtr getPartitionDataForPartitionKey(StringRef partition_key);
+    using PartitionInfoPtr = std::shared_ptr<PartitionInfo>;
 
     const LoggerPtr log;
     const Names partition_columns;
     const ObjectStoragePtr object_storage;
     const std::optional<FormatSettings> format_settings;
     const StorageObjectStorageConfigurationPtr configuration;
+    const size_t data_file_max_rows;
+    const size_t data_file_max_bytes;
     const std::unique_ptr<IPartitionStrategy> partition_strategy;
     const DeltaLake::WriteTransactionPtr delta_transaction;
 
-    absl::flat_hash_map<StringRef, PartitionDataPtr> partition_id_to_sink;
+    absl::flat_hash_map<StringRef, PartitionInfoPtr> partitions_data;
+    size_t total_data_files_count = 0;
     IColumn::Selector chunk_row_index_to_partition_index;
     Arena partition_keys_arena;
+
+    StorageSinkPtr createSinkForPartition(StringRef partition_key);
+    PartitionInfoPtr getPartitionDataForPartitionKey(StringRef partition_key);
 };
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.cpp
index dc506e1cc82e..a588435e5189 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.cpp
@@ -1,7 +1,9 @@
+#include <Core/Settings.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.h>
 
 #if USE_DELTA_KERNEL_RS
 #include <Common/logger_useful.h>
+#include <Interpreters/Context.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLake/WriteTransaction.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLake/KernelUtils.h>
@@ -9,6 +11,11 @@
 
 namespace DB
 {
+namespace Setting
+{
+    extern const SettingsNonZeroUInt64 delta_lake_insert_max_rows_in_data_file;
+    extern const SettingsNonZeroUInt64 delta_lake_insert_max_bytes_in_data_file;
+}
 
 DeltaLakeSink::DeltaLakeSink(
     DeltaLake::WriteTransactionPtr delta_transaction_,
@@ -17,28 +24,48 @@ DeltaLakeSink::DeltaLakeSink(
     ContextPtr context_,
     SharedHeader sample_block_,
     const std::optional<FormatSettings> & format_settings_)
-    : StorageObjectStorageSink(
-        DeltaLake::generateWritePath(
-            delta_transaction_->getDataPath(),
-            configuration_->format),
-        object_storage_,
-        configuration_,
-        format_settings_,
-        sample_block_,
-        context_)
+    : SinkToStorage(sample_block_)
+    , WithContext(context_)
     , delta_transaction(delta_transaction_)
     , object_storage(object_storage_)
+    , configuration(configuration_)
+    , format_settings(format_settings_)
+    , sample_block(sample_block_)
+    , data_file_max_rows(context_->getSettingsRef()[Setting::delta_lake_insert_max_rows_in_data_file])
+    , data_file_max_bytes(context_->getSettingsRef()[Setting::delta_lake_insert_max_bytes_in_data_file])
 {
     delta_transaction->validateSchema(getHeader());
 }
 
+DeltaLakeSink::StorageSinkPtr DeltaLakeSink::createStorageSink() const
+{
+    return std::make_unique<StorageObjectStorageSink>(
+        DeltaLake::generateWritePath(
+            delta_transaction->getDataPath(),
+            configuration->getFormat()),
+        object_storage,
+        configuration,
+        format_settings,
+        sample_block,
+        getContext());
+}
+
 void DeltaLakeSink::consume(Chunk & chunk)
 {
     if (isCancelled())
         return;
 
-    written_bytes += chunk.bytes();
-    StorageObjectStorageSink::consume(chunk);
+    if (data_files.empty()
+        || data_files.back().written_bytes >= data_file_max_bytes
+        || data_files.back().written_rows >= data_file_max_rows)
+    {
+        data_files.emplace_back(createStorageSink());
+    }
+
+    auto & data_file = data_files.back();
+    data_file.written_bytes += chunk.bytes();
+    data_file.written_rows += chunk.getNumRows();
+    data_file.sink->consume(chunk);
 }
 
 void DeltaLakeSink::onFinish()
@@ -46,20 +73,29 @@ void DeltaLakeSink::onFinish()
     if (isCancelled())
         return;
 
-    StorageObjectStorageSink::onFinish();
+    std::vector<DeltaLake::WriteTransaction::CommitFile> files;
+    files.reserve(data_files.size());
+    for (const auto & [sink, written_bytes, written_rows] : data_files)
+    {
+        sink->onFinish();
+        auto file_location = sink->getPath().substr(delta_transaction->getDataPath().size());
+        auto file_size = sink->getFileSize();
+        files.emplace_back(std::move(file_location), file_size, Map{});
+    }
 
     try
     {
-        std::vector<DeltaLake::WriteTransaction::CommitFile> files;
-        auto file_location = getPath().substr(delta_transaction->getDataPath().size());
-        files.emplace_back(std::move(file_location), written_bytes, Map{});
         delta_transaction->commit(files);
     }
     catch (...)
     {
-        /// FIXME: this should be just removeObject,
-        /// but IObjectStorage does not have such method.
-        object_storage->removeObjectIfExists(StoredObject(getPath()));
+        for (const auto & [sink, written_bytes, written_rows] : data_files)
+        {
+            /// FIXME: this should be just removeObject,
+            /// but IObjectStorage does not have such method.
+           object_storage->removeObjectIfExists(StoredObject(sink->getPath()));
+
+        }
         throw;
     }
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.h b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.h
index 4d77c5736085..4677e0966102 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.h
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.h
@@ -20,7 +20,7 @@ class DeltaLakeMetadataDeltaKernel;
  * Sink to write non-partitioned data to DeltaLake.
  * Writes a single data file and commits it to DeltaLake metadata.
  */
-class DeltaLakeSink : public StorageObjectStorageSink
+class DeltaLakeSink : public SinkToStorage, private WithContext
 {
 public:
     DeltaLakeSink(
@@ -40,9 +40,25 @@ class DeltaLakeSink : public StorageObjectStorageSink
     void onFinish() override;
 
 private:
+    using StorageSinkPtr = std::unique_ptr<StorageObjectStorageSink>;
+    StorageSinkPtr createStorageSink() const;
+
     const DeltaLake::WriteTransactionPtr delta_transaction;
     const ObjectStoragePtr object_storage;
-    size_t written_bytes = 0;
+    const StorageObjectStorageConfigurationPtr configuration;
+    const std::optional<FormatSettings> format_settings;
+    const SharedHeader sample_block;
+    const size_t data_file_max_rows;
+    const size_t data_file_max_bytes;
+
+    struct DataFileInfo
+    {
+        explicit DataFileInfo(StorageSinkPtr sink_) : sink(std::move(sink_)) {}
+        StorageSinkPtr sink;
+        size_t written_bytes = 0;
+        size_t written_rows = 0;
+    };
+    std::vector<DataFileInfo> data_files;
 };
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLake/WriteTransaction.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLake/WriteTransaction.cpp
index a25edb236b89..57c31cdaec9f 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLake/WriteTransaction.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLake/WriteTransaction.cpp
@@ -208,12 +208,14 @@ void WriteTransaction::create()
 void WriteTransaction::validateSchema(const DB::Block & header) const
 {
     assertTransactionCreated();
-    if (write_schema.getNames() != header.getNames())
+    auto write_column_names = write_schema.getNameSet();
+    auto header_column_names = header.getNamesAndTypesList().getNameSet();
+    if (write_column_names != header_column_names)
     {
         throw DB::Exception(
             DB::ErrorCodes::LOGICAL_ERROR,
             "Header does not match write schema. Expected: {}, got: {}",
-            fmt::join(write_schema.getNames(), ", "), fmt::join(header.getNames(), ", "));
+            fmt::join(write_column_names, ", "), fmt::join(header_column_names, ", "));
     }
 }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLake/getSchemaFromSnapshot.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLake/getSchemaFromSnapshot.cpp
index 3121e791ca79..7c46e3e92903 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLake/getSchemaFromSnapshot.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLake/getSchemaFromSnapshot.cpp
@@ -88,7 +88,7 @@ class SchemaVisitorData
     const DB::Names & getPartitionColumns() const { return partition_columns; }
 
 private:
-    DB::DataTypes getDataTypesFromTypeList(size_t list_idx);
+    DB::NamesAndTypesList getNamesAndTypesFromList(size_t list_idx);
 
     struct Field
     {
@@ -376,61 +376,51 @@ class SchemaVisitor
 
 SchemaVisitorData::SchemaResult SchemaVisitorData::getSchemaResult()
 {
-    const auto types = getDataTypesFromTypeList(0);
-    chassert(types.size() == type_lists[0]->size());
-
-    std::list<DB::NameAndTypePair> names_and_types;
     SchemaResult result;
-    for (size_t i = 0; i < types.size(); ++i)
+    result.names_and_types = getNamesAndTypesFromList(0);
+    chassert(result.names_and_types.size() == type_lists[0]->size());
+
+    for (size_t i = 0; i < type_lists[0]->size(); ++i)
     {
         const auto & field = (*type_lists[0])[i];
-        names_and_types.emplace_back(field.name, types[i]);
         if (!field.physical_name.empty())
         {
             [[maybe_unused]] bool inserted = result.physical_names_map.emplace(field.name, field.physical_name).second;
             chassert(inserted);
         }
     }
-    result.names_and_types = DB::NamesAndTypesList(names_and_types.begin(), names_and_types.end());
     return result;
 }
 
-DB::DataTypes SchemaVisitorData::getDataTypesFromTypeList(size_t list_idx)
+DB::NamesAndTypesList SchemaVisitorData::getNamesAndTypesFromList(size_t list_idx)
 {
-    DB::DataTypes types;
+    DB::NamesAndTypesList names_and_types;
     for (const auto & field : *type_lists[list_idx])
     {
+        DB::DataTypePtr type;
         if (field.is_bool)
         {
-            auto type = DB::DataTypeFactory::instance().get("Bool");
+            type = DB::DataTypeFactory::instance().get("Bool");
             if (field.nullable)
                 type = std::make_shared<DB::DataTypeNullable>(type);
-
-            types.push_back(type);
         }
         else if (field.type == DB::TypeIndex::Decimal32)
         {
-            auto type = DB::createDecimal<DB::DataTypeDecimal>(field.precision, field.scale);
+            type = DB::createDecimal<DB::DataTypeDecimal>(field.precision, field.scale);
             if (field.nullable)
                 type = std::make_shared<DB::DataTypeNullable>(type);
-
-            types.push_back(type);
         }
         else if (field.type == DB::TypeIndex::DateTime64)
         {
-            DB::DataTypePtr type = std::make_shared<DB::DataTypeDateTime64>(6);
+            type = std::make_shared<DB::DataTypeDateTime64>(6);
             if (field.nullable)
                 type = std::make_shared<DB::DataTypeNullable>(type);
-
-            types.push_back(type);
         }
         else if (DB::isSimpleDataType(field.type))
         {
-            auto type = DB::getSimpleDataTypeFromTypeIndex(field.type);
+            type = DB::getSimpleDataTypeFromTypeIndex(field.type);
             if (field.nullable)
                 type = std::make_shared<DB::DataTypeNullable>(type);
-
-            types.push_back(type);
         }
         else
         {
@@ -444,12 +434,12 @@ DB::DataTypes SchemaVisitorData::getDataTypesFromTypeList(size_t list_idx)
             DB::WhichDataType which(field.type);
             if (which.isTuple())
             {
-                auto child_types = getDataTypesFromTypeList(field.child_list_id);
-                types.push_back(std::make_shared<DB::DataTypeTuple>(child_types));
+                auto child_names_and_types = getNamesAndTypesFromList(field.child_list_id);
+                type = std::make_shared<DB::DataTypeTuple>(child_names_and_types.getTypes(), child_names_and_types.getNames());
             }
             else if (which.isArray())
             {
-                auto child_types = getDataTypesFromTypeList(field.child_list_id);
+                auto child_types = getNamesAndTypesFromList(field.child_list_id);
                 if (child_types.size() != 1)
                 {
                     throw DB::Exception(
@@ -458,11 +448,12 @@ DB::DataTypes SchemaVisitorData::getDataTypesFromTypeList(size_t list_idx)
                         child_types.size());
                 }
 
-                types.push_back(std::make_shared<DB::DataTypeArray>(child_types[0]));
+                type = std::make_shared<DB::DataTypeArray>(child_types.getTypes()[0]);
             }
             else if (which.isMap())
             {
-                auto child_types = getDataTypesFromTypeList(field.child_list_id);
+                auto child_names_and_types = getNamesAndTypesFromList(field.child_list_id);
+                auto child_types = child_names_and_types.getTypes();
                 if (child_types.size() != 2)
                 {
                     throw DB::Exception(
@@ -470,7 +461,7 @@ DB::DataTypes SchemaVisitorData::getDataTypesFromTypeList(size_t list_idx)
                         "Unexpected number of types in array: {}",
                         child_types.size());
                 }
-                types.push_back(std::make_shared<DB::DataTypeMap>(child_types[0], child_types[1]));
+                type = std::make_shared<DB::DataTypeMap>(child_types[0], child_types[1]);
             }
             else
             {
@@ -479,8 +470,10 @@ DB::DataTypes SchemaVisitorData::getDataTypesFromTypeList(size_t list_idx)
                     "Column {} has unsupported complex data type: {}", field.name, field.type);
             }
         }
+        chassert(type);
+        names_and_types.emplace_back(field.name, type);
     }
-    return types;
+    return names_and_types;
 }
 
 std::pair<DB::NamesAndTypesList, DB::NameToNameMap> getTableSchemaFromSnapshot(ffi::SharedSnapshot * snapshot)
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp
index 1aefb9867e90..b32bba1ca37f 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp
@@ -746,7 +746,7 @@ Field DeltaLakeMetadata::getFieldValue(const String & value, DataTypePtr data_ty
     {
         ReadBufferFromString in(value);
         DateTime64 time = 0;
-        readDateTime64Text(time, 6, in, assert_cast<const DataTypeDateTime64 *>(data_type.get())->getTimeZone());
+        readDateTime64Text(time, 6, in, assert_cast<const DataTypeDateTime64 *>(check_type.get())->getTimeZone());
         return time;
     }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.cpp
index e604f31dc1fa..5155a9cd2255 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.cpp
@@ -1,3 +1,4 @@
+#include <DataTypes/DataTypeNullable.h>
 #include "config.h"
 
 #if USE_PARQUET && USE_DELTA_KERNEL_RS
@@ -7,10 +8,28 @@
 #include <Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakeSink.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLake/DeltaLakePartitionedSink.h>
 #include <Storages/ObjectStorage/DataLakes/DeltaLake/WriteTransaction.h>
+#include <Interpreters/Context.h>
+#include <Core/Settings.h>
 #include <Common/logger_useful.h>
+#include <Common/assert_cast.h>
 
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace Setting
+{
+    extern const SettingsBool allow_experimental_delta_lake_writes;
+}
+
+namespace ErrorCodes
+{
+    extern const int SUPPORT_IS_DISABLED;
+}
 
 [[maybe_unused]] static void tracingCallback(struct ffi::Event event)
 {
@@ -96,57 +115,119 @@ NamesAndTypesList DeltaLakeMetadataDeltaKernel::getTableSchema() const
     return table_snapshot->getTableSchema();
 }
 
-void DeltaLakeMetadataDeltaKernel::modifyFormatSettings(FormatSettings & format_settings) const
+void DeltaLakeMetadataDeltaKernel::modifyFormatSettings(FormatSettings & format_settings, const Context &) const
 {
     /// There can be missing columns because of ALTER ADD/DROP COLUMN.
     /// So to support reading from such tables it is enough to turn on this setting.
     format_settings.parquet.allow_missing_columns = true;
 }
 
+static void checkTypesAndNestedTypesEqual(DataTypePtr type, DataTypePtr expected_type, const std::string & column_name)
+{
+    /// Checks types recursively if needed.
+    if (!type->equals(*expected_type))
+    {
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS, "Types mismatch for column `{}`. Got: {}, expected: {}",
+            column_name, type->getName(), expected_type->getName());
+    }
+}
+
 ReadFromFormatInfo DeltaLakeMetadataDeltaKernel::prepareReadingFromFormat(
     const Strings & requested_columns,
     const StorageSnapshotPtr & storage_snapshot,
     const ContextPtr & context,
     bool supports_subset_of_columns,
-    bool supports_tuple_elements)
+    bool /*supports_tuple_elements*/)
 {
-    auto info = DB::prepareReadingFromFormat(requested_columns, storage_snapshot, context, supports_subset_of_columns, supports_tuple_elements);
+    /// The below code is similar to what can be found in `prepareReadingFromFormat.cpp`,
+    /// but is adjusted for delta-lake.
+    ReadFromFormatInfo info;
 
     /// Read schema is different from table schema in case:
     /// 1. we have partition columns (they are not stored in the actual data)
     /// 2. columnMapping.mode = 'name' or 'id'.
-    /// So we add partition columns to read schema and put it together into format_header.
-    /// Partition values will be added to result data right after data is read.
     DB::NameToNameMap physical_names_map;
-    DB::NameSet read_columns;
+    DB::NamesAndTypesList read_schema;
+    DB::NamesAndTypesList table_schema;
     {
         std::lock_guard lock(table_snapshot_mutex);
         physical_names_map = table_snapshot->getPhysicalNamesMap();
-        read_columns = table_snapshot->getReadSchema().getNameSet();
+        read_schema = table_snapshot->getReadSchema();
+        table_schema = table_snapshot->getTableSchema();
     }
 
-    Block format_header;
-    for (auto && column_with_type_and_name : info.format_header)
+    Names non_virtual_requested_columns;
+    for (const auto & column_name : requested_columns)
     {
-        auto physical_name = DeltaLake::getPhysicalName(column_with_type_and_name.name, physical_names_map);
-        if (!read_columns.contains(physical_name))
-        {
-            LOG_TEST(log, "Filtering out non-readable column: {}", column_with_type_and_name.name);
-            continue;
-        }
-        column_with_type_and_name.name = physical_name;
-        format_header.insert(std::move(column_with_type_and_name));
+        if (auto virtual_column = storage_snapshot->virtual_columns->tryGet(column_name))
+            info.requested_virtual_columns.emplace_back(std::move(*virtual_column));
+        else
+            non_virtual_requested_columns.push_back(column_name);
     }
-    info.format_header = std::move(format_header);
 
-    /// Update requested columns to reference actual physical column names.
-    if (!physical_names_map.empty())
+    /// Create header for Source that will contain all requested columns including virtual at the end
+    /// (because they will be added to the chunk after reading regular columns).
+    info.source_header = storage_snapshot->getSampleBlockForColumns(non_virtual_requested_columns);
+    for (const auto & column : info.requested_virtual_columns)
+        info.source_header.insert({column.type->createColumn(), column.type, column.name});
+
+    /// Set format_header with columns that should be read from data.
+    /// However, we include partition columns in requested_columns,
+    /// because we will insert partition columns into chunk right after it is read from data file,
+    /// so we want it to be verified that chunk contains all the requested columns.
+    for (const auto & column_name : non_virtual_requested_columns)
     {
-        for (auto & [column_name, _] : info.requested_columns)
-            column_name = DeltaLake::getPhysicalName(column_name, physical_names_map);
+        auto name_and_type = table_schema.tryGetByName(column_name);
+        if (!name_and_type)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found column in schema: {}", column_name);
+
+        auto expected_type = info.source_header.getByName(column_name).type;
+
+        /// Convert for compatibility, because it used to work this way.
+        if (name_and_type->type->isNullable() && !expected_type->isNullable())
+            name_and_type->type = removeNullable(name_and_type->type);
+
+        checkTypesAndNestedTypesEqual(name_and_type->type, expected_type, column_name);
+
+        auto physical_name = DeltaLake::getPhysicalName(column_name, physical_names_map);
+        auto physical_name_and_type = read_schema.tryGetByName(physical_name);
+
+        LOG_TEST(
+            log, "Name: {}, physical name: {}, contained in read schema: {}",
+            column_name, physical_name, physical_name_and_type.has_value());
+
+        if (physical_name_and_type.has_value())
+        {
+            /// Convert for compatibility, because it used to work this way.
+            /// Note: however, we do not convert nested types.
+            if (physical_name_and_type->type->isNullable() && !expected_type->isNullable())
+                physical_name_and_type->type = removeNullable(physical_name_and_type->type);
+
+            info.requested_columns.push_back(physical_name_and_type.value());
+            info.format_header.insert(ColumnWithTypeAndName
+            {
+                physical_name_and_type->type->createColumn(),
+                physical_name_and_type->type,
+                physical_name_and_type->name
+            });
+        }
+        else
+        {
+            info.requested_columns.emplace_back(physical_name, name_and_type->type);
+        }
     }
 
-    LOG_TEST(log, "Format header: {}", info.format_header.dumpNames());
+    /// If only virtual columns were requested, just read the smallest column.
+    if (supports_subset_of_columns && non_virtual_requested_columns.empty())
+        non_virtual_requested_columns.push_back(ExpressionActions::getSmallestColumn(table_schema).name);
+
+    info.columns_description = storage_snapshot->getDescriptionForColumns(non_virtual_requested_columns);
+    info.serialization_hints = getSerializationHintsForFileLikeStorage(storage_snapshot->metadata, context);
+
+    LOG_TEST(log, "Format header: {}", info.format_header.dumpStructure());
+    LOG_TEST(log, "Source header: {}", info.source_header.dumpStructure());
+    LOG_TEST(log, "Requested columns: {}", info.requested_columns.toString());
     return info;
 }
 
@@ -159,6 +240,13 @@ SinkToStoragePtr DeltaLakeMetadataDeltaKernel::write(
     ContextPtr context,
     std::shared_ptr<DataLake::ICatalog> /* catalog */)
 {
+    if (!context->getSettingsRef()[Setting::allow_experimental_delta_lake_writes])
+    {
+        throw Exception(
+            ErrorCodes::SUPPORT_IS_DISABLED,
+            "To enable delta lake writes, use allow_experimental_delta_lake_writes = 1");
+    }
+
     Names partition_columns;
     {
         std::lock_guard lock(table_snapshot_mutex);
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.h b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.h
index c43d7dcd13a2..4a161ada5930 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.h
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadataDeltaKernel.h
@@ -47,7 +47,7 @@ class DeltaLakeMetadataDeltaKernel final : public IDataLakeMetadata
 
     bool operator ==(const IDataLakeMetadata &) const override;
 
-    void modifyFormatSettings(FormatSettings & format_settings) const override;
+    void modifyFormatSettings(FormatSettings & format_settings, const Context &) const override;
 
     static DataLakeMetadataPtr create(
         ObjectStoragePtr object_storage,
diff --git a/src/Storages/ObjectStorage/DataLakes/HudiMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/HudiMetadata.cpp
index 8417b232a845..b6471c4ba03d 100644
--- a/src/Storages/ObjectStorage/DataLakes/HudiMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/HudiMetadata.cpp
@@ -44,7 +44,7 @@ Strings HudiMetadata::getDataFilesImpl() const
 {
     auto configuration_ptr = configuration.lock();
     auto log = getLogger("HudiMetadata");
-    const auto keys = listFiles(*object_storage, *configuration_ptr, "", Poco::toLower(configuration_ptr->format));
+    const auto keys = listFiles(*object_storage, *configuration_ptr, "", Poco::toLower(configuration_ptr->getFormat()));
 
     using Partition = std::string;
     using FileID = std::string;
@@ -91,7 +91,7 @@ HudiMetadata::HudiMetadata(ObjectStoragePtr object_storage_, StorageObjectStorag
 {
 }
 
-Strings HudiMetadata::getDataFiles(const ActionsDAG *) const
+Strings HudiMetadata::getDataFiles() const
 {
     if (data_files.empty())
         data_files = getDataFilesImpl();
@@ -99,12 +99,12 @@ Strings HudiMetadata::getDataFiles(const ActionsDAG *) const
 }
 
 ObjectIterator HudiMetadata::iterate(
-    const ActionsDAG * filter_dag,
+    const ActionsDAG * /* filter_dag */,
     FileProgressCallback callback,
     size_t /* list_batch_size */,
     ContextPtr /* context  */) const
 {
-    return createKeysIterator(getDataFiles(filter_dag), object_storage, callback);
+    return createKeysIterator(getDataFiles(), object_storage, callback);
 }
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/HudiMetadata.h b/src/Storages/ObjectStorage/DataLakes/HudiMetadata.h
index 47f2e8d95366..147b39893006 100644
--- a/src/Storages/ObjectStorage/DataLakes/HudiMetadata.h
+++ b/src/Storages/ObjectStorage/DataLakes/HudiMetadata.h
@@ -60,7 +60,7 @@ class HudiMetadata final : public IDataLakeMetadata, private WithContext
     mutable Strings data_files;
 
     Strings getDataFilesImpl() const;
-    Strings getDataFiles(const ActionsDAG * filter_dag) const;
+    Strings getDataFiles() const;
 };
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.cpp
index 92c40ae695d7..3205da746054 100644
--- a/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.cpp
@@ -1,9 +1,18 @@
 #include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Core/Field.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DATA;
+};
+
 namespace
 {
 
@@ -41,12 +50,16 @@ class KeysIterator : public IObjectIterator
                 return nullptr;
 
             auto key = data_files[current_index];
-            auto object_metadata = object_storage->getObjectMetadata(key);
 
             if (callback)
-                callback(FileProgress(0, object_metadata.size_bytes));
+            {
+                /// Too expencive to load size for metadata always
+                /// because it requires API call to external storage.
+                /// In many cases only keys are needed.
+                callback(FileProgress(0, 1));
+            }
 
-            return std::make_shared<ObjectInfo>(key, std::move(object_metadata));
+            return std::make_shared<ObjectInfo>(key, std::nullopt);
         }
     }
 
@@ -87,4 +100,109 @@ ReadFromFormatInfo IDataLakeMetadata::prepareReadingFromFormat(
     return DB::prepareReadingFromFormat(requested_columns, storage_snapshot, context, supports_subset_of_columns, supports_tuple_elements);
 }
 
+DataFileMetaInfo::DataFileMetaInfo(
+    const Iceberg::IcebergSchemaProcessor & schema_processor,
+    Int32 schema_id,
+    const std::unordered_map<Int32, Iceberg::ColumnInfo> & columns_info_)
+{
+
+    std::vector<Int32> column_ids;
+    for (const auto & column : columns_info_)
+        column_ids.push_back(column.first);
+
+    auto name_and_types = schema_processor.tryGetFieldsCharacteristics(schema_id, column_ids);
+    std::unordered_map<Int32, std::string> name_by_index;
+    for (const auto & name_and_type : name_and_types)
+    {
+        const auto name = name_and_type.getNameInStorage();
+        auto index = schema_processor.tryGetColumnIDByName(schema_id, name);
+        if (index.has_value())
+            name_by_index[index.value()] = name;
+    }
+
+    for (const auto & column : columns_info_)
+    {
+        auto i_name = name_by_index.find(column.first);
+        if (i_name != name_by_index.end())
+        {
+            columns_info[i_name->second] = {column.second.rows_count, column.second.nulls_count, column.second.hyperrectangle};
+        }
+    }
+}
+
+constexpr size_t FIELD_MASK_ROWS = 0x1;
+constexpr size_t FIELD_MASK_NULLS = 0x2;
+constexpr size_t FIELD_MASK_RECT = 0x4;
+constexpr size_t FIELD_MASK_ALL = 0x7;
+
+void DataFileMetaInfo::serialize(WriteBuffer & out) const
+{
+    auto size = columns_info.size();
+    writeIntBinary(size, out);
+    for (const auto & column : columns_info)
+    {
+        writeStringBinary(column.first, out);
+        size_t field_mask = 0;
+        if (column.second.rows_count.has_value())
+            field_mask |= FIELD_MASK_ROWS;
+        if (column.second.nulls_count.has_value())
+            field_mask |= FIELD_MASK_NULLS;
+        if (column.second.hyperrectangle.has_value())
+            field_mask |= FIELD_MASK_RECT;
+        writeIntBinary(field_mask, out);
+
+        if (column.second.rows_count.has_value())
+            writeIntBinary(column.second.rows_count.value(), out);
+        if (column.second.nulls_count.has_value())
+            writeIntBinary(column.second.nulls_count.value(), out);
+        if (column.second.hyperrectangle.has_value())
+        {
+            writeFieldBinary(column.second.hyperrectangle.value().left, out);
+            writeFieldBinary(column.second.hyperrectangle.value().right, out);
+        }
+    }
+}
+
+DataFileMetaInfo DataFileMetaInfo::deserialize(ReadBuffer & in)
+{
+    DataFileMetaInfo result;
+
+    size_t size;
+    readIntBinary(size, in);
+    
+    for (size_t i = 0; i < size; ++i)
+    {
+        std::string name;
+        readStringBinary(name, in);
+        size_t field_mask;
+        readIntBinary(field_mask, in);
+        if ((field_mask & FIELD_MASK_ALL) != field_mask)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected field mask: {}", field_mask);
+
+        ColumnInfo & column = result.columns_info[name];
+
+        if (field_mask & FIELD_MASK_ROWS)
+        {
+            Int64 value;
+            readIntBinary(value, in);
+            column.rows_count = value;
+        }
+        if (field_mask & FIELD_MASK_NULLS)
+        {
+            Int64 value;
+            readIntBinary(value, in);
+            column.nulls_count = value;
+        }
+        if (field_mask & FIELD_MASK_RECT)
+        {
+            FieldRef left = readFieldBinary(in);
+            FieldRef right = readFieldBinary(in);
+            column.hyperrectangle = Range(left, true, right, true);
+        }
+    }
+
+    return result;
+}
+
+
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h b/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h
index c9872ff71aa4..28d7faf1a765 100644
--- a/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h
+++ b/src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h
@@ -3,9 +3,13 @@
 
 #include <Core/NamesAndTypes.h>
 #include <Core/Types.h>
+#include <Core/Range.h>
 #include <Interpreters/ActionsDAG.h>
 #include <Processors/ISimpleTransform.h>
-#include <Storages/ObjectStorage/IObjectIterator.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Storages/AlterCommands.h>
+#include <Storages/MutationCommands.h>
 #include <Storages/prepareReadingFromFormat.h>
 #include <Formats/FormatFilterInfo.h>
 #include <Formats/FormatParserSharedResources.h>
@@ -15,6 +19,7 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/AlterCommands.h>
 
+#include <Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.h>
 
 namespace DataLake
 {
@@ -27,13 +32,71 @@ namespace DB
 namespace ErrorCodes
 {
 extern const int UNSUPPORTED_METHOD;
-}
+};
+
+namespace Iceberg
+{
+struct ColumnInfo;
+};
+
+class DataFileMetaInfo
+{
+public:
+    DataFileMetaInfo() = default;
+
+    // subset of Iceberg::ColumnInfo now
+    struct ColumnInfo
+    {
+        std::optional<Int64> rows_count;
+        std::optional<Int64> nulls_count;
+        std::optional<DB::Range> hyperrectangle;
+    };
+
+    // Extract metadata from Iceberg structure
+    explicit DataFileMetaInfo(
+        const Iceberg::IcebergSchemaProcessor & schema_processor,
+        Int32 schema_id,
+        const std::unordered_map<Int32, Iceberg::ColumnInfo> & columns_info_);
+
+    void serialize(WriteBuffer & out) const;
+    static DataFileMetaInfo deserialize(ReadBuffer & in);
+
+    bool empty() const { return columns_info.empty(); }
+
+    std::unordered_map<std::string, ColumnInfo> columns_info;
+};
+
+using DataFileMetaInfoPtr = std::shared_ptr<DataFileMetaInfo>;
+
+struct DataFileInfo
+{
+    std::string file_path;
+    std::optional<DataFileMetaInfoPtr> file_meta_info;
+    std::optional<std::string> absolute_uri;
+
+    explicit DataFileInfo(const std::string & file_path_)
+        : file_path(file_path_) {}
+
+    explicit DataFileInfo(std::string && file_path_)
+        : file_path(std::move(file_path_)) {}
+
+    bool operator==(const DataFileInfo & rhs) const
+    {
+        return file_path == rhs.file_path;
+    }
+};
 
 class SinkToStorage;
 using SinkToStoragePtr = std::shared_ptr<SinkToStorage>;
 class StorageObjectStorageConfiguration;
 using StorageObjectStorageConfigurationPtr = std::shared_ptr<StorageObjectStorageConfiguration>;
 struct StorageID;
+struct IObjectIterator;
+struct RelativePathWithMetadata;
+class IObjectStorage;
+using ObjectIterator = std::shared_ptr<IObjectIterator>;
+using ObjectStoragePtr = std::shared_ptr<IObjectStorage>;
+using ObjectInfoPtr = std::shared_ptr<PathWithMetadata>;
 
 class IDataLakeMetadata : boost::noncopyable
 {
@@ -74,14 +137,15 @@ class IDataLakeMetadata : boost::noncopyable
     virtual bool supportsSchemaEvolution() const { return false; }
     virtual bool supportsWrites() const { return false; }
 
-    virtual void modifyFormatSettings(FormatSettings &) const {}
+    virtual void modifyFormatSettings(FormatSettings &, const Context &) const {}
 
     virtual std::optional<size_t> totalRows(ContextPtr) const { return {}; }
     virtual std::optional<size_t> totalBytes(ContextPtr) const { return {}; }
 
     /// Some data lakes specify information for reading files from disks.
     /// For example, Iceberg has Parquet schema field ids in its metadata for reading files.
-    virtual ColumnMapperPtr getColumnMapper() const { return nullptr; }
+    virtual ColumnMapperPtr getColumnMapperForObject(ObjectInfoPtr /**/) const { return nullptr; }
+    virtual ColumnMapperPtr getColumnMapperForCurrentSchema() const { return nullptr; }
 
     virtual SinkToStoragePtr write(
         SharedHeader /*sample_block*/,
@@ -111,6 +175,9 @@ class IDataLakeMetadata : boost::noncopyable
     virtual void checkAlterIsPossible(const AlterCommands & /*commands*/) { throwNotImplemented("alter"); }
     virtual void alter(const AlterCommands & /*params*/, ContextPtr /*context*/) { throwNotImplemented("alter"); }
 
+    virtual std::optional<String> partitionKey(ContextPtr) const { return {}; }
+    virtual std::optional<String> sortingKey(ContextPtr) const { return {}; }
+
 protected:
     virtual ObjectIterator createKeysIterator(
         Strings && data_files_,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.cpp
index 6315b6556b4c..a574b06f2eeb 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.cpp
@@ -1,14 +1,29 @@
+#include <memory>
+#include <sstream>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.h>
+#include <Poco/JSON/Array.h>
+#include <Poco/JSON/Object.h>
+#include <Core/ColumnWithTypeAndName.h>
+#include <IO/WriteBufferFromString.h>
 
 #if USE_AVRO
 
 #include <Processors/Formats/Impl/AvroRowInputFormat.h>
 #include <Common/assert_cast.h>
 #include <base/find_symbols.h>
+#include <Processors/Formats/Impl/JSONObjectEachRowRowOutputFormat.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 
 namespace DB::ErrorCodes
 {
     extern const int ICEBERG_SPECIFICATION_VIOLATION;
+    extern const int INCORRECT_DATA;
+}
+
+namespace ProfileEvents
+{
+    extern const Event IcebergAvroFileParsing;
+    extern const Event IcebergAvroFileParsingMicroseconds;
 }
 
 namespace DB::Iceberg
@@ -17,12 +32,14 @@ namespace DB::Iceberg
 using namespace DB;
 
 AvroForIcebergDeserializer::AvroForIcebergDeserializer(
-    std::unique_ptr<ReadBufferFromFileBase> buffer_,
-    const std::string & manifest_file_path_,
-    const DB::FormatSettings & format_settings)
+    std::unique_ptr<ReadBufferFromFileBase> buffer_, const std::string & manifest_file_path_, const DB::FormatSettings & format_settings)
+try
     : buffer(std::move(buffer_))
     , manifest_file_path(manifest_file_path_)
 {
+    ProfileEvents::increment(ProfileEvents::IcebergAvroFileParsing);
+    ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::IcebergAvroFileParsingMicroseconds);
+
     auto manifest_file_reader
         = std::make_unique<avro::DataFileReaderBase>(std::make_unique<AvroInputStreamReadBufferAdapter>(*buffer));
 
@@ -44,6 +61,10 @@ AvroForIcebergDeserializer::AvroForIcebergDeserializer(
     parsed_column = std::move(columns[0]);
     parsed_column_data_type = std::dynamic_pointer_cast<const DataTypeTuple>(data_type);
 }
+catch (const std::exception & e)
+{
+    throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot read Iceberg avro manifest file '{}': {}", manifest_file_path_, e.what());
+}
 
 size_t AvroForIcebergDeserializer::rows() const
 {
@@ -83,6 +104,54 @@ std::optional<std::string> AvroForIcebergDeserializer::tryGetAvroMetadataValue(s
     return std::string{it->second.begin(), it->second.end()};
 }
 
+namespace
+{
+
+String removeAllSlashes(const String & input)
+{
+    std::string result;
+    result.reserve(input.size());
+
+    for (size_t i = 0; i < input.size(); ++i)
+    {
+        if (i + 1 < input.size() && input[i] == '\\' && input[i + 1] == '"')
+        {
+            ++i;
+            continue;
+        }
+        result.push_back(input[i]);
+    }
+    return result;
+}
+
+}
+
+String AvroForIcebergDeserializer::getContent(size_t row_number) const
+{
+    WriteBufferFromOwnString buf;
+    FormatSettings settings;
+    settings.write_statistics = false;
+    ColumnsWithTypeAndName columns({ColumnWithTypeAndName(parsed_column, parsed_column_data_type, "")});
+    JSONEachRowRowOutputFormat output_format = JSONEachRowRowOutputFormat(buf, std::make_shared<const Block>(columns), settings);
+    output_format.writeRow({parsed_column}, row_number);
+    output_format.finalize();
+    auto result_json = buf.str();
+    /// result_json looks like '{"":<some_json>}\n'. We need to extract just <some_json>
+    return result_json.substr(4, result_json.size() - 6);
+}
+
+String AvroForIcebergDeserializer::getMetadataContent() const
+{
+    Poco::JSON::Object::Ptr metadata_object = new Poco::JSON::Object;
+    for (const auto & [key, value] : metadata)
+    {
+        metadata_object->set(key, String(value.begin(), value.end()));
+    }
+    std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    metadata_object->stringify(oss);
+    return removeAllSlashes(oss.str());
+}
+
 }
 
 #endif
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.h
index 34b16347c3c1..7eca1ef40086 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.h
@@ -50,6 +50,9 @@ class AvroForIcebergDeserializer
     DB::Field getValueFromRowByName(size_t row_num, const std::string & path, std::optional<DB::TypeIndex> expected_type = std::nullopt) const;
 
     std::optional<std::string> tryGetAvroMetadataValue(std::string metadata_key) const;
+
+    String getContent(size_t row_number) const;
+    String getMetadataContent() const;
 };
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.cpp
index 0076b1d52ddf..c2e783dc73e9 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.cpp
@@ -69,6 +69,7 @@ struct Plan
     IcebergHistory history;
     std::unordered_map<String, Int64> manifest_file_to_first_snapshot;
     std::unordered_map<String, std::vector<String>> manifest_list_to_manifest_files;
+    std::unordered_map<String, std::unordered_set<Int64>> manifest_file_to_snapshots;
     std::unordered_map<Int64, std::vector<std::shared_ptr<DataFilePlan>>> snapshot_id_to_data_files;
     std::unordered_map<String, std::shared_ptr<DataFilePlan>> path_to_data_file;
     FileNamesGenerator generator;
@@ -111,6 +112,7 @@ Plan getPlan(
     IcebergHistory snapshots_info,
     const PersistentTableComponents & persistent_table_components,
     ObjectStoragePtr object_storage,
+    SecondaryStorages & secondary_storages,
     StorageObjectStorageConfigurationPtr configuration,
     ContextPtr context,
     CompressionMethod compression_method)
@@ -146,29 +148,36 @@ Plan getPlan(
     std::unordered_map<String, std::shared_ptr<ManifestFilePlan>> manifest_files;
     for (const auto & snapshot : snapshots_info)
     {
+        auto [manifest_list_storage, key_in_storage] = resolveObjectStorageForPath(persistent_table_components.table_location, snapshot.manifest_list_path, object_storage, secondary_storages, context);
+
         auto manifest_list
-            = getManifestList(object_storage, configuration, persistent_table_components, context, snapshot.manifest_list_path, log);
+            = getManifestList(manifest_list_storage, configuration, persistent_table_components, context, key_in_storage, snapshot.manifest_list_path, log);
+
         for (const auto & manifest_file : manifest_list)
         {
-            plan.manifest_list_to_manifest_files[snapshot.manifest_list_path].push_back(manifest_file.manifest_file_path);
-            if (!plan.manifest_file_to_first_snapshot.contains(manifest_file.manifest_file_path))
-                plan.manifest_file_to_first_snapshot[manifest_file.manifest_file_path] = snapshot.snapshot_id;
+            plan.manifest_list_to_manifest_files[snapshot.manifest_list_absolute_path].push_back(manifest_file.manifest_file_absolute_path);
+            if (!plan.manifest_file_to_first_snapshot.contains(manifest_file.manifest_file_absolute_path))
+            {
+                plan.manifest_file_to_first_snapshot[manifest_file.manifest_file_absolute_path] = snapshot.snapshot_id;
+            }
             auto manifest_file_content = getManifestFile(
                 object_storage,
                 configuration,
                 persistent_table_components,
                 context,
                 log,
-                manifest_file.manifest_file_path,
+                manifest_file.manifest_file_absolute_path,
                 manifest_file.added_sequence_number,
-                manifest_file.added_snapshot_id);
+                manifest_file.added_snapshot_id,
+                secondary_storages);
 
-            if (!manifest_files.contains(manifest_file.manifest_file_path))
+            if (!manifest_files.contains(manifest_file.manifest_file_absolute_path))
             {
-                manifest_files[manifest_file.manifest_file_path] = std::make_shared<ManifestFilePlan>(current_schema);
-                manifest_files[manifest_file.manifest_file_path]->path = manifest_file.manifest_file_path;
+                manifest_files[manifest_file.manifest_file_absolute_path] = std::make_shared<ManifestFilePlan>(current_schema);
+                manifest_files[manifest_file.manifest_file_absolute_path]->path = manifest_file.manifest_file_absolute_path;
             }
-            manifest_files[manifest_file.manifest_file_path]->manifest_lists_path.push_back(snapshot.manifest_list_path);
+            manifest_files[manifest_file.manifest_file_absolute_path]->manifest_lists_path.push_back(snapshot.manifest_list_path);
+            plan.manifest_file_to_snapshots[manifest_file.manifest_file_absolute_path].insert(snapshot.snapshot_id);
             auto data_files = manifest_file_content->getFilesWithoutDeleted(FileContentType::DATA);
             auto positional_delete_files = manifest_file_content->getFilesWithoutDeleted(FileContentType::POSITION_DELETE);
             for (const auto & pos_delete_file : positional_delete_files)
@@ -180,19 +189,23 @@ Plan getPlan(
                 if (plan.partitions.size() <= partition_index)
                     plan.partitions.push_back({});
 
-                IcebergDataObjectInfoPtr data_object_info = std::make_shared<IcebergDataObjectInfo>(data_file);
+                auto [resolved_storage, resolved_key] = resolveObjectStorageForPath(
+                    persistent_table_components.table_location, data_file.file_path, object_storage, secondary_storages, context);
+
+                IcebergDataObjectInfoPtr data_object_info = std::make_shared<IcebergDataObjectInfo>(data_file, resolved_storage, resolved_key);
                 std::shared_ptr<DataFilePlan> data_file_ptr;
-                if (!plan.path_to_data_file.contains(manifest_file.manifest_file_path))
+                std::string path_identifier = resolved_storage->getDescription() + ":" + resolved_storage->getObjectsNamespace() + "|" + resolved_key;
+                if (!plan.path_to_data_file.contains(path_identifier))
                 {
                     data_file_ptr = std::make_shared<DataFilePlan>(DataFilePlan{
                         .data_object_info = data_object_info,
-                        .manifest_list = manifest_files[manifest_file.manifest_file_path],
+                        .manifest_list = manifest_files[manifest_file.manifest_file_absolute_path],
                         .patched_path = plan.generator.generateDataFileName()});
-                    plan.path_to_data_file[manifest_file.manifest_file_path] = data_file_ptr;
+                    plan.path_to_data_file[path_identifier] = data_file_ptr;
                 }
                 else
                 {
-                    data_file_ptr = plan.path_to_data_file[manifest_file.manifest_file_path];
+                    data_file_ptr = plan.path_to_data_file[path_identifier];
                 }
                 plan.partitions[partition_index].push_back(data_file_ptr);
                 plan.snapshot_id_to_data_files[snapshot.snapshot_id].push_back(plan.partitions[partition_index].back());
@@ -224,15 +237,20 @@ void writeDataFiles(
     ObjectStoragePtr object_storage,
     const std::optional<FormatSettings> & format_settings,
     ContextPtr context,
-    StorageObjectStorageConfigurationPtr configuration)
+    StorageObjectStorageConfigurationPtr configuration,
+    const String & table_location,
+    SecondaryStorages & secondary_storages)
 {
     for (auto & [_, data_file] : initial_plan.path_to_data_file)
     {
         auto delete_file_transform = std::make_shared<IcebergBitmapPositionDeleteTransform>(
-            sample_block, data_file->data_object_info, object_storage, format_settings, context);
+            sample_block, data_file->data_object_info, object_storage, format_settings, context, table_location, secondary_storages);
 
+        ObjectStoragePtr storage_to_use = data_file->data_object_info->getObjectStorage();
+        if (!storage_to_use)
+            storage_to_use = object_storage;
         StorageObjectStorage::ObjectInfo object_info(data_file->data_object_info->getPath());
-        auto read_buffer = createReadBuffer(object_info, object_storage, context, getLogger("IcebergCompaction"));
+        auto read_buffer = createReadBuffer(object_info, storage_to_use, context, getLogger("IcebergCompaction"));
 
         const Settings & settings = context->getSettingsRef();
         auto parser_shared_resources = std::make_shared<FormatParserSharedResources>(
@@ -240,7 +258,7 @@ void writeDataFiles(
             /*num_streams_=*/1);
 
         auto input_format = FormatFactory::instance().getInput(
-            configuration->format,
+            configuration->getFormat(),
             *read_buffer,
             *sample_block,
             context,
@@ -249,7 +267,7 @@ void writeDataFiles(
             parser_shared_resources,
             std::make_shared<FormatFilterInfo>(nullptr, context, nullptr),
             true /* is_remote_fs */,
-            chooseCompressionMethod(data_file->data_object_info->getPath(), configuration->compression_method),
+            chooseCompressionMethod(data_file->data_object_info->getPath(), configuration->getCompressionMethod()),
             false);
 
         auto write_buffer = object_storage->writeObject(
@@ -260,7 +278,7 @@ void writeDataFiles(
             context->getWriteSettings());
 
         auto output_format
-            = FormatFactory::instance().getOutputFormat(configuration->format, *write_buffer, *sample_block, context, format_settings);
+            = FormatFactory::instance().getOutputFormat(configuration->getFormat(), *write_buffer, *sample_block, context, format_settings);
 
         while (true)
         {
@@ -390,6 +408,9 @@ void writeMetadataFiles(
         {
             manifest_entry->patched_path = plan.generator.generateManifestEntryName();
             manifest_file_renamings[manifest_entry->path] = manifest_entry->patched_path.path_in_metadata;
+
+            std::vector<String> unique_data_filenames(data_filenames.begin(), data_filenames.end());
+
             auto buffer_manifest_entry = object_storage->writeObject(
                 StoredObject(manifest_entry->patched_path.path_in_storage),
                 WriteMode::Rewrite,
@@ -407,11 +428,11 @@ void writeMetadataFiles(
                 partition_columns,
                 plan.partition_encoder.getPartitionValue(grouped_by_manifest_files_partitions[manifest_entry]),
                 ChunkPartitioner(fields_from_partition_spec, current_schema, context, sample_block_).getResultTypes(),
-                std::vector(data_filenames.begin(), data_filenames.end()),
+                unique_data_filenames,
                 manifest_entry->statistics,
                 sample_block_,
                 snapshot,
-                configuration->format,
+                configuration->getFormat(),
                 partititon_spec,
                 partition_spec_id,
                 *buffer_manifest_entry,
@@ -436,16 +457,25 @@ void writeMetadataFiles(
         if (plan.history[i].added_files == 0)
             continue;
 
-        auto initial_manifest_list_name = plan.history[i].manifest_list_path;
+        auto initial_manifest_list_name = plan.history[i].manifest_list_absolute_path;
         auto initial_manifest_entries = plan.manifest_list_to_manifest_files[initial_manifest_list_name];
-        auto renamed_manifest_list = manifest_list_renamings[initial_manifest_list_name];
+        auto renamed_manifest_list = manifest_list_renamings[plan.history[i].manifest_list_path];
         std::vector<String> renamed_manifest_entries;
+        std::unordered_set<String> seen_manifest_entries; // Deduplicate manifest entries
         Int32 total_manifest_file_sizes = 0;
         for (const auto & initial_manifest_entry : initial_manifest_entries)
         {
             auto renamed_manifest_entry = manifest_file_renamings[initial_manifest_entry];
             if (!renamed_manifest_entry.empty())
             {
+                auto it = plan.manifest_file_to_snapshots.find(initial_manifest_entry);
+                if (it != plan.manifest_file_to_snapshots.end() && !it->second.contains(plan.history[i].snapshot_id))
+                    continue;
+
+                if (seen_manifest_entries.contains(renamed_manifest_entry))
+                    continue;
+
+                seen_manifest_entries.insert(renamed_manifest_entry);
                 renamed_manifest_entries.push_back(renamed_manifest_entry);
                 total_manifest_file_sizes += manifest_file_sizes[renamed_manifest_entry];
             }
@@ -508,6 +538,7 @@ void compactIcebergTable(
     IcebergHistory snapshots_info,
     const PersistentTableComponents & persistent_table_components,
     ObjectStoragePtr object_storage_,
+    SecondaryStorages & secondary_storages_,
     StorageObjectStorageConfigurationPtr configuration_,
     const std::optional<FormatSettings> & format_settings_,
     SharedHeader sample_block_,
@@ -515,11 +546,11 @@ void compactIcebergTable(
     CompressionMethod compression_method_)
 {
     auto plan
-        = getPlan(std::move(snapshots_info), persistent_table_components, object_storage_, configuration_, context_, compression_method_);
+        = getPlan(std::move(snapshots_info), persistent_table_components, object_storage_, secondary_storages_, configuration_, context_, compression_method_);
     if (plan.need_optimize)
     {
         auto old_files = getOldFiles(object_storage_, configuration_);
-        writeDataFiles(plan, sample_block_, object_storage_, format_settings_, context_, configuration_);
+        writeDataFiles(plan, sample_block_, object_storage_, format_settings_, context_, configuration_, persistent_table_components.table_location, secondary_storages_);
         writeMetadataFiles(plan, object_storage_, configuration_, context_, sample_block_);
         clearOldFiles(object_storage_, old_files);
     }
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.h
index c2c80ccbf6a9..16d3622c939e 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/Compaction.h
@@ -5,6 +5,7 @@
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/ObjectStorage/Utils.h>
 
 
 namespace DB::Iceberg
@@ -15,6 +16,7 @@ void compactIcebergTable(
     IcebergHistory snapshots_info,
     const PersistentTableComponents & persistent_table_components,
     DB::ObjectStoragePtr object_storage_,
+    SecondaryStorages & secondary_storages_,
     DB::StorageObjectStorageConfigurationPtr configuration_,
     const std::optional<DB::FormatSettings> & format_settings_,
     DB::SharedHeader sample_block_,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.cpp
index 7462a3b59bff..62c142d97501 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.cpp
@@ -1,3 +1,4 @@
+#include <Poco/String.h>
 #include "config.h"
 
 #if USE_AVRO
@@ -36,18 +37,37 @@ namespace Setting
 extern const SettingsBool use_roaring_bitmap_iceberg_positional_deletes;
 };
 
+
 IcebergDataObjectInfo::IcebergDataObjectInfo(Iceberg::ManifestFileEntry data_manifest_file_entry_)
-    : RelativePathWithMetadata(data_manifest_file_entry_.file_path)
+    : PathWithMetadata(data_manifest_file_entry_.file_path, std::nullopt,
+                       data_manifest_file_entry_.file_path_key.empty() ? std::nullopt : std::make_optional(data_manifest_file_entry_.file_path_key))
     , data_object_file_path_key(data_manifest_file_entry_.file_path_key)
     , underlying_format_read_schema_id(data_manifest_file_entry_.schema_id)
+    , file_format(data_manifest_file_entry_.file_format)
     , sequence_number(data_manifest_file_entry_.added_sequence_number)
 {
-    auto toupper = [](String & str)
+    if (!position_deletes_objects.empty() && Poco::toUpperInPlace(data_manifest_file_entry_.file_format) != "PARQUET")
     {
-        std::transform(str.begin(), str.end(), str.begin(), ::toupper);
-        return str;
-    };
-    if (!position_deletes_objects.empty() && toupper(data_manifest_file_entry_.file_format) != "PARQUET")
+        throw Exception(
+            ErrorCodes::NOT_IMPLEMENTED,
+            "Position deletes are only supported for data files of Parquet format in Iceberg, but got {}",
+            data_manifest_file_entry_.file_format);
+    }
+}
+
+IcebergDataObjectInfo::IcebergDataObjectInfo(
+    Iceberg::ManifestFileEntry data_manifest_file_entry_,
+    ObjectStoragePtr resolved_storage,
+    const String & resolved_key)
+    : PathWithMetadata(resolved_key, std::nullopt,
+                       data_manifest_file_entry_.file_path.empty() ? std::nullopt : std::make_optional(data_manifest_file_entry_.file_path),
+                       resolved_storage)
+    , data_object_file_path_key(data_manifest_file_entry_.file_path_key)
+    , underlying_format_read_schema_id(data_manifest_file_entry_.schema_id)
+    , file_format(data_manifest_file_entry_.file_format)
+    , sequence_number(data_manifest_file_entry_.added_sequence_number)
+{
+    if (!position_deletes_objects.empty() && Poco::toUpperInPlace(data_manifest_file_entry_.file_format) != "PARQUET")
     {
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
@@ -60,13 +80,15 @@ std::shared_ptr<ISimpleTransform> IcebergDataObjectInfo::getPositionDeleteTransf
     ObjectStoragePtr object_storage,
     const SharedHeader & header,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr context_)
+    ContextPtr context_,
+    const String & table_location,
+    SecondaryStorages & secondary_storages)
 {
     IcebergDataObjectInfoPtr self = shared_from_this();
     if (!context_->getSettingsRef()[Setting::use_roaring_bitmap_iceberg_positional_deletes].value)
-        return std::make_shared<IcebergStreamingPositionDeleteTransform>(header, self, object_storage, format_settings, context_);
+        return std::make_shared<IcebergStreamingPositionDeleteTransform>(header, self, object_storage, format_settings, context_, table_location, secondary_storages);
     else
-        return std::make_shared<IcebergBitmapPositionDeleteTransform>(header, self, object_storage, format_settings, context_);
+        return std::make_shared<IcebergBitmapPositionDeleteTransform>(header, self, object_storage, format_settings, context_, table_location, secondary_storages);
 }
 }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.h
index 40cbd2252928..2d31447e9d39 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.h
@@ -8,12 +8,13 @@
 
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteObject.h>
+#include <Storages/ObjectStorage/Utils.h>
 #include <base/defines.h>
 
 
 namespace DB
 {
-struct IcebergDataObjectInfo : public RelativePathWithMetadata, std::enable_shared_from_this<IcebergDataObjectInfo>
+struct IcebergDataObjectInfo : public PathWithMetadata, std::enable_shared_from_this<IcebergDataObjectInfo>
 {
     using IcebergDataObjectInfoPtr = std::shared_ptr<IcebergDataObjectInfo>;
 
@@ -22,11 +23,19 @@ struct IcebergDataObjectInfo : public RelativePathWithMetadata, std::enable_shar
     /// It is also used to create a filter for the data object in the position delete transform.
     explicit IcebergDataObjectInfo(Iceberg::ManifestFileEntry data_manifest_file_entry_);
 
+    /// Sometimes data files are located outside the table location and even in a different storage.
+    explicit IcebergDataObjectInfo(
+        Iceberg::ManifestFileEntry data_manifest_file_entry_,
+        ObjectStoragePtr resolved_storage,
+        const String & resolved_key);
+
     std::shared_ptr<ISimpleTransform> getPositionDeleteTransformer(
         ObjectStoragePtr object_storage,
         const SharedHeader & header,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr context_);
+        ContextPtr context_,
+        const String & table_location,
+        SecondaryStorages & secondary_storages);
 
     void addPositionDeleteObject(Iceberg::ManifestFileEntry position_delete_object)
     {
@@ -41,6 +50,7 @@ struct IcebergDataObjectInfo : public RelativePathWithMetadata, std::enable_shar
 
     String data_object_file_path_key; // Full path to the data object file
     Int32 underlying_format_read_schema_id;
+    String file_format; // Format of the data file (e.g., "PARQUET", "ORC", "AVRO")
     std::vector<Iceberg::PositionDeleteObject> position_deletes_objects;
     std::vector<Iceberg::ManifestFileEntry> equality_deletes_objects;
     Int64 sequence_number;
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.cpp
index 162a83e80e3a..a3f635072fc0 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.cpp
@@ -1,4 +1,3 @@
-
 #include "config.h"
 #if USE_AVRO
 
@@ -24,6 +23,7 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/Context.h>
+#include <Disks/DiskType.h>
 
 #include <IO/CompressedReadBufferWrapper.h>
 #include <Interpreters/ExpressionActions.h>
@@ -42,16 +42,26 @@
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Utils.h>
+#include <Storages/ObjectStorage/Utils.h>
 
 #include <Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h>
 
+#include <Common/ProfileEvents.h>
 #include <Common/SharedLockGuard.h>
 #include <Common/logger_useful.h>
 
+#include <Interpreters/IcebergMetadataLog.h>
+#include <base/wide_integer_to_string.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
+
+
 namespace ProfileEvents
 {
 extern const Event IcebergPartitionPrunedFiles;
 extern const Event IcebergMinMaxIndexPrunedFiles;
+extern const Event IcebergMetadataReadWaitTimeMicroseconds;
+extern const Event IcebergMetadataReturnedObjectInfos;
+extern const Event IcebergIteratorNextMicroseconds;
 };
 
 
@@ -110,6 +120,8 @@ defineDeletesSpan(ManifestFileEntry data_object_, const std::vector<ManifestFile
 
 std::optional<ManifestFileEntry> SingleThreadIcebergKeysIterator::next()
 {
+    ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::IcebergIteratorNextMicroseconds);
+
     if (!data_snapshot)
     {
         return std::nullopt;
@@ -130,15 +142,16 @@ std::optional<ManifestFileEntry> SingleThreadIcebergKeysIterator::next()
                 persistent_components,
                 local_context,
                 log,
-                data_snapshot->manifest_list_entries[manifest_file_index].manifest_file_path,
+                data_snapshot->manifest_list_entries[manifest_file_index].manifest_file_absolute_path,
                 data_snapshot->manifest_list_entries[manifest_file_index].added_sequence_number,
-                data_snapshot->manifest_list_entries[manifest_file_index].added_snapshot_id);
+                data_snapshot->manifest_list_entries[manifest_file_index].added_snapshot_id,
+                *secondary_storages);
             internal_data_index = 0;
         }
         auto files = files_generator(current_manifest_file_content);
         while (internal_data_index < files.size())
         {
-            const auto & manifest_file_entry = files[internal_data_index++];
+            auto & manifest_file_entry = files[internal_data_index++];
             if ((manifest_file_entry.schema_id != previous_entry_schema) && (use_partition_pruning))
             {
                 previous_entry_schema = manifest_file_entry.schema_id;
@@ -158,10 +171,24 @@ std::optional<ManifestFileEntry> SingleThreadIcebergKeysIterator::next()
                     local_context);
             }
             auto pruning_status = current_pruner ? current_pruner->canBePruned(manifest_file_entry) : PruningReturnStatus::NOT_PRUNED;
+            insertRowToLogTable(
+                local_context,
+                [&]()->String { return ""; },
+                DB::IcebergMetadataLogLevel::ManifestFileEntry,
+                configuration.lock()->getRawPath().path,
+                current_manifest_file_content->getPathToManifestFile(),
+                manifest_file_entry.row_number,
+                pruning_status);
             switch (pruning_status)
             {
                 case PruningReturnStatus::NOT_PRUNED:
+                {
+                    auto [storage_to_use, resolved_key] = resolveObjectStorageForPath(
+                        persistent_components.table_location, manifest_file_entry.file_path, object_storage, *secondary_storages, local_context);
+                    manifest_file_entry.storage_to_use = storage_to_use;
+                    manifest_file_entry.resolved_key = resolved_key;
                     return manifest_file_entry;
+                }
                 case PruningReturnStatus::MIN_MAX_INDEX_PRUNED: {
                     ++min_max_index_pruned_files;
                     break;
@@ -199,7 +226,8 @@ SingleThreadIcebergKeysIterator::SingleThreadIcebergKeysIterator(
     const ActionsDAG * filter_dag_,
     Iceberg::IcebergTableStateSnapshotPtr table_snapshot_,
     Iceberg::IcebergDataSnapshotPtr data_snapshot_,
-    PersistentTableComponents persistent_components_)
+    PersistentTableComponents persistent_components_,
+    std::shared_ptr<SecondaryStorages> secondary_storages_)
     : object_storage(object_storage_)
     , filter_dag(filter_dag_ ? std::make_shared<ActionsDAG>(filter_dag_->clone()) : nullptr)
     , local_context(local_context_)
@@ -221,6 +249,7 @@ SingleThreadIcebergKeysIterator::SingleThreadIcebergKeysIterator(
     , persistent_components(persistent_components_)
     , files_generator(files_generator_)
     , log(getLogger("IcebergIterator"))
+    , secondary_storages(secondary_storages_)
     , manifest_file_content_type(manifest_file_content_type_)
 {
 }
@@ -233,7 +262,8 @@ IcebergIterator::IcebergIterator(
     IDataLakeMetadata::FileProgressCallback callback_,
     Iceberg::IcebergTableStateSnapshotPtr table_snapshot_,
     Iceberg::IcebergDataSnapshotPtr data_snapshot_,
-    PersistentTableComponents persistent_components_)
+    PersistentTableComponents persistent_components_,
+    std::shared_ptr<SecondaryStorages> secondary_storages_)
     : filter_dag(filter_dag_ ? std::make_unique<ActionsDAG>(filter_dag_->clone()) : nullptr)
     , object_storage(std::move(object_storage_))
     , data_files_iterator(
@@ -245,7 +275,8 @@ IcebergIterator::IcebergIterator(
           filter_dag.get(),
           table_snapshot_,
           data_snapshot_,
-          persistent_components_)
+          persistent_components_,
+          secondary_storages_)
     , deletes_iterator(
           object_storage,
           local_context_,
@@ -261,30 +292,16 @@ IcebergIterator::IcebergIterator(
           filter_dag.get(),
           table_snapshot_,
           data_snapshot_,
-          persistent_components_)
+          persistent_components_,
+          secondary_storages_)
     , blocking_queue(100)
-    , producer_task(local_context_->getSchedulePool().createTask(
-          "IcebergMetaReaderThread",
-          [this]
-          {
-              while (!blocking_queue.isFinished())
-              {
-                  auto info = data_files_iterator.next();
-                  if (!info.has_value())
-                      break;
-                  while (!blocking_queue.push(std::move(info.value())))
-                  {
-                      if (blocking_queue.isFinished())
-                      {
-                          break;
-                      }
-                  }
-              }
-              blocking_queue.finish();
-          }))
+    , producer_task(std::nullopt)
     , callback(std::move(callback_))
-    , format(configuration_.lock()->format)
-    , compression_method(configuration_.lock()->compression_method)
+    , format(configuration_.lock()->getFormat())
+    , compression_method(configuration_.lock()->getCompressionMethod())
+    , persistent_components(persistent_components_)
+    , table_schema_id(table_snapshot_->schema_id)
+    , secondary_storages(secondary_storages_)
 {
     auto delete_file = deletes_iterator.next();
     while (delete_file.has_value())
@@ -301,26 +318,73 @@ IcebergIterator::IcebergIterator(
     }
     std::sort(equality_deletes_files.begin(), equality_deletes_files.end());
     std::sort(position_deletes_files.begin(), position_deletes_files.end());
-
-    producer_task->activateAndSchedule();
+    producer_task.emplace(
+        [this]()
+        {
+            while (!blocking_queue.isFinished())
+            {
+                std::optional<ManifestFileEntry> entry;
+                try
+                {
+                    entry = data_files_iterator.next();
+                }
+                catch (...)
+                {
+                    std::lock_guard lock(exception_mutex);
+                    if (!exception)
+                    {
+                        exception = std::current_exception();
+                    }
+                    blocking_queue.finish();
+                    break;
+                }
+                if (!entry.has_value())
+                    break;
+                while (!blocking_queue.push(std::move(entry.value())))
+                {
+                    if (blocking_queue.isFinished())
+                    {
+                        break;
+                    }
+                }
+            }
+            blocking_queue.finish();
+        });
 }
 
 ObjectInfoPtr IcebergIterator::next(size_t)
 {
+    ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::IcebergMetadataReadWaitTimeMicroseconds);
     Iceberg::ManifestFileEntry manifest_file_entry;
     if (blocking_queue.pop(manifest_file_entry))
     {
-        IcebergDataObjectInfoPtr object_info = std::make_shared<IcebergDataObjectInfo>(manifest_file_entry);
+        IcebergDataObjectInfoPtr object_info = std::make_shared<IcebergDataObjectInfo>(
+            manifest_file_entry, manifest_file_entry.storage_to_use, manifest_file_entry.resolved_key);
+
         for (const auto & position_delete : defineDeletesSpan(manifest_file_entry, position_deletes_files, false))
-        {
             object_info->addPositionDeleteObject(position_delete);
-        }
+
         for (const auto & equality_delete : defineDeletesSpan(manifest_file_entry, equality_deletes_files, true))
-        {
             object_info->addEqualityDeleteObject(equality_delete);
-        }
+
+        object_info->setFileMetaInfo(std::make_shared<DataFileMetaInfo>(
+                                    *persistent_components.schema_processor,
+                                    table_schema_id, /// current schema id to use current column names
+                                    manifest_file_entry.columns_infos));
+
+        ProfileEvents::increment(ProfileEvents::IcebergMetadataReturnedObjectInfos);
+
         return object_info;
     }
+    {
+        std::lock_guard lock(exception_mutex);
+        if (exception)
+        {
+            auto exception_message = getExceptionMessage(exception, true, true);
+            auto exception_code = getExceptionErrorCode(exception);
+            throw DB::Exception(exception_code, "Iceberg iterator is failed with exception: {}", exception_message);
+        }
+    }
     return nullptr;
 }
 
@@ -332,7 +396,10 @@ size_t IcebergIterator::estimatedKeysCount()
 IcebergIterator::~IcebergIterator()
 {
     blocking_queue.finish();
-    producer_task->deactivate();
+    if (producer_task)
+    {
+        producer_task->join();
+    }
 }
 }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h
index ed19051138ff..1ee3a9239cdf 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h
@@ -25,6 +25,7 @@
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadataFilesCache.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h>
+#include <Storages/ObjectStorage/Utils.h>
 
 namespace DB
 {
@@ -45,7 +46,8 @@ class SingleThreadIcebergKeysIterator
         const ActionsDAG * filter_dag_,
         IcebergTableStateSnapshotPtr table_snapshot_,
         IcebergDataSnapshotPtr data_snapshot_,
-        PersistentTableComponents persistent_components);
+        PersistentTableComponents persistent_components,
+        std::shared_ptr<SecondaryStorages> secondary_storages_);
 
     std::optional<DB::Iceberg::ManifestFileEntry> next();
 
@@ -62,7 +64,7 @@ class SingleThreadIcebergKeysIterator
     PersistentTableComponents persistent_components;
     FilesGenerator files_generator;
     LoggerPtr log;
-
+    std::shared_ptr<SecondaryStorages> secondary_storages;
 
     // By Iceberg design it is difficult to avoid storing position deletes in memory.
     size_t manifest_file_index = 0;
@@ -90,25 +92,33 @@ class IcebergIterator : public IObjectIterator
         IDataLakeMetadata::FileProgressCallback callback_,
         Iceberg::IcebergTableStateSnapshotPtr table_snapshot_,
         Iceberg::IcebergDataSnapshotPtr data_snapshot_,
-        Iceberg::PersistentTableComponents persistent_components);
+        Iceberg::PersistentTableComponents persistent_components_,
+        std::shared_ptr<SecondaryStorages> secondary_storages_);
 
     ObjectInfoPtr next(size_t) override;
 
     size_t estimatedKeysCount() override;
     ~IcebergIterator() override;
 
+    bool has_concurrent_next() const override { return true; }
+
 private:
     std::unique_ptr<ActionsDAG> filter_dag;
     ObjectStoragePtr object_storage;
     Iceberg::SingleThreadIcebergKeysIterator data_files_iterator;
     Iceberg::SingleThreadIcebergKeysIterator deletes_iterator;
     ConcurrentBoundedQueue<Iceberg::ManifestFileEntry> blocking_queue;
-    BackgroundSchedulePool::TaskHolder producer_task;
+    std::optional<ThreadFromGlobalPool> producer_task;
     IDataLakeMetadata::FileProgressCallback callback;
     const String format;
     const String compression_method;
     std::vector<Iceberg::ManifestFileEntry> position_deletes_files;
     std::vector<Iceberg::ManifestFileEntry> equality_deletes_files;
+    std::exception_ptr exception;
+    std::mutex exception_mutex;
+    Iceberg::PersistentTableComponents persistent_components;
+    Int32 table_schema_id;
+    std::shared_ptr<SecondaryStorages> secondary_storages;  // Sometimes data or manifests can be located on another storage
 };
 }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
index f8728f845ca2..bb401a2d418a 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
@@ -2,26 +2,27 @@
 #include "config.h"
 #if USE_AVRO
 
+#include <sstream>
 #include <cstddef>
 #include <memory>
 #include <optional>
-#include <Formats/FormatFilterInfo.h>
-#include <Formats/FormatParserSharedResources.h>
-#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
-#include <Storages/ObjectStorage/StorageObjectStorageConfiguration.h>
-#include <Poco/JSON/Array.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Stringifier.h>
-#include <Common/Exception.h>
 #include <Columns/ColumnSet.h>
 #include <DataTypes/DataTypeSet.h>
+#include <Formats/FormatFilterInfo.h>
+#include <Formats/FormatParserSharedResources.h>
 #include <Formats/ReadSchemaUtils.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunctionAdaptors.h>
 #include <Functions/tuple.h>
 #include <Processors/Formats/ISchemaReader.h>
+#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Storages/ObjectStorage/StorageObjectStorageConfiguration.h>
+#include <Poco/JSON/Array.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Stringifier.h>
+#include <Common/Exception.h>
 
 #include <Databases/DataLake/Common.h>
 #include <Core/Settings.h>
@@ -33,6 +34,7 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/IcebergMetadataLog.h>
 
 #include <Storages/ObjectStorage/DataLakes/Common.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
@@ -41,24 +43,24 @@
 #include <Interpreters/ExpressionActions.h>
 #include <IO/CompressedReadBufferWrapper.h>
 
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Interpreters/StorageID.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/AvroForIcebergDeserializer.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/Compaction.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/Constant.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/Mutations.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Utils.h>
 #include <Storages/ObjectStorage/Utils.h>
-#include <Storages/ObjectStorage/DataLakes/Iceberg/Constant.h>
-#include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.h>
-#include <Storages/ObjectStorage/DataLakes/Iceberg/Compaction.h>
-#include <Storages/ObjectStorage/DataLakes/Iceberg/Mutations.h>
-#include <Disks/ObjectStorages/IObjectStorage.h>
-#include <Interpreters/StorageID.h>
 
 #include <Common/ProfileEvents.h>
 #include <Common/SharedLockGuard.h>
@@ -66,7 +68,9 @@
 
 namespace ProfileEvents
 {
-    extern const Event IcebergTrivialCountOptimizationApplied;
+extern const Event IcebergIteratorInitializationMicroseconds;
+extern const Event IcebergMetadataUpdateMicroseconds;
+extern const Event IcebergTrivialCountOptimizationApplied;
 }
 
 namespace DB
@@ -78,7 +82,7 @@ namespace DataLakeStorageSetting
     extern const DataLakeStorageSettingsString iceberg_metadata_table_uuid;
     extern const DataLakeStorageSettingsBool iceberg_recent_metadata_file_by_last_updated_ms_field;
     extern const DataLakeStorageSettingsBool iceberg_use_version_hint;
-    extern const DataLakeStorageSettingsInt64 iceberg_format_version;
+    extern const DataLakeStorageSettingsNonZeroUInt64 iceberg_format_version;
 }
 
 namespace ErrorCodes
@@ -108,6 +112,16 @@ extern const SettingsBool allow_experimental_insert_into_iceberg;
 extern const SettingsBool allow_experimental_iceberg_compaction;
 }
 
+namespace
+{
+String dumpMetadataObjectToString(const Poco::JSON::Object::Ptr & metadata_object)
+{
+    std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    Poco::JSON::Stringifier::stringify(metadata_object, oss);
+    return removeEscapedSlashes(oss.str());
+}
+}
+
 
 using namespace Iceberg;
 
@@ -121,9 +135,10 @@ IcebergMetadata::IcebergMetadata(
     IcebergMetadataFilesCachePtr cache_ptr,
     CompressionMethod metadata_compression_method_)
     : object_storage(std::move(object_storage_))
+    , secondary_storages(std::make_shared<SecondaryStorages>())
     , configuration(std::move(configuration_))
     , persistent_components(PersistentTableComponents{
-          .schema_processor = std::make_shared<IcebergSchemaProcessor>(),
+          .schema_processor = std::make_shared<IcebergSchemaProcessor>(context_),
           .metadata_cache = cache_ptr,
           .format_version = format_version_,
           .table_location = metadata_object_->getValue<String>(f_location)
@@ -136,7 +151,7 @@ IcebergMetadata::IcebergMetadata(
     updateState(context_, metadata_object_);
 }
 
-void IcebergMetadata::addTableSchemaById(Int32 schema_id, Poco::JSON::Object::Ptr metadata_object) const
+void IcebergMetadata::addTableSchemaById(Int32 schema_id, Poco::JSON::Object::Ptr metadata_object, ContextPtr context_) const
 {
     if (persistent_components.schema_processor->hasClickhouseTableSchemaById(schema_id))
         return;
@@ -151,7 +166,7 @@ void IcebergMetadata::addTableSchemaById(Int32 schema_id, Poco::JSON::Object::Pt
         auto current_schema = schemas->getObject(i);
         if (current_schema->has(f_schema_id) && current_schema->getValue<int>(f_schema_id) == schema_id)
         {
-            persistent_components.schema_processor->addIcebergTableSchema(current_schema);
+            persistent_components.schema_processor->addIcebergTableSchema(current_schema, context_);
             return;
         }
     }
@@ -162,13 +177,16 @@ void IcebergMetadata::addTableSchemaById(Int32 schema_id, Poco::JSON::Object::Pt
 }
 
 Int32 IcebergMetadata::parseTableSchema(
-    const Poco::JSON::Object::Ptr & metadata_object, IcebergSchemaProcessor & schema_processor, LoggerPtr metadata_logger)
+    const Poco::JSON::Object::Ptr & metadata_object,
+    IcebergSchemaProcessor & schema_processor,
+    ContextPtr context_,
+    LoggerPtr metadata_logger)
 {
     const auto format_version = metadata_object->getValue<Int32>(f_format_version);
     if (format_version == 2)
     {
         auto [schema, current_schema_id] = parseTableSchemaV2Method(metadata_object);
-        schema_processor.addIcebergTableSchema(schema);
+        schema_processor.addIcebergTableSchema(schema, context_);
         return current_schema_id;
     }
     else
@@ -176,7 +194,7 @@ Int32 IcebergMetadata::parseTableSchema(
         try
         {
             auto [schema, current_schema_id] = parseTableSchemaV1Method(metadata_object);
-            schema_processor.addIcebergTableSchema(schema);
+            schema_processor.addIcebergTableSchema(schema, context_);
             return current_schema_id;
         }
         catch (const Exception & first_error)
@@ -186,7 +204,7 @@ Int32 IcebergMetadata::parseTableSchema(
             try
             {
                 auto [schema, current_schema_id] = parseTableSchemaV2Method(metadata_object);
-                schema_processor.addIcebergTableSchema(schema);
+                schema_processor.addIcebergTableSchema(schema, context_);
                 LOG_WARNING(
                     metadata_logger,
                     "Iceberg table schema was parsed using v2 specification, but it was impossible to parse it using v1 "
@@ -231,6 +249,16 @@ bool IcebergMetadata::update(const ContextPtr & local_context)
 
     updateState(local_context, metadata_object);
 
+    auto dump_metadata = [&]()->String { return dumpMetadataObjectToString(metadata_object); };
+    insertRowToLogTable(
+        local_context,
+        dump_metadata,
+        DB::IcebergMetadataLogLevel::Metadata,
+        configuration_ptr->getRawPath().path,
+        metadata_file_path,
+        std::nullopt,
+        std::nullopt);
+
     if (previous_snapshot_id != relevant_snapshot_id)
     {
         return true;
@@ -238,6 +266,192 @@ bool IcebergMetadata::update(const ContextPtr & local_context)
     return previous_snapshot_schema_id != relevant_snapshot_schema_id;
 }
 
+namespace
+{
+
+using IdToName = std::unordered_map<Int32, String>;
+
+IdToName buildIdToNameMap(const Poco::JSON::Object::Ptr & metadata_obj)
+{
+    IdToName map;
+    if (!metadata_obj || !metadata_obj->has("current-schema-id") || !metadata_obj->has("schemas"))
+        return map;
+
+    const auto current_schema_id = metadata_obj->getValue<Int32>("current-schema-id");
+    auto schemas = metadata_obj->getArray("schemas");
+    if (!schemas)
+        return map;
+
+    for (size_t i = 0; i < schemas->size(); ++i)
+    {
+        auto schema = schemas->getObject(i);
+
+        if (!schema || !schema->has("schema-id") || (schema->getValue<Int32>("schema-id") != current_schema_id))
+            continue;
+
+        if (auto fields = schema->getArray("fields"))
+        {
+            for (size_t j = 0; j < fields->size(); ++j)
+            {
+                auto f = fields->getObject(j);
+                if (!f || !f->has("id") || !f->has("name"))
+                    continue;
+                map.emplace(f->getValue<Int32>("id"), f->getValue<String>("name"));
+            }
+        }
+        break;
+    }
+    return map;
+}
+
+String formatTransform(
+    const String & transform,
+    const Poco::JSON::Object::Ptr & field_obj,
+    const IdToName & id_to_name)
+{
+    Int32 source_id = (field_obj && field_obj->has("source-id"))
+        ? field_obj->getValue<Int32>("source-id")
+        : -1;
+
+    const auto it = id_to_name.find(source_id);
+    const String col = (it != id_to_name.end()) ? it->second : ("col_" + toString(source_id));
+
+    String base = transform;
+    String param;
+    if (const auto lpos = transform.find('['); lpos != String::npos && transform.back() == ']')
+    {
+        base = transform.substr(0, lpos);
+        param = transform.substr(lpos + 1, transform.size() - lpos - 2); // strip [ and ]
+    }
+
+    String result;
+    if (base == "identity")
+        result = col;
+    else if (base == "year" || base == "month" || base == "day" || base == "hour")
+        result = base + "(" + col + ")";
+    else if (base != "void")
+    {
+        if (!param.empty())
+            result = base + "(" + param + ", " + col + ")";
+        else
+            result = base + "(" + col + ")";
+    }
+    return result;
+}
+
+Poco::JSON::Array::Ptr findActivePartitionFields(const Poco::JSON::Object::Ptr & metadata_obj)
+{
+    if (!metadata_obj)
+        return nullptr;
+
+    if (metadata_obj->has("partition-spec"))
+        return metadata_obj->getArray("partition-spec");
+
+    // If for some reason there is no partition-spec, try partition-specs + default-
+    if (metadata_obj->has("partition-specs") && metadata_obj->has("default-spec-id"))
+    {
+        const auto default_spec_id = metadata_obj->getValue<Int32>("default-spec-id");
+        if (auto specs = metadata_obj->getArray("partition-specs"))
+        {
+            for (size_t i = 0; i < specs->size(); ++i)
+            {
+                auto spec = specs->getObject(i);
+                if (!spec || !spec->has("spec-id"))
+                    continue;
+                if (spec->getValue<Int32>("spec-id") == default_spec_id)
+                    return spec->has("fields") ? spec->getArray("fields") : nullptr;
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+Poco::JSON::Array::Ptr findActiveSortFields(const Poco::JSON::Object::Ptr & metadata_obj)
+{
+    if (!metadata_obj || !metadata_obj->has("default-sort-order-id") || !metadata_obj->has("sort-orders"))
+        return nullptr;
+
+    const auto default_sort_order_id = metadata_obj->getValue<Int32>("default-sort-order-id");
+    auto orders = metadata_obj->getArray("sort-orders");
+    if (!orders)
+        return nullptr;
+
+    for (size_t i = 0; i < orders->size(); ++i)
+    {
+        auto order = orders->getObject(i);
+        if (!order || !order->has("order-id"))
+            continue;
+        if (order->getValue<Int32>("order-id") == default_sort_order_id)
+            return order->has("fields") ? order->getArray("fields") : nullptr;
+    }
+    return nullptr;
+}
+
+String composeList(
+    const Poco::JSON::Array::Ptr & fields,
+    const IdToName & id_to_name,
+    bool lookup_sort_modifiers)
+{
+    if (!fields || fields->size() == 0)
+        return {};
+
+    Strings parts;
+    parts.reserve(fields->size());
+
+    for (size_t i = 0; i < fields->size(); ++i)
+    {
+        auto field = fields->getObject(i);
+        if (!field)
+            continue;
+
+        const String transform = field->has("transform") ? field->getValue<String>("transform") : "identity";
+        String expr = formatTransform(transform, field, id_to_name);
+        if (expr.empty())
+            continue;
+
+        if (lookup_sort_modifiers)
+        {
+            if (field->has("direction"))
+            {
+                auto d = field->getValue<String>("direction");
+                expr += (Poco::icompare(d, "desc") == 0) ? " DESC" : " ASC";
+            }
+        }
+
+        parts.push_back(std::move(expr));
+    }
+
+    if (parts.empty())
+        return {};
+
+    String res;
+    for (size_t i = 0; i < parts.size(); ++i)
+    {
+        if (i) res += ", ";
+        res += parts[i];
+    }
+    return res;
+}
+
+std::pair<std::optional<String>, std::optional<String>> extractIcebergKeys(const Poco::JSON::Object::Ptr & metadata_obj)
+{
+    std::optional<String> partition_key;
+    std::optional<String> sort_key;
+
+    if (metadata_obj)
+    {
+        auto id_to_name = buildIdToNameMap(metadata_obj);
+
+        partition_key = composeList(findActivePartitionFields(metadata_obj), id_to_name, /*lookup_sort_modifiers=*/ false);
+        sort_key = composeList(findActiveSortFields(metadata_obj), id_to_name, /*lookup_sort_modifiers=*/ true);
+    }
+
+    return {partition_key, sort_key};
+}
+
+}
+
 void IcebergMetadata::updateSnapshot(ContextPtr local_context, Poco::JSON::Object::Ptr metadata_object)
 {
     auto configuration_ptr = configuration.lock();
@@ -251,7 +465,7 @@ void IcebergMetadata::updateSnapshot(ContextPtr local_context, Poco::JSON::Objec
     for (UInt32 j = 0; j < schemas->size(); ++j)
     {
         auto schema = schemas->getObject(j);
-        persistent_components.schema_processor->addIcebergTableSchema(schema);
+        persistent_components.schema_processor->addIcebergTableSchema(schema, local_context);
     }
     auto snapshots = metadata_object->get(f_snapshots).extract<Poco::JSON::Array::Ptr>();
     bool successfully_found_snapshot = false;
@@ -289,39 +503,26 @@ void IcebergMetadata::updateSnapshot(ContextPtr local_context, Poco::JSON::Objec
                 }
             }
 
-#if USE_PARQUET
-            if (configuration_ptr->format == "Parquet")
-                column_mapper = std::make_shared<ColumnMapper>();
+            auto [partition_key, sorting_key] = extractIcebergKeys(metadata_object);
 
-            if (column_mapper)
-            {
-                Int32 schema_id = snapshot->getValue<Int32>(f_schema_id);
-                std::unordered_map<String, Int64> column_name_to_parquet_field_id;
-                for (UInt32 j = 0; j < schemas->size(); ++j)
-                {
-                    auto schema = schemas->getObject(j);
-                    if (schema->getValue<Int32>(f_schema_id) != schema_id)
-                        continue;
-
-                    column_name_to_parquet_field_id = IcebergSchemaProcessor::traverseSchema(schema->getArray(Iceberg::f_fields));
-                }
-                column_mapper->setStorageColumnEncoding(std::move(column_name_to_parquet_field_id));
-            }
-#endif
+            String manifest_list_path = snapshot->getValue<String>(f_manifest_list);
+            auto [storage_to_use, key_in_storage] = resolveObjectStorageForPath(persistent_components.table_location, manifest_list_path, object_storage, *secondary_storages, local_context);
 
             relevant_snapshot = std::make_shared<IcebergDataSnapshot>(
                 getManifestList(
-                    object_storage,
-                    configuration_ptr,
-                    persistent_components,
+                    storage_to_use,
+                configuration_ptr,
+                persistent_components,
                     local_context,
-                    getProperFilePathFromMetadataInfo(
-                        snapshot->getValue<String>(f_manifest_list), configuration_ptr->getPathForRead().path, persistent_components.table_location),
-                    log),
+                    key_in_storage,
+                    makeAbsolutePath(persistent_components.table_location, manifest_list_path),
+                log),
                 relevant_snapshot_id,
                 total_rows,
                 total_bytes,
-                total_position_deletes);
+                total_position_deletes,
+                partition_key,
+                sorting_key);
 
             if (!snapshot->has(f_schema_id))
                 throw Exception(
@@ -330,7 +531,7 @@ void IcebergMetadata::updateSnapshot(ContextPtr local_context, Poco::JSON::Objec
                     relevant_snapshot_id,
                     configuration_ptr->getPathForRead().path);
             relevant_snapshot_schema_id = snapshot->getValue<Int32>(f_schema_id);
-            addTableSchemaById(relevant_snapshot_schema_id, metadata_object);
+            addTableSchemaById(relevant_snapshot_schema_id, metadata_object, local_context);
         }
     }
     if (!successfully_found_snapshot)
@@ -352,6 +553,7 @@ bool IcebergMetadata::optimize(const StorageMetadataPtr & metadata_snapshot, Con
             snapshots_info,
             persistent_components,
             object_storage,
+            *secondary_storages,
             configuration_ptr,
             format_settings,
             sample_block,
@@ -417,7 +619,11 @@ void IcebergMetadata::updateState(const ContextPtr & local_context, Poco::JSON::
         {
             updateSnapshot(local_context, metadata_object);
         }
-        relevant_snapshot_schema_id = parseTableSchema(metadata_object, *persistent_components.schema_processor, log);
+        relevant_snapshot_schema_id = parseTableSchema(
+            metadata_object,
+            *persistent_components.schema_processor,
+            local_context,
+            log);
     }
 }
 
@@ -428,19 +634,23 @@ std::shared_ptr<NamesAndTypesList> IcebergMetadata::getInitialSchemaByPath(Conte
     if (!iceberg_object_info)
         return nullptr;
     /// if we need schema evolution or have equality deletes files, we need to read all the columns.
-    return (iceberg_object_info->underlying_format_read_schema_id != relevant_snapshot_schema_id) || (!iceberg_object_info->equality_deletes_objects.empty())
+    return (iceberg_object_info->underlying_format_read_schema_id != relevant_snapshot_schema_id)
+            || (!iceberg_object_info->equality_deletes_objects.empty())
         ? persistent_components.schema_processor->getClickhouseTableSchemaById(iceberg_object_info->underlying_format_read_schema_id)
         : nullptr;
 }
 
-std::shared_ptr<const ActionsDAG> IcebergMetadata::getSchemaTransformer(ContextPtr, ObjectInfoPtr object_info) const
+std::shared_ptr<const ActionsDAG> IcebergMetadata::getSchemaTransformer(ContextPtr local_context, ObjectInfoPtr object_info) const
 {
     IcebergDataObjectInfo * iceberg_object_info = dynamic_cast<IcebergDataObjectInfo *>(object_info.get());
     SharedLockGuard lock(mutex);
     if (!iceberg_object_info)
         return nullptr;
     return (iceberg_object_info->underlying_format_read_schema_id != relevant_snapshot_schema_id)
-        ? persistent_components.schema_processor->getSchemaTransformationDagByIds(iceberg_object_info->underlying_format_read_schema_id, relevant_snapshot_schema_id)
+        ? persistent_components.schema_processor->getSchemaTransformationDagByIds(
+            local_context,
+            iceberg_object_info->underlying_format_read_schema_id,
+            relevant_snapshot_schema_id)
         : nullptr;
 }
 
@@ -477,9 +687,9 @@ void IcebergMetadata::checkAlterIsPossible(const AlterCommands & commands)
 {
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN)
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by Iceberg storage",
-                command.type);
+        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by Iceberg storage", command.type);
     }
 }
 
@@ -579,6 +789,16 @@ DataLakeMetadataPtr IcebergMetadata::create(
     Poco::JSON::Object::Ptr object = getMetadataJSONObject(metadata_file_path, object_storage, configuration_ptr, cache_ptr, local_context, log, compression_method);
 
     auto format_version = object->getValue<int>(f_format_version);
+
+    auto dump_metadata = [&]()->String { return dumpMetadataObjectToString(object); };
+    insertRowToLogTable(
+        local_context,
+        dump_metadata,
+        DB::IcebergMetadataLogLevel::Metadata,
+        configuration_ptr->getRawPath().path,
+        metadata_file_path,
+        std::nullopt,
+        std::nullopt);
     return std::make_unique<IcebergMetadata>(object_storage, configuration_ptr, local_context, metadata_version, format_version, object, cache_ptr, compression_method);
 }
 
@@ -712,9 +932,10 @@ std::optional<size_t> IcebergMetadata::totalRows(ContextPtr local_context) const
             persistent_components,
             local_context,
             log,
-            manifest_list_entry.manifest_file_path,
+            manifest_list_entry.manifest_file_absolute_path,
             manifest_list_entry.added_sequence_number,
-            manifest_list_entry.added_snapshot_id);
+            manifest_list_entry.added_snapshot_id,
+            *secondary_storages);
         auto data_count = manifest_file_ptr->getRowsCountInAllFilesExcludingDeleted(FileContentType::DATA);
         auto position_deletes_count = manifest_file_ptr->getRowsCountInAllFilesExcludingDeleted(FileContentType::POSITION_DELETE);
         if (!data_count.has_value() || !position_deletes_count.has_value())
@@ -752,9 +973,10 @@ std::optional<size_t> IcebergMetadata::totalBytes(ContextPtr local_context) cons
             persistent_components,
             local_context,
             log,
-            manifest_list_entry.manifest_file_path,
+            manifest_list_entry.manifest_file_absolute_path,
             manifest_list_entry.added_sequence_number,
-            manifest_list_entry.added_snapshot_id);
+            manifest_list_entry.added_snapshot_id,
+            *secondary_storages);
         auto count = manifest_file_ptr->getBytesCountInAllDataFilesExcludingDeleted();
         if (!count.has_value())
             return {};
@@ -765,6 +987,23 @@ std::optional<size_t> IcebergMetadata::totalBytes(ContextPtr local_context) cons
     return result;
 }
 
+std::optional<String> IcebergMetadata::partitionKey(ContextPtr) const
+{
+    SharedLockGuard lock(mutex);
+    if (!relevant_snapshot)
+        return {};
+    return relevant_snapshot->partition_key;
+}
+
+std::optional<String> IcebergMetadata::sortingKey(ContextPtr) const
+{
+    SharedLockGuard lock(mutex);
+    if (!relevant_snapshot)
+        return {};
+    return relevant_snapshot->sorting_key;
+}
+
+
 ObjectIterator IcebergMetadata::iterate(
     const ActionsDAG * filter_dag,
     FileProgressCallback callback,
@@ -773,6 +1012,8 @@ ObjectIterator IcebergMetadata::iterate(
 {
     SharedLockGuard lock(mutex);
 
+    ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::IcebergIteratorInitializationMicroseconds);
+
     auto table_snapshot
         = std::make_shared<IcebergTableStateSnapshot>(last_metadata_version, relevant_snapshot_schema_id, relevant_snapshot_id);
     return std::make_shared<IcebergIterator>(
@@ -783,7 +1024,8 @@ ObjectIterator IcebergMetadata::iterate(
         callback,
         table_snapshot,
         relevant_snapshot,
-        persistent_components);
+        persistent_components,
+        secondary_storages);
 }
 
 NamesAndTypesList IcebergMetadata::getTableSchema() const
@@ -798,7 +1040,19 @@ std::tuple<Int64, Int32> IcebergMetadata::getVersion() const
     return std::make_tuple(relevant_snapshot_id, relevant_snapshot_schema_id);
 }
 
-void IcebergMetadata::addDeleteTransformers(ObjectInfoPtr object_info, QueryPipelineBuilder & builder, const std::optional<FormatSettings> & format_settings, ContextPtr local_context) const
+void IcebergMetadata::modifyFormatSettings(FormatSettings & format_settings, const Context & local_context) const
+{
+    if (!local_context.getSettingsRef()[Setting::use_roaring_bitmap_iceberg_positional_deletes].value)
+        /// IcebergStreamingPositionDeleteTransform requires increasing row numbers from both the
+        /// data reader and the deletes reader.
+        format_settings.parquet.preserve_order = true;
+}
+
+void IcebergMetadata::addDeleteTransformers(
+    ObjectInfoPtr object_info,
+    QueryPipelineBuilder & builder,
+    const std::optional<FormatSettings> & format_settings,
+    ContextPtr local_context) const
 {
     auto iceberg_object_info = std::dynamic_pointer_cast<IcebergDataObjectInfo>(object_info);
     if (!iceberg_object_info)
@@ -806,22 +1060,27 @@ void IcebergMetadata::addDeleteTransformers(ObjectInfoPtr object_info, QueryPipe
 
     if (!iceberg_object_info->position_deletes_objects.empty())
     {
-        builder.addSimpleTransform([&](const SharedHeader & header)
-        {
-            return iceberg_object_info->getPositionDeleteTransformer(object_storage, header, format_settings, local_context);
-        });
+        LOG_DEBUG(log, "Constructing filter transform for position delete, there are {} delete objects", iceberg_object_info->position_deletes_objects.size());
+        builder.addSimpleTransform(
+            [&](const SharedHeader & header)
+            { return iceberg_object_info->getPositionDeleteTransformer(object_storage, header, format_settings, local_context, persistent_components.table_location, *secondary_storages); });
     }
     const auto & delete_files = iceberg_object_info->equality_deletes_objects;
-    LOG_DEBUG(log, "Constructing filter transform for equality delete, there are {} delete files", delete_files.size());
+    if (!delete_files.empty())
+        LOG_DEBUG(log, "Constructing filter transform for equality delete, there are {} delete files", delete_files.size());
     for (const ManifestFileEntry & delete_file : delete_files)
     {
         auto simple_transform_adder = [&](const SharedHeader & header)
         {
             /// get header of delete file
             Block delete_file_header;
-            ObjectInfo delete_file_object(delete_file.file_path);
+
+            auto [delete_storage_to_use, resolved_delete_key] = resolveObjectStorageForPath(
+                persistent_components.table_location, delete_file.file_path, object_storage, *secondary_storages, local_context);
+
+            PathWithMetadata delete_file_object(resolved_delete_key, std::nullopt, delete_file.file_path, delete_storage_to_use);
             {
-                auto schema_read_buffer = createReadBuffer(delete_file_object, object_storage, local_context, log);
+                auto schema_read_buffer = createReadBuffer(delete_file_object, delete_storage_to_use, local_context, log);
                 auto schema_reader = FormatFactory::instance().getSchemaReader(delete_file.file_format, *schema_read_buffer, local_context);
                 auto columns_with_names = schema_reader->readSchema();
                 ColumnsWithTypeAndName initial_header_data;
@@ -837,15 +1096,26 @@ void IcebergMetadata::addDeleteTransformers(ObjectInfoPtr object_info, QueryPipe
             std::vector<size_t> equality_indexes_delete_file;
             for (Int32 col_id : equality_ids)
             {
-                NameAndTypePair name_and_type = persistent_components.schema_processor->getFieldCharacteristics(delete_file.schema_id, col_id);
+                NameAndTypePair name_and_type
+                    = persistent_components.schema_processor->getFieldCharacteristics(delete_file.schema_id, col_id);
                 block_for_set.insert(ColumnWithTypeAndName(name_and_type.type, name_and_type.name));
                 equality_indexes_delete_file.push_back(delete_file_header.getPositionByName(name_and_type.name));
             }
             /// Then we read the content of the delete file.
             auto mutable_columns_for_set = block_for_set.cloneEmptyColumns();
-            std::unique_ptr<ReadBuffer> data_read_buffer = createReadBuffer(delete_file_object, object_storage, local_context, log);
+            std::unique_ptr<ReadBuffer> data_read_buffer = createReadBuffer(delete_file_object, delete_storage_to_use, local_context, log);
             CompressionMethod compression_method = chooseCompressionMethod(delete_file.file_path, "auto");
-            auto delete_format = FormatFactory::instance().getInput(delete_file.file_format, *data_read_buffer, delete_file_header, local_context, local_context->getSettingsRef()[DB::Setting::max_block_size], format_settings, nullptr, nullptr, true, compression_method);
+            auto delete_format = FormatFactory::instance().getInput(
+                delete_file.file_format,
+                *data_read_buffer,
+                delete_file_header,
+                local_context,
+                local_context->getSettingsRef()[DB::Setting::max_block_size],
+                format_settings,
+                nullptr,
+                nullptr,
+                true,
+                compression_method);
             /// only get the delete columns and construct a set by 'block_for_set'
             while (true)
             {
@@ -862,8 +1132,10 @@ void IcebergMetadata::addDeleteTransformers(ObjectInfoPtr object_info, QueryPipe
             block_for_set.setColumns(std::move(mutable_columns_for_set));
             /// we are constructing a 'not in' expression
             const auto & settings = local_context->getSettingsRef();
-            SizeLimits size_limits_for_set = {settings[Setting::max_rows_in_set], settings[Setting::max_bytes_in_set], settings[Setting::set_overflow_mode]};
-            FutureSetPtr future_set = std::make_shared<FutureSetFromTuple>(CityHash_v1_0_2::uint128(), nullptr, block_for_set.getColumnsWithTypeAndName(), true, size_limits_for_set);
+            SizeLimits size_limits_for_set
+                = {settings[Setting::max_rows_in_set], settings[Setting::max_bytes_in_set], settings[Setting::set_overflow_mode]};
+            FutureSetPtr future_set = std::make_shared<FutureSetFromTuple>(
+                CityHash_v1_0_2::uint128(), nullptr, block_for_set.getColumnsWithTypeAndName(), true, size_limits_for_set);
             ColumnPtr set_col = ColumnSet::create(1, future_set);
             ActionsDAG dag(header->getColumnsWithTypeAndName());
             /// Construct right argument of 'not in' expression, it is the column set.
@@ -876,27 +1148,23 @@ void IcebergMetadata::addDeleteTransformers(ObjectInfoPtr object_info, QueryPipe
             /// select columns to use in 'notIn' function
             for (Int32 col_id : equality_ids)
             {
-                NameAndTypePair name_and_type = persistent_components.schema_processor->getFieldCharacteristics(iceberg_object_info->underlying_format_read_schema_id, col_id);
+                NameAndTypePair name_and_type = persistent_components.schema_processor->getFieldCharacteristics(
+                    iceberg_object_info->underlying_format_read_schema_id, col_id);
                 auto it = outputs.find(name_and_type.name);
                 if (it == outputs.end())
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find column {} in dag outputs", name_and_type.name);
                 left_columns.push_back(it->second);
             }
-            FunctionOverloadResolverPtr func_tuple_builder =
-                std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionTuple>());
-            const ActionsDAG::Node * in_lhs_arg = left_columns.size() == 1 ?
-                left_columns.front() :
-                &dag.addFunction(func_tuple_builder, std::move(left_columns), {});
+            FunctionOverloadResolverPtr func_tuple_builder
+                = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionTuple>());
+            const ActionsDAG::Node * in_lhs_arg
+                = left_columns.size() == 1 ? left_columns.front() : &dag.addFunction(func_tuple_builder, std::move(left_columns), {});
             /// we got the NOT IN function
             auto func_not_in = FunctionFactory::instance().get("notIn", nullptr);
             const auto & not_in_node = dag.addFunction(func_not_in, {in_lhs_arg, in_rhs_arg}, "notInResult");
             dag.getOutputs().push_back(&not_in_node);
             LOG_DEBUG(log, "Use expression {} in equality deletes", dag.dumpDAG());
-            return std::make_shared<FilterTransform>(
-                header,
-                std::make_shared<ExpressionActions>(std::move(dag)),
-                "notInResult",
-                true);
+            return std::make_shared<FilterTransform>(header, std::make_shared<ExpressionActions>(std::move(dag)), "notInResult", true);
         };
         builder.addSimpleTransform(simple_transform_adder);
     }
@@ -925,6 +1193,26 @@ SinkToStoragePtr IcebergMetadata::write(
     }
 }
 
+ColumnMapperPtr IcebergMetadata::getColumnMapperForObject(ObjectInfoPtr object_info) const
+{
+    IcebergDataObjectInfo * iceberg_object_info = dynamic_cast<IcebergDataObjectInfo *>(object_info.get());
+    if (!iceberg_object_info)
+        return nullptr;
+    if (Poco::toLower(iceberg_object_info->file_format) != "parquet")
+        return nullptr;
+
+    return persistent_components.schema_processor->getColumnMapperById(iceberg_object_info->underlying_format_read_schema_id);
+}
+
+ColumnMapperPtr IcebergMetadata::getColumnMapperForCurrentSchema() const
+{
+    auto configuration_ptr = configuration.lock();
+    if (Poco::toLower(configuration_ptr->getFormat()) != "parquet")
+        return nullptr;
+    SharedLockGuard lock(mutex);
+    return persistent_components.schema_processor->getColumnMapperById(relevant_snapshot_schema_id);
+}
+
 }
 
 #endif
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h
index a894a53c8cdf..ad1b60e86820 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h
@@ -28,6 +28,7 @@
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h>
+#include <Storages/ObjectStorage/Utils.h>
 
 namespace DB
 {
@@ -79,7 +80,11 @@ class IcebergMetadata : public IDataLakeMetadata
 
     bool supportsSchemaEvolution() const override { return true; }
 
-    static Int32 parseTableSchema(const Poco::JSON::Object::Ptr & metadata_object, IcebergSchemaProcessor & schema_processor, LoggerPtr metadata_logger);
+    static Int32 parseTableSchema(
+        const Poco::JSON::Object::Ptr & metadata_object,
+        Iceberg::IcebergSchemaProcessor & schema_processor,
+        ContextPtr context_,
+        LoggerPtr metadata_logger);
 
     bool supportsUpdate() const override { return true; }
     bool supportsWrites() const override { return true; }
@@ -91,8 +96,9 @@ class IcebergMetadata : public IDataLakeMetadata
     std::optional<size_t> totalRows(ContextPtr Local_context) const override;
     std::optional<size_t> totalBytes(ContextPtr Local_context) const override;
 
-    ColumnMapperPtr getColumnMapper() const override { return column_mapper; }
+    ColumnMapperPtr getColumnMapperForObject(ObjectInfoPtr object_info) const override;
 
+    ColumnMapperPtr getColumnMapperForCurrentSchema() const override;
     SinkToStoragePtr write(
         SharedHeader sample_block,
         const StorageID & table_id,
@@ -115,16 +121,28 @@ class IcebergMetadata : public IDataLakeMetadata
 
     void checkMutationIsPossible(const MutationCommands & commands) override;
 
+    void modifyFormatSettings(FormatSettings & format_settings, const Context & local_context) const override;
     void addDeleteTransformers(ObjectInfoPtr object_info, QueryPipelineBuilder & builder, const std::optional<FormatSettings> & format_settings, ContextPtr local_context) const override;
     void checkAlterIsPossible(const AlterCommands & commands) override;
     void alter(const AlterCommands & params, ContextPtr context) override;
 
+    std::optional<String> partitionKey(ContextPtr) const override;
+    std::optional<String> sortingKey(ContextPtr) const override;
+
 protected:
+    ObjectIterator createIcebergKeysIterator(
+        Strings && data_files_,
+        ObjectStoragePtr,
+        IDataLakeMetadata::FileProgressCallback callback_,
+        ContextPtr local_context);
+
     ObjectIterator
     iterate(const ActionsDAG * filter_dag, FileProgressCallback callback, size_t list_batch_size, ContextPtr local_context) const override;
 
 private:
     const ObjectStoragePtr object_storage;
+    mutable std::shared_ptr<SecondaryStorages> secondary_storages; // Sometimes data or manifests can be located on another storage
+
     const StorageObjectStorageConfigurationWeakPtr configuration;
 
     DB::Iceberg::PersistentTableComponents persistent_components;
@@ -143,12 +161,9 @@ class IcebergMetadata : public IDataLakeMetadata
     Int64 relevant_snapshot_id TSA_GUARDED_BY(mutex) {-1};
     CompressionMethod metadata_compression_method;
 
-
-    ColumnMapperPtr column_mapper;
-
     void updateState(const ContextPtr & local_context, Poco::JSON::Object::Ptr metadata_object) TSA_REQUIRES(mutex);
     void updateSnapshot(ContextPtr local_context, Poco::JSON::Object::Ptr metadata_object) TSA_REQUIRES(mutex);
-    void addTableSchemaById(Int32 schema_id, Poco::JSON::Object::Ptr metadata_object) const TSA_REQUIRES(mutex);
+    void addTableSchemaById(Int32 schema_id, Poco::JSON::Object::Ptr metadata_object, ContextPtr context_) const TSA_REQUIRES(mutex);
     std::optional<Int32> getSchemaVersionByFileIfOutdated(String data_path) const TSA_REQUIRES_SHARED(mutex);
     void initializeSchemasFromManifestList(ContextPtr local_context, ManifestFileCacheKeys manifest_list_ptr) const TSA_REQUIRES(mutex);
 };
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadataFilesCache.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadataFilesCache.h
index d60fa5fdd870..a5f136648f32 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadataFilesCache.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadataFilesCache.h
@@ -31,7 +31,7 @@ namespace DB
 /// And we can get `ManifestFileContent` from cache by ManifestFileEntry.
 struct ManifestFileCacheKey
 {
-    String manifest_file_path;
+    String manifest_file_absolute_path;
     Int64 added_sequence_number;
     Int64 added_snapshot_id;
     Iceberg::ManifestFileContentType content_type;
@@ -73,7 +73,7 @@ struct IcebergMetadataFilesCacheCell : private boost::noncopyable
          size_t total_size = 0;
          for (const auto & entry: manifest_file_cache_keys)
          {
-             total_size += sizeof(ManifestFileCacheKey) + entry.manifest_file_path.capacity();
+             total_size += sizeof(ManifestFileCacheKey) + entry.manifest_file_absolute_path.capacity();
          }
          return total_size;
     }
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.cpp
index ab80b64c5e37..75fe44315faa 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergWrites.cpp
@@ -1232,11 +1232,6 @@ void IcebergStorageSink::consume(Chunk & chunk)
         {
             auto [data_filename, data_filename_in_storage] = filename_generator.generateDataFileName();
             data_filenames[partition_key] = data_filename;
-            if (!statistics.contains(partition_key))
-            {
-                statistics.emplace(partition_key, current_schema->getArray(Iceberg::f_fields));
-            }
-            statistics.at(partition_key).update(part_chunk);
 
             auto buffer = object_storage->writeObject(
                 StoredObject(data_filename_in_storage), WriteMode::Rewrite, std::nullopt, DBMS_DEFAULT_BUFFER_SIZE, context->getWriteSettings());
@@ -1249,8 +1244,14 @@ void IcebergStorageSink::consume(Chunk & chunk)
                 format_settings->parquet.filter_push_down = true;
             }
             writers[partition_key] = FormatFactory::instance().getOutputFormatParallelIfPossible(
-                configuration->format, *write_buffers[partition_key], *sample_block, context, format_settings);
+                configuration->getFormat(), *write_buffers[partition_key], *sample_block, context, format_settings);
+        }
+
+        if (!statistics.contains(partition_key))
+        {
+            statistics.emplace(partition_key, current_schema->getArray(Iceberg::f_fields));
         }
+        statistics.at(partition_key).update(part_chunk);
 
         writers[partition_key]->write(getHeader().cloneWithColumns(part_chunk.getColumns()));
     }
@@ -1368,7 +1369,7 @@ bool IcebergStorageSink::initializeMetadata()
                     statistics.at(partition_key),
                     sample_block,
                     new_snapshot,
-                    configuration->format,
+                    configuration->getFormat(),
                     partititon_spec,
                     partition_spec_id,
                     *buffer_manifest_entry,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.cpp
index 64da8a2fb335..d5c50a6c9994 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.cpp
@@ -5,10 +5,12 @@
 #include <compare>
 #include <optional>
 
+#include <Interpreters/IcebergMetadataLog.h>
+
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Constant.h>
-#include <Storages/ObjectStorage/DataLakes/Iceberg/Utils.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h>
+#include <Storages/ObjectStorage/Utils.h>
 
 #include <Core/TypeId.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -20,6 +22,9 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 
+#include <Common/logger_useful.h>
+
+
 namespace DB::ErrorCodes
 {
     extern const int ICEBERG_SPECIFICATION_VIOLATION;
@@ -141,7 +146,7 @@ ManifestFileContent::ManifestFileContent(
     const String & manifest_file_name,
     Int32 format_version_,
     const String & common_path,
-    const IcebergSchemaProcessor & schema_processor,
+    IcebergSchemaProcessor & schema_processor,
     Int64 inherited_sequence_number,
     Int64 inherited_snapshot_id,
     const String & table_location,
@@ -149,6 +154,16 @@ ManifestFileContent::ManifestFileContent(
     const String & path_to_manifest_file_)
     : path_to_manifest_file(path_to_manifest_file_)
 {
+    auto dump_metadata = [&]()->String { return manifest_file_deserializer.getMetadataContent(); };
+    insertRowToLogTable(
+        context,
+        dump_metadata,
+        DB::IcebergMetadataLogLevel::ManifestFileMetadata,
+        common_path,
+        path_to_manifest_file,
+        std::nullopt,
+        std::nullopt);
+
     for (const auto & column_name : {f_status, f_data_file})
     {
         if (!manifest_file_deserializer.hasPath(column_name))
@@ -186,6 +201,8 @@ ManifestFileContent::ManifestFileContent(
     const Poco::JSON::Object::Ptr & schema_object = json.extract<Poco::JSON::Object::Ptr>();
     Int32 manifest_schema_id = schema_object->getValue<int>(f_schema_id);
 
+    schema_processor.addIcebergTableSchema(schema_object, context);
+
     for (size_t i = 0; i != partition_specification->size(); ++i)
     {
         auto partition_specification_field = partition_specification->getObject(static_cast<UInt32>(i));
@@ -214,12 +231,20 @@ ManifestFileContent::ManifestFileContent(
 
     for (size_t i = 0; i < manifest_file_deserializer.rows(); ++i)
     {
+        auto dump_row_metadata = [&]()->String { return manifest_file_deserializer.getContent(i); };
+        insertRowToLogTable(
+            context,
+            dump_row_metadata,
+            DB::IcebergMetadataLogLevel::ManifestFileEntry,
+            common_path,
+            path_to_manifest_file,
+            i,
+            std::nullopt);
         FileContentType content_type = FileContentType::DATA;
         if (format_version_ > 1)
             content_type = FileContentType(manifest_file_deserializer.getValueFromRowByName(i, c_data_file_content, TypeIndex::Int32).safeGet<UInt64>());
         const auto status = ManifestEntryStatus(manifest_file_deserializer.getValueFromRowByName(i, f_status, TypeIndex::Int32).safeGet<UInt64>());
 
-
         if (status == ManifestEntryStatus::DELETED)
             continue;
 
@@ -242,11 +267,29 @@ ManifestFileContent::ManifestFileContent(
             snapshot_id = snapshot_id_value.safeGet<Int64>();
         }
 
+        const auto schema_id_opt = schema_processor.tryGetSchemaIdForSnapshot(snapshot_id);
+        if (!schema_id_opt.has_value())
+        {
+            /// Error logged but not thrown to avoid breaking whole query because of backward compatibility reasons.
+            /// That's actually an error because it can lead to incorrect query results, so we are creating an exception to put it to system.error_log.
+            try
+            {
+                throw Exception(
+                    ErrorCodes::ICEBERG_SPECIFICATION_VIOLATION,
+                    "Cannot read Iceberg table: manifest file '{}' has entry with snapshot_id '{}' for which write file schema is unknown",
+                    manifest_file_name,
+                    snapshot_id);
+            }
+            catch (const Exception &)
+            {
+                tryLogCurrentException("ICEBERG_SPECIFICATION_VIOLATION", "", LogsLevel::error);
+            }
+        }
+        const auto schema_id = schema_id_opt.has_value() ? schema_id_opt.value() : manifest_schema_id;
 
-        const auto schema_id = schema_processor.getSchemaIdForSnapshot(snapshot_id);
-
-        const auto file_path_key = manifest_file_deserializer.getValueFromRowByName(i, c_data_file_file_path, TypeIndex::String).safeGet<String>();
-        const auto file_path = getProperFilePathFromMetadataInfo(manifest_file_deserializer.getValueFromRowByName(i, c_data_file_file_path, TypeIndex::String).safeGet<String>(), common_path, table_location);
+        const auto file_path_key_field = manifest_file_deserializer.getValueFromRowByName(i, c_data_file_file_path, TypeIndex::String);
+        const auto file_path_key = file_path_key_field.safeGet<String>();
+        const auto file_path = makeAbsolutePath(table_location, file_path_key);
 
         /// NOTE: This is weird, because in manifest file partition looks like this:
         /// {
@@ -378,6 +421,7 @@ ManifestFileContent::ManifestFileContent(
                 this->data_files_without_deleted.emplace_back(
                     file_path_key,
                     file_path,
+                    i,
                     status,
                     added_sequence_number,
                     snapshot_id,
@@ -404,6 +448,7 @@ ManifestFileContent::ManifestFileContent(
                 this->position_deletes_files_without_deleted.emplace_back(
                     file_path_key,
                     file_path,
+                    i,
                     status,
                     added_sequence_number,
                     snapshot_id,
@@ -432,6 +477,7 @@ ManifestFileContent::ManifestFileContent(
                 this->equality_deletes_files.emplace_back(
                     file_path_key,
                     file_path,
+                    i,
                     status,
                     added_sequence_number,
                     snapshot_id,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h
index 9eb03c37946b..ad63ab2be8e3 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h
@@ -1,6 +1,23 @@
 #pragma once
 
 #include "config.h"
+#include <Core/Range.h>
+#include <Core/Types.h>
+
+#include <optional>
+
+namespace DB::Iceberg
+{
+
+struct ColumnInfo
+{
+    std::optional<Int64> rows_count;
+    std::optional<Int64> bytes_size;
+    std::optional<Int64> nulls_count;
+    std::optional<DB::Range> hyperrectangle;
+};
+
+}
 
 #if USE_AVRO
 
@@ -9,6 +26,7 @@
 #include <Storages/KeyDescription.h>
 #include <Storages/MergeTree/KeyCondition.h>
 #include <Core/Field.h>
+#include <Disks/ObjectStorages/IObjectStorage_fwd.h>
 
 #include <cstdint>
 
@@ -38,14 +56,6 @@ enum class ManifestFileContentType
 
 String FileContentTypeToString(FileContentType type);
 
-struct ColumnInfo
-{
-    std::optional<Int64> rows_count;
-    std::optional<Int64> bytes_size;
-    std::optional<Int64> nulls_count;
-    std::optional<DB::Range> hyperrectangle;
-};
-
 struct PartitionSpecsEntry
 {
     Int32 source_id;
@@ -61,6 +71,7 @@ struct ManifestFileEntry
     String file_path_key;
     // It's a processed file path to be used by Object Storage
     String file_path;
+    Int64 row_number;
 
     ManifestEntryStatus status;
     Int64 added_sequence_number;
@@ -75,6 +86,10 @@ struct ManifestFileEntry
     String file_format;
     std::optional<String> reference_data_file_path; // For position delete files only.
     std::optional<std::vector<Int32>> equality_ids;
+
+    // Resolved storage and key (set by SingleThreadIcebergKeysIterator)
+    ObjectStoragePtr storage_to_use;
+    String resolved_key;
 };
 
 /**
@@ -111,7 +126,7 @@ class ManifestFileContent : public boost::noncopyable
         const String & manifest_file_name,
         Int32 format_version_,
         const String & common_path,
-        const DB::IcebergSchemaProcessor & schema_processor,
+        IcebergSchemaProcessor & schema_processor,
         Int64 inherited_sequence_number,
         Int64 inherited_snapshot_id,
         const std::string & table_location,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.cpp
index a6937af89e02..51c68dc7a18c 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.cpp
@@ -96,7 +96,7 @@ std::unique_ptr<DB::ActionsDAG> ManifestFilesPruner::transformFilterDagForManife
 
 
 ManifestFilesPruner::ManifestFilesPruner(
-    const DB::IcebergSchemaProcessor & schema_processor_,
+    const IcebergSchemaProcessor & schema_processor_,
     Int32 current_schema_id_,
     Int32 initial_schema_id_,
     const DB::ActionsDAG * filter_dag,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h
index 1843dc0ccfaf..f17a1ee97326 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "config.h"
 
-#if USE_AVRO
 
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IAST_fwd.h>
@@ -21,6 +20,13 @@ enum class PruningReturnStatus
     MIN_MAX_INDEX_PRUNED
 };
 
+}
+
+#if USE_AVRO
+
+namespace DB::Iceberg
+{
+
 struct ManifestFileEntry;
 class ManifestFileContent;
 
@@ -30,7 +36,7 @@ DB::ASTPtr getASTFromTransform(const String & transform_name_src, const String &
 class ManifestFilesPruner
 {
 private:
-    const DB::IcebergSchemaProcessor & schema_processor;
+    const IcebergSchemaProcessor & schema_processor;
     Int32 current_schema_id;
     Int32 initial_schema_id;
     const DB::KeyDescription * partition_key;
@@ -44,7 +50,7 @@ class ManifestFilesPruner
 
 public:
     ManifestFilesPruner(
-        const DB::IcebergSchemaProcessor & schema_processor_,
+        const IcebergSchemaProcessor & schema_processor_,
         Int32 current_schema_id_,
         Int32 initial_schema_id_,
         const DB::ActionsDAG * filter_dag,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/Mutations.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/Mutations.cpp
index c7ef9a654903..0bc97042b01e 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/Mutations.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/Mutations.cpp
@@ -1,4 +1,5 @@
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnNullable.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -114,18 +115,10 @@ std::optional<DeleteFileWriteResultWithStats> writeDataFiles(
             Chunk chunk(block.getColumns(), block.rows());
             auto partition_result = chunk_partitioner.partitionChunk(chunk);
 
-            auto col_data_filename = block.getByName(block_datafile_path);
-            auto col_position = block.getByName(block_row_number);
-
-            size_t col_data_filename_index = 0;
-            size_t col_position_index = 0;
-            for (size_t i = 0; i < block.columns(); ++i)
-            {
-                if (block.getNames()[i] == block_datafile_path)
-                    col_data_filename_index = i;
-                if (block.getNames()[i] == block_row_number)
-                    col_position_index = i;
-            }
+            size_t col_data_filename_index = block.getPositionByName(block_datafile_path);
+            size_t col_position_index = block.getPositionByName(block_row_number);
+            ColumnWithTypeAndName col_data_filename = block.getByPosition(col_data_filename_index);
+            ColumnWithTypeAndName col_position = block.getByPosition(col_position_index);
 
             for (const auto & [partition_key, partition_chunk] : partition_result)
             {
@@ -152,7 +145,7 @@ std::optional<DeleteFileWriteResultWithStats> writeDataFiles(
                     column_mapper->setStorageColumnEncoding(std::move(field_ids));
                     FormatFilterInfoPtr format_filter_info = std::make_shared<FormatFilterInfo>(nullptr, context, column_mapper);
                     auto output_format = FormatFactory::instance().getOutputFormat(
-                        configuration->format, *write_buffer, delete_file_sample_block, context, format_settings, format_filter_info);
+                        configuration->getFormat(), *write_buffer, delete_file_sample_block, context, format_settings, format_filter_info);
 
                     write_buffers[partition_key] = std::move(write_buffer);
                     writers[partition_key] = std::move(output_format);
@@ -161,21 +154,33 @@ std::optional<DeleteFileWriteResultWithStats> writeDataFiles(
                 col_data_filename.column = partition_chunk.getColumns()[col_data_filename_index];
                 col_position.column = partition_chunk.getColumns()[col_position_index];
 
+                if (const ColumnNullable * nullable = typeid_cast<const ColumnNullable *>(col_position.column.get()))
+                {
+                    const auto & null_map = nullable->getNullMapData();
+                    if (std::any_of(null_map.begin(), null_map.end(), [](UInt8 x) { return x != 0; }))
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected null _row_number");
+                    col_position.column = nullable->getNestedColumnPtr();
+                }
+
                 auto col_data_filename_without_namespaces = ColumnString::create();
                 for (size_t i = 0; i < col_data_filename.column->size(); ++i)
                 {
                     Field cur_value;
                     col_data_filename.column->get(i, cur_value);
 
+                    String original_path = cur_value.safeGet<String>();
                     String path_without_namespace;
-                    if (cur_value.safeGet<String>().starts_with(configuration->getNamespace()))
-                        path_without_namespace = cur_value.safeGet<String>().substr(configuration->getNamespace().size());
 
-                    if (!path_without_namespace.starts_with(configuration->getPathForRead().path))
+                    if (original_path.starts_with(configuration->getNamespace()))
+                        path_without_namespace = original_path.substr(configuration->getNamespace().size());
+                    else
+                        path_without_namespace = original_path;
+
+                    if (!path_without_namespace.empty() && !path_without_namespace.starts_with(configuration->getPathForRead().path))
                     {
                         if (path_without_namespace.starts_with('/'))
                             path_without_namespace = path_without_namespace.substr(1);
-                        else
+                        else if (!path_without_namespace.empty())
                             path_without_namespace = "/" + path_without_namespace;
                     }
                     col_data_filename_without_namespaces->insert(path_without_namespace);
@@ -285,7 +290,7 @@ bool writeMetadataFiles(
                     delete_filenames.statistic.at(partition_key),
                     std::make_shared<const Block>(getPositionDeleteFileSampleBlock()),
                     new_snapshot,
-                    configuration->format,
+                    configuration->getFormat(),
                     partititon_spec,
                     partition_spec_id,
                     *buffer_manifest_entry,
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h
index cd9b0156dc70..ec533d63f655 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h
@@ -8,9 +8,11 @@
 
 namespace DB::Iceberg
 {
+
+// All fields in this struct should be either thread-safe or immutable, because it can be used by several queries
 struct PersistentTableComponents
 {
-    mutable IcebergSchemaProcessorPtr schema_processor;
+    IcebergSchemaProcessorPtr schema_processor;
     IcebergMetadataFilesCachePtr metadata_cache;
     const Int32 format_version;
     const String table_location;
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.cpp
index 1599d93433bb..d97b786d1ff0 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.cpp
@@ -67,18 +67,22 @@ void IcebergPositionDeleteTransform::initializeDeleteSources()
     {
         /// Skip position deletes that do not match the data file path.
         if (position_deletes_object.reference_data_file_path.has_value()
-            && position_deletes_object.reference_data_file_path != iceberg_data_path)
+            && position_deletes_object.reference_data_file_path.value() != iceberg_data_path)
             continue;
 
-        auto object_path = position_deletes_object.file_path;
-        auto object_metadata = object_storage->getObjectMetadata(object_path);
-        auto object_info = std::make_shared<ObjectInfo>(object_path, object_metadata);
+        /// Resolve the position delete file path to get the correct storage and key
+        /// This handles cases where delete files are outside the table location
+        auto [delete_storage_to_use, resolved_delete_key] = resolveObjectStorageForPath(
+            table_location, position_deletes_object.file_path, object_storage, secondary_storages, context);
+        
+        auto object_metadata = delete_storage_to_use->getObjectMetadata(resolved_delete_key);
+        PathWithMetadata delete_file_object(resolved_delete_key, object_metadata, position_deletes_object.file_path, delete_storage_to_use);
 
 
         String format = position_deletes_object.file_format;
         Block initial_header;
         {
-            std::unique_ptr<ReadBuffer> read_buf_schema = createReadBuffer(*object_info, object_storage, context, log);
+            std::unique_ptr<ReadBuffer> read_buf_schema = createReadBuffer(delete_file_object, delete_storage_to_use, context, log);
             auto schema_reader = FormatFactory::instance().getSchemaReader(format, *read_buf_schema, context);
             auto columns_with_names = schema_reader->readSchema();
             ColumnsWithTypeAndName initial_header_data;
@@ -89,9 +93,9 @@ void IcebergPositionDeleteTransform::initializeDeleteSources()
             initial_header = Block(initial_header_data);
         }
 
-        CompressionMethod compression_method = chooseCompressionMethod(object_path, "auto");
+        CompressionMethod compression_method = chooseCompressionMethod(resolved_delete_key, "auto");
 
-        delete_read_buffers.push_back(createReadBuffer(*object_info, object_storage, context, log));
+        delete_read_buffers.push_back(createReadBuffer(delete_file_object, delete_storage_to_use, context, log));
 
         auto syntax_result = TreeRewriter(context).analyze(where_ast, initial_header.getNamesAndTypesList());
         ExpressionAnalyzer analyzer(where_ast, syntax_result, context);
@@ -138,25 +142,46 @@ void IcebergBitmapPositionDeleteTransform::transform(Chunk & chunk)
     IColumn::Filter delete_vector(num_rows, true);
     size_t num_rows_after_filtration = num_rows;
 
-    auto chunk_info = chunk.getChunkInfos().get<ChunkInfoRowNumOffset>();
+    auto chunk_info = chunk.getChunkInfos().get<ChunkInfoRowNumbers>();
     if (!chunk_info)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "ChunkInfoRowNumOffset does not exist");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "ChunkInfoRowNumbers does not exist");
 
     size_t row_num_offset = chunk_info->row_num_offset;
-    for (size_t i = 0; i < num_rows; i++)
+    auto & applied_filter = chunk_info->applied_filter;
+    size_t num_indices = applied_filter.has_value() ? applied_filter->size() : num_rows;
+    size_t idx_in_chunk = 0;
+    for (size_t i = 0; i < num_indices; i++)
     {
-        size_t row_idx = row_num_offset + i;
-        if (bitmap.rb_contains(row_idx))
+        if (!applied_filter.has_value() || applied_filter.value()[i])
         {
-            delete_vector[i] = false;
-            num_rows_after_filtration--;
+            size_t row_idx = row_num_offset + i;
+            if (bitmap.rb_contains(row_idx))
+            {
+                delete_vector[idx_in_chunk] = false;
+
+                /// If we already have a _row_number-indexed filter vector, update it in place.
+                if (applied_filter.has_value())
+                    applied_filter.value()[i] = false;
+
+                num_rows_after_filtration--;
+            }
+            idx_in_chunk += 1;
         }
     }
+    chassert(idx_in_chunk == num_rows);
+
+    if (num_rows_after_filtration == num_rows)
+        return;
 
     auto columns = chunk.detachColumns();
     for (auto & column : columns)
         column = column->filter(delete_vector, -1);
 
+    /// If it's the first filtering we do on this Chunk (i.e. its _row_number-s were consecutive),
+    /// assign its applied_filter.
+    if (!applied_filter.has_value())
+        applied_filter.emplace(std::move(delete_vector));
+
     chunk.setColumns(std::move(columns), num_rows_after_filtration);
 }
 
@@ -167,10 +192,8 @@ void IcebergBitmapPositionDeleteTransform::initialize()
         while (auto delete_chunk = delete_source->read())
         {
             int position_index = getColumnIndex(delete_source, IcebergPositionDeleteTransform::positions_column_name);
-            int filename_index = getColumnIndex(delete_source, IcebergPositionDeleteTransform::data_file_path_column_name);
 
             auto position_column = delete_chunk.getColumns()[position_index];
-            auto filename_column = delete_chunk.getColumns()[filename_index];
 
             for (size_t i = 0; i < delete_chunk.getNumRows(); ++i)
             {
@@ -223,50 +246,75 @@ void IcebergStreamingPositionDeleteTransform::transform(Chunk & chunk)
     size_t num_rows = chunk.getNumRows();
     IColumn::Filter filter(num_rows, true);
     size_t num_rows_after_filtration = chunk.getNumRows();
-    auto chunk_info = chunk.getChunkInfos().get<ChunkInfoRowNumOffset>();
+    auto chunk_info = chunk.getChunkInfos().get<ChunkInfoRowNumbers>();
     if (!chunk_info)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "ChunkInfoRowNumOffset does not exist");
-
-    size_t total_previous_chunks_size = chunk_info->row_num_offset;
-    if (previous_chunk_offset && previous_chunk_offset.value() > total_previous_chunks_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "ChunkInfoRowNumbers does not exist");
+
+    size_t num_indices = chunk_info->applied_filter.has_value() ? chunk_info->applied_filter->size() : chunk.getNumRows();
+
+    /// We get chunks in order of increasing row number because:
+    ///  * this transform should be immediately after the IInputFormat
+    ///    (typically ParquetV3BlockInputFormat) in the pipeline,
+    ///  * IInputFormat outputs chunks in order of row number even if it uses multiple threads
+    ///    internally; for parquet IcebergMetadata::modifyFormatSettings sets
+    ///    `format_settings.parquet.preserve_order = true` to ensure this, other formats return
+    ///    chunks in order by default.
+    if (previous_chunk_end_offset && previous_chunk_end_offset.value() > chunk_info->row_num_offset)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Chunks offsets should increase.");
-    previous_chunk_offset = total_previous_chunks_size;
-    for (size_t i = 0; i < chunk.getNumRows(); ++i)
+    previous_chunk_end_offset = chunk_info->row_num_offset + num_indices;
+
+    size_t idx_in_chunk = 0;
+    for (size_t i = 0; i < num_indices; i++)
     {
-        while (!latest_positions.empty())
+        if (!chunk_info->applied_filter.has_value() || chunk_info->applied_filter.value()[i])
         {
-            auto it = latest_positions.begin();
-            if (it->first < i + total_previous_chunks_size)
+            size_t row_idx = chunk_info->row_num_offset + i;
+
+            while (!latest_positions.empty())
             {
-                size_t delete_source_index = it->second;
-                latest_positions.erase(it);
-                if (iterator_at_latest_chunks[delete_source_index] + 1 >= latest_chunks[delete_source_index].getNumRows() && latest_chunks[delete_source_index].getNumRows() > 0)
+                auto it = latest_positions.begin();
+                if (it->first < row_idx)
                 {
-                    fetchNewChunkFromSource(delete_source_index);
+                    size_t delete_source_index = it->second;
+                    latest_positions.erase(it);
+                    if (iterator_at_latest_chunks[delete_source_index] + 1 >= latest_chunks[delete_source_index].getNumRows() && latest_chunks[delete_source_index].getNumRows() > 0)
+                    {
+                        fetchNewChunkFromSource(delete_source_index);
+                    }
+                    else
+                    {
+                        ++iterator_at_latest_chunks[delete_source_index];
+                        auto position_index = delete_source_column_indices[delete_source_index].position_index;
+                        size_t next_index_value_in_positional_delete_file = latest_chunks[delete_source_index].getColumns()[position_index]->get64(iterator_at_latest_chunks[delete_source_index]);
+                        latest_positions.insert(std::pair<size_t, size_t>{next_index_value_in_positional_delete_file, delete_source_index});
+                    }
                 }
-                else
+                else if (it->first == row_idx)
                 {
-                    ++iterator_at_latest_chunks[delete_source_index];
-                    auto position_index = delete_source_column_indices[delete_source_index].position_index;
-                    size_t next_index_value_in_positional_delete_file = latest_chunks[delete_source_index].getColumns()[position_index]->get64(iterator_at_latest_chunks[delete_source_index]);
-                    latest_positions.insert(std::pair<size_t, size_t>{next_index_value_in_positional_delete_file, delete_source_index});
+                    filter[idx_in_chunk] = false;
+
+                    if (chunk_info->applied_filter.has_value())
+                        chunk_info->applied_filter.value()[i] = false;
+
+                    --num_rows_after_filtration;
+                    break;
                 }
+                else
+                    break;
             }
-            else if (it->first == i + total_previous_chunks_size)
-            {
-                filter[i] = false;
-                --num_rows_after_filtration;
-                break;
-            }
-            else
-                break;
+
+            idx_in_chunk += 1;
         }
     }
+    chassert(idx_in_chunk == chunk.getNumRows());
 
     auto columns = chunk.detachColumns();
     for (auto & column : columns)
         column = column->filter(filter, -1);
 
+    if (!chunk_info->applied_filter.has_value())
+        chunk_info->applied_filter.emplace(std::move(filter));
+
     chunk.setColumns(std::move(columns), num_rows_after_filtration);
 }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h
index 1c2122645b06..e03fe400b542 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.h
@@ -27,13 +27,17 @@ class IcebergPositionDeleteTransform : public ISimpleTransform
         IcebergDataObjectInfoPtr iceberg_object_info_,
         ObjectStoragePtr object_storage_,
         const std::optional<FormatSettings> & format_settings_,
-        ContextPtr context_)
+        ContextPtr context_,
+        const String & table_location_,
+        SecondaryStorages & secondary_storages_)
         : ISimpleTransform(header_, header_, false)
         , header(header_)
         , iceberg_object_info(iceberg_object_info_)
         , object_storage(object_storage_)
         , format_settings(format_settings_)
         , context(context_)
+        , table_location(table_location_)
+        , secondary_storages(secondary_storages_)
     {
         initializeDeleteSources();
     }
@@ -52,6 +56,8 @@ class IcebergPositionDeleteTransform : public ISimpleTransform
     const ObjectStoragePtr object_storage;
     const std::optional<FormatSettings> format_settings;
     ContextPtr context;
+    const String table_location;
+    SecondaryStorages & secondary_storages;
 
     /// We need to keep the read buffers alive since the delete_sources depends on them.
     std::vector<std::unique_ptr<ReadBuffer>> delete_read_buffers;
@@ -66,8 +72,10 @@ class IcebergBitmapPositionDeleteTransform : public IcebergPositionDeleteTransfo
         IcebergDataObjectInfoPtr iceberg_object_info_,
         ObjectStoragePtr object_storage_,
         const std::optional<FormatSettings> & format_settings_,
-        ContextPtr context_)
-        : IcebergPositionDeleteTransform(header_, iceberg_object_info_, object_storage_, format_settings_, context_)
+        ContextPtr context_,
+        const String & table_location_,
+        SecondaryStorages & secondary_storages_)
+        : IcebergPositionDeleteTransform(header_, iceberg_object_info_, object_storage_, format_settings_, context_, table_location_, secondary_storages_)
     {
         initialize();
     }
@@ -82,6 +90,7 @@ class IcebergBitmapPositionDeleteTransform : public IcebergPositionDeleteTransfo
 };
 
 
+/// Requires both the deletes and the input Chunk-s to arrive in order of increasing row number.
 class IcebergStreamingPositionDeleteTransform : public IcebergPositionDeleteTransform
 {
 public:
@@ -90,8 +99,10 @@ class IcebergStreamingPositionDeleteTransform : public IcebergPositionDeleteTran
         IcebergDataObjectInfoPtr iceberg_object_info_,
         ObjectStoragePtr object_storage_,
         const std::optional<FormatSettings> & format_settings_,
-        ContextPtr context_)
-        : IcebergPositionDeleteTransform(header_, iceberg_object_info_, object_storage_, format_settings_, context_)
+        ContextPtr context_,
+        const String & table_location_,
+        SecondaryStorages & secondary_storages_)
+        : IcebergPositionDeleteTransform(header_, iceberg_object_info_, object_storage_, format_settings_, context_, table_location_, secondary_storages_)
     {
         initialize();
     }
@@ -116,7 +127,7 @@ class IcebergStreamingPositionDeleteTransform : public IcebergPositionDeleteTran
     std::vector<size_t> iterator_at_latest_chunks;
     std::set<std::pair<size_t, size_t>> latest_positions;
 
-    std::optional<size_t> previous_chunk_offset;
+    std::optional<size_t> previous_chunk_end_offset;
 };
 
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.cpp
index 27df820a47e4..56a2cd976f6b 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.cpp
@@ -17,6 +17,7 @@
 #include <base/types.h>
 #include <Common/SharedLockGuard.h>
 #include <base/scope_guard.h>
+#include <Core/Settings.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
@@ -32,6 +33,8 @@
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Formats/FormatFactory.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/Context.h>
 
 #include <IO/ReadHelpers.h>
 
@@ -46,6 +49,10 @@ extern const int LOGICAL_ERROR;
 extern const int BAD_ARGUMENTS;
 }
 
+namespace Setting
+{
+extern const SettingsTimezone iceberg_timezone_for_timestamptz;
+}
 
 namespace
 {
@@ -72,7 +79,7 @@ void traverseComplexType(Poco::JSON::Object::Ptr type, std::unordered_map<String
     {
         auto element_id = type->getValue<Int64>(Iceberg::f_element_id);
         if (type->isObject(Iceberg::f_element))
-            traverseComplexType(type->getObject(Iceberg::f_element), result, Nested::concatenateName(current_path, "list.element"));
+            traverseComplexType(type->getObject(Iceberg::f_element), result, current_path);
         result[current_path] = element_id;
         return;
     }
@@ -139,9 +146,12 @@ std::pair<size_t, size_t> parseDecimal(const String & type_name)
 
 }
 
+namespace Iceberg
+{
+
 std::string IcebergSchemaProcessor::default_link{};
 
-void IcebergSchemaProcessor::addIcebergTableSchema(Poco::JSON::Object::Ptr schema_ptr)
+void IcebergSchemaProcessor::addIcebergTableSchema(Poco::JSON::Object::Ptr schema_ptr, ContextPtr context_)
 {
     std::lock_guard lock(mutex);
 
@@ -164,7 +174,7 @@ void IcebergSchemaProcessor::addIcebergTableSchema(Poco::JSON::Object::Ptr schem
             auto name = field->getValue<String>(f_name);
             bool required = field->getValue<bool>(f_required);
             current_full_name = name;
-            auto type = getFieldType(field, f_type, required, current_full_name, true);
+            auto type = getFieldType(field, f_type, context_, required, current_full_name, true);
             clickhouse_schema->push_back(NameAndTypePair{name, type});
             clickhouse_types_by_source_ids[{schema_id, field->getValue<Int32>(f_id)}] = NameAndTypePair{current_full_name, type};
             clickhouse_ids_by_source_names[{schema_id, current_full_name}] = field->getValue<Int32>(f_id);
@@ -218,7 +228,7 @@ NamesAndTypesList IcebergSchemaProcessor::tryGetFieldsCharacteristics(Int32 sche
     return fields;
 }
 
-DataTypePtr IcebergSchemaProcessor::getSimpleType(const String & type_name)
+DataTypePtr IcebergSchemaProcessor::getSimpleType(const String & type_name, ContextPtr context_)
 {
     if (type_name == f_boolean)
         return DataTypeFactory::instance().get("Bool");
@@ -237,7 +247,10 @@ DataTypePtr IcebergSchemaProcessor::getSimpleType(const String & type_name)
     if (type_name == f_timestamp)
         return std::make_shared<DataTypeDateTime64>(6);
     if (type_name == f_timestamptz)
-        return std::make_shared<DataTypeDateTime64>(6, "UTC");
+    {
+        std::string timezone = context_->getSettingsRef()[Setting::iceberg_timezone_for_timestamptz];
+        return std::make_shared<DataTypeDateTime64>(6, timezone);
+    }
     if (type_name == f_string || type_name == f_binary)
         return std::make_shared<DataTypeString>();
     if (type_name == f_uuid)
@@ -262,21 +275,25 @@ DataTypePtr IcebergSchemaProcessor::getSimpleType(const String & type_name)
 }
 
 DataTypePtr
-IcebergSchemaProcessor::getComplexTypeFromObject(const Poco::JSON::Object::Ptr & type, String & current_full_name, bool is_subfield_of_root)
+IcebergSchemaProcessor::getComplexTypeFromObject(
+    const Poco::JSON::Object::Ptr & type,
+    String & current_full_name,
+    ContextPtr context_,
+    bool is_subfield_of_root)
 {
     String type_name = type->getValue<String>(f_type);
     if (type_name == f_list)
     {
         bool element_required = type->getValue<bool>("element-required");
-        auto element_type = getFieldType(type, f_element, element_required);
+        auto element_type = getFieldType(type, f_element, context_, element_required);
         return std::make_shared<DataTypeArray>(element_type);
     }
 
     if (type_name == f_map)
     {
-        auto key_type = getFieldType(type, f_key, true);
+        auto key_type = getFieldType(type, f_key, context_, true);
         auto value_required = type->getValue<bool>("value-required");
-        auto value_type = getFieldType(type, f_value, value_required);
+        auto value_type = getFieldType(type, f_value, context_, value_required);
         return std::make_shared<DataTypeMap>(key_type, value_type);
     }
 
@@ -300,15 +317,16 @@ IcebergSchemaProcessor::getComplexTypeFromObject(const Poco::JSON::Object::Ptr &
 
                 (current_full_name += ".").append(element_names.back());
                 scope_guard guard([&] { current_full_name.resize(current_full_name.size() - element_names.back().size() - 1); });
-                element_types.push_back(getFieldType(field, f_type, required, current_full_name, true));
-                TSA_SUPPRESS_WARNING_FOR_WRITE(clickhouse_types_by_source_ids)[{schema_id, field->getValue<Int32>(f_id)}]
-                    = NameAndTypePair{current_full_name, element_types.back()};
+                element_types.push_back(getFieldType(field, f_type, context_, required, current_full_name, true));
+                TSA_SUPPRESS_WARNING_FOR_WRITE(clickhouse_types_by_source_ids)
+                [{schema_id, field->getValue<Int32>(f_id)}] = NameAndTypePair{current_full_name, element_types.back()};
 
-                TSA_SUPPRESS_WARNING_FOR_WRITE(clickhouse_ids_by_source_names)[{schema_id, current_full_name}] = field->getValue<Int32>(f_id);
+                TSA_SUPPRESS_WARNING_FOR_WRITE(clickhouse_ids_by_source_names)
+                [{schema_id, current_full_name}] = field->getValue<Int32>(f_id);
             }
             else
             {
-                element_types.push_back(getFieldType(field, f_type, required));
+                element_types.push_back(getFieldType(field, f_type, context_, required));
             }
         }
 
@@ -319,16 +337,21 @@ IcebergSchemaProcessor::getComplexTypeFromObject(const Poco::JSON::Object::Ptr &
 }
 
 DataTypePtr IcebergSchemaProcessor::getFieldType(
-    const Poco::JSON::Object::Ptr & field, const String & type_key, bool required, String & current_full_name, bool is_subfield_of_root)
+    const Poco::JSON::Object::Ptr & field,
+    const String & type_key,
+    ContextPtr context_,
+    bool required,
+    String & current_full_name,
+    bool is_subfield_of_root)
 {
     if (field->isObject(type_key))
-        return getComplexTypeFromObject(field->getObject(type_key), current_full_name, is_subfield_of_root);
+        return getComplexTypeFromObject(field->getObject(type_key), current_full_name, context_, is_subfield_of_root);
 
     auto type = field->get(type_key);
     if (type.isString())
     {
         const String & type_name = type.extract<String>();
-        auto data_type = getSimpleType(type_name);
+        auto data_type = getSimpleType(type_name, context_);
         return required ? data_type : makeNullable(data_type);
     }
 
@@ -358,7 +381,11 @@ bool IcebergSchemaProcessor::allowPrimitiveTypeConversion(const String & old_typ
 
 // Ids are passed only for error logging purposes
 std::shared_ptr<ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDag(
-    const Poco::JSON::Object::Ptr & old_schema, const Poco::JSON::Object::Ptr & new_schema, Int32 old_id, Int32 new_id)
+    const Poco::JSON::Object::Ptr & old_schema,
+    const Poco::JSON::Object::Ptr & new_schema,
+    ContextPtr context_,
+    Int32 old_id,
+    Int32 new_id)
 {
     std::unordered_map<size_t, std::pair<Poco::JSON::Object::Ptr, const ActionsDAG::Node *>> old_schema_entries;
     auto old_schema_fields = old_schema->get(f_fields).extract<Poco::JSON::Array::Ptr>();
@@ -370,7 +397,7 @@ std::shared_ptr<ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDag(
         size_t id = field->getValue<size_t>(f_id);
         auto name = field->getValue<String>(f_name);
         bool required = field->getValue<bool>(f_required);
-        old_schema_entries[id] = {field, &dag->addInput(name, getFieldType(field, f_type, required))};
+        old_schema_entries[id] = {field, &dag->addInput(name, getFieldType(field, f_type, context_, required))};
     }
     auto new_schema_fields = new_schema->get(f_fields).extract<Poco::JSON::Array::Ptr>();
     for (size_t i = 0; i != new_schema_fields->size(); ++i)
@@ -379,7 +406,7 @@ std::shared_ptr<ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDag(
         size_t id = field->getValue<size_t>(f_id);
         auto name = field->getValue<String>(f_name);
         bool required = field->getValue<bool>(f_required);
-        auto type = getFieldType(field, f_type, required);
+        auto type = getFieldType(field, f_type, context_, required);
         auto old_node_it = old_schema_entries.find(id);
         if (old_node_it != old_schema_entries.end())
         {
@@ -389,7 +416,7 @@ std::shared_ptr<ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDag(
                     || field->getObject(f_type)->getValue<std::string>(f_type) == "list"
                     || field->getObject(f_type)->getValue<std::string>(f_type) == "map"))
             {
-                auto old_type = getFieldType(old_json, "type", required);
+                auto old_type = getFieldType(old_json, "type", context_, required);
                 auto transform = std::make_shared<EvolutionFunctionStruct>(std::vector{type}, std::vector{old_type}, old_json, field);
                 old_node = &dag->addFunction(transform, std::vector<const Node *>{old_node}, name);
 
@@ -419,7 +446,7 @@ std::shared_ptr<ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDag(
                 }
                 else if (allowPrimitiveTypeConversion(old_type, new_type))
                 {
-                    node = &dag->addCast(*old_node, getFieldType(field, f_type, required), name);
+                    node = &dag->addCast(*old_node, getFieldType(field, f_type, context_, required), name);
                 }
                 outputs.push_back(node);
             }
@@ -445,7 +472,10 @@ std::shared_ptr<ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDag(
     return dag;
 }
 
-std::shared_ptr<const ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDagByIds(Int32 old_id, Int32 new_id)
+std::shared_ptr<const ActionsDAG> IcebergSchemaProcessor::getSchemaTransformationDagByIds(
+    ContextPtr context_,
+    Int32 old_id,
+    Int32 new_id)
 {
     if (old_id == new_id)
         return nullptr;
@@ -464,7 +494,7 @@ std::shared_ptr<const ActionsDAG> IcebergSchemaProcessor::getSchemaTransformatio
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Schema with schema-id {} is unknown", new_id);
 
     return transform_dags_by_ids[{old_id, new_id}]
-        = getSchemaTransformationDag(old_schema_it->second, new_schema_it->second, old_id, new_id);
+        = getSchemaTransformationDag(old_schema_it->second, new_schema_it->second, context_, old_id, new_id);
 }
 
 Poco::JSON::Object::Ptr IcebergSchemaProcessor::getIcebergTableSchemaById(Int32 id) const
@@ -549,4 +579,22 @@ std::unordered_map<String, Int64> IcebergSchemaProcessor::traverseSchema(Poco::J
     return result;
 }
 
+ColumnMapperPtr IcebergSchemaProcessor::getColumnMapperById(Int32 id) const
+{
+    auto schema = getIcebergTableSchemaById(id);
+    if (!schema)
+        return nullptr;
+    return createColumnMapper(schema);
+}
+
+ColumnMapperPtr createColumnMapper(Poco::JSON::Object::Ptr schema_object)
+{
+    auto column_mapper = std::make_shared<ColumnMapper>();
+    std::unordered_map<String, Int64> column_name_to_parquet_field_id
+        = IcebergSchemaProcessor::traverseSchema(schema_object->getArray(Iceberg::f_fields));
+    column_mapper->setStorageColumnEncoding(std::move(column_name_to_parquet_field_id));
+    return column_mapper;
+}
+
+}
 }
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.h
index 33a5ac1bb55c..b4a7a8d6fdeb 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/SchemaProcessor.h
@@ -8,18 +8,22 @@
 #include <Core/NamesAndTypes.h>
 #include <Core/Types.h>
 #include <Interpreters/ActionsDAG.h>
+#include <Storages/ObjectStorage/DataLakes/Iceberg/Constant.h>
 #include <base/defines.h>
 
 
+#include <Formats/FormatFilterInfo.h>
 #include <Poco/JSON/Array.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
 #include <Common/SharedMutex.h>
 
 #include <unordered_map>
-namespace DB
+namespace DB::Iceberg
 {
 
+ColumnMapperPtr createColumnMapper(Poco::JSON::Object::Ptr schema_object);
+
 /**
  * Iceberg supports the following data types (see https://iceberg.apache.org/spec/#schemas-and-data-types):
  * - Primitive types:
@@ -71,16 +75,18 @@ namespace DB
  *     }
  * }
  */
-class IcebergSchemaProcessor
+class IcebergSchemaProcessor : private WithContext
 {
     static std::string default_link;
 
     using Node = ActionsDAG::Node;
 
 public:
-    void addIcebergTableSchema(Poco::JSON::Object::Ptr schema_ptr);
+    explicit IcebergSchemaProcessor(ContextPtr context_) : WithContext(context_) {}
+
+    void addIcebergTableSchema(Poco::JSON::Object::Ptr schema_ptr, ContextPtr context_);
     std::shared_ptr<NamesAndTypesList> getClickhouseTableSchemaById(Int32 id);
-    std::shared_ptr<const ActionsDAG> getSchemaTransformationDagByIds(Int32 old_id, Int32 new_id);
+    std::shared_ptr<const ActionsDAG> getSchemaTransformationDagByIds(ContextPtr context_, Int32 old_id, Int32 new_id);
     NameAndTypePair getFieldCharacteristics(Int32 schema_version, Int32 source_id) const;
     std::optional<NameAndTypePair> tryGetFieldCharacteristics(Int32 schema_version, Int32 source_id) const;
     NamesAndTypesList tryGetFieldsCharacteristics(Int32 schema_id, const std::vector<Int32> & source_ids) const;
@@ -88,7 +94,7 @@ class IcebergSchemaProcessor
     Poco::JSON::Object::Ptr getIcebergTableSchemaById(Int32 id) const;
     bool hasClickhouseTableSchemaById(Int32 id) const;
 
-    static DataTypePtr getSimpleType(const String & type_name);
+    static DataTypePtr getSimpleType(const String & type_name, ContextPtr context_);
 
     static std::unordered_map<String, Int64> traverseSchema(Poco::JSON::Array::Ptr schema);
 
@@ -96,6 +102,8 @@ class IcebergSchemaProcessor
     Int32 getSchemaIdForSnapshot(Int64 snapshot_id) const;
     std::optional<Int32> tryGetSchemaIdForSnapshot(Int64 snapshot_id) const;
 
+    ColumnMapperPtr getColumnMapperById(Int32 id) const;
+
 private:
     std::unordered_map<Int32, Poco::JSON::Object::Ptr> iceberg_table_schemas_by_ids TSA_GUARDED_BY(mutex);
     std::unordered_map<Int32, std::shared_ptr<NamesAndTypesList>> clickhouse_table_schemas_by_ids TSA_GUARDED_BY(mutex);
@@ -106,10 +114,15 @@ class IcebergSchemaProcessor
     std::unordered_map<Int64, Int32> schema_id_by_snapshot TSA_GUARDED_BY(mutex);
 
     NamesAndTypesList getSchemaType(const Poco::JSON::Object::Ptr & schema);
-    DataTypePtr getComplexTypeFromObject(const Poco::JSON::Object::Ptr & type, String & current_full_name, bool is_subfield_of_root);
+    DataTypePtr getComplexTypeFromObject(
+        const Poco::JSON::Object::Ptr & type,
+        String & current_full_name,
+        ContextPtr context_,
+        bool is_subfield_of_root);
     DataTypePtr getFieldType(
         const Poco::JSON::Object::Ptr & field,
         const String & type_key,
+        ContextPtr context_,
         bool required,
         String & current_full_name = default_link,
         bool is_subfield_of_root = false);
@@ -118,7 +131,11 @@ class IcebergSchemaProcessor
     const Node * getDefaultNodeForField(const Poco::JSON::Object::Ptr & field);
 
     std::shared_ptr<ActionsDAG> getSchemaTransformationDag(
-        const Poco::JSON::Object::Ptr & old_schema, const Poco::JSON::Object::Ptr & new_schema, Int32 old_id, Int32 new_id);
+        const Poco::JSON::Object::Ptr & old_schema,
+        const Poco::JSON::Object::Ptr & new_schema,
+        ContextPtr context_,
+        Int32 old_id,
+        Int32 new_id);
 
     mutable SharedMutex mutex;
 };
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h
index ec1553b65212..f88838168639 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/Snapshot.h
@@ -17,6 +17,8 @@ struct IcebergDataSnapshot
     std::optional<size_t> total_rows;
     std::optional<size_t> total_bytes;
     std::optional<size_t> total_position_delete_rows;
+    std::optional<String> partition_key;
+    std::optional<String> sorting_key;
 
     std::optional<size_t> getTotalRows() const
     {
@@ -44,6 +46,7 @@ struct IcebergHistoryRecord
     Int64 parent_id;
     bool is_current_ancestor;
     String manifest_list_path;
+    String manifest_list_absolute_path;
 
     Int32 added_files = 0;
     Int32 added_records = 0;
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.cpp
index 4f6750c7d792..892503d126b0 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.cpp
@@ -43,6 +43,7 @@
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Utils.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h>
 #include <Storages/ObjectStorage/Utils.h>
+#include <Interpreters/IcebergMetadataLog.h>
 
 
 #include <Common/ProfileEvents.h>
@@ -59,6 +60,11 @@ extern const int LOGICAL_ERROR;
 extern const int BAD_ARGUMENTS;
 }
 
+namespace Setting
+{
+extern const SettingsIcebergMetadataLogLevel iceberg_metadata_log_level;
+}
+
 namespace Iceberg
 {
 Iceberg::ManifestFilePtr getManifestFile(
@@ -67,25 +73,34 @@ Iceberg::ManifestFilePtr getManifestFile(
     const PersistentTableComponents & persistent_table_components,
     ContextPtr local_context,
     LoggerPtr log,
-    const String & filename,
+    const String & absolute_path,
     Int64 inherited_sequence_number,
-    Int64 inherited_snapshot_id)
+    Int64 inherited_snapshot_id,
+    SecondaryStorages & secondary_storages)
 {
-    auto create_fn = [&]()
+    auto log_level = local_context->getSettingsRef()[Setting::iceberg_metadata_log_level].value;
+
+    bool use_iceberg_metadata_cache
+        = (persistent_table_components.metadata_cache && log_level < DB::IcebergMetadataLogLevel::ManifestFileMetadata);
+
+    auto create_fn = [&, use_iceberg_metadata_cache]()
     {
-        RelativePathWithMetadata manifest_object_info(filename);
+        auto [storage_to_use, resolved_key_in_storage] = resolveObjectStorageForPath(
+            persistent_table_components.table_location, absolute_path, object_storage, secondary_storages, local_context);
+
+        PathWithMetadata manifest_object_info(resolved_key_in_storage, std::nullopt, absolute_path, storage_to_use);
 
         auto read_settings = local_context->getReadSettings();
         /// Do not utilize filesystem cache if more precise cache enabled
-        if (persistent_table_components.metadata_cache)
+        if (use_iceberg_metadata_cache)
             read_settings.enable_filesystem_cache = false;
 
-        auto buffer = createReadBuffer(manifest_object_info, object_storage, local_context, log, read_settings);
-        Iceberg::AvroForIcebergDeserializer manifest_file_deserializer(std::move(buffer), filename, getFormatSettings(local_context));
+        auto buffer = createReadBuffer(manifest_object_info, storage_to_use, local_context, log, read_settings);
+        Iceberg::AvroForIcebergDeserializer manifest_file_deserializer(std::move(buffer), resolved_key_in_storage, getFormatSettings(local_context));
 
         return std::make_shared<Iceberg::ManifestFileContent>(
             manifest_file_deserializer,
-            filename,
+            resolved_key_in_storage,
             persistent_table_components.format_version,
             configuration->getPathForRead().path,
             *persistent_table_components.schema_processor,
@@ -93,13 +108,13 @@ Iceberg::ManifestFilePtr getManifestFile(
             inherited_snapshot_id,
             persistent_table_components.table_location,
             local_context,
-            filename);
+            absolute_path);
     };
 
-    if (persistent_table_components.metadata_cache)
+    if (use_iceberg_metadata_cache)
     {
         auto manifest_file = persistent_table_components.metadata_cache->getOrSetManifestFile(
-            IcebergMetadataFilesCache::getKey(configuration, filename), create_fn);
+            IcebergMetadataFilesCache::getKey(configuration, absolute_path), create_fn);
         return manifest_file;
     }
     return create_fn();
@@ -110,33 +125,48 @@ ManifestFileCacheKeys getManifestList(
     StorageObjectStorageConfigurationWeakPtr configuration,
     const PersistentTableComponents & persistent_table_components,
     ContextPtr local_context,
-    const String & filename,
+    const String & key_in_storage,
+    const String & absolute_path,
     LoggerPtr log)
 {
     auto configuration_ptr = configuration.lock();
     if (configuration_ptr == nullptr)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Configuration is expired");
 
-    auto create_fn = [&]()
+    IcebergMetadataLogLevel log_level = local_context->getSettingsRef()[Setting::iceberg_metadata_log_level].value;
+
+    bool use_iceberg_metadata_cache
+        = (persistent_table_components.metadata_cache && log_level < DB::IcebergMetadataLogLevel::ManifestListMetadata);
+
+    auto create_fn = [&, use_iceberg_metadata_cache]()
     {
-        StorageObjectStorage::ObjectInfo object_info(filename);
+        PathWithMetadata object_info(key_in_storage, std::nullopt, absolute_path, object_storage);
 
         auto read_settings = local_context->getReadSettings();
         /// Do not utilize filesystem cache if more precise cache enabled
-        if (persistent_table_components.metadata_cache)
+        if (use_iceberg_metadata_cache)
             read_settings.enable_filesystem_cache = false;
 
         auto manifest_list_buf = createReadBuffer(object_info, object_storage, local_context, log, read_settings);
-        AvroForIcebergDeserializer manifest_list_deserializer(std::move(manifest_list_buf), filename, getFormatSettings(local_context));
+        AvroForIcebergDeserializer manifest_list_deserializer(std::move(manifest_list_buf), key_in_storage, getFormatSettings(local_context));
 
         ManifestFileCacheKeys manifest_file_cache_keys;
 
+        auto dump_metadata = [&]()->String { return manifest_list_deserializer.getMetadataContent(); };
+        insertRowToLogTable(
+            local_context,
+            dump_metadata,
+            DB::IcebergMetadataLogLevel::ManifestListMetadata,
+            configuration_ptr->getRawPath().path,
+            key_in_storage,
+            std::nullopt,
+            std::nullopt);
+
         for (size_t i = 0; i < manifest_list_deserializer.rows(); ++i)
         {
             const std::string file_path
                 = manifest_list_deserializer.getValueFromRowByName(i, f_manifest_path, TypeIndex::String).safeGet<std::string>();
-            const auto manifest_file_name = getProperFilePathFromMetadataInfo(
-                file_path, configuration_ptr->getPathForRead().path, persistent_table_components.table_location);
+            const auto manifest_absolute_path = makeAbsolutePath(persistent_table_components.table_location, file_path);
             Int64 added_sequence_number = 0;
             auto added_snapshot_id = manifest_list_deserializer.getValueFromRowByName(i, f_added_snapshot_id);
             if (added_snapshot_id.isNull())
@@ -155,7 +185,17 @@ ManifestFileCacheKeys getManifestList(
                     manifest_list_deserializer.getValueFromRowByName(i, f_content, TypeIndex::Int32).safeGet<Int32>());
             }
             manifest_file_cache_keys.emplace_back(
-                manifest_file_name, added_sequence_number, added_snapshot_id.safeGet<Int64>(), content_type);
+                manifest_absolute_path, added_sequence_number, added_snapshot_id.safeGet<Int64>(), content_type);
+
+            auto dump_row_metadata = [&]()->String { return manifest_list_deserializer.getContent(i); };
+            insertRowToLogTable(
+                local_context,
+                dump_row_metadata,
+                DB::IcebergMetadataLogLevel::ManifestListEntry,
+                configuration_ptr->getRawPath().path,
+                absolute_path,
+                i,
+                std::nullopt);
         }
         /// We only return the list of {file name, seq number} for cache.
         /// Because ManifestList holds a list of ManifestFilePtr which consume much memory space.
@@ -164,9 +204,9 @@ ManifestFileCacheKeys getManifestList(
     };
 
     ManifestFileCacheKeys manifest_file_cache_keys;
-    if (persistent_table_components.metadata_cache)
+    if (use_iceberg_metadata_cache)
         manifest_file_cache_keys = persistent_table_components.metadata_cache->getOrSetManifestFileCacheKeys(
-            IcebergMetadataFilesCache::getKey(configuration_ptr, filename), create_fn);
+            IcebergMetadataFilesCache::getKey(configuration_ptr, absolute_path), create_fn);
     else
         manifest_file_cache_keys = create_fn();
     return manifest_file_cache_keys;
@@ -216,7 +256,6 @@ std::pair<Poco::JSON::Object::Ptr, Int32> parseTableSchemaV1Method(const Poco::J
     auto current_schema_id = schema->getValue<int>(f_schema_id);
     return {schema, current_schema_id};
 }
-
 }
 }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h
index 432409678312..26f17cbd2231 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.h
@@ -19,6 +19,7 @@
 
 #include <Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/PersistentTableComponents.h>
+#include <Storages/ObjectStorage/Utils.h>
 
 namespace DB::Iceberg
 {
@@ -29,9 +30,10 @@ Iceberg::ManifestFilePtr getManifestFile(
     const PersistentTableComponents & persistent_table_components,
     ContextPtr local_context,
     LoggerPtr log,
-    const String & filename,
+    const String & absolute_path,
     Int64 inherited_sequence_number,
-    Int64 inherited_snapshot_id);
+    Int64 inherited_snapshot_id,
+    SecondaryStorages & secondary_storages);
 
 
 ManifestFileCacheKeys getManifestList(
@@ -39,7 +41,8 @@ ManifestFileCacheKeys getManifestList(
     StorageObjectStorageConfigurationWeakPtr configuration,
     const PersistentTableComponents & persistent_table_components,
     ContextPtr local_context,
-    const String & filename,
+    const String & key_in_storage,
+    const String & absolute_path,
     LoggerPtr log);
 
 std::pair<Poco::JSON::Object::Ptr, Int32> parseTableSchemaV1Method(const Poco::JSON::Object::Ptr & metadata_object);
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.cpp
index 8bd324ba474c..435b65086f64 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.cpp
@@ -40,6 +40,8 @@
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
 #include <Storages/ObjectStorage/Utils.h>
 
+#include <Common/ElapsedTimeProfileEventIncrement.h>
+
 using namespace DB;
 
 
@@ -59,12 +61,14 @@ namespace DB::DataLakeStorageSetting
     extern const DataLakeStorageSettingsString iceberg_metadata_table_uuid;
     extern const DataLakeStorageSettingsBool iceberg_recent_metadata_file_by_last_updated_ms_field;
     extern const DataLakeStorageSettingsBool iceberg_use_version_hint;
-    extern const DataLakeStorageSettingsInt64 iceberg_format_version;
+    extern const DataLakeStorageSettingsNonZeroUInt64 iceberg_format_version;
 }
 
 namespace ProfileEvents
 {
     extern const Event IcebergVersionHintUsed;
+    extern const Event IcebergJsonFileParsing;
+    extern const Event IcebergJsonFileParsingMicroseconds;
 }
 
 namespace DB::Setting
@@ -74,7 +78,6 @@ namespace DB::Setting
 
 namespace DB::Iceberg
 {
-
 using namespace DB;
 
 void writeMessageToFile(
@@ -163,78 +166,6 @@ std::optional<TransformAndArgument> parseTransformAndArgument(const String & tra
     return std::nullopt;
 }
 
-// This function is used to get the file path inside the directory which corresponds to iceberg table from the full blob path which is written in manifest and metadata files.
-// For example, if the full blob path is s3://bucket/table_name/data/00000-1-1234567890.avro, the function will return table_name/data/00000-1-1234567890.avro
-// Common path should end with "<table_name>" or "<table_name>/".
-std::string getProperFilePathFromMetadataInfo(std::string_view data_path, std::string_view common_path, std::string_view table_location)
-{
-    auto trim_backward_slash = [](std::string_view str) -> std::string_view
-    {
-        if (str.ends_with('/'))
-        {
-            return str.substr(0, str.size() - 1);
-        }
-        return str;
-    };
-    auto trim_forward_slash = [](std::string_view str) -> std::string_view
-    {
-        if (str.starts_with('/'))
-        {
-            return str.substr(1);
-        }
-        return str;
-    };
-    common_path = trim_backward_slash(common_path);
-    table_location = trim_backward_slash(table_location);
-
-    if (data_path.starts_with(table_location) && table_location.ends_with(common_path))
-    {
-        return std::filesystem::path{common_path} / trim_forward_slash(data_path.substr(table_location.size()));
-    }
-
-
-    auto pos = data_path.find(common_path);
-    /// Valid situation when data and metadata files are stored in different directories.
-    if (pos == std::string::npos)
-    {
-        /// connection://bucket
-        auto prefix = table_location.substr(0, table_location.size() - common_path.size());
-        return std::string{data_path.substr(prefix.size())};
-    }
-
-    size_t good_pos = std::string::npos;
-    while (pos != std::string::npos)
-    {
-        auto potential_position = pos + common_path.size();
-        if ((std::string_view(data_path.data() + potential_position, 6) == "/data/")
-            || (std::string_view(data_path.data() + potential_position, 10) == "/metadata/"))
-        {
-            good_pos = pos;
-            break;
-        }
-        size_t new_pos = data_path.find(common_path, pos + 1);
-        if (new_pos == std::string::npos)
-        {
-            break;
-        }
-        pos = new_pos;
-    }
-
-
-    if (good_pos != std::string::npos)
-    {
-        return std::string{data_path.substr(good_pos)};
-    }
-    else if (pos != std::string::npos)
-    {
-        return std::string{data_path.substr(pos)};
-    }
-    else
-    {
-        throw ::DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Expected to find '{}' in data path: '{}'", common_path, data_path);
-    }
-}
-
 enum class MostRecentMetadataFileSelectionWay
 {
     BY_LAST_UPDATED_MS_FIELD,
@@ -293,6 +224,9 @@ Poco::JSON::Object::Ptr getMetadataJSONObject(
         return json_str;
     };
 
+    ProfileEvents::increment(ProfileEvents::IcebergJsonFileParsing);
+    ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::IcebergJsonFileParsingMicroseconds);
+
     String metadata_json_str;
     if (cache_ptr)
         metadata_json_str = cache_ptr->getOrSetTableMetadata(IcebergMetadataFilesCache::getKey(configuration_ptr, metadata_file_path), create_fn);
@@ -496,11 +430,15 @@ Poco::JSON::Object::Ptr getPartitionField(
     }
     else if (partition_function->name == "icebergTruncate")
     {
+        if (!param.has_value())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "TRUNCATE function for iceberg partitioning requires one integer parameter");
         result->set(Iceberg::f_transform, fmt::format("truncate[{}]", *param));
         return result;
     }
     else if (partition_function->name == "icebergBucket")
     {
+        if (!param.has_value())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "BUCKET function for iceberg partitioning requires one integer parameter");
         result->set(Iceberg::f_transform, fmt::format("bucket[{}]", *param));
         return result;
     }
@@ -695,6 +633,22 @@ MetadataFileWithInfo getLatestMetadataFileAndVersion(
         }
     }
 
+    if (metadata_files_with_versions.empty())
+    {
+        if (table_uuid.has_value())
+        {
+            throw Exception(
+                ErrorCodes::FILE_DOESNT_EXIST,
+                "The metadata file for Iceberg table with path {} and table UUID {} doesn't exist",
+                configuration_ptr->getPathForRead().path,
+                table_uuid.value());
+        }
+        throw Exception(
+            ErrorCodes::FILE_DOESNT_EXIST,
+            "The metadata file for Iceberg table with path {} doesn't exist",
+            configuration_ptr->getPathForRead().path);
+    }
+
     /// Get the latest version of metadata file: v<V>.metadata.json
     const ShortMetadataFileInfo & latest_metadata_file_info = [&]()
     {
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h b/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h
index 52c2b19b049d..a1b559b05810 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h
@@ -1,7 +1,10 @@
 #pragma once
 
+
+#include <Interpreters/Context_fwd.h>
 #include "config.h"
 
+#include <map>
 #include <string>
 #include <string_view>
 
@@ -31,8 +34,6 @@ void writeMessageToFile(
     std::function<void()> cleanup,
     DB::CompressionMethod compression_method = DB::CompressionMethod::None);
 
-std::string getProperFilePathFromMetadataInfo(std::string_view data_path, std::string_view common_path, std::string_view table_location);
-
 struct TransformAndArgument
 {
     String transform_name;
diff --git a/src/Storages/ObjectStorage/HDFS/Configuration.cpp b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
index 94548f845b85..dec6cf52ff8e 100644
--- a/src/Storages/ObjectStorage/HDFS/Configuration.cpp
+++ b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
@@ -41,7 +41,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void StorageHDFSConfiguration::check(ContextPtr context) const
+void StorageHDFSConfiguration::check(ContextPtr context)
 {
     context->getRemoteHostFilter().checkURL(Poco::URI(url));
     checkHDFSURL(fs::path(url) / path.path.substr(1));
@@ -92,23 +92,23 @@ void StorageHDFSConfiguration::fromAST(ASTs & args, ContextPtr context, bool wit
 
     if (args.size() > 1)
     {
-        format = checkAndGetLiteralArgument<String>(args[1], "format_name");
+        setFormat(checkAndGetLiteralArgument<String>(args[1], "format_name"));
     }
 
     if (with_structure)
     {
         if (args.size() > 2)
         {
-            structure = checkAndGetLiteralArgument<String>(args[2], "structure");
+            setStructure(checkAndGetLiteralArgument<String>(args[2], "structure"));
         }
         if (args.size() > 3)
         {
-            compression_method = checkAndGetLiteralArgument<String>(args[3], "compression_method");
+            setCompressionMethod(checkAndGetLiteralArgument<String>(args[3], "compression_method"));
         }
     }
     else if (args.size() > 2)
     {
-        compression_method = checkAndGetLiteralArgument<String>(args[2], "compression_method");
+        setCompressionMethod(checkAndGetLiteralArgument<String>(args[2], "compression_method"));
     }
 
     setURL(url_str);
@@ -124,10 +124,10 @@ void StorageHDFSConfiguration::fromNamedCollection(const NamedCollection & colle
     else
         url_str = collection.get<String>("url");
 
-    format = collection.getOrDefault<String>("format", "auto");
-    compression_method = collection.getOrDefault<String>("compression_method",
-                                                         collection.getOrDefault<String>("compression", "auto"));
-    structure = collection.getOrDefault<String>("structure", "auto");
+    setFormat(collection.getOrDefault<String>("format", "auto"));
+    setCompressionMethod(collection.getOrDefault<String>("compression_method",
+                                                         collection.getOrDefault<String>("compression", "auto")));
+    setStructure(collection.getOrDefault<String>("structure", "auto"));
 
     setURL(url_str);
 }
@@ -217,6 +217,13 @@ void StorageHDFSConfiguration::addStructureAndFormatToArgsIfNeeded(
     }
 }
 
+ASTPtr StorageHDFSConfiguration::createArgsWithAccessData() const
+{
+    auto arguments = std::make_shared<ASTExpressionList>();
+    arguments->children.push_back(std::make_shared<ASTLiteral>(url + path.path));
+    return arguments;
+}
+
 }
 
 #endif
diff --git a/src/Storages/ObjectStorage/HDFS/Configuration.h b/src/Storages/ObjectStorage/HDFS/Configuration.h
index 65ea6082675b..7bc1dcbe2a44 100644
--- a/src/Storages/ObjectStorage/HDFS/Configuration.h
+++ b/src/Storages/ObjectStorage/HDFS/Configuration.h
@@ -58,7 +58,7 @@ class StorageHDFSConfiguration : public StorageObjectStorageConfiguration
     String getDataSourceDescription() const override { return url; }
     StorageObjectStorageQuerySettings getQuerySettings(const ContextPtr &) const override;
 
-    void check(ContextPtr context) const override;
+    void check(ContextPtr context) override;
 
     ObjectStoragePtr createObjectStorage(ContextPtr context, bool is_readonly) override;
 
@@ -69,6 +69,8 @@ class StorageHDFSConfiguration : public StorageObjectStorageConfiguration
         ContextPtr context,
         bool with_structure) override;
 
+    ASTPtr createArgsWithAccessData() const override;
+
 private:
     void fromNamedCollection(const NamedCollection &, ContextPtr context) override;
     void fromAST(ASTs & args, ContextPtr, bool /* with_structure */) override;
diff --git a/src/Storages/ObjectStorage/IObjectIterator.cpp b/src/Storages/ObjectStorage/IObjectIterator.cpp
index cea5d709b5ca..08714909e63d 100644
--- a/src/Storages/ObjectStorage/IObjectIterator.cpp
+++ b/src/Storages/ObjectStorage/IObjectIterator.cpp
@@ -1,10 +1,23 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/ObjectStorage/IObjectIterator.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Formats/FormatFactory.h>
+#include <Interpreters/Context.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <IO/ReadBufferFromFileBase.h>
+#include <Core/Settings.h>
+#include <Core/Defines.h>
+#include <Storages/ObjectStorage/Utils.h>
+#include <Processors/Formats/IInputFormat.h>
 
 namespace DB
 {
 
+namespace Setting
+{
+    extern const SettingsUInt64 cluster_table_function_buckets_batch_size;
+}
+
 static ExpressionActionsPtr getExpressionActions(
     const DB::ActionsDAG & filter_,
     const NamesAndTypesList & virtual_columns_,
@@ -63,4 +76,52 @@ ObjectInfoPtr ObjectIteratorWithPathAndFileFilter::next(size_t id)
     return {};
 }
 
+ObjectIteratorSplitByBuckets::ObjectIteratorSplitByBuckets(
+    ObjectIterator iterator_,
+    const String & format_,
+    ObjectStoragePtr object_storage_,
+    const ContextPtr & context_)
+    : WithContext(context_)
+    , iterator(iterator_)
+    , format(format_)
+    , object_storage(object_storage_)
+    , format_settings(getFormatSettings(context_))
+{
+}
+
+ObjectInfoPtr ObjectIteratorSplitByBuckets::next(size_t id)
+{
+    if (!pending_objects_info.empty())
+    {
+        auto result = pending_objects_info.front();
+        pending_objects_info.pop();
+        return result;
+    }
+    auto last_object_info = iterator->next(id);
+    if (!last_object_info)
+        return {};
+
+    auto splitter = FormatFactory::instance().getSplitter(format);
+    /// If there's no splitter for this format (e.g., CSV in archives), return the object as-is
+    if (!splitter)
+        return last_object_info;
+
+    auto buffer = createReadBuffer(*last_object_info, object_storage, getContext(), log);
+    size_t bucket_size = getContext()->getSettingsRef()[Setting::cluster_table_function_buckets_batch_size];
+    auto file_bucket_info = splitter->splitToBuckets(bucket_size, *buffer, format_settings);
+    for (const auto & file_bucket : file_bucket_info)
+    {
+        auto copy_object_info = *last_object_info;
+        copy_object_info.file_bucket_info = file_bucket;
+        pending_objects_info.push(std::make_shared<ObjectInfo>(copy_object_info));
+    }
+
+    if (pending_objects_info.empty())
+        return last_object_info;
+
+    auto result = pending_objects_info.front();
+    pending_objects_info.pop();
+    return result;
+}
+
 }
diff --git a/src/Storages/ObjectStorage/IObjectIterator.h b/src/Storages/ObjectStorage/IObjectIterator.h
index 76358ea44dfc..47e603a36dc8 100644
--- a/src/Storages/ObjectStorage/IObjectIterator.h
+++ b/src/Storages/ObjectStorage/IObjectIterator.h
@@ -1,12 +1,18 @@
 #pragma once
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Processors/ISimpleTransform.h>
+#include <Storages/ObjectStorage/StorageObjectStorageConfiguration.h>
+#include <Common/Logger.h>
+#include <Common/Macros.h>
+#include <Formats/FormatSettings.h>
 
 namespace DB
 {
 
-using ObjectInfo = RelativePathWithMetadata;
-using ObjectInfoPtr = std::shared_ptr<RelativePathWithMetadata>;
+using ObjectInfo = PathWithMetadata;
+using ObjectInfoPtr = std::shared_ptr<PathWithMetadata>;
+using ObjectInfos = std::vector<ObjectInfoPtr>;
+
 class ExpressionActions;
 
 struct IObjectIterator
@@ -15,6 +21,7 @@ struct IObjectIterator
     virtual ObjectInfoPtr next(size_t) = 0;
     virtual size_t estimatedKeysCount() = 0;
     virtual std::optional<UInt64> getSnapshotVersion() const { return std::nullopt; }
+    virtual bool has_concurrent_next() const { return false; }
 };
 
 using ObjectIterator = std::shared_ptr<IObjectIterator>;
@@ -41,4 +48,29 @@ class ObjectIteratorWithPathAndFileFilter : public IObjectIterator, private With
     const NamesAndTypesList hive_partition_columns;
     const std::shared_ptr<ExpressionActions> filter_actions;
 };
+
+class ObjectIteratorSplitByBuckets : public IObjectIterator, private WithContext
+{
+public:
+    ObjectIteratorSplitByBuckets(
+        ObjectIterator iterator_,
+        const String & format_,
+        ObjectStoragePtr object_storage_,
+        const ContextPtr & context_);
+
+    ObjectInfoPtr next(size_t) override;
+    size_t estimatedKeysCount() override { return iterator->estimatedKeysCount(); }
+    std::optional<UInt64> getSnapshotVersion() const override { return iterator->getSnapshotVersion(); }
+
+private:
+    const ObjectIterator iterator;
+    String format;
+    ObjectStoragePtr object_storage;
+    FormatSettings format_settings;
+
+    std::queue<ObjectInfoPtr> pending_objects_info;
+    const LoggerPtr log = getLogger("GlobIterator");
+};
+
+
 }
diff --git a/src/Storages/ObjectStorage/Local/Configuration.cpp b/src/Storages/ObjectStorage/Local/Configuration.cpp
index 870c3c383c0d..58eeac06b0e2 100644
--- a/src/Storages/ObjectStorage/Local/Configuration.cpp
+++ b/src/Storages/ObjectStorage/Local/Configuration.cpp
@@ -24,9 +24,9 @@ extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 void StorageLocalConfiguration::fromNamedCollection(const NamedCollection & collection, ContextPtr)
 {
     path = collection.get<String>("path");
-    format = collection.getOrDefault<String>("format", "auto");
-    compression_method = collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto"));
-    structure = collection.getOrDefault<String>("structure", "auto");
+    setFormat(collection.getOrDefault<String>("format", "auto"));
+    setCompressionMethod(collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto")));
+    setStructure(collection.getOrDefault<String>("structure", "auto"));
     paths = {path};
 }
 
@@ -46,23 +46,23 @@ void StorageLocalConfiguration::fromAST(ASTs & args, ContextPtr context, bool wi
 
     if (args.size() > 1)
     {
-        format = checkAndGetLiteralArgument<String>(args[1], "format_name");
+        setFormat(checkAndGetLiteralArgument<String>(args[1], "format_name"));
     }
 
     if (with_structure)
     {
         if (args.size() > 2)
         {
-            structure = checkAndGetLiteralArgument<String>(args[2], "structure");
+            setStructure(checkAndGetLiteralArgument<String>(args[2], "structure"));
         }
         if (args.size() > 3)
         {
-            compression_method = checkAndGetLiteralArgument<String>(args[3], "compression_method");
+            setCompressionMethod(checkAndGetLiteralArgument<String>(args[3], "compression_method"));
         }
     }
     else if (args.size() > 2)
     {
-        compression_method = checkAndGetLiteralArgument<String>(args[2], "compression_method");
+        setCompressionMethod(checkAndGetLiteralArgument<String>(args[2], "compression_method"));
     }
     paths = {path};
 }
@@ -81,4 +81,20 @@ StorageObjectStorageQuerySettings StorageLocalConfiguration::getQuerySettings(co
         .ignore_non_existent_file = false};
 }
 
+ASTPtr StorageLocalConfiguration::createArgsWithAccessData() const
+{
+    auto arguments = std::make_shared<ASTExpressionList>();
+
+    arguments->children.push_back(std::make_shared<ASTLiteral>(path.path));
+    if (getFormat() != "auto")
+        arguments->children.push_back(std::make_shared<ASTLiteral>(getFormat()));
+    if (getStructure() != "auto")
+        arguments->children.push_back(std::make_shared<ASTLiteral>(getStructure()));
+    if (getCompressionMethod() != "auto")
+        arguments->children.push_back(std::make_shared<ASTLiteral>(getCompressionMethod()));
+
+    return arguments;
+}
+
+
 }
diff --git a/src/Storages/ObjectStorage/Local/Configuration.h b/src/Storages/ObjectStorage/Local/Configuration.h
index 231e33f84d35..207d297147c1 100644
--- a/src/Storages/ObjectStorage/Local/Configuration.h
+++ b/src/Storages/ObjectStorage/Local/Configuration.h
@@ -60,6 +60,8 @@ class StorageLocalConfiguration : public StorageObjectStorageConfiguration
 
     void addStructureAndFormatToArgsIfNeeded(ASTs &, const String &, const String &, ContextPtr, bool) override { }
 
+    ASTPtr createArgsWithAccessData() const override;
+
 private:
     void fromNamedCollection(const NamedCollection & collection, ContextPtr context) override;
     void fromAST(ASTs & args, ContextPtr context, bool with_structure) override;
diff --git a/src/Storages/ObjectStorage/MultiFileStorageObjectStorageSink.cpp b/src/Storages/ObjectStorage/MultiFileStorageObjectStorageSink.cpp
new file mode 100644
index 000000000000..815e1c804eac
--- /dev/null
+++ b/src/Storages/ObjectStorage/MultiFileStorageObjectStorageSink.cpp
@@ -0,0 +1,146 @@
+#include <Storages/ObjectStorage/MultiFileStorageObjectStorageSink.h>
+#include <Interpreters/Context.h>
+#include <Common/logger_useful.h>
+#include <filesystem>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FILE_ALREADY_EXISTS;
+}
+
+MultiFileStorageObjectStorageSink::MultiFileStorageObjectStorageSink(
+    const std::string & base_path_,
+    const String & transaction_id_,
+    ObjectStoragePtr object_storage_,
+    StorageObjectStorageConfigurationPtr configuration_,
+    std::size_t max_bytes_per_file_,
+    std::size_t max_rows_per_file_,
+    bool overwrite_if_exists_,
+    const std::function<void(const std::string &)> & new_file_path_callback_,
+    const std::optional<FormatSettings> & format_settings_,
+    SharedHeader sample_block_,
+    ContextPtr context_)
+    : SinkToStorage(sample_block_),
+    base_path(base_path_),
+    transaction_id(transaction_id_),
+    object_storage(object_storage_),
+    configuration(configuration_),
+    max_bytes_per_file(max_bytes_per_file_),
+    max_rows_per_file(max_rows_per_file_),
+    overwrite_if_exists(overwrite_if_exists_),
+    new_file_path_callback(new_file_path_callback_),
+    format_settings(format_settings_),
+    sample_block(sample_block_),
+    context(context_)
+{
+    current_sink = createNewSink();
+}
+
+MultiFileStorageObjectStorageSink::~MultiFileStorageObjectStorageSink()
+{
+    if (isCancelled())
+        current_sink->cancel();
+}
+
+/// Adds a counter that represents file index to the file path.
+/// Example:
+/// Input is  `table_root/year=2025/month=12/day=12/file.parquet`
+/// Output is `table_root/year=2025/month=12/day=12/file.1.parquet`
+std::string MultiFileStorageObjectStorageSink::generateNewFilePath()
+{
+    const auto file_format = Poco::toLower(configuration->getFormat());
+    const auto index_string = std::to_string(file_paths.size() + 1);
+    std::size_t pos = base_path.rfind(file_format);
+
+    /// normal case - path ends with the file format
+    if (pos != std::string::npos)
+    {
+        const auto path_without_extension = base_path.substr(0, pos);
+        const auto file_format_extension = "." + file_format;
+
+        return path_without_extension + index_string + file_format_extension;
+    }
+
+    /// if no extension is found, just append the index - I am not even sure this is possible
+    return base_path + "." + index_string;
+}
+
+std::shared_ptr<StorageObjectStorageSink> MultiFileStorageObjectStorageSink::createNewSink()
+{
+    auto new_path = generateNewFilePath();
+
+    /// todo
+    /// sounds like bad design, but callers might decide to ignore the exception, and if we throw it before the callback
+    /// they will not be able to grab the file path.
+    /// maybe I should consider moving the file already exists policy in here?
+    new_file_path_callback(new_path);
+
+    file_paths.emplace_back(std::move(new_path));
+
+    if (!overwrite_if_exists && object_storage->exists(StoredObject(file_paths.back())))
+    {
+        throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "File {} already exists", file_paths.back());
+    }
+
+    return std::make_shared<StorageObjectStorageSink>(file_paths.back(), object_storage, configuration, format_settings, sample_block, context);
+}
+
+void MultiFileStorageObjectStorageSink::consume(Chunk & chunk)
+{
+    if (isCancelled())
+    {
+        current_sink->cancel();
+        return;
+    }
+
+    const auto written_bytes = current_sink->getWrittenBytes();
+    
+    const bool exceeded_bytes_limit = max_bytes_per_file && written_bytes >= max_bytes_per_file;
+    const bool exceeded_rows_limit = max_rows_per_file && current_sink_written_rows >= max_rows_per_file;
+
+    if (exceeded_bytes_limit || exceeded_rows_limit)
+    {
+        current_sink->onFinish();
+        current_sink = createNewSink();
+        current_sink_written_rows = 0;
+    }
+
+    current_sink->consume(chunk);
+    current_sink_written_rows += chunk.getNumRows();
+}
+
+void MultiFileStorageObjectStorageSink::onFinish()
+{
+    current_sink->onFinish();
+    commit();
+}
+
+void MultiFileStorageObjectStorageSink::commit()
+{
+    /// the commit file path should be in the same directory as the data files
+    const auto commit_file_path = fs::path(base_path).parent_path() / ("commit_" + transaction_id);
+
+    if (!overwrite_if_exists && object_storage->exists(StoredObject(commit_file_path)))
+    {
+        throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Commit file {} already exists, aborting {} export", commit_file_path, transaction_id);
+    }
+
+    auto out = object_storage->writeObject(
+        StoredObject(commit_file_path), 
+        WriteMode::Rewrite, /* attributes= */
+        {}, DBMS_DEFAULT_BUFFER_SIZE,
+        context->getWriteSettings());
+
+    for (const auto & p : file_paths)
+    {
+        out->write(p.data(), p.size());
+        out->write("\n", 1);
+    }
+
+    out->finalize();
+}
+
+}
diff --git a/src/Storages/ObjectStorage/MultiFileStorageObjectStorageSink.h b/src/Storages/ObjectStorage/MultiFileStorageObjectStorageSink.h
new file mode 100644
index 000000000000..51f6b8094232
--- /dev/null
+++ b/src/Storages/ObjectStorage/MultiFileStorageObjectStorageSink.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <Storages/ObjectStorage/StorageObjectStorageSink.h>
+
+namespace DB
+{
+
+/// This is useful when the data is too large to fit into a single file.
+/// It will create a new file when the current file exceeds the max bytes or max rows limit.
+/// Ships a commit file including the list of data files to make it transactional
+class MultiFileStorageObjectStorageSink : public SinkToStorage
+{
+public:
+    MultiFileStorageObjectStorageSink(
+        const std::string & base_path_,
+        const String & transaction_id_,
+        ObjectStoragePtr object_storage_,
+        StorageObjectStorageConfigurationPtr configuration_,
+        std::size_t max_bytes_per_file_,
+        std::size_t max_rows_per_file_,
+        bool overwrite_if_exists_,
+        const std::function<void(const std::string &)> & new_file_path_callback_,
+        const std::optional<FormatSettings> & format_settings_,
+        SharedHeader sample_block_,
+        ContextPtr context_);
+
+    ~MultiFileStorageObjectStorageSink() override;
+
+    void consume(Chunk & chunk) override;
+
+    void onFinish() override;
+
+    String getName() const override { return "MultiFileStorageObjectStorageSink"; }
+
+private:
+    const std::string base_path;
+    const String transaction_id;
+    ObjectStoragePtr object_storage;
+    StorageObjectStorageConfigurationPtr configuration;
+    std::size_t max_bytes_per_file;
+    std::size_t max_rows_per_file;
+    bool overwrite_if_exists;
+    std::function<void(const std::string &)> new_file_path_callback;
+    const std::optional<FormatSettings> format_settings;
+    SharedHeader sample_block;
+    ContextPtr context;
+    
+    std::vector<std::string> file_paths;
+    std::shared_ptr<StorageObjectStorageSink> current_sink;
+    std::size_t current_sink_written_rows = 0;
+
+    std::string generateNewFilePath();
+    std::shared_ptr<StorageObjectStorageSink> createNewSink();
+    void commit();
+};
+
+}
diff --git a/src/Storages/ObjectStorage/ObjectStorageFilePathGenerator.h b/src/Storages/ObjectStorage/ObjectStorageFilePathGenerator.h
new file mode 100644
index 000000000000..a1f21dc502d5
--- /dev/null
+++ b/src/Storages/ObjectStorage/ObjectStorageFilePathGenerator.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <string>
+#include <Storages/PartitionedSink.h>
+#include <Poco/String.h>
+#include <Functions/generateSnowflakeID.h>
+#include <boost/algorithm/string/replace.hpp>
+
+namespace DB
+{
+    struct ObjectStorageFilePathGenerator
+    {
+        virtual ~ObjectStorageFilePathGenerator() = default;
+        std::string getPathForWrite(const std::string & partition_id) const { 
+            return getPathForWrite(partition_id, "");
+        }
+        virtual std::string getPathForWrite(const std::string & partition_id, const std::string & /* file_name_override */) const = 0;
+        virtual std::string getPathForRead() const = 0;
+    };
+
+    struct ObjectStorageWildcardFilePathGenerator : ObjectStorageFilePathGenerator
+    {
+        static constexpr const char * FILE_WILDCARD = "{_file}";
+        explicit ObjectStorageWildcardFilePathGenerator(const std::string & raw_path_) : raw_path(raw_path_) {}
+
+        using ObjectStorageFilePathGenerator::getPathForWrite;  // Bring base class overloads into scope
+        std::string getPathForWrite(const std::string & partition_id, const std::string & file_name_override) const override
+        {
+            const auto partition_replaced_path = PartitionedSink::replaceWildcards(raw_path, partition_id);
+            const auto final_path = boost::replace_all_copy(partition_replaced_path, FILE_WILDCARD, file_name_override);
+            return final_path;
+        }
+
+        std::string getPathForRead() const override
+        {
+            return raw_path;
+        }
+
+    private:
+        std::string raw_path;
+
+    };
+
+    struct ObjectStorageAppendFilePathGenerator : ObjectStorageFilePathGenerator
+    {
+        explicit ObjectStorageAppendFilePathGenerator(
+            const std::string & raw_path_,
+            const std::string & file_format_)
+        : raw_path(raw_path_), file_format(Poco::toLower(file_format_)){}
+
+        using ObjectStorageFilePathGenerator::getPathForWrite;  // Bring base class overloads into scope
+        std::string getPathForWrite(const std::string & partition_id, const std::string & file_name_override) const override
+        {
+            std::string result;
+
+            result += raw_path;
+
+            if (!result.empty() && result.back() != '/')
+            {
+                result += "/";
+            }
+
+            /// Not adding '/' because buildExpressionHive() always adds a trailing '/'
+            result += partition_id;
+
+            const auto file_name = file_name_override.empty() ? std::to_string(generateSnowflakeID()) : file_name_override;
+
+            result += file_name + "." + file_format;
+
+            return result;
+        }
+
+        std::string getPathForRead() const override
+        {
+            return raw_path + "**." + file_format;
+        }
+
+    private:
+        std::string raw_path;
+        std::string file_format;
+    };
+
+}
diff --git a/src/Storages/ObjectStorage/ReadBufferIterator.cpp b/src/Storages/ObjectStorage/ReadBufferIterator.cpp
index 31089036abe0..c423a8851ca6 100644
--- a/src/Storages/ObjectStorage/ReadBufferIterator.cpp
+++ b/src/Storages/ObjectStorage/ReadBufferIterator.cpp
@@ -7,7 +7,6 @@
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
 #include <Storages/ObjectStorage/Utils.h>
 
-
 namespace DB
 {
 namespace Setting
@@ -40,8 +39,8 @@ ReadBufferIterator::ReadBufferIterator(
     , read_keys(read_keys_)
     , prev_read_keys_size(read_keys_.size())
 {
-    if (configuration->format != "auto")
-        format = configuration->format;
+    if (configuration->getFormat() != "auto")
+        format = configuration->getFormat();
 }
 
 SchemaCache::Key ReadBufferIterator::getKeyForSchemaCache(const ObjectInfo & object_info, const String & format_name) const
@@ -76,10 +75,7 @@ std::optional<ColumnsDescription> ReadBufferIterator::tryGetColumnsFromCache(
         const auto & object_info = (*it);
         auto get_last_mod_time = [&] -> std::optional<time_t>
         {
-            const auto & path = object_info->isArchive() ? object_info->getPathToArchive() : object_info->getPath();
-            if (!object_info->metadata)
-                object_info->metadata = object_storage->tryGetObjectMetadata(path);
-
+            object_info->loadMetadata(object_storage);
             return object_info->metadata
                 ? std::optional<time_t>(object_info->metadata->last_modified.epochTime())
                 : std::nullopt;
@@ -119,20 +115,8 @@ void ReadBufferIterator::setNumRowsToLastFile(size_t num_rows)
 
 void ReadBufferIterator::setSchemaToLastFile(const ColumnsDescription & columns)
 {
-    if (query_settings.schema_inference_use_cache
-        && query_settings.schema_inference_mode == SchemaInferenceMode::UNION)
-    {
+    if (query_settings.schema_inference_use_cache)
         schema_cache.addColumns(getKeyForSchemaCache(*current_object_info, *format), columns);
-    }
-}
-
-void ReadBufferIterator::setResultingSchema(const ColumnsDescription & columns)
-{
-    if (query_settings.schema_inference_use_cache
-        && query_settings.schema_inference_mode == SchemaInferenceMode::DEFAULT)
-    {
-        schema_cache.addManyColumns(getKeysForSchemaCache(), columns);
-    }
 }
 
 void ReadBufferIterator::setFormatName(const String & format_name)
@@ -151,10 +135,9 @@ std::unique_ptr<ReadBuffer> ReadBufferIterator::recreateLastReadBuffer()
 {
     auto context = getContext();
 
-    const auto & path = current_object_info->isArchive() ? current_object_info->getPathToArchive() : current_object_info->getPath();
     auto impl = createReadBuffer(*current_object_info, object_storage, context, getLogger("ReadBufferIterator"));
 
-    const auto compression_method = chooseCompressionMethod(current_object_info->getFileName(), configuration->compression_method);
+    const auto compression_method = chooseCompressionMethod(current_object_info->getFileName(), configuration->getCompressionMethod());
     const auto zstd_window = static_cast<int>(context->getSettingsRef()[Setting::zstd_window_log_max]);
 
     return wrapReadBufferWithCompressionMethod(std::move(impl), compression_method, zstd_window);
@@ -250,6 +233,8 @@ ReadBufferIterator::Data ReadBufferIterator::next()
             prev_read_keys_size = read_keys.size();
         }
 
+        current_object_info->loadMetadata(object_storage);
+
         if (query_settings.skip_empty_files
             && current_object_info->metadata && current_object_info->metadata->size_bytes == 0)
             continue;
@@ -270,13 +255,13 @@ ReadBufferIterator::Data ReadBufferIterator::next()
         using ObjectInfoInArchive = StorageObjectStorageSource::ArchiveIterator::ObjectInfoInArchive;
         if (const auto * object_info_in_archive = dynamic_cast<const ObjectInfoInArchive *>(current_object_info.get()))
         {
-            compression_method = chooseCompressionMethod(filename, configuration->compression_method);
+            compression_method = chooseCompressionMethod(filename, configuration->getCompressionMethod());
             const auto & archive_reader = object_info_in_archive->archive_reader;
             read_buf = archive_reader->readFile(object_info_in_archive->path_in_archive, /*throw_on_not_found=*/true);
         }
         else
         {
-            compression_method = chooseCompressionMethod(filename, configuration->compression_method);
+            compression_method = chooseCompressionMethod(filename, configuration->getCompressionMethod());
             read_buf = createReadBuffer(*current_object_info, object_storage, getContext(), getLogger("ReadBufferIterator"));
         }
 
diff --git a/src/Storages/ObjectStorage/ReadBufferIterator.h b/src/Storages/ObjectStorage/ReadBufferIterator.h
index e14aef3863af..197edee955dd 100644
--- a/src/Storages/ObjectStorage/ReadBufferIterator.h
+++ b/src/Storages/ObjectStorage/ReadBufferIterator.h
@@ -27,8 +27,6 @@ class ReadBufferIterator : public IReadBufferIterator, WithContext
 
     void setSchemaToLastFile(const ColumnsDescription & columns) override;
 
-    void setResultingSchema(const ColumnsDescription & columns) override;
-
     String getLastFilePath() const override;
 
     void setFormatName(const String & format_name) override;
diff --git a/src/Storages/ObjectStorage/S3/Configuration.cpp b/src/Storages/ObjectStorage/S3/Configuration.cpp
index decdbe718822..1c4edefca767 100644
--- a/src/Storages/ObjectStorage/S3/Configuration.cpp
+++ b/src/Storages/ObjectStorage/S3/Configuration.cpp
@@ -92,6 +92,7 @@ static const std::unordered_set<std::string_view> optional_configuration_keys =
     "no_sign_request",
     "partition_strategy",
     "partition_columns_in_data_file",
+    "storage_type",
     /// Private configuration options
     "role_arn", /// for extra_credentials
     "role_session_name", /// for extra_credentials
@@ -114,11 +115,11 @@ std::string StorageS3Configuration::getPathInArchive() const
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Path {} is not an archive", getRawPath().path);
 }
 
-void StorageS3Configuration::check(ContextPtr context) const
+void StorageS3Configuration::check(ContextPtr context)
 {
     validateNamespace(url.bucket);
     context->getGlobalContext()->getRemoteHostFilter().checkURL(url.uri);
-    context->getGlobalContext()->getHTTPHeaderFilter().checkHeaders(headers_from_ast);
+    context->getGlobalContext()->getHTTPHeaderFilter().checkAndNormalizeHeaders(headers_from_ast);
     StorageObjectStorageConfiguration::check(context);
 }
 
@@ -205,10 +206,10 @@ void StorageS3Configuration::fromNamedCollection(const NamedCollection & collect
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Partition strategy {} is not supported", partition_strategy_name);
         }
 
-        partition_strategy_type = partition_strategy_type_opt.value();
+        setPartitionStrategyType(partition_strategy_type_opt.value());
     }
 
-    partition_columns_in_data_file = collection.getOrDefault<bool>("partition_columns_in_data_file", partition_strategy_type != PartitionStrategyFactory::StrategyType::HIVE);
+    setPartitionColumnsInDataFile(collection.getOrDefault<bool>("partition_columns_in_data_file", getPartitionStrategyType() != PartitionStrategyFactory::StrategyType::HIVE));
     s3_settings->auth_settings[S3AuthSetting::role_arn] = collection.getOrDefault<String>("role_arn", "");
     s3_settings->auth_settings[S3AuthSetting::role_session_name] = collection.getOrDefault<String>("role_session_name", "");
 
@@ -217,9 +218,9 @@ void StorageS3Configuration::fromNamedCollection(const NamedCollection & collect
     s3_settings->auth_settings[S3AuthSetting::metadata_service] = collection.getOrDefault<String>("metadata_service", "");
     s3_settings->auth_settings[S3AuthSetting::request_token_path] = collection.getOrDefault<String>("request_token_path", "");
 
-    format = collection.getOrDefault<String>("format", format);
-    compression_method = collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto"));
-    structure = collection.getOrDefault<String>("structure", "auto");
+    setFormat(collection.getOrDefault<String>("format", getFormat()));
+    setCompressionMethod(collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto")));
+    setStructure(collection.getOrDefault<String>("structure", "auto"));
 
     s3_settings->request_settings = S3::S3RequestSettings(collection, settings, /* validate_settings */true);
 
@@ -619,25 +620,26 @@ void StorageS3Configuration::fromAST(ASTs & args, ContextPtr context, bool with_
     if (auto format_value = getFromPositionOrKeyValue<String>("format", args, engine_args_to_idx, key_value_args);
         format_value.has_value())
     {
-        format = format_value.value();
+        auto format_ = format_value.value();
         /// Set format to configuration only of it's not 'auto',
         /// because we can have default format set in configuration.
-        if (format != "auto")
-            format = format;
+        if (format_ != "auto")
+            setFormat(format_);
     }
 
     if (auto structure_value = getFromPositionOrKeyValue<String>("structure", args, engine_args_to_idx, key_value_args);
         structure_value.has_value())
     {
-        structure = structure_value.value();
+        setStructure(structure_value.value());
     }
 
     if (auto compression_method_value = getFromPositionOrKeyValue<String>("compression_method", args, engine_args_to_idx, key_value_args);
         compression_method_value.has_value())
     {
-        compression_method = compression_method_value.value();
+        setCompressionMethod(compression_method_value.value());
     }
 
+
     if (auto partition_strategy_value = getFromPositionOrKeyValue<String>("partition_strategy", args, engine_args_to_idx, key_value_args);
         partition_strategy_value.has_value())
     {
@@ -649,16 +651,16 @@ void StorageS3Configuration::fromAST(ASTs & args, ContextPtr context, bool with_
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Partition strategy {} is not supported", partition_strategy_name);
         }
 
-        partition_strategy_type = partition_strategy_type_opt.value();
+        setPartitionStrategyType(partition_strategy_type_opt.value());
     }
 
     if (auto partition_columns_in_data_file_value = getFromPositionOrKeyValue<bool>("partition_columns_in_data_file", args, engine_args_to_idx, key_value_args);
         partition_columns_in_data_file_value.has_value())
     {
-        partition_columns_in_data_file = partition_columns_in_data_file_value.value();
+        setPartitionColumnsInDataFile(partition_columns_in_data_file_value.value());
     }
     else
-        partition_columns_in_data_file = partition_strategy_type != PartitionStrategyFactory::StrategyType::HIVE;
+        setPartitionColumnsInDataFile(getPartitionStrategyType() != PartitionStrategyFactory::StrategyType::HIVE);
 
     if (auto access_key_id_value = getFromPositionOrKeyValue<String>("access_key_id", args, engine_args_to_idx, key_value_args);
         access_key_id_value.has_value())
@@ -969,6 +971,30 @@ void StorageS3Configuration::addStructureAndFormatToArgsIfNeeded(
     }
 }
 
+ASTPtr StorageS3Configuration::createArgsWithAccessData() const
+{
+    auto arguments = std::make_shared<ASTExpressionList>();
+
+    arguments->children.push_back(std::make_shared<ASTLiteral>(url.uri_str));
+    if (s3_settings->auth_settings[S3AuthSetting::no_sign_request])
+    {
+        arguments->children.push_back(std::make_shared<ASTLiteral>("NOSIGN"));
+    }
+    else
+    {
+        arguments->children.push_back(std::make_shared<ASTLiteral>(s3_settings->auth_settings[S3AuthSetting::access_key_id].value));
+        arguments->children.push_back(std::make_shared<ASTLiteral>(s3_settings->auth_settings[S3AuthSetting::secret_access_key].value));
+        if (!s3_settings->auth_settings[S3AuthSetting::session_token].value.empty())
+            arguments->children.push_back(std::make_shared<ASTLiteral>(s3_settings->auth_settings[S3AuthSetting::session_token].value));
+        if (getFormat() != "auto")
+            arguments->children.push_back(std::make_shared<ASTLiteral>(getFormat()));
+        if (!getCompressionMethod().empty())
+            arguments->children.push_back(std::make_shared<ASTLiteral>(getCompressionMethod()));
+    }
+
+    return arguments;
+}
+
 }
 
 #endif
diff --git a/src/Storages/ObjectStorage/S3/Configuration.h b/src/Storages/ObjectStorage/S3/Configuration.h
index 668714798cb5..438c9d487751 100644
--- a/src/Storages/ObjectStorage/S3/Configuration.h
+++ b/src/Storages/ObjectStorage/S3/Configuration.h
@@ -87,7 +87,7 @@ class StorageS3Configuration : public StorageObjectStorageConfiguration
     bool isArchive() const override { return url.archive_pattern.has_value(); }
     std::string getPathInArchive() const override;
 
-    void check(ContextPtr context) const override;
+    void check(ContextPtr context) override;
     void validateNamespace(const String & name) const override;
     bool isStaticConfiguration() const override { return static_configuration; }
 
@@ -100,6 +100,8 @@ class StorageS3Configuration : public StorageObjectStorageConfiguration
         ContextPtr context,
         bool with_structure) override;
 
+    ASTPtr createArgsWithAccessData() const override;
+
     static ASTPtr extractExtraCredentials(ASTs & args);
     static bool collectCredentials(ASTPtr maybe_credentials, S3::S3AuthSettings & auth_settings_, ContextPtr local_context);
 
diff --git a/src/Storages/ObjectStorage/StorageObjectStorage.cpp b/src/Storages/ObjectStorage/StorageObjectStorage.cpp
index 7f0f6c82491c..1fe70fc5d96e 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorage.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorage.cpp
@@ -1,6 +1,8 @@
+#include <optional>
 #include <thread>
 #include <Core/ColumnWithTypeAndName.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
 
 #include <Common/Exception.h>
 #include <Common/Logger.h>
@@ -32,12 +34,12 @@
 #include <Common/parseGlobs.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/Mutations.h>
 #include <Interpreters/StorageID.h>
-#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 #include <Databases/LoadingStrictnessLevel.h>
 #include <Databases/DataLake/Common.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/HivePartitioningUtils.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSettings.h>
+#include <Storages/ObjectStorage/MultiFileStorageObjectStorageSink.h>
 
 #include <Poco/Logger.h>
 
@@ -55,6 +57,7 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
     extern const int INCORRECT_DATA;
+    extern const int FILE_ALREADY_EXISTS;
 }
 
 String StorageObjectStorage::getPathSample(ContextPtr context)
@@ -68,6 +71,11 @@ String StorageObjectStorage::getPathSample(ContextPtr context)
     if (context->getSettingsRef()[Setting::use_hive_partitioning])
         local_distributed_processing = false;
 
+    const auto path = configuration->getRawPath();
+
+    if (!configuration->isArchive() && !path.hasGlobs() && !local_distributed_processing)
+        return path.path;
+
     auto file_iterator = StorageObjectStorageSource::createFileIterator(
         configuration,
         query_settings,
@@ -82,11 +90,6 @@ String StorageObjectStorage::getPathSample(ContextPtr context)
         {} // file_progress_callback
     );
 
-    const auto path = configuration->getRawPath();
-
-    if (!configuration->isArchive() && !path.hasGlobs() && !local_distributed_processing)
-        return path.path;
-
     if (auto file = file_iterator->next(0))
         return file->getPath();
     return "";
@@ -103,12 +106,13 @@ StorageObjectStorage::StorageObjectStorage(
     std::optional<FormatSettings> format_settings_,
     LoadingStrictnessLevel mode,
     std::shared_ptr<DataLake::ICatalog> catalog_,
-    bool if_not_exists_,
-    bool is_datalake_query,
+    bool /*if_not_exists_*/,
+    bool /*is_datalake_query*/,
     bool distributed_processing_,
     ASTPtr partition_by_,
     bool is_table_function,
-    bool lazy_init)
+    bool lazy_init,
+    std::optional<std::string> sample_path_)
     : IStorage(table_id_)
     , configuration(configuration_)
     , object_storage(object_storage_)
@@ -120,25 +124,12 @@ StorageObjectStorage::StorageObjectStorage(
 {
     configuration->initPartitionStrategy(partition_by_, columns_in_table_or_function_definition, context);
 
-    const bool need_resolve_columns_or_format = columns_in_table_or_function_definition.empty() || (configuration->format == "auto");
+    const bool need_resolve_columns_or_format = columns_in_table_or_function_definition.empty() || (configuration->getFormat() == "auto");
     const bool need_resolve_sample_path = context->getSettingsRef()[Setting::use_hive_partitioning]
-        && !configuration->partition_strategy
+        && !configuration->getPartitionStrategy()
         && !configuration->isDataLakeConfiguration();
     const bool do_lazy_init = lazy_init && !need_resolve_columns_or_format && !need_resolve_sample_path;
 
-    if (!is_table_function && !columns_in_table_or_function_definition.empty() && !is_datalake_query && mode == LoadingStrictnessLevel::CREATE)
-    {
-        configuration->create(
-            object_storage,
-            context,
-            columns_in_table_or_function_definition,
-            partition_by_,
-            if_not_exists_,
-            catalog,
-            storage_id
-        );
-    }
-
     bool updated_configuration = false;
     try
     {
@@ -169,11 +160,11 @@ StorageObjectStorage::StorageObjectStorage(
     /// (e.g. read always follows constructor immediately).
     update_configuration_on_read_write = !is_table_function || !updated_configuration;
 
-    std::string sample_path;
+    std::string sample_path = sample_path_.value_or("");
 
     ColumnsDescription columns{columns_in_table_or_function_definition};
     if (need_resolve_columns_or_format)
-        resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, sample_path, context);
+        resolveSchemaAndFormat(columns, object_storage, configuration, format_settings, sample_path, context);
     else
         validateSupportedColumns(columns, *configuration);
 
@@ -181,7 +172,7 @@ StorageObjectStorage::StorageObjectStorage(
 
     /// FIXME: We need to call getPathSample() lazily on select
     /// in case it failed to be initialized in constructor.
-    if (updated_configuration && sample_path.empty() && need_resolve_sample_path && !configuration->partition_strategy)
+    if (updated_configuration && sample_path.empty() && need_resolve_sample_path && !configuration->getPartitionStrategy())
     {
         try
         {
@@ -197,56 +188,13 @@ StorageObjectStorage::StorageObjectStorage(
         }
     }
 
-    /*
-     * If `partition_strategy=hive`, the partition columns shall be extracted from the `PARTITION BY` expression.
-     * There is no need to read from the file's path.
-     *
-     * Otherwise, in case `use_hive_partitioning=1`, we can keep the old behavior of extracting it from the sample path.
-     * And if the schema was inferred (not specified in the table definition), we need to enrich it with the path partition columns
-     */
-    if (configuration->partition_strategy && configuration->partition_strategy_type == PartitionStrategyFactory::StrategyType::HIVE)
-    {
-        hive_partition_columns_to_read_from_file_path = configuration->partition_strategy->getPartitionColumns();
-    }
-    else if (context->getSettingsRef()[Setting::use_hive_partitioning])
-    {
-        HivePartitioningUtils::extractPartitionColumnsFromPathAndEnrichStorageColumns(
-           columns,
-           hive_partition_columns_to_read_from_file_path,
-           sample_path,
-           columns_in_table_or_function_definition.empty(),
-           format_settings,
-           context);
-    }
-
-    if (hive_partition_columns_to_read_from_file_path.size() == columns.size())
-    {
-        throw Exception(
-            ErrorCodes::INCORRECT_DATA,
-            "A hive partitioned file can't contain only partition columns. Try reading it with `partition_strategy=wildcard` and `use_hive_partitioning=0`");
-    }
-
-    if (configuration->partition_columns_in_data_file)
-    {
-        file_columns = columns;
-    }
-    else
-    {
-        std::unordered_set<String> hive_partition_columns_to_read_from_file_path_set;
-
-        for (const auto & [name, type] : hive_partition_columns_to_read_from_file_path)
-        {
-            hive_partition_columns_to_read_from_file_path_set.insert(name);
-        }
-
-        for (const auto & [name, type] : columns.getAllPhysical())
-        {
-            if (!hive_partition_columns_to_read_from_file_path_set.contains(name))
-            {
-                file_columns.add({name, type});
-            }
-        }
-    }
+    std::tie(hive_partition_columns_to_read_from_file_path, file_columns) = HivePartitioningUtils::setupHivePartitioningForObjectStorage(
+        columns,
+        configuration,
+        sample_path,
+        columns_in_table_or_function_definition.empty(),
+        format_settings,
+        context);
 
     // Assert file contains at least one column. The assertion only takes place if we were able to deduce the schema. The storage might be empty.
     if (!columns.empty() && file_columns.empty())
@@ -256,7 +204,31 @@ StorageObjectStorage::StorageObjectStorage(
             sample_path);
     }
 
-    supports_prewhere = FormatFactory::instance().checkIfFormatSupportsPrewhere(configuration->format, context, format_settings);
+    bool format_supports_prewhere = FormatFactory::instance().checkIfFormatSupportsPrewhere(configuration->getFormat(), context, format_settings);
+
+    /// TODO: Known problems with datalake prewhere:
+    ///  * If the iceberg table went through schema evolution, columns read from file may need to
+    ///    be renamed or typecast before applying prewhere. There's already a mechanism for
+    ///    telling parquet reader to rename columns: ColumnMapper. And parquet reader already
+    ///    automatically does type casts to requested types. But weirdly the iceberg reader uses
+    ///    those mechanism to request the *old* name and type of the column, then has additional
+    ///    code to do the renaming and casting as a separate step outside parquet reader.
+    ///    We should probably change this and delete that additional code?
+    ///  * Delta Lake can have "partition columns", which are columns with constant value specified
+    ///    in the metadata, not present in parquet file. Like hive partitioning, but in metadata
+    ///    files instead of path. Currently these columns are added to the block outside parquet
+    ///    reader. If they appear in prewhere expression, parquet reader gets a "no column in block"
+    ///    error. Unlike hive partitioning, we can't (?) just return these columns from
+    ///    supportedPrewhereColumns() because at the time of the call the delta lake metadata hasn't
+    ///    been read yet. So we should probably pass these columns to the parquet reader instead of
+    ///    adding them outside.
+    ///  * There's a bug in StorageObjectStorageSource::createReader: it makes a copy of
+    ///    FormatFilterInfo, but for some reason unsets prewhere_info and row_level_filter_info.
+    ///    There's probably no reason for this, and it should just copy those fields like the others.
+    ///  * If the table contains files in different formats, with only some of them supporting
+    ///    prewhere, things break.
+    supports_prewhere = !configuration->isDataLakeConfiguration() && format_supports_prewhere;
+    supports_tuple_elements = format_supports_prewhere;
 
     StorageInMemoryMetadata metadata;
     metadata.setColumns(columns);
@@ -264,9 +236,9 @@ StorageObjectStorage::StorageObjectStorage(
     metadata.setComment(comment);
 
     /// I am not sure this is actually required, but just in case
-    if (configuration->partition_strategy)
+    if (configuration->getPartitionStrategy())
     {
-        metadata.partition_key = configuration->partition_strategy->getPartitionKeyDescription();
+        metadata.partition_key = configuration->getPartitionStrategy()->getPartitionKeyDescription();
     }
 
     setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(metadata.columns));
@@ -280,17 +252,17 @@ String StorageObjectStorage::getName() const
 
 bool StorageObjectStorage::prefersLargeBlocks() const
 {
-    return FormatFactory::instance().checkIfOutputFormatPrefersLargeBlocks(configuration->format);
+    return FormatFactory::instance().checkIfOutputFormatPrefersLargeBlocks(configuration->getFormat());
 }
 
 bool StorageObjectStorage::parallelizeOutputAfterReading(ContextPtr context) const
 {
-    return FormatFactory::instance().checkParallelizeOutputAfterReading(configuration->format, context);
+    return FormatFactory::instance().checkParallelizeOutputAfterReading(configuration->getFormat(), context);
 }
 
 bool StorageObjectStorage::supportsSubsetOfColumns(const ContextPtr & context) const
 {
-    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->format, context, format_settings);
+    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->getFormat(), context, format_settings);
 }
 
 bool StorageObjectStorage::supportsPrewhere() const
@@ -305,7 +277,7 @@ bool StorageObjectStorage::canMoveConditionsToPrewhere() const
 
 std::optional<NameSet> StorageObjectStorage::supportedPrewhereColumns() const
 {
-    return getInMemoryMetadataPtr()->getColumnsWithoutDefaultExpressions();
+    return getInMemoryMetadataPtr()->getColumnsWithoutDefaultExpressions(/*exclude=*/ hive_partition_columns_to_read_from_file_path);
 }
 
 IStorage::ColumnSizeByName StorageObjectStorage::getColumnSizes() const
@@ -398,23 +370,21 @@ void StorageObjectStorage::read(
             /* check_consistent_with_previous_metadata */true);
     }
 
-    if (configuration->partition_strategy && configuration->partition_strategy_type != PartitionStrategyFactory::StrategyType::HIVE)
+    if (configuration->getPartitionStrategy() && configuration->getPartitionStrategyType() != PartitionStrategyFactory::StrategyType::HIVE)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "Reading from a partitioned {} storage is not implemented yet",
                         getName());
     }
 
-    auto all_file_columns = file_columns.getAll();
-
     auto read_from_format_info = configuration->prepareReadingFromFormat(
         object_storage,
         column_names,
         storage_snapshot,
         supportsSubsetOfColumns(local_context),
-        /*supports_tuple_elements=*/ supports_prewhere,
+        supports_tuple_elements,
         local_context,
-        PrepareReadingFromFormatHiveParams { all_file_columns, hive_partition_columns_to_read_from_file_path.getNameToTypeMap() });
+        PrepareReadingFromFormatHiveParams { file_columns, hive_partition_columns_to_read_from_file_path.getNameToTypeMap() });
     if (query_info.prewhere_info)
         read_from_format_info = updateFormatPrewhereInfo(read_from_format_info, query_info.prewhere_info);
 
@@ -425,7 +395,7 @@ void StorageObjectStorage::read(
     if (!modified_format_settings.has_value())
         modified_format_settings.emplace(getFormatSettings(local_context));
 
-    configuration->modifyFormatSettings(modified_format_settings.value());
+    configuration->modifyFormatSettings(modified_format_settings.value(), *local_context);
 
     auto read_step = std::make_unique<ReadFromObjectStorageStep>(
         object_storage,
@@ -487,9 +457,10 @@ SinkToStoragePtr StorageObjectStorage::write(
 
     /// Not a data lake, just raw object storage
 
-    if (configuration->partition_strategy)
+    if (configuration->getPartitionStrategy())
     {
-        return std::make_shared<PartitionedStorageObjectStorageSink>(object_storage, configuration, format_settings, sample_block, local_context);
+        auto sink_creator = std::make_shared<PartitionedStorageObjectStorageSink>(object_storage, configuration, format_settings, sample_block, local_context);
+        return std::make_shared<PartitionedSink>(configuration->partition_strategy, sink_creator, local_context, sample_block);
     }
 
     auto paths = configuration->getPaths();
@@ -521,6 +492,76 @@ bool StorageObjectStorage::optimize(
     return configuration->optimize(metadata_snapshot, context, format_settings);
 }
 
+bool StorageObjectStorage::supportsImport() const
+{
+    if (!configuration->partition_strategy)
+        return false;
+
+    if (configuration->partition_strategy_type == PartitionStrategyFactory::StrategyType::WILDCARD)
+        return configuration->getRawPath().hasExportFilenameWildcard();
+
+    return configuration->partition_strategy_type == PartitionStrategyFactory::StrategyType::HIVE;
+}
+
+
+SinkToStoragePtr StorageObjectStorage::import(
+    const std::string & file_name,
+    Block & block_with_partition_values,
+    const std::function<void(const std::string &)> & new_file_path_callback,
+    bool overwrite_if_exists,
+    std::size_t max_bytes_per_file,
+    std::size_t max_rows_per_file,
+    const std::optional<FormatSettings> & format_settings_,
+    ContextPtr local_context)
+{
+    std::string partition_key;
+
+    if (configuration->partition_strategy)
+    {
+        const auto column_with_partition_key = configuration->partition_strategy->computePartitionKey(block_with_partition_values);
+
+        if (!column_with_partition_key->empty())
+        {
+            partition_key = column_with_partition_key->getDataAt(0).toString();
+        }
+    }
+
+    const auto base_path = configuration->getPathForWrite(partition_key, file_name).path;
+
+    return std::make_shared<MultiFileStorageObjectStorageSink>(
+        base_path,
+        /* transaction_id= */ file_name, /// not pretty, but the sink needs some sort of id to generate the commit file name. Using the source part name should be enough
+        object_storage,
+        configuration,
+        max_bytes_per_file,
+        max_rows_per_file,
+        overwrite_if_exists,
+        new_file_path_callback,
+        format_settings_ ? format_settings_ : format_settings,
+        std::make_shared<const Block>(getInMemoryMetadataPtr()->getSampleBlock()),
+        local_context);
+}
+
+void StorageObjectStorage::commitExportPartitionTransaction(const String & transaction_id, const String & partition_id, const Strings & exported_paths, ContextPtr local_context)
+{
+    const String commit_object = configuration->getRawPath().path + "/commit_" + partition_id + "_" + transaction_id;
+
+    /// if file already exists, nothing to be done
+    if (object_storage->exists(StoredObject(commit_object)))
+    {
+        LOG_DEBUG(getLogger("StorageObjectStorage"), "Commit file already exists, nothing to be done: {}", commit_object);
+        return;
+    }
+
+    auto out = object_storage->writeObject(StoredObject(commit_object), WriteMode::Rewrite, /* attributes= */ {}, DBMS_DEFAULT_BUFFER_SIZE, local_context->getWriteSettings());
+    for (const auto & p : exported_paths)
+    {
+        out->write(p.data(), p.size());
+        out->write("\n", 1);
+    }
+    out->finalize();
+}
+
 void StorageObjectStorage::truncate(
     const ASTPtr & /* query */,
     const StorageMetadataPtr & /* metadata_snapshot */,
@@ -594,7 +635,7 @@ ColumnsDescription StorageObjectStorage::resolveSchemaFromData(
 {
     ObjectInfos read_keys;
     auto iterator = createReadBufferIterator(object_storage, configuration, format_settings, read_keys, context);
-    auto schema = readSchemaFromFormat(configuration->format, format_settings, *iterator, context);
+    auto schema = readSchemaFromFormat(configuration->getFormat(), format_settings, *iterator, context);
     sample_path = iterator->getLastFilePath();
     return schema;
 }
@@ -615,7 +656,7 @@ std::string StorageObjectStorage::resolveFormatFromData(
 
 std::pair<ColumnsDescription, std::string> StorageObjectStorage::resolveSchemaAndFormatFromData(
     const ObjectStoragePtr & object_storage,
-    const StorageObjectStorageConfigurationPtr & configuration,
+    StorageObjectStorageConfigurationPtr & configuration,
     const std::optional<FormatSettings> & format_settings,
     std::string & sample_path,
     const ContextPtr & context)
@@ -624,13 +665,13 @@ std::pair<ColumnsDescription, std::string> StorageObjectStorage::resolveSchemaAn
     auto iterator = createReadBufferIterator(object_storage, configuration, format_settings, read_keys, context);
     auto [columns, format] = detectFormatAndReadSchema(format_settings, *iterator, context);
     sample_path = iterator->getLastFilePath();
-    configuration->format = format;
+    configuration->setFormat(format);
     return std::pair(columns, format);
 }
 
 void StorageObjectStorage::addInferredEngineArgsToCreateQuery(ASTs & args, const ContextPtr & context) const
 {
-    configuration->addStructureAndFormatToArgsIfNeeded(args, "", configuration->format, context, /*with_structure=*/false);
+    configuration->addStructureAndFormatToArgsIfNeeded(args, "", configuration->getFormat(), context, /*with_structure=*/false);
 }
 
 SchemaCache & StorageObjectStorage::getSchemaCache(const ContextPtr & context, const std::string & storage_engine_name)
@@ -692,5 +733,4 @@ void StorageObjectStorage::checkAlterIsPossible(const AlterCommands & commands,
     configuration->checkAlterIsPossible(commands);
 }
 
-
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorage.h b/src/Storages/ObjectStorage/StorageObjectStorage.h
index 59b4da5d2b4e..e2d84b3c89c5 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorage.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorage.h
@@ -7,6 +7,7 @@
 #include <Storages/ObjectStorage/IObjectIterator.h>
 #include <Storages/prepareReadingFromFormat.h>
 #include <Common/threadPoolCallbackRunner.h>
+#include "Storages/ObjectStorage/ObjectStorageFilePathGenerator.h"
 #include <Interpreters/ActionsDAG.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
@@ -36,7 +37,10 @@ struct IPartitionStrategy;
 class StorageObjectStorage : public IStorage
 {
 public:
-    using ObjectInfo = RelativePathWithMetadata;
+    class Configuration;
+    using ConfigurationPtr = std::shared_ptr<Configuration>;
+    using ConfigurationObserverPtr = std::weak_ptr<Configuration>;
+    using ObjectInfo = PathWithMetadata;
     using ObjectInfoPtr = std::shared_ptr<ObjectInfo>;
     using ObjectInfos = std::vector<ObjectInfoPtr>;
 
@@ -56,7 +60,8 @@ class StorageObjectStorage : public IStorage
         bool distributed_processing_ = false,
         ASTPtr partition_by_ = nullptr,
         bool is_table_function_ = false,
-        bool lazy_init = false);
+        bool lazy_init = false,
+        std::optional<std::string> sample_path_ = std::nullopt);
 
     String getName() const override;
 
@@ -76,6 +81,25 @@ class StorageObjectStorage : public IStorage
         ContextPtr context,
         bool async_insert) override;
 
+
+    bool supportsImport() const override;
+
+    SinkToStoragePtr import(
+        const std::string & /* file_name */,
+        Block & /* block_with_partition_values */,
+        const std::function<void(const std::string &)> & new_file_path_callback,
+        bool /* overwrite_if_exists */,
+        std::size_t /* max_bytes_per_file */,
+        std::size_t /* max_rows_per_file */,
+        const std::optional<FormatSettings> & /* format_settings_ */,
+        ContextPtr /* context */) override;
+
+    void commitExportPartitionTransaction(
+        const String & transaction_id,
+        const String & partition_id,
+        const Strings & exported_paths,
+        ContextPtr local_context) override;
+
     void truncate(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
@@ -122,7 +146,7 @@ class StorageObjectStorage : public IStorage
 
     static std::pair<ColumnsDescription, std::string> resolveSchemaAndFormatFromData(
         const ObjectStoragePtr & object_storage,
-        const StorageObjectStorageConfigurationPtr & configuration,
+        StorageObjectStorageConfigurationPtr & configuration,
         const std::optional<FormatSettings> & format_settings,
         std::string & sample_path,
         const ContextPtr & context);
@@ -177,12 +201,13 @@ class StorageObjectStorage : public IStorage
     /// (One of the reading replicas, not the initiator).
     const bool distributed_processing;
     bool supports_prewhere = false;
+    bool supports_tuple_elements = false;
     /// Whether we need to call `configuration->update()`
     /// (e.g. refresh configuration) on each read() method call.
     bool update_configuration_on_read_write = true;
 
     NamesAndTypesList hive_partition_columns_to_read_from_file_path;
-    ColumnsDescription file_columns;
+    NamesAndTypesList file_columns;
 
     LoggerPtr log;
 
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp b/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp
index f1fd5f988b9b..07b6dc8471ba 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp
@@ -1,15 +1,24 @@
+#include <optional>
 #include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 
 #include <Common/Exception.h>
 #include <Common/StringUtils.h>
+#include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Interpreters/Context.h>
 
 #include <Core/Settings.h>
 #include <Formats/FormatFactory.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
 #include <Storages/IPartitionStrategy.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Interpreters/ClusterProxy/SelectStreamFactory.h>
 
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/HivePartitioningUtils.h>
@@ -24,12 +33,14 @@ namespace Setting
 {
     extern const SettingsBool use_hive_partitioning;
     extern const SettingsBool cluster_function_process_archive_on_multiple_nodes;
+    extern const SettingsUInt64 lock_object_storage_task_distribution_ms;
+    extern const SettingsString object_storage_cluster;
 }
 
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int INCORRECT_DATA;
+    extern const int INVALID_SETTING_VALUE;
 }
 
 String StorageObjectStorageCluster::getPathSample(ContextPtr context)
@@ -37,6 +48,14 @@ String StorageObjectStorageCluster::getPathSample(ContextPtr context)
     auto query_settings = configuration->getQuerySettings(context);
     /// We don't want to throw an exception if there are no files with specified path.
     query_settings.throw_on_zero_files_match = false;
+
+    if (!configuration->isArchive())
+    {
+        const auto & path = configuration->getPathForRead();
+        if (!path.hasGlobs())
+            return path.path;
+    }
+
     auto file_iterator = StorageObjectStorageSource::createFileIterator(
         configuration,
         query_settings,
@@ -48,11 +67,14 @@ String StorageObjectStorageCluster::getPathSample(ContextPtr context)
         {}, // virtual_columns
         {}, // hive_columns
         nullptr, // read_keys
-        {} // file_progress_callback
+        {}, // file_progress_callback
+        false, // ignore_archive_globs
+        true // skip_object_metadata
     );
 
     if (auto file = file_iterator->next(0))
         return file->getPath();
+
     return "";
 }
 
@@ -64,68 +86,128 @@ StorageObjectStorageCluster::StorageObjectStorageCluster(
     const ColumnsDescription & columns_in_table_or_function_definition,
     const ConstraintsDescription & constraints_,
     const ASTPtr & partition_by,
-    ContextPtr context_)
+    ContextPtr context_,
+    const String & comment_,
+    std::optional<FormatSettings> format_settings_,
+    LoadingStrictnessLevel mode_,
+    std::shared_ptr<DataLake::ICatalog> catalog,
+    bool if_not_exists,
+    bool is_datalake_query,
+    bool distributed_processing,
+    bool is_table_function,
+    bool lazy_init)
     : IStorageCluster(
         cluster_name_, table_id_, getLogger(fmt::format("{}({})", configuration_->getEngineName(), table_id_.table_name)))
     , configuration{configuration_}
     , object_storage(object_storage_)
+    , cluster_name_in_settings(false)
 {
     configuration->initPartitionStrategy(partition_by, columns_in_table_or_function_definition, context_);
-    /// We allow exceptions to be thrown on update(),
-    /// because Cluster engine can only be used as table function,
-    /// so no lazy initialization is allowed.
-    configuration->update(
-        object_storage,
-        context_,
-        /* if_not_updated_before */false,
-        /* check_consistent_with_previous_metadata */true);
 
-    ColumnsDescription columns{columns_in_table_or_function_definition};
-    std::string sample_path;
-    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, {}, sample_path, context_);
-    configuration->check(context_);
+    const bool need_resolve_columns_or_format = columns_in_table_or_function_definition.empty() || (configuration->getFormat() == "auto");
+    const bool do_lazy_init = lazy_init && !need_resolve_columns_or_format;
 
-    if (sample_path.empty() && context_->getSettingsRef()[Setting::use_hive_partitioning] && !configuration->isDataLakeConfiguration() && !configuration->partition_strategy)
-        sample_path = getPathSample(context_);
+    auto log_ = getLogger("StorageObjectStorageCluster");
 
-    /*
-     * If `partition_strategy=hive`, the partition columns shall be extracted from the `PARTITION BY` expression.
-     * There is no need to read from the filepath.
-     *
-     * Otherwise, in case `use_hive_partitioning=1`, we can keep the old behavior of extracting it from the sample path.
-     * And if the schema was inferred (not specified in the table definition), we need to enrich it with the path partition columns
-     */
-    if (configuration->partition_strategy && configuration->partition_strategy_type == PartitionStrategyFactory::StrategyType::HIVE)
-    {
-        hive_partition_columns_to_read_from_file_path = configuration->partition_strategy->getPartitionColumns();
-    }
-    else if (context_->getSettingsRef()[Setting::use_hive_partitioning])
-    {
-        HivePartitioningUtils::extractPartitionColumnsFromPathAndEnrichStorageColumns(
-            columns,
-            hive_partition_columns_to_read_from_file_path,
-            sample_path,
-            columns_in_table_or_function_definition.empty(),
-            std::nullopt,
-            context_
+    if (!columns_in_table_or_function_definition.empty()
+        && !is_datalake_query
+        && mode_ == LoadingStrictnessLevel::CREATE)
+    {
+        configuration->create(
+            object_storage,
+            context_,
+            columns_in_table_or_function_definition,
+            partition_by,
+            if_not_exists,
+            catalog,
+            table_id_
         );
     }
 
-    if (hive_partition_columns_to_read_from_file_path.size() == columns.size())
+    try
     {
-        throw Exception(
-            ErrorCodes::INCORRECT_DATA,
-            "A hive partitioned file can't contain only partition columns. Try reading it with `partition_strategy=wildcard` and `use_hive_partitioning=0`");
+        if (!do_lazy_init)
+        {
+            /// We allow exceptions to be thrown on update(),
+            /// because Cluster engine can only be used as table function,
+            /// so no lazy initialization is allowed.
+            configuration->update(
+                object_storage,
+                context_,
+                /* if_not_updated_before */false,
+                /* check_consistent_with_previous_metadata */true);
+        }
     }
+    catch (...)
+    {
+        // If we don't have format or schema yet, we can't ignore failed configuration update,
+        // because relevant configuration is crucial for format and schema inference
+        if (mode_ <= LoadingStrictnessLevel::CREATE || need_resolve_columns_or_format)
+        {
+            throw;
+        }
+        tryLogCurrentException(log_);
+    }
+
+    // For tables need to update configuration on each read
+    // because data can be changed after previous update
+    update_configuration_on_read_write = !is_table_function;
+
+    ColumnsDescription columns{columns_in_table_or_function_definition};
+    std::string sample_path;
+    if (need_resolve_columns_or_format)
+        resolveSchemaAndFormat(columns, object_storage, configuration, {}, sample_path, context_);
+    else
+        validateSupportedColumns(columns, *configuration);
+    configuration->check(context_);
 
-    /// Hive: Not building the file_columns like `StorageObjectStorage` does because it is not necessary to do it here.
+    if (sample_path.empty() && context_->getSettingsRef()[Setting::use_hive_partitioning] && !configuration->isDataLakeConfiguration() && !configuration->getPartitionStrategy())
+        sample_path = getPathSample(context_);
+
+    /// Not grabbing the file_columns because it is not necessary to do it here.
+    std::tie(hive_partition_columns_to_read_from_file_path, std::ignore) = HivePartitioningUtils::setupHivePartitioningForObjectStorage(
+        columns,
+        configuration,
+        sample_path,
+        columns_in_table_or_function_definition.empty(),
+        std::nullopt,
+        context_);
 
     StorageInMemoryMetadata metadata;
     metadata.setColumns(columns);
     metadata.setConstraints(constraints_);
 
+    if (configuration->getPartitionStrategy())
+    {
+        metadata.partition_key = configuration->getPartitionStrategy()->getPartitionKeyDescription();
+    }
+
     setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(metadata.columns));
     setInMemoryMetadata(metadata);
+
+    pure_storage = std::make_shared<StorageObjectStorage>(
+        configuration,
+        object_storage,
+        context_,
+        getStorageID(),
+        IStorageCluster::getInMemoryMetadata().getColumns(),
+        IStorageCluster::getInMemoryMetadata().getConstraints(),
+        comment_,
+        format_settings_,
+        mode_,
+        catalog,
+        if_not_exists,
+        is_datalake_query,
+        distributed_processing,
+        partition_by,
+        /* is_table_function */false,
+        /* lazy_init */lazy_init,
+        sample_path);
+
+    auto virtuals_ = getVirtualsPtr();
+    if (virtuals_)
+        pure_storage->setVirtuals(*virtuals_);
+    pure_storage->setInMemoryMetadata(IStorageCluster::getInMemoryMetadata());
 }
 
 std::string StorageObjectStorageCluster::getName() const
@@ -135,6 +217,8 @@ std::string StorageObjectStorageCluster::getName() const
 
 std::optional<UInt64> StorageObjectStorageCluster::totalRows(ContextPtr query_context) const
 {
+    if (pure_storage)
+        return pure_storage->totalRows(query_context);
     configuration->update(
         object_storage,
         query_context,
@@ -145,6 +229,8 @@ std::optional<UInt64> StorageObjectStorageCluster::totalRows(ContextPtr query_co
 
 std::optional<UInt64> StorageObjectStorageCluster::totalBytes(ContextPtr query_context) const
 {
+    if (pure_storage)
+        return pure_storage->totalBytes(query_context);
     configuration->update(
         object_storage,
         query_context,
@@ -153,20 +239,139 @@ std::optional<UInt64> StorageObjectStorageCluster::totalBytes(ContextPtr query_c
     return configuration->totalBytes(query_context);
 }
 
+void StorageObjectStorageCluster::updateQueryForDistributedEngineIfNeeded(ASTPtr & query, ContextPtr context)
+{
+    // Change table engine on table function for distributed request
+    // CREATE TABLE t (...) ENGINE=IcebergS3(...)
+    // SELECT * FROM t
+    // change on
+    // SELECT * FROM icebergS3(...)
+    // to execute on cluster nodes
+
+    auto * select_query = query->as<ASTSelectQuery>();
+    if (!select_query || !select_query->tables())
+        return;
+
+    auto * tables = select_query->tables()->as<ASTTablesInSelectQuery>();
+
+    if (tables->children.empty())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Expected SELECT query from table with engine {}, got '{}'",
+            configuration->getEngineName(), query->formatForLogging());
+
+    auto * table_expression = tables->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression->as<ASTTableExpression>();
+
+    if (!table_expression)
+        return;
+
+    if (!table_expression->database_and_table_name)
+        return;
+
+    auto & table_identifier_typed = table_expression->database_and_table_name->as<ASTTableIdentifier &>();
+
+    auto table_alias = table_identifier_typed.tryGetAlias();
+
+    auto storage_engine_name = configuration->getEngineName();
+    if (storage_engine_name == "Iceberg")
+    {
+        switch (configuration->getType())
+        {
+            case ObjectStorageType::S3:
+                storage_engine_name = "IcebergS3";
+                break;
+            case ObjectStorageType::Azure:
+                storage_engine_name = "IcebergAzure";
+                break;
+            case ObjectStorageType::HDFS:
+                storage_engine_name = "IcebergHDFS";
+                break;
+            default:
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Can't find table function for engine {}",
+                    storage_engine_name
+                );
+        }
+    }
+
+    static std::unordered_map<std::string, std::string> engine_to_function = {
+        {"S3", "s3"},
+        {"Azure", "azureBlobStorage"},
+        {"HDFS", "hdfs"},
+        {"Iceberg", "iceberg"},
+        {"IcebergS3", "icebergS3"},
+        {"IcebergAzure", "icebergAzure"},
+        {"IcebergHDFS", "icebergHDFS"},
+        {"IcebergLocal", "icebergLocal"},
+        {"DeltaLake", "deltaLake"},
+        {"DeltaLakeS3", "deltaLakeS3"},
+        {"DeltaLakeAzure", "deltaLakeAzure"},
+        {"Hudi", "hudi"}
+    };
+
+    auto p = engine_to_function.find(storage_engine_name);
+    if (p == engine_to_function.end())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Can't find table function for engine {}",
+            storage_engine_name
+        );
+    }
+
+    std::string table_function_name = p->second;
+
+    auto function_ast = std::make_shared<ASTFunction>();
+    function_ast->name = table_function_name;
+
+    auto cluster_name = getClusterName(context);
+
+    if (cluster_name.empty())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Can't be here without cluster name, no cluster name in query {}",
+            query->formatForLogging());
+    }
+
+    function_ast->arguments = configuration->createArgsWithAccessData();
+    function_ast->children.push_back(function_ast->arguments);
+    function_ast->setAlias(table_alias);
+
+    ASTPtr function_ast_ptr(function_ast);
+
+    table_expression->database_and_table_name = nullptr;
+    table_expression->table_function = function_ast_ptr;
+    table_expression->children[0] = function_ast_ptr;
+
+    auto settings = select_query->settings();
+    if (settings)
+    {
+        auto & settings_ast = settings->as<ASTSetQuery &>();
+        settings_ast.changes.insertSetting("object_storage_cluster", cluster_name);
+    }
+    else
+    {
+        auto settings_ast_ptr = std::make_shared<ASTSetQuery>();
+        settings_ast_ptr->is_standalone = false;
+        settings_ast_ptr->changes.setSetting("object_storage_cluster", cluster_name);
+        select_query->setExpression(ASTSelectQuery::Expression::SETTINGS, std::move(settings_ast_ptr));
+    }
+
+    cluster_name_in_settings = true;
+}
+
 void StorageObjectStorageCluster::updateQueryToSendIfNeeded(
     ASTPtr & query,
     const DB::StorageSnapshotPtr & storage_snapshot,
     const ContextPtr & context)
 {
+    updateQueryForDistributedEngineIfNeeded(query, context);
+
     auto * table_function = extractTableFunctionFromSelectQuery(query);
     if (!table_function)
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Expected SELECT query from table function {}, got '{}'",
-            configuration->getEngineName(), query->formatForErrorMessage());
-    }
-
+        return;
     auto * expression_list = table_function->arguments->as<ASTExpressionList>();
     if (!expression_list)
     {
@@ -186,6 +391,16 @@ void StorageObjectStorageCluster::updateQueryToSendIfNeeded(
             configuration->getEngineName());
     }
 
+    ASTPtr object_storage_type_arg;
+    if (cluster_name_in_settings)
+        configuration->extractDynamicStorageType(args, context, &object_storage_type_arg);
+    else
+    {
+        auto args_copy = args;
+        // Remove cluster name from args to avoid confusing cluster name and named collection name
+        args_copy.erase(args_copy.begin());
+        configuration->extractDynamicStorageType(args_copy, context, &object_storage_type_arg);
+    }
     ASTPtr settings_temporary_storage = nullptr;
     for (auto * it = args.begin(); it != args.end(); ++it)
     {
@@ -198,21 +413,107 @@ void StorageObjectStorageCluster::updateQueryToSendIfNeeded(
         }
     }
 
-    if (!endsWith(table_function->name, "Cluster"))
-        configuration->addStructureAndFormatToArgsIfNeeded(args, structure, configuration->format, context, /*with_structure=*/true);
+    if (cluster_name_in_settings || !endsWith(table_function->name, "Cluster"))
+    {
+        configuration->addStructureAndFormatToArgsIfNeeded(args, structure, configuration->getFormat(), context, /*with_structure=*/true);
+
+        /// Convert to old-stype *Cluster table function.
+        /// This allows to use old clickhouse versions in cluster.
+        static std::unordered_map<std::string, std::string> function_to_cluster_function = {
+            {"s3", "s3Cluster"},
+            {"azureBlobStorage", "azureBlobStorageCluster"},
+            {"hdfs", "hdfsCluster"},
+            {"iceberg", "icebergCluster"},
+            {"icebergS3", "icebergS3Cluster"},
+            {"icebergAzure", "icebergAzureCluster"},
+            {"icebergHDFS", "icebergHDFSCluster"},
+            {"icebergLocal", "icebergLocalCluster"},
+            {"deltaLake", "deltaLakeCluster"},
+            {"deltaLakeS3", "deltaLakeS3Cluster"},
+            {"deltaLakeAzure", "deltaLakeAzureCluster"},
+            {"hudi", "hudiCluster"},
+        };
+
+        auto p = function_to_cluster_function.find(table_function->name);
+        if (p == function_to_cluster_function.end())
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Can't find cluster name for table function {}",
+                table_function->name);
+        }
+
+        table_function->name = p->second;
+
+        auto cluster_name = getClusterName(context);
+        auto cluster_name_arg = std::make_shared<ASTLiteral>(cluster_name);
+        args.insert(args.begin(), cluster_name_arg);
+
+        auto * select_query = query->as<ASTSelectQuery>();
+        if (!select_query)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Expected SELECT query from table function {}",
+                configuration->getEngineName());
+
+        auto settings = select_query->settings();
+        if (settings)
+        {
+            auto & settings_ast = settings->as<ASTSetQuery &>();
+            if (settings_ast.changes.removeSetting("object_storage_cluster") && settings_ast.changes.empty())
+            {
+                select_query->setExpression(ASTSelectQuery::Expression::SETTINGS, {});
+            }
+            /// No throw if not found - `object_storage_cluster` can be global setting.
+        }
+    }
     else
     {
         ASTPtr cluster_name_arg = args.front();
         args.erase(args.begin());
-        configuration->addStructureAndFormatToArgsIfNeeded(args, structure, configuration->format, context, /*with_structure=*/true);
+        configuration->addStructureAndFormatToArgsIfNeeded(args, structure, configuration->getFormat(), context, /*with_structure=*/true);
         args.insert(args.begin(), cluster_name_arg);
     }
     if (settings_temporary_storage)
     {
         args.insert(args.end(), std::move(settings_temporary_storage));
     }
+    if (object_storage_type_arg)
+        args.insert(args.end(), object_storage_type_arg);
 }
 
+class TaskDistributor : public TaskIterator
+{
+public:
+    TaskDistributor(std::shared_ptr<IObjectIterator> iterator,
+        std::vector<std::string> && ids_of_hosts,
+        bool send_over_whole_archive,
+        uint64_t lock_object_storage_task_distribution_ms,
+        ContextPtr context_
+        )
+        : task_distributor(iterator, std::move(ids_of_hosts), send_over_whole_archive, lock_object_storage_task_distribution_ms)
+        , context(context_) {}
+    ~TaskDistributor() override = default;
+    bool supportRerunTask() const override { return true; }
+    void rescheduleTasksFromReplica(size_t number_of_current_replica) override
+    {
+        task_distributor.rescheduleTasksFromReplica(number_of_current_replica);
+    }
+
+    ClusterFunctionReadTaskResponsePtr operator()(size_t number_of_current_replica) const override
+    {
+        auto task = task_distributor.getNextTask(number_of_current_replica);
+        if (task)
+        {
+            return std::make_shared<ClusterFunctionReadTaskResponse>(std::move(task), context);
+        }
+        return std::make_shared<ClusterFunctionReadTaskResponse>();
+    }
+
+private:
+    mutable StorageObjectStorageStableTaskDistributor task_distributor;
+    ContextPtr context;
+};
 
 RemoteQueryExecutor::Extension StorageObjectStorageCluster::getTaskIteratorExtension(
     const ActionsDAG::Node * predicate,
@@ -228,7 +529,7 @@ RemoteQueryExecutor::Extension StorageObjectStorageCluster::getTaskIteratorExten
         local_context,
         predicate,
         filter,
-        virtual_columns,
+        getVirtualsList(),
         hive_partition_columns_to_read_from_file_path,
         nullptr,
         local_context->getFileProgressCallback(),
@@ -248,21 +549,470 @@ RemoteQueryExecutor::Extension StorageObjectStorageCluster::getTaskIteratorExten
         }
     }
 
-    auto task_distributor = std::make_shared<StorageObjectStorageStableTaskDistributor>(
-        iterator,
-        std::move(ids_of_hosts),
-        /* send_over_whole_archive */!local_context->getSettingsRef()[Setting::cluster_function_process_archive_on_multiple_nodes]);
+    uint64_t lock_object_storage_task_distribution_ms = local_context->getSettingsRef()[Setting::lock_object_storage_task_distribution_ms];
 
-    auto callback = std::make_shared<TaskIterator>(
-        [task_distributor, local_context](size_t number_of_current_replica) mutable -> ClusterFunctionReadTaskResponsePtr
-        {
-            auto task = task_distributor->getNextTask(number_of_current_replica);
-            if (task)
-                return std::make_shared<ClusterFunctionReadTaskResponse>(std::move(task), local_context);
-            return std::make_shared<ClusterFunctionReadTaskResponse>();
-        });
+    /// Check value to avoid negative result after conversion in microseconds.
+    /// Poco::Timestamp::TimeDiff is signed int 64.
+    static const uint64_t lock_object_storage_task_distribution_ms_max = 0x0020000000000000ULL;
+    if (lock_object_storage_task_distribution_ms > lock_object_storage_task_distribution_ms_max)
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE,
+            "Value lock_object_storage_task_distribution_ms is too big: {}, allowed maximum is {}",
+            lock_object_storage_task_distribution_ms,
+            lock_object_storage_task_distribution_ms_max
+        );
+
+    auto callback = std::make_shared<TaskDistributor>(iterator,
+        std::move(ids_of_hosts),
+        /* send_over_whole_archive */!local_context->getSettingsRef()[Setting::cluster_function_process_archive_on_multiple_nodes],
+        lock_object_storage_task_distribution_ms,
+        local_context);
 
     return RemoteQueryExecutor::Extension{ .task_iterator = std::move(callback) };
 }
 
+bool StorageObjectStorageCluster::supportsImport() const
+{
+    if (pure_storage)
+        return pure_storage->supportsImport();
+    return false;
+}
+
+SinkToStoragePtr StorageObjectStorageCluster::import(
+    const std::string & file_name,
+    Block & block_with_partition_values,
+    const std::function<void(const std::string &)> & new_file_path_callback,
+    bool overwrite_if_exists,
+    std::size_t max_bytes_per_file,
+    std::size_t max_rows_per_file,
+    const std::optional<FormatSettings> & format_settings_,
+    ContextPtr context)
+{
+    if (pure_storage)
+        return pure_storage->import(file_name, block_with_partition_values, new_file_path_callback, overwrite_if_exists, max_bytes_per_file, max_rows_per_file, format_settings_, context);
+    
+    return IStorageCluster::import(file_name, block_with_partition_values, new_file_path_callback, overwrite_if_exists, max_bytes_per_file, max_rows_per_file, format_settings_, context);
+}
+
+void StorageObjectStorageCluster::readFallBackToPure(
+    QueryPlan & query_plan,
+    const Names & column_names,
+    const StorageSnapshotPtr & storage_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum processed_stage,
+    size_t max_block_size,
+    size_t num_streams)
+{
+    pure_storage->read(query_plan, column_names, storage_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+}
+
+SinkToStoragePtr StorageObjectStorageCluster::writeFallBackToPure(
+    const ASTPtr & query,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    bool async_insert)
+{
+    return pure_storage->write(query, metadata_snapshot, context, async_insert);
+}
+
+String StorageObjectStorageCluster::getClusterName(ContextPtr context) const
+{
+    /// StorageObjectStorageCluster is always created for cluster or non-cluster variants.
+    /// User can specify cluster name in table definition or in setting `object_storage_cluster`
+    /// only for several queries. When it specified in both places, priority is given to the query setting.
+    /// When it is empty, non-cluster realization is used.
+    auto cluster_name_from_settings = context->getSettingsRef()[Setting::object_storage_cluster].value;
+    if (cluster_name_from_settings.empty())
+        cluster_name_from_settings = getOriginalClusterName();
+    return cluster_name_from_settings;
+}
+
+QueryProcessingStage::Enum StorageObjectStorageCluster::getQueryProcessingStage(
+    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageSnapshotPtr & storage_snapshot, SelectQueryInfo & query_info) const
+{
+    /// Full query if fall back to pure storage.
+    if (getClusterName(context).empty())
+        return QueryProcessingStage::Enum::FetchColumns;
+
+    /// Distributed storage.
+    return IStorageCluster::getQueryProcessingStage(context, to_stage, storage_snapshot, query_info);
+}
+
+std::optional<QueryPipeline> StorageObjectStorageCluster::distributedWrite(
+    const ASTInsertQuery & query,
+    ContextPtr context)
+{
+    if (getClusterName(context).empty())
+        return pure_storage->distributedWrite(query, context);
+    return IStorageCluster::distributedWrite(query, context);
+}
+
+void StorageObjectStorageCluster::drop()
+{
+    if (pure_storage)
+    {
+        pure_storage->drop();
+        return;
+    }
+    IStorageCluster::drop();
+}
+
+void StorageObjectStorageCluster::dropInnerTableIfAny(bool sync, ContextPtr context)
+{
+    if (getClusterName(context).empty())
+    {
+        pure_storage->dropInnerTableIfAny(sync, context);
+        return;
+    }
+    IStorageCluster::dropInnerTableIfAny(sync, context);
+}
+
+void StorageObjectStorageCluster::truncate(
+    const ASTPtr & query,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr local_context,
+    TableExclusiveLockHolder & lock_holder)
+{
+    /// Full query if fall back to pure storage.
+    if (getClusterName(local_context).empty())
+    {
+        pure_storage->truncate(query, metadata_snapshot, local_context, lock_holder);
+        return;
+    }
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Truncate is not supported by storage {}", getName());
+}
+
+void StorageObjectStorageCluster::checkTableCanBeRenamed(const StorageID & new_name) const
+{
+    if (pure_storage)
+    {
+        pure_storage->checkTableCanBeRenamed(new_name);
+        return;
+    }
+    IStorageCluster::checkTableCanBeRenamed(new_name);
+}
+
+void StorageObjectStorageCluster::rename(const String & new_path_to_table_data, const StorageID & new_table_id)
+{
+    if (pure_storage)
+    {
+        pure_storage->rename(new_path_to_table_data, new_table_id);
+        return;
+    }
+    IStorageCluster::rename(new_path_to_table_data, new_table_id);
+}
+
+void StorageObjectStorageCluster::renameInMemory(const StorageID & new_table_id)
+{
+    if (pure_storage)
+    {
+        pure_storage->renameInMemory(new_table_id);
+        return;
+    }
+    IStorageCluster::renameInMemory(new_table_id);
+}
+
+void StorageObjectStorageCluster::alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & alter_lock_holder)
+{
+    if (getClusterName(context).empty())
+    {
+        pure_storage->alter(params, context, alter_lock_holder);
+        setInMemoryMetadata(pure_storage->getInMemoryMetadata());
+        return;
+    }
+    IStorageCluster::alter(params, context, alter_lock_holder);
+    pure_storage->setInMemoryMetadata(IStorageCluster::getInMemoryMetadata());
+}
+
+void StorageObjectStorageCluster::addInferredEngineArgsToCreateQuery(ASTs & args, const ContextPtr & context) const
+{
+    configuration->addStructureAndFormatToArgsIfNeeded(args, "", configuration->getFormat(), context, /*with_structure=*/false);
+}
+
+bool StorageObjectStorageCluster::updateExternalDynamicMetadataIfExists(ContextPtr context)
+{
+    if (getClusterName(context).empty())
+        return pure_storage->updateExternalDynamicMetadataIfExists(context);
+    return IStorageCluster::updateExternalDynamicMetadataIfExists(context);
+}
+
+StorageMetadataPtr StorageObjectStorageCluster::getInMemoryMetadataPtr() const
+{
+    if (pure_storage)
+        return pure_storage->getInMemoryMetadataPtr();
+    return IStorageCluster::getInMemoryMetadataPtr();
+}
+
+IDataLakeMetadata * StorageObjectStorageCluster::getExternalMetadata(ContextPtr query_context)
+{
+    if (getClusterName(query_context).empty())
+        return pure_storage->getExternalMetadata(query_context);
+
+    configuration->update(
+        object_storage,
+        query_context,
+        /* if_not_updated_before */false,
+        /* check_consistent_with_previous_metadata */false);
+
+    return configuration->getExternalMetadata();
+}
+
+void StorageObjectStorageCluster::updateConfigurationIfNeeded(ContextPtr context)
+{
+    if (update_configuration_on_read_write)
+    {
+        configuration->update(
+            object_storage,
+            context,
+            /* if_not_updated_before */false,
+            /* check_consistent_with_previous_metadata */false);
+    }
+}
+
+void StorageObjectStorageCluster::checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const
+{
+    if (getClusterName(context).empty())
+    {
+        pure_storage->checkAlterIsPossible(commands, context);
+        return;
+    }
+    IStorageCluster::checkAlterIsPossible(commands, context);
+}
+
+void StorageObjectStorageCluster::checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const
+{
+    if (pure_storage)
+    {
+        pure_storage->checkMutationIsPossible(commands, settings);
+        return;
+    }
+    IStorageCluster::checkMutationIsPossible(commands, settings);
+}
+
+Pipe StorageObjectStorageCluster::alterPartition(
+    const StorageMetadataPtr & metadata_snapshot,
+    const PartitionCommands & commands,
+    ContextPtr context)
+{
+    if (getClusterName(context).empty())
+        return pure_storage->alterPartition(metadata_snapshot, commands, context);
+    return IStorageCluster::alterPartition(metadata_snapshot, commands, context);
+}
+
+void StorageObjectStorageCluster::checkAlterPartitionIsPossible(
+    const PartitionCommands & commands,
+    const StorageMetadataPtr & metadata_snapshot,
+    const Settings & settings,
+    ContextPtr context) const
+{
+    if (getClusterName(context).empty())
+    {
+        pure_storage->checkAlterPartitionIsPossible(commands, metadata_snapshot, settings, context);
+        return;
+    }
+    IStorageCluster::checkAlterPartitionIsPossible(commands, metadata_snapshot, settings, context);
+}
+
+bool StorageObjectStorageCluster::optimize(
+    const ASTPtr & query,
+    const StorageMetadataPtr & metadata_snapshot,
+    const ASTPtr & partition,
+    bool final,
+    bool deduplicate,
+    const Names & deduplicate_by_columns,
+    bool cleanup,
+    ContextPtr context)
+{
+    if (getClusterName(context).empty())
+        return pure_storage->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, cleanup, context);
+    return IStorageCluster::optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, cleanup, context);
+}
+
+QueryPipeline StorageObjectStorageCluster::updateLightweight(const MutationCommands & commands, ContextPtr context)
+{
+    if (getClusterName(context).empty())
+        return pure_storage->updateLightweight(commands, context);
+    return IStorageCluster::updateLightweight(commands, context);
+}
+
+void StorageObjectStorageCluster::mutate(const MutationCommands & commands, ContextPtr context)
+{
+    if (getClusterName(context).empty())
+    {
+        pure_storage->mutate(commands, context);
+        return;
+    }
+    IStorageCluster::mutate(commands, context);
+}
+
+CancellationCode StorageObjectStorageCluster::killMutation(const String & mutation_id)
+{
+    if (pure_storage)
+        return pure_storage->killMutation(mutation_id);
+    return IStorageCluster::killMutation(mutation_id);
+}
+
+void StorageObjectStorageCluster::waitForMutation(const String & mutation_id, bool wait_for_another_mutation)
+{
+    if (pure_storage)
+    {
+        pure_storage->waitForMutation(mutation_id, wait_for_another_mutation);
+        return;
+    }
+    IStorageCluster::waitForMutation(mutation_id, wait_for_another_mutation);
+}
+
+void StorageObjectStorageCluster::setMutationCSN(const String & mutation_id, UInt64 csn)
+{
+    if (pure_storage)
+    {
+        pure_storage->setMutationCSN(mutation_id, csn);
+        return;
+    }
+    IStorageCluster::setMutationCSN(mutation_id, csn);
+}
+
+CancellationCode StorageObjectStorageCluster::killPartMoveToShard(const UUID & task_uuid)
+{
+    if (pure_storage)
+        return pure_storage->killPartMoveToShard(task_uuid);
+    return IStorageCluster::killPartMoveToShard(task_uuid);
+}
+
+void StorageObjectStorageCluster::startup()
+{
+    if (pure_storage)
+    {
+        pure_storage->startup();
+        return;
+    }
+    IStorageCluster::startup();
+}
+
+void StorageObjectStorageCluster::shutdown(bool is_drop)
+{
+    if (pure_storage)
+    {
+        pure_storage->shutdown(is_drop);
+        return;
+    }
+    IStorageCluster::shutdown(is_drop);
+}
+
+void StorageObjectStorageCluster::flushAndPrepareForShutdown()
+{
+    if (pure_storage)
+    {
+        pure_storage->flushAndPrepareForShutdown();
+        return;
+    }
+    IStorageCluster::flushAndPrepareForShutdown();
+}
+
+ActionLock StorageObjectStorageCluster::getActionLock(StorageActionBlockType action_type)
+{
+    if (pure_storage)
+        return pure_storage->getActionLock(action_type);
+    return IStorageCluster::getActionLock(action_type);
+}
+
+void StorageObjectStorageCluster::onActionLockRemove(StorageActionBlockType action_type)
+{
+    if (pure_storage)
+    {
+        pure_storage->onActionLockRemove(action_type);
+        return;
+    }
+    IStorageCluster::onActionLockRemove(action_type);
+}
+
+bool StorageObjectStorageCluster::prefersLargeBlocks() const
+{
+    if (pure_storage)
+        return pure_storage->prefersLargeBlocks();
+    return IStorageCluster::prefersLargeBlocks();
+}
+
+void StorageObjectStorageCluster::commitExportPartitionTransaction(
+    const String & transaction_id,
+    const String & partition_id,
+    const Strings & exported_paths,
+    ContextPtr local_context)
+{
+    if (pure_storage)
+        return pure_storage->commitExportPartitionTransaction(transaction_id, partition_id, exported_paths, local_context);
+    return IStorageCluster::commitExportPartitionTransaction(transaction_id, partition_id, exported_paths, local_context);
+}
+
+bool StorageObjectStorageCluster::supportsPartitionBy() const
+{
+    if (pure_storage)
+        return pure_storage->supportsPartitionBy();
+    return IStorageCluster::supportsPartitionBy();
+}
+
+bool StorageObjectStorageCluster::supportsSubcolumns() const
+{
+    if (pure_storage)
+        return pure_storage->supportsSubcolumns();
+    return IStorageCluster::supportsSubcolumns();
+}
+
+bool StorageObjectStorageCluster::supportsDynamicSubcolumns() const
+{
+    if (pure_storage)
+        return pure_storage->supportsDynamicSubcolumns();
+    return IStorageCluster::supportsDynamicSubcolumns();
+}
+
+bool StorageObjectStorageCluster::supportsTrivialCountOptimization(const StorageSnapshotPtr & snapshot, ContextPtr context) const
+{
+    if (pure_storage)
+        return pure_storage->supportsTrivialCountOptimization(snapshot, context);
+    return IStorageCluster::supportsTrivialCountOptimization(snapshot, context);
+}
+
+bool StorageObjectStorageCluster::supportsPrewhere() const
+{
+    if (pure_storage)
+        return pure_storage->supportsPrewhere();
+    return IStorageCluster::supportsPrewhere();
+}
+
+bool StorageObjectStorageCluster::canMoveConditionsToPrewhere() const
+{
+    if (pure_storage)
+        return pure_storage->canMoveConditionsToPrewhere();
+    return IStorageCluster::canMoveConditionsToPrewhere();
+}
+
+std::optional<NameSet> StorageObjectStorageCluster::supportedPrewhereColumns() const
+{
+    if (pure_storage)
+        return pure_storage->supportedPrewhereColumns();
+    return IStorageCluster::supportedPrewhereColumns();
+}
+
+IStorageCluster::ColumnSizeByName StorageObjectStorageCluster::getColumnSizes() const
+{
+    if (pure_storage)
+        return pure_storage->getColumnSizes();
+    return IStorageCluster::getColumnSizes();
+}
+
+bool StorageObjectStorageCluster::parallelizeOutputAfterReading(ContextPtr context) const
+{
+    if (pure_storage)
+        return pure_storage->parallelizeOutputAfterReading(context);
+    return IStorageCluster::parallelizeOutputAfterReading(context);
+}
+
+bool StorageObjectStorageCluster::supportsDelete() const
+{
+    if (pure_storage)
+        return pure_storage->supportsDelete();
+    return IStorageCluster::supportsDelete();
+}
+
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageCluster.h b/src/Storages/ObjectStorage/StorageObjectStorageCluster.h
index 6dc9837da134..6d6055149e12 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageCluster.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageCluster.h
@@ -18,7 +18,16 @@ class StorageObjectStorageCluster : public IStorageCluster
         const ColumnsDescription & columns_in_table_or_function_definition,
         const ConstraintsDescription & constraints_,
         const ASTPtr & partition_by,
-        ContextPtr context_);
+        ContextPtr context_,
+        const String & comment_,
+        std::optional<FormatSettings> format_settings_,
+        LoadingStrictnessLevel mode_,
+        std::shared_ptr<DataLake::ICatalog> catalog,
+        bool if_not_exists,
+        bool is_datalake_query,
+        bool distributed_processing,
+        bool is_table_function,
+        bool lazy_init);
 
     std::string getName() const override;
 
@@ -32,6 +41,125 @@ class StorageObjectStorageCluster : public IStorageCluster
 
     std::optional<UInt64> totalRows(ContextPtr query_context) const override;
     std::optional<UInt64> totalBytes(ContextPtr query_context) const override;
+    void setClusterNameInSettings(bool cluster_name_in_settings_) { cluster_name_in_settings = cluster_name_in_settings_; }
+
+    String getClusterName(ContextPtr context) const override;
+
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
+
+    std::optional<QueryPipeline> distributedWrite(
+        const ASTInsertQuery & query,
+        ContextPtr context) override;
+
+    void drop() override;
+
+    void dropInnerTableIfAny(bool sync, ContextPtr context) override;
+
+    void truncate(
+        const ASTPtr & query,
+        const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr local_context,
+        TableExclusiveLockHolder &) override;
+
+    void checkTableCanBeRenamed(const StorageID & new_name) const override;
+
+    void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
+
+    void renameInMemory(const StorageID & new_table_id) override;
+
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & alter_lock_holder) override;
+
+    void addInferredEngineArgsToCreateQuery(ASTs & args, const ContextPtr & context) const override;
+
+    IDataLakeMetadata * getExternalMetadata(ContextPtr query_context);
+
+    bool updateExternalDynamicMetadataIfExists(ContextPtr context) override;
+
+    StorageMetadataPtr getInMemoryMetadataPtr() const override;
+
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
+
+    void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
+
+    Pipe alterPartition(
+        const StorageMetadataPtr & metadata_snapshot,
+        const PartitionCommands & commands,
+        ContextPtr context) override;
+
+    void checkAlterPartitionIsPossible(
+        const PartitionCommands & commands,
+        const StorageMetadataPtr & metadata_snapshot,
+        const Settings & settings,
+        ContextPtr context) const override;
+
+    bool optimize(
+        const ASTPtr & query,
+        const StorageMetadataPtr & metadata_snapshot,
+        const ASTPtr & partition,
+        bool final,
+        bool deduplicate,
+        const Names & deduplicate_by_columns,
+        bool cleanup,
+        ContextPtr context) override;
+
+    QueryPipeline updateLightweight(const MutationCommands & commands, ContextPtr context) override;
+
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
+
+    CancellationCode killMutation(const String & mutation_id) override;
+
+    void waitForMutation(const String & mutation_id, bool wait_for_another_mutation) override;
+
+    void setMutationCSN(const String & mutation_id, UInt64 csn) override;
+
+    CancellationCode killPartMoveToShard(const UUID & task_uuid) override;
+
+    void startup() override;
+
+    void shutdown(bool is_drop = false) override;
+
+    void flushAndPrepareForShutdown() override;
+
+    ActionLock getActionLock(StorageActionBlockType action_type) override;
+
+    void onActionLockRemove(StorageActionBlockType action_type) override;
+
+    bool supportsImport() const override;
+
+    SinkToStoragePtr import(
+        const std::string & /* file_name */,
+        Block & /* block_with_partition_values */,
+        const std::function<void(const std::string &)> & /* new_file_path_callback */,
+        bool /* overwrite_if_exists */,
+        std::size_t /* max_bytes_per_file */,
+        std::size_t /* max_rows_per_file */,
+        const std::optional<FormatSettings> & /* format_settings_ */,
+        ContextPtr /* context */) override;
+    bool prefersLargeBlocks() const override;
+
+    void commitExportPartitionTransaction(
+        const String & transaction_id,
+        const String & partition_id,
+        const Strings & exported_paths,
+        ContextPtr local_context) override;
+
+    bool supportsPartitionBy() const override;
+
+    bool supportsSubcolumns() const override;
+
+    bool supportsDynamicSubcolumns() const override;
+
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override;
+
+    /// Things required for PREWHERE.
+    bool supportsPrewhere() const override;
+    bool canMoveConditionsToPrewhere() const override;
+    std::optional<NameSet> supportedPrewhereColumns() const override;
+    ColumnSizeByName getColumnSizes() const override;
+
+    bool parallelizeOutputAfterReading(ContextPtr context) const override;
+
+    bool supportsDelete() const override;
 
 private:
     void updateQueryToSendIfNeeded(
@@ -39,11 +167,47 @@ class StorageObjectStorageCluster : public IStorageCluster
         const StorageSnapshotPtr & storage_snapshot,
         const ContextPtr & context) override;
 
+    void readFallBackToPure(
+        QueryPlan & query_plan,
+        const Names & column_names,
+        const StorageSnapshotPtr & storage_snapshot,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t max_block_size,
+        size_t num_streams) override;
+
+    SinkToStoragePtr writeFallBackToPure(
+        const ASTPtr & query,
+        const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr context,
+        bool async_insert) override;
+
+    void updateConfigurationIfNeeded(ContextPtr context) override;
+
+    /*
+    In case the table was created with `object_storage_cluster` setting,
+    modify the AST query object so that it uses the table function implementation
+    by mapping the engine name to table function name and setting `object_storage_cluster`.
+    For table like
+    CREATE TABLE table ENGINE=S3(...) SETTINGS object_storage_cluster='cluster'
+    coverts request
+    SELECT * FROM table
+    to
+    SELECT * FROM s3(...) SETTINGS object_storage_cluster='cluster'
+    to make distributed request over cluster 'cluster'.
+    */
+    void updateQueryForDistributedEngineIfNeeded(ASTPtr & query, ContextPtr context);
+
     const String engine_name;
-    const StorageObjectStorageConfigurationPtr configuration;
+    StorageObjectStorageConfigurationPtr configuration;
     const ObjectStoragePtr object_storage;
-    NamesAndTypesList virtual_columns;
     NamesAndTypesList hive_partition_columns_to_read_from_file_path;
+    bool cluster_name_in_settings;
+
+    /// non-clustered storage to fall back on pure realisation if needed
+    std::shared_ptr<StorageObjectStorage> pure_storage;
+    bool update_configuration_on_read_write;
 };
 
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.cpp b/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.cpp
index 2b6defbe4347..6112817663f4 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.cpp
@@ -59,53 +59,65 @@ std::optional<ColumnsDescription> StorageObjectStorageConfiguration::tryGetTable
 }
 
 void StorageObjectStorageConfiguration::initialize(
-    StorageObjectStorageConfiguration & configuration_to_initialize,
     ASTs & engine_args,
     ContextPtr local_context,
     bool with_table_structure)
 {
     if (auto named_collection = tryGetNamedCollectionWithOverrides(engine_args, local_context))
-        configuration_to_initialize.fromNamedCollection(*named_collection, local_context);
+        fromNamedCollection(*named_collection, local_context);
     else
-        configuration_to_initialize.fromAST(engine_args, local_context, with_table_structure);
+        fromAST(engine_args, local_context, with_table_structure);
 
-    if (configuration_to_initialize.isNamespaceWithGlobs())
+    if (isNamespaceWithGlobs())
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Expression can not have wildcards inside {} name", configuration_to_initialize.getNamespaceType());
+                        "Expression can not have wildcards inside {} name", getNamespaceType());
 
-    if (configuration_to_initialize.isDataLakeConfiguration())
+    if (isDataLakeConfiguration())
     {
-        if (configuration_to_initialize.partition_strategy_type != PartitionStrategyFactory::StrategyType::NONE)
+        if (getPartitionStrategyType() != PartitionStrategyFactory::StrategyType::NONE)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "The `partition_strategy` argument is incompatible with data lakes");
         }
     }
-    else if (configuration_to_initialize.partition_strategy_type == PartitionStrategyFactory::StrategyType::NONE)
+    else if (getPartitionStrategyType() == PartitionStrategyFactory::StrategyType::NONE)
     {
-        // Promote to wildcard in case it is not data lake to make it backwards compatible
-        configuration_to_initialize.partition_strategy_type = PartitionStrategyFactory::StrategyType::WILDCARD;
+        if (getRawPath().hasPartitionWildcard())
+        {
+            // Promote to wildcard in case it is not data lake to make it backwards compatible
+            setPartitionStrategyType(PartitionStrategyFactory::StrategyType::WILDCARD);
+        }
     }
 
-    if (configuration_to_initialize.format == "auto")
+    if (partition_strategy_type == PartitionStrategyFactory::StrategyType::HIVE)
+    {
+        file_path_generator = std::make_shared<ObjectStorageAppendFilePathGenerator>(
+            getRawPath().path,
+            format);
+    }
+    else
     {
-        if (configuration_to_initialize.isDataLakeConfiguration())
+        file_path_generator = std::make_shared<ObjectStorageWildcardFilePathGenerator>(getRawPath().path);
+    }
+
+    if (format == "auto")
+    {
+        if (isDataLakeConfiguration())
         {
-            configuration_to_initialize.format = "Parquet";
+            format = "Parquet";
         }
         else
         {
-            configuration_to_initialize.format
+            format
                 = FormatFactory::instance()
-                      .tryGetFormatFromFileName(configuration_to_initialize.isArchive() ? configuration_to_initialize.getPathInArchive() : configuration_to_initialize.getRawPath().path)
+                      .tryGetFormatFromFileName(isArchive() ? getPathInArchive() : getRawPath().path)
                       .value_or("auto");
         }
     }
     else
-        FormatFactory::instance().checkFormatName(configuration_to_initialize.format);
+        FormatFactory::instance().checkFormatName(format);
 
-    /// It might be changed on `StorageObjectStorageConfiguration::initPartitionStrategy`
-    configuration_to_initialize.read_path = configuration_to_initialize.getRawPath();
-    configuration_to_initialize.initialized = true;
+    read_path = file_path_generator->getPathForRead();
+    initialized = true;
 }
 
 void StorageObjectStorageConfiguration::initPartitionStrategy(ASTPtr partition_by, const ColumnsDescription & columns, ContextPtr context)
@@ -122,7 +134,6 @@ void StorageObjectStorageConfiguration::initPartitionStrategy(ASTPtr partition_b
 
     if (partition_strategy)
     {
-        read_path = partition_strategy->getPathForRead(getRawPath().path);
         LOG_DEBUG(getLogger("StorageObjectStorageConfiguration"), "Initialized partition strategy {}", magic_enum::enum_name(partition_strategy_type));
     }
 }
@@ -134,14 +145,12 @@ const StorageObjectStorageConfiguration::Path & StorageObjectStorageConfiguratio
 
 StorageObjectStorageConfiguration::Path StorageObjectStorageConfiguration::getPathForWrite(const std::string & partition_id) const
 {
-    auto raw_path = getRawPath();
-
-    if (!partition_strategy)
-    {
-        return raw_path;
-    }
+    return getPathForWrite(partition_id, /* filename_override */ "");
+}
 
-    return Path {partition_strategy->getPathForWrite(raw_path.path, partition_id)};
+StorageObjectStorageConfiguration::Path StorageObjectStorageConfiguration::getPathForWrite(const std::string & partition_id, const std::string & filename_override) const
+{
+    return Path {file_path_generator->getPathForWrite(partition_id, filename_override)};
 }
 
 bool StorageObjectStorageConfiguration::Path::hasPartitionWildcard() const
@@ -150,6 +159,12 @@ bool StorageObjectStorageConfiguration::Path::hasPartitionWildcard() const
     return path.find(PARTITION_ID_WILDCARD) != String::npos;
 }
 
+bool StorageObjectStorageConfiguration::Path::hasExportFilenameWildcard() const
+{
+    return path.find(ObjectStorageWildcardFilePathGenerator::FILE_WILDCARD) != String::npos;
+}
+
+
 bool StorageObjectStorageConfiguration::Path::hasGlobsIgnorePartitionWildcard() const
 {
     if (!hasPartitionWildcard())
@@ -176,7 +191,7 @@ std::string StorageObjectStorageConfiguration::Path::cutGlobs(bool supports_part
     return path.substr(0, end_of_path_without_globs);
 }
 
-void StorageObjectStorageConfiguration::check(ContextPtr) const
+void StorageObjectStorageConfiguration::check(ContextPtr)
 {
     FormatFactory::instance().checkFormatName(format);
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.h b/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.h
index a8277048b9c8..e13e76bb90f6 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageConfiguration.h
@@ -6,20 +6,28 @@
 #include <Storages/prepareReadingFromFormat.h>
 #include <Interpreters/ActionsDAG.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
-#include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeStorageSettings.h>
 #include <Interpreters/StorageID.h>
 #include <Databases/DataLake/ICatalog.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
+#include <Storages/ObjectStorage/ObjectStorageFilePathGenerator.h>
+#include <Common/Exception.h>
+#include <Storages/StorageFactory.h>
+#include <Formats/FormatFilterInfo.h>
+#include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
 
 namespace DB
 {
 
 class NamedCollection;
 class SinkToStorage;
+class IDataLakeMetadata;
+struct IObjectIterator;
 using SinkToStoragePtr = std::shared_ptr<SinkToStorage>;
+using ObjectIterator = std::shared_ptr<IObjectIterator>;
+using ObjectInfoPtr = std::shared_ptr<PathWithMetadata>;
 
 namespace ErrorCodes
 {
@@ -61,6 +69,7 @@ class StorageObjectStorageConfiguration
         std::string path;
 
         bool hasPartitionWildcard() const;
+        bool hasExportFilenameWildcard() const;
         bool hasGlobsIgnorePartitionWildcard() const;
         bool hasGlobs() const;
         std::string cutGlobs(bool supports_partial_prefix) const;
@@ -69,8 +78,7 @@ class StorageObjectStorageConfiguration
     using Paths = std::vector<Path>;
 
     /// Initialize configuration from either AST or NamedCollection.
-    static void initialize(
-        StorageObjectStorageConfiguration & configuration_to_initialize,
+    virtual void initialize(
         ASTs & engine_args,
         ContextPtr local_context,
         bool with_table_structure);
@@ -91,11 +99,13 @@ class StorageObjectStorageConfiguration
     /// Raw URI, specified by a user. Used in permission check.
     virtual const String & getRawURI() const = 0;
 
-    const Path & getPathForRead() const;
+    virtual const Path & getPathForRead() const;
     // Path used for writing, it should not be globbed and might contain a partition key
-    Path getPathForWrite(const std::string & partition_id = "") const;
+    virtual Path getPathForWrite(const std::string & partition_id = "") const;
+
+    Path getPathForWrite(const std::string & partition_id, const std::string & filename_override) const;
 
-    void setPathForRead(const Path & path)
+    virtual void setPathForRead(const Path & path)
     {
         read_path = path;
     }
@@ -117,13 +127,13 @@ class StorageObjectStorageConfiguration
     virtual void addStructureAndFormatToArgsIfNeeded(
         ASTs & args, const String & structure_, const String & format_, ContextPtr context, bool with_structure) = 0;
 
-    bool isNamespaceWithGlobs() const;
+    virtual bool isNamespaceWithGlobs() const;
 
     virtual bool isArchive() const { return false; }
-    bool isPathInArchiveWithGlobs() const;
+    virtual bool isPathInArchiveWithGlobs() const;
     virtual std::string getPathInArchive() const;
 
-    virtual void check(ContextPtr context) const;
+    virtual void check(ContextPtr context);
     virtual void validateNamespace(const String & /* name */) const {}
 
     virtual ObjectStoragePtr createObjectStorage(ContextPtr context, bool is_readonly) = 0;
@@ -142,7 +152,7 @@ class StorageObjectStorageConfiguration
 
     virtual std::shared_ptr<const ActionsDAG> getSchemaTransformer(ContextPtr, ObjectInfoPtr) const { return {}; }
 
-    virtual void modifyFormatSettings(FormatSettings &) const {}
+    virtual void modifyFormatSettings(FormatSettings &, const Context &) const {}
 
     virtual void addDeleteTransformers(
         ObjectInfoPtr object_info,
@@ -159,7 +169,7 @@ class StorageObjectStorageConfiguration
         ContextPtr local_context,
         const PrepareReadingFromFormatHiveParams & hive_parameters);
 
-    void initPartitionStrategy(ASTPtr partition_by, const ColumnsDescription & columns, ContextPtr context);
+    virtual void initPartitionStrategy(ASTPtr partition_by, const ColumnsDescription & columns, ContextPtr context);
 
     virtual std::optional<ColumnsDescription> tryGetTableStructureFromMetadata() const;
 
@@ -213,7 +223,16 @@ class StorageObjectStorageConfiguration
         const std::optional<FormatSettings> & /*format_settings*/) {}
     virtual void checkMutationIsPossible(const MutationCommands & /*commands*/) {}
 
-    virtual void checkAlterIsPossible(const AlterCommands & /*commands*/) {}
+    virtual void checkAlterIsPossible(const AlterCommands & commands)
+    {
+        for (const auto & command : commands)
+        {
+            if (!command.isCommentAlter())
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getEngineName());
+        }
+    }
+
     virtual void alter(const AlterCommands & /*params*/, ContextPtr /*context*/) {}
 
     virtual const DataLakeStorageSettings & getDataLakeSettings() const
@@ -221,7 +240,49 @@ class StorageObjectStorageConfiguration
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getDataLakeSettings() is not implemented for configuration type {}", getTypeName());
     }
 
-    virtual ColumnMapperPtr getColumnMapper() const { return nullptr; }
+    /// Create arguments for table function with path and access parameters
+    virtual ASTPtr createArgsWithAccessData() const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method createArgsWithAccessData is not supported by storage {}", getEngineName());
+    }
+
+    virtual void fromNamedCollection(const NamedCollection & collection, ContextPtr context) = 0;
+    virtual void fromAST(ASTs & args, ContextPtr context, bool with_structure) = 0;
+
+    virtual ObjectStorageType extractDynamicStorageType(ASTs & /* args */, ContextPtr /* context */, ASTPtr * /* type_arg */) const
+    { return ObjectStorageType::None; }
+
+    virtual const String & getFormat() const { return format; }
+    virtual const String & getCompressionMethod() const { return compression_method; }
+    virtual const String & getStructure() const { return structure; }
+
+    virtual PartitionStrategyFactory::StrategyType getPartitionStrategyType() const { return partition_strategy_type; }
+    virtual bool getPartitionColumnsInDataFile() const { return partition_columns_in_data_file; }
+    virtual std::shared_ptr<IPartitionStrategy> getPartitionStrategy() const { return partition_strategy; }
+
+    virtual void setFormat(const String & format_) { format = format_; }
+    virtual void setCompressionMethod(const String & compression_method_) { compression_method = compression_method_; }
+    virtual void setStructure(const String & structure_) { structure = structure_; }
+
+    virtual void setPartitionStrategyType(PartitionStrategyFactory::StrategyType partition_strategy_type_)
+    {
+        partition_strategy_type = partition_strategy_type_;
+    }
+    virtual void setPartitionColumnsInDataFile(bool partition_columns_in_data_file_)
+    {
+        partition_columns_in_data_file = partition_columns_in_data_file_;
+    }
+    virtual void setPartitionStrategy(const std::shared_ptr<IPartitionStrategy> & partition_strategy_)
+    {
+        partition_strategy = partition_strategy_;
+    }
+
+    virtual void assertInitialized() const;
+
+    virtual ColumnMapperPtr getColumnMapperForObject(ObjectInfoPtr /**/) const { return nullptr; }
+
+    virtual ColumnMapperPtr getColumnMapperForCurrentSchema() const { return nullptr; }
+
 
     virtual std::shared_ptr<DataLake::ICatalog> getCatalog(ContextPtr /*context*/, bool /*is_attach*/) const { return nullptr; }
 
@@ -233,24 +294,22 @@ class StorageObjectStorageConfiguration
     String format = "auto";
     String compression_method = "auto";
     String structure = "auto";
+
     PartitionStrategyFactory::StrategyType partition_strategy_type = PartitionStrategyFactory::StrategyType::NONE;
+    std::shared_ptr<IPartitionStrategy> partition_strategy;
     /// Whether partition column values are contained in the actual data.
     /// And alternative is with hive partitioning, when they are contained in file path.
     bool partition_columns_in_data_file = true;
-    std::shared_ptr<IPartitionStrategy> partition_strategy;
 
 protected:
-    virtual void fromNamedCollection(const NamedCollection & collection, ContextPtr context) = 0;
-    virtual void fromAST(ASTs & args, ContextPtr context, bool with_structure) = 0;
-
-    void assertInitialized() const;
-
     bool initialized = false;
 
 private:
     // Path used for reading, by default it is the same as `getRawPath`
     // When using `partition_strategy=hive`, a recursive reading pattern will be appended `'table_root/**.parquet'
     Path read_path;
+
+    std::shared_ptr<ObjectStorageFilePathGenerator> file_path_generator;
 };
 
 using StorageObjectStorageConfigurationPtr = std::shared_ptr<StorageObjectStorageConfiguration>;
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageDefinitions.h b/src/Storages/ObjectStorage/StorageObjectStorageDefinitions.h
index 83fb17ab3b8a..ef00c15750ab 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageDefinitions.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageDefinitions.h
@@ -127,6 +127,13 @@ struct HDFSClusterDefinition
     static constexpr auto non_clustered_storage_engine_name = HDFSDefinition::storage_engine_name;
 };
 
+struct IcebergClusterDefinition
+{
+    static constexpr auto name = "icebergCluster";
+    static constexpr auto storage_engine_name = "IcebergCluster";
+    static constexpr auto non_clustered_storage_engine_name = IcebergDefinition::storage_engine_name;
+};
+
 struct IcebergS3ClusterDefinition
 {
     static constexpr auto name = "icebergS3Cluster";
@@ -148,6 +155,13 @@ struct IcebergHDFSClusterDefinition
     static constexpr auto non_clustered_storage_engine_name = IcebergHDFSDefinition::storage_engine_name;
 };
 
+struct IcebergLocalClusterDefinition
+{
+    static constexpr auto name = "icebergLocalCluster";
+    static constexpr auto storage_engine_name = "IcebergLocalCluster";
+    static constexpr auto non_clustered_storage_engine_name = IcebergLocalDefinition::storage_engine_name;
+};
+
 struct DeltaLakeClusterDefinition
 {
     static constexpr auto name = "deltaLakeCluster";
@@ -155,6 +169,20 @@ struct DeltaLakeClusterDefinition
     static constexpr auto non_clustered_storage_engine_name = DeltaLakeDefinition::storage_engine_name;
 };
 
+struct DeltaLakeS3ClusterDefinition
+{
+    static constexpr auto name = "deltaLakeS3Cluster";
+    static constexpr auto storage_engine_name = "DeltaLakeS3Cluster";
+    static constexpr auto non_clustered_storage_engine_name = DeltaLakeS3Definition::storage_engine_name;
+};
+
+struct DeltaLakeAzureClusterDefinition
+{
+    static constexpr auto name = "deltaLakeAzureCluster";
+    static constexpr auto storage_engine_name = "DeltaLakeAzureCluster";
+    static constexpr auto non_clustered_storage_engine_name = DeltaLakeAzureDefinition::storage_engine_name;
+};
+
 struct HudiClusterDefinition
 {
     static constexpr auto name = "hudiCluster";
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSettings.h b/src/Storages/ObjectStorage/StorageObjectStorageSettings.h
index 1314b7d87c3d..180d71ea0c8a 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSettings.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSettings.h
@@ -68,7 +68,17 @@ struct StorageObjectStorageSettings
 
 using StorageObjectStorageSettingsPtr = std::shared_ptr<StorageObjectStorageSettings>;
 
+// clang-format off
+
+#define STORAGE_OBJECT_STORAGE_RELATED_SETTINGS(DECLARE, ALIAS) \
+    DECLARE(String, object_storage_cluster, "", R"(
+Cluster for distributed requests
+)", 0) \
+
+// clang-format on
+
 #define LIST_OF_STORAGE_OBJECT_STORAGE_SETTINGS(M, ALIAS) \
+    STORAGE_OBJECT_STORAGE_RELATED_SETTINGS(M, ALIAS) \
     LIST_OF_ALL_FORMAT_SETTINGS(M, ALIAS)
 
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
index 785d2c490912..c395d61eacbb 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
@@ -19,6 +19,7 @@ namespace ErrorCodes
 {
     extern const int CANNOT_PARSE_TEXT;
     extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
 }
 
 namespace
@@ -61,7 +62,7 @@ StorageObjectStorageSink::StorageObjectStorageSink(
     , sample_block(sample_block_)
 {
     const auto & settings = context->getSettingsRef();
-    const auto chosen_compression_method = chooseCompressionMethod(path, configuration->compression_method);
+    const auto chosen_compression_method = chooseCompressionMethod(path, configuration->getCompressionMethod());
 
     auto buffer = object_storage->writeObject(
         StoredObject(path), WriteMode::Rewrite, std::nullopt, DBMS_DEFAULT_BUFFER_SIZE, context->getWriteSettings());
@@ -73,7 +74,7 @@ StorageObjectStorageSink::StorageObjectStorageSink(
         static_cast<int>(settings[Setting::output_format_compression_zstd_window_log]));
 
     writer = FormatFactory::instance().getOutputFormatParallelIfPossible(
-        configuration->format, *write_buf, *sample_block, context, format_settings_);
+        configuration->getFormat(), *write_buf, *sample_block, context, format_settings_);
 }
 
 void StorageObjectStorageSink::consume(Chunk & chunk)
@@ -111,6 +112,7 @@ void StorageObjectStorageSink::finalizeBuffers()
     }
 
     write_buf->finalize();
+    result_file_size = write_buf->count();
 }
 
 void StorageObjectStorageSink::releaseBuffers()
@@ -127,14 +129,27 @@ void StorageObjectStorageSink::cancelBuffers()
         write_buf->cancel();
 }
 
+size_t StorageObjectStorageSink::getFileSize() const
+{
+    if (!result_file_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Sink must be finalized before requesting result file size");
+    return *result_file_size;
+}
+
+size_t StorageObjectStorageSink::getWrittenBytes() const
+{
+    if (!write_buf)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer must be initialized before requesting written bytes");
+    return write_buf->count();
+}
+
 PartitionedStorageObjectStorageSink::PartitionedStorageObjectStorageSink(
     ObjectStoragePtr object_storage_,
     StorageObjectStorageConfigurationPtr configuration_,
     std::optional<FormatSettings> format_settings_,
     SharedHeader sample_block_,
     ContextPtr context_)
-    : PartitionedSink(configuration_->partition_strategy, context_, sample_block_)
-    , object_storage(object_storage_)
+    : object_storage(object_storage_)
     , configuration(configuration_)
     , query_settings(configuration_->getQuerySettings(context_))
     , format_settings(format_settings_)
@@ -167,7 +182,7 @@ SinkPtr PartitionedStorageObjectStorageSink::createSinkForPartition(const String
         object_storage,
         configuration,
         format_settings,
-        std::make_shared<Block>(partition_strategy->getFormatHeader()),
+        std::make_shared<Block>(configuration->partition_strategy->getFormatHeader()),
         context
     );
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSink.h b/src/Storages/ObjectStorage/StorageObjectStorageSink.h
index bfaf68a38eb8..1a35b50ab25b 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSink.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSink.h
@@ -8,6 +8,8 @@ namespace DB
 {
 class StorageObjectStorageSink : public SinkToStorage
 {
+friend class StorageObjectStorageImporterSink;
+
 public:
     StorageObjectStorageSink(
         const std::string & path_,
@@ -27,18 +29,23 @@ class StorageObjectStorageSink : public SinkToStorage
 
     const String & getPath() const { return path; }
 
+    size_t getWrittenBytes() const;
+
+    size_t getFileSize() const;
+
 private:
     const String path;
     SharedHeader sample_block;
     std::unique_ptr<WriteBuffer> write_buf;
     OutputFormatPtr writer;
+    std::optional<size_t> result_file_size;
 
     void finalizeBuffers();
     void releaseBuffers();
     void cancelBuffers();
 };
 
-class PartitionedStorageObjectStorageSink : public PartitionedSink
+class PartitionedStorageObjectStorageSink : public PartitionedSink::SinkCreator
 {
 public:
     PartitionedStorageObjectStorageSink(
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
index 7e1cfb4fa69d..1fc4860831e1 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
@@ -27,10 +27,13 @@
 #include <Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
+#include <Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.h>
 #include <Storages/ObjectStorage/Utils.h>
 #include <Storages/VirtualColumnUtils.h>
+#include <boost/operators.hpp>
 #include <Common/SipHash.h>
 #include <Common/parseGlobs.h>
+#include <Storages/ObjectStorage/IObjectIterator.h>
 #if ENABLE_DISTRIBUTED_CACHE
 #include <DistributedCache/DistributedCacheRegistry.h>
 #include <Disks/IO/ReadBufferFromDistributedCache.h>
@@ -38,12 +41,16 @@
 #endif
 
 #include <fmt/ranges.h>
-
+#include <Disks/DiskType.h>
+#include <Common/ProfileEvents.h>
+#include <Core/SettingsEnums.h>
 
 namespace fs = std::filesystem;
 namespace ProfileEvents
 {
     extern const Event EngineFileLikeReadFiles;
+    extern const Event ObjectStorageClusterProcessedTasks;
+    extern const Event ObjectStorageClusterWaitingMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -65,6 +72,9 @@ namespace Setting
     extern const SettingsBool use_iceberg_partition_pruning;
     extern const SettingsBool cluster_function_process_archive_on_multiple_nodes;
     extern const SettingsBool table_engine_read_through_distributed_cache;
+    extern const SettingsBool use_object_storage_list_objects_cache;
+    extern const SettingsBool allow_experimental_iceberg_read_optimization;
+    extern const SettingsObjectStorageGranularityLevel cluster_table_function_split_granularity;
 }
 
 namespace ErrorCodes
@@ -170,6 +180,8 @@ std::shared_ptr<IObjectIterator> StorageObjectStorageSource::createFileIterator(
         return distributed_iterator;
     }
 
+    configuration->update(object_storage, local_context, true, true);
+
     std::unique_ptr<IObjectIterator> iterator;
     const auto & reading_path = configuration->getPathForRead();
     if (reading_path.hasGlobs())
@@ -182,11 +194,36 @@ std::shared_ptr<IObjectIterator> StorageObjectStorageSource::createFileIterator(
                 query_settings.ignore_non_existent_file, skip_object_metadata, file_progress_callback);
         }
         else
+        {
+            std::shared_ptr<IObjectStorageIterator> object_iterator = nullptr;
+            std::unique_ptr<GlobIterator::ListObjectsCacheWithKey> cache_ptr = nullptr;
+
+            if (local_context->getSettingsRef()[Setting::use_object_storage_list_objects_cache] && object_storage->supportsListObjectsCache())
+            {
+                auto & cache = ObjectStorageListObjectsCache::instance();
+                ObjectStorageListObjectsCache::Key cache_key {object_storage->getDescription(), configuration->getNamespace(), configuration->getRawPath().cutGlobs(configuration->supportsPartialPathPrefix())};
+
+                if (auto objects_info = cache.get(cache_key, /*filter_by_prefix=*/ false))
+                {
+                    object_iterator = std::make_shared<ObjectStorageIteratorFromList>(std::move(*objects_info));
+                }
+                else
+                {
+                    cache_ptr = std::make_unique<GlobIterator::ListObjectsCacheWithKey>(cache, cache_key);
+                    object_iterator = object_storage->iterate(configuration->getRawPath().cutGlobs(configuration->supportsPartialPathPrefix()), query_settings.list_object_keys_size);
+                }
+            }
+            else
+            {
+                object_iterator = object_storage->iterate(configuration->getRawPath().cutGlobs(configuration->supportsPartialPathPrefix()), query_settings.list_object_keys_size);
+            }
+
             /// Iterate through disclosed globs and make a source for each file
             iterator = std::make_unique<GlobIterator>(
-                object_storage, configuration, predicate, virtual_columns, hive_columns,
-                local_context, is_archive ? nullptr : read_keys, query_settings.list_object_keys_size,
-                query_settings.throw_on_zero_files_match, file_progress_callback);
+                object_iterator, configuration, predicate, virtual_columns, hive_columns,
+                local_context, is_archive ? nullptr : read_keys,
+                query_settings.throw_on_zero_files_match, file_progress_callback, std::move(cache_ptr));
+        }
     }
     else if (configuration->supportsFileIterator())
     {
@@ -198,7 +235,7 @@ std::shared_ptr<IObjectIterator> StorageObjectStorageSource::createFileIterator(
 
         if (filter_actions_dag)
         {
-            return std::make_shared<ObjectIteratorWithPathAndFileFilter>(
+            iter = std::make_shared<ObjectIteratorWithPathAndFileFilter>(
                 std::move(iter),
                 *filter_actions_dag,
                 virtual_columns,
@@ -206,6 +243,15 @@ std::shared_ptr<IObjectIterator> StorageObjectStorageSource::createFileIterator(
                 configuration->getNamespace(),
                 local_context);
         }
+        if (local_context->getSettingsRef()[Setting::cluster_table_function_split_granularity] == ObjectStorageGranularityLevel::BUCKET)
+        {
+            iter = std::make_shared<ObjectIteratorSplitByBuckets>(
+                std::move(iter),
+                configuration->format,
+                object_storage,
+                local_context
+            );
+        }
         return iter;
     }
     else
@@ -270,7 +316,6 @@ void StorageObjectStorageSource::lazyInitialize()
 
 Chunk StorageObjectStorageSource::generate()
 {
-
     lazyInitialize();
 
     while (true)
@@ -307,10 +352,24 @@ Chunk StorageObjectStorageSource::generate()
 
             const auto path = getUniqueStoragePathIdentifier(*configuration, *object_info, false);
 
+            /// The order is important, hive partition columns must be added before virtual columns
+            /// because they are part of the schema
+            if (!read_from_format_info.hive_partition_columns_to_read_from_file_path.empty())
+            {
+                HivePartitioningUtils::addPartitionColumnsToChunk(
+                    chunk,
+                    read_from_format_info.hive_partition_columns_to_read_from_file_path,
+                    path);
+            }
+
+            /// For _path column, use absolute_path if available (e.g., file:///home/...)
+            /// Otherwise, fall back to the storage path identifier
+            std::string path_for_virtual_column = object_info->getAbsolutePath().value_or(path);
+
             VirtualColumnUtils::addRequestedFileLikeStorageVirtualsToChunk(
                 chunk,
                 read_from_format_info.requested_virtual_columns,
-                {.path = path,
+                {.path = path_for_virtual_column,
                  .size = object_info->isArchive() ? object_info->fileSizeInArchive() : object_info->metadata->size_bytes,
                  .filename = &filename,
                  .last_modified = object_info->metadata->last_modified,
@@ -318,14 +377,16 @@ Chunk StorageObjectStorageSource::generate()
                  .data_lake_snapshot_version = file_iterator->getSnapshotVersion()},
                 read_context);
 
-            // The order is important, it must be added after virtual columns..
-            if (!read_from_format_info.hive_partition_columns_to_read_from_file_path.empty())
+            /// Not empty when allow_experimental_iceberg_read_optimization=true
+            /// and some columns were removed from read list as columns with constant values.
+            /// Restore data for these columns.
+            for (const auto & constant_column : reader.constant_columns_with_values)
             {
-                HivePartitioningUtils::addPartitionColumnsToChunk(
-                    chunk,
-                    read_from_format_info.hive_partition_columns_to_read_from_file_path,
-                    path);
+                chunk.addColumn(constant_column.first,
+                    constant_column.second.name_and_type.type->createColumnConst(
+                        chunk.getNumRows(), constant_column.second.value)->convertToFullColumnIfConst());
             }
+
 #if USE_PARQUET && USE_AWS_S3
             if (chunk_size && chunk.hasColumns())
             {
@@ -403,7 +464,7 @@ Chunk StorageObjectStorageSource::generate()
 void StorageObjectStorageSource::addNumRowsToCache(const ObjectInfo & object_info, size_t num_rows)
 {
     const auto cache_key = getKeyForSchemaCache(
-        getUniqueStoragePathIdentifier(*configuration, object_info), configuration->format, format_settings, read_context);
+        getUniqueStoragePathIdentifier(*configuration, object_info), configuration->getFormat(), format_settings, read_context);
     schema_cache.addNumRows(cache_key, num_rows);
 }
 
@@ -443,43 +504,65 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
     ObjectInfoPtr object_info;
     auto query_settings = configuration->getQuerySettings(context_);
 
+    bool not_a_path = false;
+
     do
     {
+        not_a_path = false;
         object_info = file_iterator->next(processor);
 
-        if (!object_info || object_info->getPath().empty())
+        if (!object_info)
             return {};
 
-        if (!object_info->metadata)
+        if (object_info->getCommand().isValid())
         {
-            const auto & path = object_info->isArchive() ? object_info->getPathToArchive() : object_info->getPath();
-
-            if (query_settings.ignore_non_existent_file)
+            auto retry_after_us = object_info->getCommand().getRetryAfterUs();
+            if (retry_after_us.has_value())
             {
-                auto metadata = object_storage->tryGetObjectMetadata(path);
-                if (!metadata)
-                    return {};
-
-                object_info->metadata = metadata;
+                not_a_path = true;
+                /// TODO: Make asyncronous waiting without sleep in thread
+                /// Now this sleep is on executor node in worker thread
+                /// Does not block query initiator
+                auto wait_time = std::min(Poco::Timestamp::TimeDiff(100000ul), retry_after_us.value());
+                ProfileEvents::increment(ProfileEvents::ObjectStorageClusterWaitingMicroseconds, wait_time);
+                sleepForMicroseconds(wait_time);
+                continue;
             }
-            else
-                object_info->metadata = object_storage->getObjectMetadata(path);
         }
+
+        if (object_info->getPath().empty())
+            return {};
+
+        object_info->loadMetadata(object_storage, query_settings.ignore_non_existent_file);
     }
-    while (query_settings.skip_empty_files && object_info->metadata->size_bytes == 0);
+    while (not_a_path || (query_settings.skip_empty_files && object_info->metadata->size_bytes == 0));
+
+    ProfileEvents::increment(ProfileEvents::ObjectStorageClusterProcessedTasks);
+
+    ObjectStoragePtr storage_to_use = object_info->getObjectStorage();
+    if (!storage_to_use)
+        storage_to_use = object_storage;
 
     QueryPipelineBuilder builder;
     std::shared_ptr<ISource> source;
     std::unique_ptr<ReadBuffer> read_buf;
+    std::optional<Int64> rows_count_from_metadata;
 
     auto try_get_num_rows_from_cache = [&]() -> std::optional<size_t>
     {
+        if (rows_count_from_metadata.has_value())
+        {
+            /// Must be non negative here
+            size_t value = rows_count_from_metadata.value();
+            return value;
+        }
+
         if (!schema_cache)
             return std::nullopt;
 
         const auto cache_key = getKeyForSchemaCache(
             getUniqueStoragePathIdentifier(*configuration, *object_info),
-            configuration->format,
+            configuration->getFormat(),
             format_settings,
             context_);
 
@@ -492,6 +575,128 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
         return schema_cache->tryGetNumRows(cache_key, get_last_mod_time);
     };
 
+    /// List of columns with constant value in current file, and values
+    std::map<size_t, ConstColumnWithValue> constant_columns_with_values;
+    std::unordered_set<String> constant_columns;
+
+    NamesAndTypesList requested_columns_copy = read_from_format_info.requested_columns;
+
+    std::unordered_map<String, std::pair<size_t, NameAndTypePair>> requested_columns_list;
+    {
+        size_t column_index = 0;
+        for (const auto & column : requested_columns_copy)
+            requested_columns_list[column.getNameInStorage()] = std::make_pair(column_index++, column);
+    }
+
+    if (context_->getSettingsRef()[Setting::allow_experimental_iceberg_read_optimization])
+    {
+        auto file_meta_data = object_info->getFileMetaInfo();
+        if (file_meta_data.has_value())
+        {
+            bool is_all_rows_count_equals = true;
+            for (const auto & column : file_meta_data.value()->columns_info)
+            {
+                if (is_all_rows_count_equals && column.second.rows_count.has_value())
+                {
+                    if (rows_count_from_metadata.has_value())
+                    {
+                        if (column.second.rows_count.value() != rows_count_from_metadata.value())
+                        {
+                            LOG_WARNING(log, "Inconsistent rows count for file {} in metadats, ignored", object_info->getPath());
+                            is_all_rows_count_equals = false;
+                            rows_count_from_metadata = std::nullopt;
+                        }
+                    }
+                    else if (column.second.rows_count.value() < 0)
+                    {
+                        LOG_WARNING(log, "Negative rows count for file {} in metadats, ignored", object_info->getPath());
+                        is_all_rows_count_equals = false;
+                        rows_count_from_metadata = std::nullopt;
+                    }
+                    else
+                        rows_count_from_metadata = column.second.rows_count;
+                }
+
+                if (column.second.hyperrectangle.has_value())
+                {
+                    auto column_name = column.first;
+
+                    auto i_column = requested_columns_list.find(column_name);
+                    if (i_column == requested_columns_list.end())
+                        continue;
+
+                    if (column.second.hyperrectangle.value().isPoint() &&
+                        (!column.second.nulls_count.has_value() || column.second.nulls_count.value() <= 0))
+                    {
+                        /// isPoint() method checks before that left==right
+                        constant_columns_with_values[i_column->second.first] =
+                            ConstColumnWithValue{
+                                i_column->second.second,
+                                column.second.hyperrectangle.value().left
+                            };
+                        constant_columns.insert(column_name);
+
+                        LOG_DEBUG(log, "In file {} constant column '{}' type '{}' with value '{}'",
+                            object_info->getPath(),
+                            column_name,
+                            i_column->second.second.type,
+                            column.second.hyperrectangle.value().left.dump());
+                    }
+                    else if (column.second.rows_count.has_value() && column.second.nulls_count.has_value()
+                            && column.second.rows_count.value() == column.second.nulls_count.value()
+                            && i_column->second.second.type->isNullable())
+                    {
+                        constant_columns_with_values[i_column->second.first] =
+                            ConstColumnWithValue{
+                                i_column->second.second,
+                                Field()
+                            };
+                        constant_columns.insert(column_name);
+
+                        LOG_DEBUG(log, "In file {} constant column '{}' type '{}' with value 'NULL'",
+                            object_info->getPath(),
+                            column_name,
+                            i_column->second.second.type);
+                    }
+                }
+            }
+            for (const auto & column : requested_columns_list)
+            {
+                const auto & column_name = column.first;
+
+                if (file_meta_data.value()->columns_info.contains(column_name))
+                    continue;
+
+                if (!column.second.second.type->isNullable())
+                    continue;
+
+                /// Column is nullable and absent in file
+                constant_columns_with_values[column.second.first] =
+                    ConstColumnWithValue{
+                        column.second.second,
+                        Field()
+                    };
+                constant_columns.insert(column_name);
+
+                LOG_DEBUG(log, "In file {} constant column '{}' type '{}' with value 'NULL'",
+                    object_info->getPath(),
+                    column_name,
+                    column.second.second.type);
+            }
+        }
+
+        if (!constant_columns.empty())
+        {
+            size_t original_columns = requested_columns_copy.size();
+            requested_columns_copy = requested_columns_copy.eraseNames(constant_columns);
+            if (requested_columns_copy.size() + constant_columns.size() != original_columns)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't remove constant columns for file {} correct, fallback to read. Founded constant columns: [{}]",
+                    object_info->getPath(), constant_columns);
+            if (requested_columns_copy.empty())
+                need_only_count = true;
+        }
+    }
+
     std::optional<size_t> num_rows_from_cache
         = need_only_count && context_->getSettingsRef()[Setting::use_cache_for_count_from_files] ? try_get_num_rows_from_cache() : std::nullopt;
 
@@ -509,23 +714,26 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
             columns.emplace_back(type->createColumn(), type, name);
         builder.init(Pipe(std::make_shared<ConstChunkGenerator>(
                               std::make_shared<const Block>(columns), *num_rows_from_cache, max_block_size)));
+        if (!constant_columns.empty())
+            configuration->addDeleteTransformers(object_info, builder, format_settings, context_);
     }
     else
     {
         CompressionMethod compression_method;
         if (const auto * object_info_in_archive = dynamic_cast<const ArchiveIterator::ObjectInfoInArchive *>(object_info.get()))
         {
-            compression_method = chooseCompressionMethod(configuration->getPathInArchive(), configuration->compression_method);
+            compression_method = chooseCompressionMethod(configuration->getPathInArchive(), configuration->getCompressionMethod());
             const auto & archive_reader = object_info_in_archive->archive_reader;
             read_buf = archive_reader->readFile(object_info_in_archive->path_in_archive, /*throw_on_not_found=*/true);
         }
         else
         {
-            compression_method = chooseCompressionMethod(object_info->getFileName(), configuration->compression_method);
-            read_buf = createReadBuffer(*object_info, object_storage, context_, log);
+            compression_method = chooseCompressionMethod(object_info->getFileName(), configuration->getCompressionMethod());
+            read_buf = createReadBuffer(*object_info, storage_to_use, context_, log);
         }
 
         Block initial_header = read_from_format_info.format_header;
+        bool schema_changed = false;
 
         if (auto initial_schema = configuration->getInitialSchemaByPath(context_, object_info))
         {
@@ -535,26 +743,40 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
                 sample_header.insert({type->createColumn(), type, name});
             }
             initial_header = sample_header;
+            schema_changed = true;
         }
+        auto filter_info = [&]()
+        {
+            if (!schema_changed)
+                return format_filter_info;
+            auto mapper = configuration->getColumnMapperForObject(object_info);
+            if (!mapper)
+                return format_filter_info;
+            return std::make_shared<FormatFilterInfo>(format_filter_info->filter_actions_dag, format_filter_info->context.lock(), mapper);
+        }();
 
         auto input_format = FormatFactory::instance().getInput(
-            configuration->format,
+            configuration->getFormat(),
             *read_buf,
             initial_header,
             context_,
             max_block_size,
             format_settings,
             parser_shared_resources,
-            format_filter_info,
+            filter_info,
             true /* is_remote_fs */,
             compression_method,
             need_only_count);
 
+        input_format->setBucketsToRead(object_info->file_bucket_info);
         input_format->setSerializationHints(read_from_format_info.serialization_hints);
 
         if (need_only_count)
             input_format->needOnlyCount();
 
+        if (!object_info->getPath().empty())
+            input_format->setStorageRelatedUniqueKey(context_->getSettingsRef(), object_info->getPath() + ":" + object_info->metadata->etag);
+
         builder.init(Pipe(input_format));
 
         configuration->addDeleteTransformers(object_info, builder, format_settings, context_);
@@ -599,7 +821,7 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
     /// from chunk read by IInputFormat.
     builder.addSimpleTransform([&](const SharedHeader & header)
     {
-        return std::make_shared<ExtractColumnsTransform>(header, read_from_format_info.requested_columns);
+        return std::make_shared<ExtractColumnsTransform>(header, requested_columns_copy);
     });
 
     auto pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
@@ -608,7 +830,12 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
     ProfileEvents::increment(ProfileEvents::EngineFileLikeReadFiles);
 
     return ReaderHolder(
-        object_info, std::move(read_buf), std::move(source), std::move(pipeline), std::move(current_reader));
+        object_info,
+        std::move(read_buf),
+        std::move(source),
+        std::move(pipeline),
+        std::move(current_reader),
+        std::move(constant_columns_with_values));
 }
 
 std::future<StorageObjectStorageSource::ReaderHolder> StorageObjectStorageSource::createReaderAsync()
@@ -626,6 +853,10 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
     const auto & settings = context_->getSettingsRef();
     const auto & effective_read_settings = read_settings.has_value() ? read_settings.value() : context_->getReadSettings();
 
+    ObjectStoragePtr storage_to_use = object_info.getObjectStorage();
+    if (!storage_to_use)
+        storage_to_use = object_storage;
+
     bool use_distributed_cache = false;
 #if ENABLE_DISTRIBUTED_CACHE
     ObjectStorageConnectionInfoPtr connection_info;
@@ -633,7 +864,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
         && DistributedCache::Registry::instance().isReady(
             effective_read_settings.distributed_cache_settings.read_only_from_current_az))
     {
-        connection_info = object_storage->getConnectionInfo();
+        connection_info = storage_to_use->getConnectionInfo();
         if (connection_info)
             use_distributed_cache = true;
     }
@@ -646,15 +877,15 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
         filesystem_cache_name = settings[Setting::filesystem_cache_name].value;
         use_filesystem_cache = effective_read_settings.enable_filesystem_cache
             && !filesystem_cache_name.empty()
-            && (object_storage->getType() == ObjectStorageType::Azure
-                || object_storage->getType() == ObjectStorageType::S3);
+            && (storage_to_use->getType() == ObjectStorageType::Azure
+                || storage_to_use->getType() == ObjectStorageType::S3);
     }
 
     /// We need object metadata for two cases:
     /// 1. object size suggests whether we need to use prefetch
     /// 2. object etag suggests a cache key in case we use filesystem cache
     if (!object_info.metadata)
-        object_info.metadata = object_storage->getObjectMetadata(object_info.getPath());
+        object_info.metadata = storage_to_use->getObjectMetadata(object_info.getPath());
 
     const auto & object_size = object_info.metadata->size_bytes;
 
@@ -690,9 +921,9 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
     {
         const std::string path = object_info.getPath();
         StoredObject object(path, "", object_size);
-        auto read_buffer_creator = [object, nested_buffer_read_settings, object_storage]()
+        auto read_buffer_creator = [object, nested_buffer_read_settings, storage_to_use]()
         {
-            return object_storage->readObject(object, nested_buffer_read_settings);
+            return storage_to_use->readObject(object, nested_buffer_read_settings);
         };
 
         impl = std::make_unique<ReadBufferFromDistributedCache>(
@@ -725,9 +956,9 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
             const auto cache_key = FileCacheKey::fromKey(hash.get128());
             auto cache = FileCacheFactory::instance().get(filesystem_cache_name);
 
-            auto read_buffer_creator = [path = object_info.getPath(), object_size, nested_buffer_read_settings, object_storage]()
+            auto read_buffer_creator = [path = object_info.getPath(), object_size, nested_buffer_read_settings, object_storage, storage_to_use]()
             {
-                return object_storage->readObject(StoredObject(path, "", object_size), nested_buffer_read_settings);
+                return storage_to_use->readObject(StoredObject(path, "", object_size), nested_buffer_read_settings);
             };
 
             impl = std::make_unique<CachedOnDiskReadBufferFromFile>(
@@ -755,7 +986,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
     }
 
     if (!impl)
-        impl = object_storage->readObject(StoredObject(object_info.getPath(), "", object_size), nested_buffer_read_settings);
+        impl = storage_to_use->readObject(StoredObject(object_info.getPath(), "", object_size), nested_buffer_read_settings);
 
     if (!use_async_buffer)
         return impl;
@@ -792,18 +1023,18 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
 }
 
 StorageObjectStorageSource::GlobIterator::GlobIterator(
-    ObjectStoragePtr object_storage_,
-    StorageObjectStorageConfigurationPtr configuration_,
+    const ObjectStorageIteratorPtr & object_storage_iterator_,
+    ConfigurationPtr configuration_,
     const ActionsDAG::Node * predicate,
     const NamesAndTypesList & virtual_columns_,
     const NamesAndTypesList & hive_columns_,
     ContextPtr context_,
     ObjectInfos * read_keys_,
-    size_t list_object_keys_size,
     bool throw_on_zero_files_match_,
-    std::function<void(FileProgress)> file_progress_callback_)
+    std::function<void(FileProgress)> file_progress_callback_,
+    std::unique_ptr<ListObjectsCacheWithKey> list_cache_)
     : WithContext(context_)
-    , object_storage(object_storage_)
+    , object_storage_iterator(object_storage_iterator_)
     , configuration(configuration_)
     , virtual_columns(virtual_columns_)
     , hive_columns(hive_columns_)
@@ -812,6 +1043,7 @@ StorageObjectStorageSource::GlobIterator::GlobIterator(
     , read_keys(read_keys_)
     , local_context(context_)
     , file_progress_callback(file_progress_callback_)
+    , list_cache(std::move(list_cache_))
 {
     const auto & reading_path = configuration->getPathForRead();
     if (reading_path.hasGlobs())
@@ -819,8 +1051,6 @@ StorageObjectStorageSource::GlobIterator::GlobIterator(
         const auto & key_with_globs = reading_path;
         const auto key_prefix = reading_path.cutGlobs(configuration->supportsPartialPathPrefix());
 
-        object_storage_iterator = object_storage->iterate(key_prefix, list_object_keys_size);
-
         matcher = std::make_unique<re2::RE2>(makeRegexpPatternFromGlobs(key_with_globs.path));
         if (!matcher->ok())
         {
@@ -884,11 +1114,21 @@ StorageObjectStorage::ObjectInfoPtr StorageObjectStorageSource::GlobIterator::ne
             auto result = object_storage_iterator->getCurrentBatchAndScheduleNext();
             if (!result.has_value())
             {
+                if (list_cache)
+                {
+                    list_cache->set(std::move(object_list));
+                }
                 is_finished = true;
                 return {};
             }
 
             new_batch = std::move(result.value());
+
+            if (list_cache)
+            {
+                object_list.insert(object_list.end(), new_batch.begin(), new_batch.end());
+            }
+
             for (auto it = new_batch.begin(); it != new_batch.end();)
             {
                 if (!recursive && !re2::RE2::FullMatch((*it)->getPath(), *matcher))
@@ -1000,12 +1240,14 @@ StorageObjectStorageSource::ReaderHolder::ReaderHolder(
     std::unique_ptr<ReadBuffer> read_buf_,
     std::shared_ptr<ISource> source_,
     std::unique_ptr<QueryPipeline> pipeline_,
-    std::unique_ptr<PullingPipelineExecutor> reader_)
+    std::unique_ptr<PullingPipelineExecutor> reader_,
+    std::map<size_t, ConstColumnWithValue> && constant_columns_with_values_)
     : object_info(std::move(object_info_))
     , read_buf(std::move(read_buf_))
     , source(std::move(source_))
     , pipeline(std::move(pipeline_))
     , reader(std::move(reader_))
+    , constant_columns_with_values(std::move(constant_columns_with_values_))
 {
 }
 
@@ -1019,6 +1261,7 @@ StorageObjectStorageSource::ReaderHolder::operator=(ReaderHolder && other) noexc
     source = std::move(other.source);
     read_buf = std::move(other.read_buf);
     object_info = std::move(other.object_info);
+    constant_columns_with_values = std::move(other.constant_columns_with_values);
     return *this;
 }
 
@@ -1033,6 +1276,12 @@ StorageObjectStorageSource::ReadTaskIterator::ReadTaskIterator(
     , is_archive(is_archive_)
     , object_storage(object_storage_)
 {
+    if (!getContext()->isSwarmModeEnabled())
+    {
+        LOG_DEBUG(getLogger("StorageObjectStorageSource"), "STOP SWARM MODE called, stop getting new tasks");
+        return;
+    }
+
     ThreadPool pool(
         CurrentMetrics::StorageObjectStorageThreads,
         CurrentMetrics::StorageObjectStorageThreadsActive,
@@ -1057,7 +1306,22 @@ StorageObjectStorageSource::ReadTaskIterator::ReadTaskIterator(
     {
         auto object = object_future.get();
         if (object)
+        {
+            if (object->getAbsolutePath().has_value())
+            {
+                auto [storage_to_use, key] = resolveObjectStorageForPath("", object->getAbsolutePath().value(), object_storage, secondary_storages, getContext());
+                if (!key.empty())
+                {
+                    object->object_storage_to_use = storage_to_use;
+                    object->relative_path = key;
+                }
+            }
+            else
+            {
+                object->object_storage_to_use = object_storage;
+            }
             buffer.push_back(object);
+        }
     }
 }
 
@@ -1068,10 +1332,35 @@ StorageObjectStorage::ObjectInfoPtr StorageObjectStorageSource::ReadTaskIterator
     ObjectInfoPtr object_info;
     if (current_index >= buffer.size())
     {
-        auto task = callback();
-        if (!task || task->isEmpty())
+        if (!getContext()->isSwarmModeEnabled())
+        {
+            LOG_DEBUG(getLogger("StorageObjectStorageSource"), "STOP SWARM MODE called, stop getting new tasks");
+            return nullptr;
+        }
+
+        auto raw = callback();
+        if (!raw || raw->isEmpty())
             return nullptr;
-        object_info = task->getObjectInfo();
+
+        object_info = raw->getObjectInfo();
+
+        // The 'path' field from master is already the correctly resolved relative path.
+        // We should use it directly and NOT overwrite relative_path.
+        // Only resolve absolute_path if we need to determine which storage to use (for secondary storages).
+        object_info->object_storage_to_use = object_storage;
+
+        if (raw->absolute_path.has_value())
+        {
+            auto [storage_to_use, key]
+                = resolveObjectStorageForPath("", raw->absolute_path.value(), object_storage, secondary_storages, getContext());
+
+            if (!key.empty() && storage_to_use != object_storage)
+            {
+                // File is in a different storage (secondary storage), use that storage
+                // BUT preserve the original relative_path from master - don't overwrite it!
+                object_info->object_storage_to_use = storage_to_use;
+            }
+        }
     }
     else
     {
@@ -1168,7 +1457,10 @@ StorageObjectStorageSource::ArchiveIterator::createArchiveReader(ObjectInfoPtr o
     return DB::createArchiveReader(
         /* path_to_archive */
         object_info->getPath(),
-        /* archive_read_function */ [=, this]() { return createReadBuffer(*object_info, object_storage, getContext(), log); },
+        /* archive_read_function */ [=, this]() {
+            ObjectStoragePtr storage = object_info->getObjectStorage() ? object_info->getObjectStorage() : object_storage;
+            return createReadBuffer(*object_info, storage, getContext(), log);
+        },
         /* archive_size */ size);
 }
 
@@ -1190,7 +1482,12 @@ ObjectInfoPtr StorageObjectStorageSource::ArchiveIterator::next(size_t processor
                 }
 
                 if (!archive_object->metadata)
-                    archive_object->metadata = object_storage->getObjectMetadata(archive_object->getPath());
+                {
+                    ObjectStoragePtr storage_to_use = archive_object->getObjectStorage();
+                    if (!storage_to_use)
+                        storage_to_use = object_storage;
+                    archive_object->metadata = storage_to_use->getObjectMetadata(archive_object->getPath());
+                }
 
                 archive_reader = createArchiveReader(archive_object);
                 file_enumerator = archive_reader->firstFile();
@@ -1216,7 +1513,12 @@ ObjectInfoPtr StorageObjectStorageSource::ArchiveIterator::next(size_t processor
                 return {};
 
             if (!archive_object->metadata)
-                archive_object->metadata = object_storage->getObjectMetadata(archive_object->getPath());
+            {
+                ObjectStoragePtr storage_to_use = archive_object->getObjectStorage();
+                if (!storage_to_use)
+                    storage_to_use = object_storage;
+                archive_object->metadata = storage_to_use->getObjectMetadata(archive_object->getPath());
+            }
 
             archive_reader = createArchiveReader(archive_object);
             if (!archive_reader->fileExists(path_in_archive))
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSource.h b/src/Storages/ObjectStorage/StorageObjectStorageSource.h
index 8145105a09e2..ebcc159d8679 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSource.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSource.h
@@ -8,8 +8,12 @@
 #include <Processors/Formats/IInputFormat.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorage/IObjectIterator.h>
+#include <Storages/ObjectStorage/Utils.h>
 #include <Formats/FormatParserSharedResources.h>
 #include <Formats/FormatFilterInfo.h>
+#include <Storages/Cache/ObjectStorageListObjectsCache.h>
+
+
 namespace DB
 {
 
@@ -87,6 +91,12 @@ class StorageObjectStorageSource : public ISource
     size_t total_rows_in_file = 0;
     LoggerPtr log = getLogger("StorageObjectStorageSource");
 
+    struct ConstColumnWithValue
+    {
+        NameAndTypePair name_and_type;
+        Field value;
+    };
+
     struct ReaderHolder : private boost::noncopyable
     {
     public:
@@ -95,7 +105,8 @@ class StorageObjectStorageSource : public ISource
             std::unique_ptr<ReadBuffer> read_buf_,
             std::shared_ptr<ISource> source_,
             std::unique_ptr<QueryPipeline> pipeline_,
-            std::unique_ptr<PullingPipelineExecutor> reader_);
+            std::unique_ptr<PullingPipelineExecutor> reader_,
+            std::map<size_t, ConstColumnWithValue> && constant_columns_with_values_);
 
         ReaderHolder() = default;
         ReaderHolder(ReaderHolder && other) noexcept { *this = std::move(other); }
@@ -114,6 +125,9 @@ class StorageObjectStorageSource : public ISource
         std::shared_ptr<ISource> source;
         std::unique_ptr<QueryPipeline> pipeline;
         std::unique_ptr<PullingPipelineExecutor> reader;
+
+    public:
+        std::map<size_t, ConstColumnWithValue> constant_columns_with_values;
     };
 
     ReaderHolder reader;
@@ -166,6 +180,7 @@ class StorageObjectStorageSource::ReadTaskIterator : public IObjectIterator, pri
     std::atomic_size_t index = 0;
     bool is_archive;
     ObjectStoragePtr object_storage;
+    SecondaryStorages secondary_storages; // Sometimes data can be located on a different storage
     /// path_to_archive -> archive reader.
     std::unordered_map<std::string, std::shared_ptr<IArchiveReader>> archive_readers;
     std::mutex archive_readers_mutex;
@@ -175,17 +190,33 @@ class StorageObjectStorageSource::ReadTaskIterator : public IObjectIterator, pri
 class StorageObjectStorageSource::GlobIterator : public IObjectIterator, WithContext
 {
 public:
+    struct ListObjectsCacheWithKey
+    {
+        ListObjectsCacheWithKey(ObjectStorageListObjectsCache & cache_, const ObjectStorageListObjectsCache::Key & key_) : cache(cache_), key(key_) {}
+
+        void set(ObjectStorageListObjectsCache::Value && value) const
+        {
+            cache.set(key, std::make_shared<ObjectStorageListObjectsCache::Value>(std::move(value)));
+        }
+
+    private:
+        ObjectStorageListObjectsCache & cache;
+        ObjectStorageListObjectsCache::Key key;
+    };
+
+    using ConfigurationPtr = std::shared_ptr<StorageObjectStorageConfiguration>;
+
     GlobIterator(
-        ObjectStoragePtr object_storage_,
-        StorageObjectStorageConfigurationPtr configuration_,
+        const ObjectStorageIteratorPtr & object_storage_iterator_,
+        ConfigurationPtr configuration_,
         const ActionsDAG::Node * predicate,
         const NamesAndTypesList & virtual_columns_,
         const NamesAndTypesList & hive_columns_,
         ContextPtr context_,
         ObjectInfos * read_keys_,
-        size_t list_object_keys_size,
         bool throw_on_zero_files_match_,
-        std::function<void(FileProgress)> file_progress_callback_ = {});
+        std::function<void(FileProgress)> file_progress_callback_ = {},
+        std::unique_ptr<ListObjectsCacheWithKey> list_cache_ = nullptr);
 
     ~GlobIterator() override = default;
 
@@ -198,7 +229,7 @@ class StorageObjectStorageSource::GlobIterator : public IObjectIterator, WithCon
     void createFilterAST(const String & any_key);
     void fillBufferForKey(const std::string & uri_key);
 
-    const ObjectStoragePtr object_storage;
+    ObjectStorageIteratorPtr object_storage_iterator;
     const StorageObjectStorageConfigurationPtr configuration;
     const NamesAndTypesList virtual_columns;
     const NamesAndTypesList hive_columns;
@@ -210,7 +241,6 @@ class StorageObjectStorageSource::GlobIterator : public IObjectIterator, WithCon
     ObjectInfos object_infos;
     ObjectInfos * read_keys;
     ExpressionActionsPtr filter_expr;
-    ObjectStorageIteratorPtr object_storage_iterator;
     bool recursive{false};
     std::vector<String> expanded_keys;
     std::vector<String>::iterator expanded_keys_iter;
@@ -223,6 +253,8 @@ class StorageObjectStorageSource::GlobIterator : public IObjectIterator, WithCon
     const ContextPtr local_context;
 
     std::function<void(FileProgress)> file_progress_callback;
+    std::unique_ptr<ListObjectsCacheWithKey> list_cache;
+    ObjectInfos object_list;
 };
 
 class StorageObjectStorageSource::KeysIterator : public IObjectIterator
@@ -247,7 +279,7 @@ class StorageObjectStorageSource::KeysIterator : public IObjectIterator
     const ObjectStoragePtr object_storage;
     const NamesAndTypesList virtual_columns;
     const std::function<void(FileProgress)> file_progress_callback;
-    const std::vector<String> keys;
+    const Strings keys;
     std::atomic<size_t> index = 0;
     bool ignore_non_existent_files;
     bool skip_object_metadata;
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp b/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp
index 37b966cd7bbc..2984facad9d0 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp
@@ -3,40 +3,69 @@
 #include <consistent_hashing.h>
 #include <optional>
 
+namespace ProfileEvents
+{
+    extern const Event ObjectStorageClusterSentToMatchedReplica;
+    extern const Event ObjectStorageClusterSentToNonMatchedReplica;
+};
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-}
+    extern const int CANNOT_READ_ALL_DATA;
+};
 
 StorageObjectStorageStableTaskDistributor::StorageObjectStorageStableTaskDistributor(
     std::shared_ptr<IObjectIterator> iterator_,
     std::vector<std::string> && ids_of_nodes_,
-    bool send_over_whole_archive_)
+    bool send_over_whole_archive_,
+    uint64_t lock_object_storage_task_distribution_ms_)
     : iterator(std::move(iterator_))
     , send_over_whole_archive(send_over_whole_archive_)
     , connection_to_files(ids_of_nodes_.size())
     , ids_of_nodes(std::move(ids_of_nodes_))
+    , lock_object_storage_task_distribution_us(lock_object_storage_task_distribution_ms_ * 1000)
     , iterator_exhausted(false)
 {
+    Poco::Timestamp now;
+    size_t nodes = ids_of_nodes.size();
+    for (size_t i = 0; i < nodes; ++i)
+    {
+        replica_to_files_to_be_processed[i] = std::list<ObjectInfoPtr>{};
+        last_node_activity[i] = now;
+    }
 }
 
 ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getNextTask(size_t number_of_current_replica)
 {
     LOG_TRACE(log, "Received request from replica {} looking for a file", number_of_current_replica);
 
-    // 1. Check pre-queued files first
-    if (auto file = getPreQueuedFile(number_of_current_replica))
-        return file;
+    saveLastNodeActivity(number_of_current_replica);
 
-    // 2. Try to find a matching file from the iterator
-    if (auto file = getMatchingFileFromIterator(number_of_current_replica))
-        return file;
+    auto processed_file_list_ptr = replica_to_files_to_be_processed.find(number_of_current_replica);
+    if (processed_file_list_ptr == replica_to_files_to_be_processed.end())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Replica number {} was marked as lost, can't set task for it anymore",
+            number_of_current_replica
+        );
 
+    // 1. Check pre-queued files first
+    auto file = getPreQueuedFile(number_of_current_replica);
+    // 2. Try to find a matching file from the iterator
+    if (!file)
+        file = getMatchingFileFromIterator(number_of_current_replica);
     // 3. Process unprocessed files if iterator is exhausted
-    return getAnyUnprocessedFile(number_of_current_replica);
+    if (!file)
+        file = getAnyUnprocessedFile(number_of_current_replica);
+
+    if (file)
+        processed_file_list_ptr->second.push_back(file);
+
+    return file;
 }
 
 size_t StorageObjectStorageStableTaskDistributor::getReplicaForFile(const String & file_path)
@@ -48,16 +77,27 @@ size_t StorageObjectStorageStableTaskDistributor::getReplicaForFile(const String
         return 0;
 
     /// Rendezvous hashing
-    size_t best_id = 0;
-    UInt64 best_weight = sipHash64(ids_of_nodes[0] + file_path);
-    for (size_t id = 1; id < nodes_count; ++id)
+    auto replica = replica_to_files_to_be_processed.begin();
+    if (replica == replica_to_files_to_be_processed.end())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "No active replicas, can't find best replica for file {}",
+            file_path
+        );
+
+    size_t best_id = replica->first;
+    UInt64 best_weight = sipHash64(ids_of_nodes[best_id] + file_path);
+    ++replica;
+    while (replica != replica_to_files_to_be_processed.end())
     {
+        size_t id = replica->first;
         UInt64 weight = sipHash64(ids_of_nodes[id] + file_path);
         if (weight > best_weight)
         {
             best_weight = weight;
             best_id = id;
         }
+        ++replica;
     }
     return best_id;
 }
@@ -81,8 +121,8 @@ ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getPreQueuedFile(size_t
         auto next_file = files.back();
         files.pop_back();
 
-        auto file_path = send_over_whole_archive ? next_file->getPathOrPathToArchiveIfArchive() : next_file->getPath();
-        auto it = unprocessed_files.find(file_path);
+        auto file_identifier = send_over_whole_archive ? next_file->getPathOrPathToArchiveIfArchive() : next_file->getIdentifier();
+        auto it = unprocessed_files.find(file_identifier);
         if (it == unprocessed_files.end())
             continue;
 
@@ -91,10 +131,11 @@ ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getPreQueuedFile(size_t
         LOG_TRACE(
             log,
             "Assigning pre-queued file {} to replica {}",
-            file_path,
+            file_identifier,
             number_of_current_replica
         );
 
+        ProfileEvents::increment(ProfileEvents::ObjectStorageClusterSentToMatchedReplica);
         return next_file;
     }
 
@@ -113,6 +154,19 @@ ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getMatchingFileFromIter
     {
         ObjectInfoPtr object_info;
 
+        if (iterator->has_concurrent_next())
+        {
+            object_info = iterator->next(0);
+
+            if (!object_info)
+            {
+                LOG_TEST(log, "Iterator is exhausted");
+                std::lock_guard lock(mutex);
+                iterator_exhausted = true;
+                break;
+            }
+        }
+        else
         {
             std::lock_guard lock(mutex);
             object_info = iterator->next(0);
@@ -125,33 +179,34 @@ ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getMatchingFileFromIter
             }
         }
 
-        String file_path;
+        String file_identifier;
         if (send_over_whole_archive && object_info->isArchive())
         {
-            file_path = object_info->getPathOrPathToArchiveIfArchive();
+            file_identifier = object_info->getPathOrPathToArchiveIfArchive();
             LOG_TEST(log, "Will send over the whole archive {} to replicas. "
                      "This will be suboptimal, consider turning on "
-                     "cluster_function_process_archive_on_multiple_nodes setting", file_path);
+                     "cluster_function_process_archive_on_multiple_nodes setting", file_identifier);
         }
         else
         {
-            file_path = object_info->getPath();
+            file_identifier = object_info->getIdentifier();
         }
 
-        size_t file_replica_idx = getReplicaForFile(file_path);
+        size_t file_replica_idx = getReplicaForFile(file_identifier);
         if (file_replica_idx == number_of_current_replica)
         {
             LOG_TRACE(
                 log, "Found file {} for replica {}",
-                file_path, number_of_current_replica
+                file_identifier, number_of_current_replica
             );
 
+            ProfileEvents::increment(ProfileEvents::ObjectStorageClusterSentToMatchedReplica);
             return object_info;
         }
         LOG_TEST(
             log,
             "Found file {} for replica {} (number of current replica: {})",
-            file_path,
+            file_identifier,
             file_replica_idx,
             number_of_current_replica
         );
@@ -159,7 +214,7 @@ ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getMatchingFileFromIter
         // Queue file for its assigned replica
         {
             std::lock_guard lock(mutex);
-            unprocessed_files.emplace(file_path, object_info);
+            unprocessed_files.emplace(file_identifier, std::make_pair(object_info, file_replica_idx));
             connection_to_files[file_replica_idx].push_back(object_info);
         }
     }
@@ -169,26 +224,97 @@ ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getMatchingFileFromIter
 
 ObjectInfoPtr StorageObjectStorageStableTaskDistributor::getAnyUnprocessedFile(size_t number_of_current_replica)
 {
+    /// Limit time of node activity to keep task in queue
+    Poco::Timestamp activity_limit;
+    Poco::Timestamp oldest_activity;
+    if (lock_object_storage_task_distribution_us > 0)
+        activity_limit -= lock_object_storage_task_distribution_us;
+
     std::lock_guard lock(mutex);
 
     if (!unprocessed_files.empty())
     {
         auto it = unprocessed_files.begin();
-        auto next_file = it->second;
-        unprocessed_files.erase(it);
 
-        auto file_path = send_over_whole_archive ? next_file->getPathOrPathToArchiveIfArchive() : next_file->getPath();
+        while (it != unprocessed_files.end())
+        {
+            auto number_of_matched_replica = it->second.second;
+            auto last_activity = last_node_activity.find(number_of_matched_replica);
+            if (lock_object_storage_task_distribution_us <= 0 // file deferring is turned off
+                || it->second.second == number_of_current_replica // file is matching with current replica
+                || last_activity == last_node_activity.end() // msut never be happen, last_activity is filled for each replica on start
+                || activity_limit > last_activity->second) // matched replica did not ask for a new files for a while
+            {
+                auto next_file = it->second.first;
+                unprocessed_files.erase(it);
+
+                auto file_path = send_over_whole_archive ? next_file->getPathOrPathToArchiveIfArchive() : next_file->getAbsolutePath().value_or(next_file->getPath());
+                LOG_TRACE(
+                    log,
+                    "Iterator exhausted. Assigning unprocessed file {} to replica {} from matched replica {}",
+                    file_path,
+                    number_of_current_replica,
+                    number_of_matched_replica
+                );
+
+                ProfileEvents::increment(ProfileEvents::ObjectStorageClusterSentToNonMatchedReplica);
+                return next_file;
+            }
+
+            oldest_activity = std::min(oldest_activity, last_activity->second);
+            ++it;
+        }
+
         LOG_TRACE(
             log,
-            "Iterator exhausted. Assigning unprocessed file {} to replica {}",
-            file_path,
-            number_of_current_replica
+            "No unprocessed file for replica {}, need to retry after {} us",
+            number_of_current_replica,
+            oldest_activity - activity_limit
         );
 
-        return next_file;
+        /// All unprocessed files owned by alive replicas with recenlty activity
+        /// Need to retry after (oldest_activity - activity_limit) microseconds
+        PathWithMetadata::CommandInTaskResponse response;
+        response.setRetryAfterUs(oldest_activity - activity_limit);
+        return std::make_shared<ObjectInfo>(response.toString());
     }
 
     return {};
 }
 
+void StorageObjectStorageStableTaskDistributor::saveLastNodeActivity(size_t number_of_current_replica)
+{
+    Poco::Timestamp now;
+    std::lock_guard lock(mutex);
+    last_node_activity[number_of_current_replica] = now;
+}
+
+void StorageObjectStorageStableTaskDistributor::rescheduleTasksFromReplica(size_t number_of_current_replica)
+{
+    LOG_INFO(log, "Replica {} is marked as lost, tasks are returned to queue", number_of_current_replica);
+    std::lock_guard lock(mutex);
+
+    auto processed_file_list_ptr = replica_to_files_to_be_processed.find(number_of_current_replica);
+    if (processed_file_list_ptr == replica_to_files_to_be_processed.end())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Replica number {} was marked as lost already",
+            number_of_current_replica
+        );
+
+    if (replica_to_files_to_be_processed.size() < 2)
+        throw Exception(
+            ErrorCodes::CANNOT_READ_ALL_DATA,
+            "All replicas were marked as lost"
+        );
+
+    replica_to_files_to_be_processed.erase(number_of_current_replica);
+    for (const auto & file : processed_file_list_ptr->second)
+    {
+        auto file_replica_idx = getReplicaForFile(file->getAbsolutePath().value_or(file->getPath()));
+        unprocessed_files.emplace(file->getAbsolutePath().value_or(file->getPath()), std::make_pair(file, file_replica_idx));
+        connection_to_files[file_replica_idx].push_back(file);
+    }
+}
+
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.h b/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.h
index 02d3ba7a030f..25673b3eeb02 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.h
@@ -4,7 +4,13 @@
 #include <Common/Logger.h>
 #include <Interpreters/Cluster.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSource.h>
+#include <Storages/ObjectStorageQueue/ObjectStorageQueueSource.h>
+
+#include <Poco/Timestamp.h>
+
 #include <unordered_set>
+#include <unordered_map>
+#include <list>
 #include <vector>
 #include <mutex>
 #include <memory>
@@ -18,24 +24,34 @@ class StorageObjectStorageStableTaskDistributor
     StorageObjectStorageStableTaskDistributor(
         std::shared_ptr<IObjectIterator> iterator_,
         std::vector<std::string> && ids_of_nodes_,
-        bool send_over_whole_archive_);
+        bool send_over_whole_archive_,
+        uint64_t lock_object_storage_task_distribution_ms_);
 
     ObjectInfoPtr getNextTask(size_t number_of_current_replica);
 
+    /// Insert objects back to unprocessed files
+    void rescheduleTasksFromReplica(size_t number_of_current_replica);
+
 private:
     size_t getReplicaForFile(const String & file_path);
     ObjectInfoPtr getPreQueuedFile(size_t number_of_current_replica);
     ObjectInfoPtr getMatchingFileFromIterator(size_t number_of_current_replica);
     ObjectInfoPtr getAnyUnprocessedFile(size_t number_of_current_replica);
 
+    void saveLastNodeActivity(size_t number_of_current_replica);
+
     const std::shared_ptr<IObjectIterator> iterator;
     const bool send_over_whole_archive;
 
     std::vector<std::vector<ObjectInfoPtr>> connection_to_files;
-    std::unordered_map<std::string, ObjectInfoPtr> unprocessed_files;
+    std::unordered_map<std::string, std::pair<ObjectInfoPtr, size_t>> unprocessed_files;
 
     std::vector<std::string> ids_of_nodes;
 
+    std::unordered_map<size_t, Poco::Timestamp> last_node_activity;
+    Poco::Timestamp::TimeDiff lock_object_storage_task_distribution_us;
+    std::unordered_map<size_t, std::list<ObjectInfoPtr>> replica_to_files_to_be_processed;
+
     std::mutex mutex;
     bool iterator_exhausted = false;
 
diff --git a/src/Storages/ObjectStorage/Utils.cpp b/src/Storages/ObjectStorage/Utils.cpp
index 5b5cc208ef86..229a7d1a99d7 100644
--- a/src/Storages/ObjectStorage/Utils.cpp
+++ b/src/Storages/ObjectStorage/Utils.cpp
@@ -9,6 +9,18 @@
 #include <Interpreters/Context.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorage/Utils.h>
+#include <Disks/ObjectStorages/ObjectStorageFactory.h>
+#include <Poco/Util/MapConfiguration.h>
+#include <IO/S3/URI.h>
+#include <filesystem>
+#include <functional>
+#if USE_AWS_S3
+#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
+#endif
+#if USE_HDFS
+#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
+#endif
+
 
 namespace DB
 {
@@ -19,6 +31,178 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+namespace
+{
+
+std::string normalizeScheme(const std::string & scheme)
+{
+    auto scheme_lowercase = Poco::toLower(scheme);
+
+    if (scheme_lowercase == "s3a" || scheme_lowercase == "s3n")
+        scheme_lowercase = "s3";
+    else if (scheme_lowercase == "wasb" || scheme_lowercase == "wasbs" || scheme_lowercase == "abfss")
+        scheme_lowercase = "abfs";
+
+    return scheme_lowercase;
+}
+
+std::string factoryTypeForScheme(const std::string & normalized_scheme)
+{
+    if (normalized_scheme == "s3") return "s3";
+    if (normalized_scheme == "abfs") return "azure";
+    if (normalized_scheme == "hdfs") return "hdfs";
+    if (normalized_scheme == "file") return "local";
+    return "";
+}
+
+bool isAbsolutePath(const std::string & path)
+{
+    if (!path.empty() && (path.front() == '/' || path.find("://") != std::string_view::npos))
+        return true;
+
+    return false;
+}
+
+/// Normalize a path string by removing redundant components and leading slashes.
+std::string normalizePathString(const std::string & path)
+{
+    std::filesystem::path fs_path(path);
+    std::filesystem::path normalized = fs_path.lexically_normal();
+
+    std::string normalized_result = normalized.string();
+
+    while (!normalized_result.empty() && normalized_result.front() == '/')
+        normalized_result = normalized_result.substr(1);
+
+    return normalized_result;
+}
+
+#if USE_AWS_S3
+/// For s3:// URIs (generic), bucket needs to match.
+/// For explicit http(s):// URIs, both bucket and endpoint must match.
+bool s3URIMatches(const S3::URI & target_uri, const std::string & base_bucket, const std::string & base_endpoint, const std::string & target_scheme_normalized)
+{
+    bool bucket_matches = (target_uri.bucket == base_bucket);
+    bool endpoint_matches = (target_uri.endpoint == base_endpoint);
+    bool is_generic_s3_uri = (target_scheme_normalized == "s3");
+    return bucket_matches && (endpoint_matches || is_generic_s3_uri);
+}
+#endif
+
+std::pair<ObjectStoragePtr, std::string> getOrCreateStorageAndKey(
+    const std::string & cache_key,
+    const std::string & key_to_use,
+    const std::string & storage_type,
+    SecondaryStorages & secondary_storages,
+    const ContextPtr & context,
+    std::function<void(Poco::Util::MapConfiguration &, const std::string &)> configure_fn)
+{
+    {
+        std::lock_guard lock(secondary_storages.mutex);
+        if (auto it = secondary_storages.storages.find(cache_key); it != secondary_storages.storages.end())
+            return {it->second, key_to_use};
+    }
+
+    Poco::AutoPtr<Poco::Util::MapConfiguration> cfg(new Poco::Util::MapConfiguration);
+    const std::string config_prefix = "object_storages." + cache_key;
+
+    cfg->setString(config_prefix + ".object_storage_type", storage_type);
+
+    configure_fn(*cfg, config_prefix);
+
+    ObjectStoragePtr storage = ObjectStorageFactory::instance().create(cache_key, *cfg, config_prefix, context, /*skip_access_check*/ true);
+
+    {
+        std::lock_guard lock(secondary_storages.mutex);
+        auto [it, inserted] = secondary_storages.storages.emplace(cache_key, storage);
+        if (!inserted)
+            return {it->second, key_to_use};
+    }
+
+    return {storage, key_to_use};
+}
+
+/// Normalize a path (relative to table location ot absolute path) to a key that will be looked up in the object storage.
+std::string normalizePathToStorageRoot(const std::string & table_location, const std::string & path)
+{
+    if (table_location.empty())
+    {
+        if (!path.empty() && path.front() == '/')
+            return path.substr(1);
+        return path;
+    }
+
+    if (isAbsolutePath(path))
+        return SchemeAuthorityKey(path).key; // Absolute path, return the key part
+
+    SchemeAuthorityKey base{table_location};
+    if (base.key.empty())
+        return path; // Table location is empty, return the path as is
+
+    std::string base_key_trimmed = base.key;
+    while (!base_key_trimmed.empty() && base_key_trimmed.front() == '/')
+        base_key_trimmed = base_key_trimmed.substr(1);
+    while (!base_key_trimmed.empty() && base_key_trimmed.back() == '/')
+        base_key_trimmed.pop_back();
+
+    std::string rel_path = path;
+    while (!rel_path.empty() && rel_path.front() == '/')
+        rel_path = rel_path.substr(1);
+
+    if (!base_key_trimmed.empty() && (rel_path == base_key_trimmed || rel_path.starts_with(base_key_trimmed + "/")))
+        return normalizePathString(rel_path);  // Path already includes table location
+
+    std::string result = base.key;
+    if (!result.empty() && result.back() != '/')
+        result += '/';
+    result += rel_path;
+
+    return normalizePathString(result);
+}
+
+}
+
+// TODO: handle https://s3.amazonaws.com/bucketname/... properly
+SchemeAuthorityKey::SchemeAuthorityKey(const std::string & uri)
+{
+    if (uri.empty())
+        return;
+
+    if (auto scheme_sep = uri.find("://"); scheme_sep != std::string_view::npos)
+    {
+        scheme = Poco::toLower(uri.substr(0, scheme_sep));
+        auto rest = uri.substr(scheme_sep + 3); // skip ://
+
+        // authority is up to next '/'
+        auto slash = rest.find('/');
+        if (slash == std::string_view::npos)
+        {
+            authority = std::string(rest);
+            key = "/";   // Path obviously incorrect, but it will be dealt with by caller
+            return;
+        }
+        authority = std::string(rest.substr(0, slash));
+        /// For file:// URIs, the path is absolute, so we need to keep the leading '/'
+        /// e.g. file:///home/user/data -> scheme="file", authority="", key="/home/user/data"
+        if (scheme == "file")
+            key = std::string(rest.substr(slash));
+        else
+            key = std::string(rest.substr(++slash));
+        return;
+    }
+
+    // if part has no scheme and starts with '/' -- it is an absolute uri for local file: file:///path
+    if (uri.front() == '/')
+    {
+        scheme = "file";
+        key = std::string(uri);
+        return;
+    }
+
+    // Relative path
+    key = std::string(uri);
+}
+
 std::optional<String> checkAndGetNewFileOnInsertIfNeeded(
     const IObjectStorage & object_storage,
     const StorageObjectStorageConfiguration & configuration,
@@ -54,14 +238,13 @@ std::optional<String> checkAndGetNewFileOnInsertIfNeeded(
 
 void resolveSchemaAndFormat(
     ColumnsDescription & columns,
-    std::string & format,
     ObjectStoragePtr object_storage,
-    const StorageObjectStorageConfigurationPtr & configuration,
+    StorageObjectStorageConfigurationPtr & configuration,
     std::optional<FormatSettings> format_settings,
     std::string & sample_path,
     const ContextPtr & context)
 {
-    if (format == "auto")
+    if (configuration->getFormat() == "auto")
     {
         if (configuration->isDataLakeConfiguration())
         {
@@ -83,21 +266,23 @@ void resolveSchemaAndFormat(
 
         if (columns.empty())
         {
-            if (format == "auto")
+            if (configuration->getFormat() == "auto")
             {
+                std::string format;
                 std::tie(columns, format) = StorageObjectStorage::resolveSchemaAndFormatFromData(
                     object_storage, configuration, format_settings, sample_path, context);
+                configuration->setFormat(format);
             }
             else
             {
-                chassert(!format.empty());
+                chassert(!configuration->getFormat().empty());
                 columns = StorageObjectStorage::resolveSchemaFromData(object_storage, configuration, format_settings, sample_path, context);
             }
         }
     }
-    else if (format == "auto")
+    else if (configuration->getFormat() == "auto")
     {
-        format = StorageObjectStorage::resolveFormatFromData(object_storage, configuration, format_settings, sample_path, context);
+        configuration->setFormat(StorageObjectStorage::resolveFormatFromData(object_storage, configuration, format_settings, sample_path, context));
     }
 
     validateSupportedColumns(columns, *configuration);
@@ -116,11 +301,208 @@ void validateSupportedColumns(
     }
 }
 
-namespace Setting
+std::string makeAbsolutePath(const std::string & table_location, const std::string & path)
 {
-extern const SettingsUInt64 max_download_buffer_size;
-extern const SettingsBool use_cache_for_count_from_files;
-extern const SettingsString filesystem_cache_name;
-extern const SettingsUInt64 filesystem_cache_boundary_alignment;
+    if (isAbsolutePath(path))
+        return path;
+
+    auto table_location_decomposed = SchemeAuthorityKey(table_location);
+
+    std::string normalized_key = normalizePathToStorageRoot(table_location, path);
+
+    if (!table_location_decomposed.scheme.empty())
+        return table_location_decomposed.scheme + "://" + table_location_decomposed.authority + "/" + normalized_key;
+
+    return normalized_key;
+}
+
+std::pair<DB::ObjectStoragePtr, std::string> resolveObjectStorageForPath(
+    const std::string & table_location,
+    const std::string & path,
+    const DB::ObjectStoragePtr & base_storage,
+    SecondaryStorages & secondary_storages,
+    const DB::ContextPtr & context)
+{
+    if (!isAbsolutePath(path))
+        return {base_storage, normalizePathToStorageRoot(table_location, path)}; // Relative path definitely goes to base storage
+
+    SchemeAuthorityKey table_location_decomposed{table_location};
+    SchemeAuthorityKey target_decomposed{path};
+
+    const std::string base_scheme_normalized = normalizeScheme(table_location_decomposed.scheme);
+    const std::string target_scheme_normalized = normalizeScheme(target_decomposed.scheme);
+
+    // For S3 URIs, use S3::URI to properly handle all kinds of URIs, e.g. https://s3.amazonaws.com/bucket/... == s3://bucket/...
+    #if USE_AWS_S3
+    if (target_scheme_normalized == "s3" || target_scheme_normalized == "https" || target_scheme_normalized == "http")
+    {
+        std::string normalized_path = path;
+        if (target_decomposed.scheme == "s3a" || target_decomposed.scheme == "s3n")
+        {
+            normalized_path = "s3://" + target_decomposed.authority + "/" + target_decomposed.key;
+        }
+        S3::URI s3_uri(normalized_path);
+      
+        // Use key (parsed without URI decoding) so that percent-encoded
+        // characters in object keys (e.g. %2F in Iceberg partition paths) are preserved.
+        std::string key_to_use = target_decomposed.key;
+      
+        bool use_base_storage = false;
+        if (base_storage->getType() == ObjectStorageType::S3)
+        {
+            if (auto s3_storage = std::dynamic_pointer_cast<S3ObjectStorage>(base_storage))
+            {
+                const std::string base_bucket = s3_storage->getObjectsNamespace();
+                const std::string base_endpoint = s3_storage->getDescription();
+
+                if (s3URIMatches(s3_uri, base_bucket, base_endpoint, target_scheme_normalized))
+                    use_base_storage = true;
+            }
+        }
+
+        if (!use_base_storage && (base_scheme_normalized == "s3" || base_scheme_normalized == "https" || base_scheme_normalized == "http"))
+        {
+            std::string normalized_table_location = table_location;
+            if (table_location_decomposed.scheme == "s3a" || table_location_decomposed.scheme == "s3n")
+            {
+                normalized_table_location = "s3://" + table_location_decomposed.authority + "/" + table_location_decomposed.key;
+            }
+            S3::URI base_s3_uri(normalized_table_location);
+
+            if (s3URIMatches(s3_uri, base_s3_uri.bucket, base_s3_uri.endpoint, target_scheme_normalized))
+                use_base_storage = true;
+        }
+
+        if (use_base_storage)
+            return {base_storage, key_to_use};
+
+        const std::string storage_cache_key = "s3://" + s3_uri.bucket + "@" + (s3_uri.endpoint.empty() ? "amazonaws.com" : s3_uri.endpoint);
+
+        return getOrCreateStorageAndKey(
+            storage_cache_key,
+            key_to_use,
+            "s3",
+            secondary_storages,
+            context,
+            [&](Poco::Util::MapConfiguration & cfg, const std::string & config_prefix)
+            {
+                // Use the full endpoint or construct it from bucket
+                std::string endpoint = s3_uri.endpoint.empty()
+                    ? ("https://" + s3_uri.bucket + ".s3.amazonaws.com")
+                    : s3_uri.endpoint;
+                cfg.setString(config_prefix + ".endpoint", endpoint);
+
+                // Copy credentials from base storage if it's also S3
+                if (base_storage->getType() == ObjectStorageType::S3)
+                {
+                    if (auto s3_storage = std::dynamic_pointer_cast<S3ObjectStorage>(base_storage))
+                    {
+                        if (auto s3_client = s3_storage->tryGetS3StorageClient())
+                        {
+                            const auto credentials = s3_client->getCredentials();
+                            const String & access_key_id = credentials.GetAWSAccessKeyId();
+                            const String & secret_access_key = credentials.GetAWSSecretKey();
+                            const String & session_token = credentials.GetSessionToken();
+                            const String & region = s3_client->getRegion();
+
+                            if (!access_key_id.empty())
+                                cfg.setString(config_prefix + ".access_key_id", access_key_id);
+                            if (!secret_access_key.empty())
+                                cfg.setString(config_prefix + ".secret_access_key", secret_access_key);
+                            if (!session_token.empty())
+                                cfg.setString(config_prefix + ".session_token", session_token);
+                            if (!region.empty())
+                                cfg.setString(config_prefix + ".region", region);
+                        }
+                    }
+                }
+            });
+    }
+    #endif
+
+    #if USE_HDFS
+    if (target_scheme_normalized == "hdfs")
+    {
+        bool use_base_storage = false;
+
+        // Check if base_storage matches (only if it's HDFS)
+        if (base_storage->getType() == ObjectStorageType::HDFS)
+        {
+            if (auto hdfs_storage = std::dynamic_pointer_cast<HDFSObjectStorage>(base_storage))
+            {
+                const std::string base_url = hdfs_storage->getDescription();
+                // Extract endpoint from base URL (hdfs://namenode:port/path -> hdfs://namenode:port)
+                std::string base_endpoint;
+                if (auto pos = base_url.find('/', base_url.find("//") + 2); pos != std::string::npos)
+                    base_endpoint = base_url.substr(0, pos);
+                else
+                    base_endpoint = base_url;
+
+                // For HDFS, compare endpoints (namenode addresses)
+                std::string target_endpoint = target_scheme_normalized + "://" + target_decomposed.authority;
+
+                if (base_endpoint == target_endpoint)
+                    use_base_storage = true;
+
+                // Also check if table_location matches
+                if (!use_base_storage && base_scheme_normalized == "hdfs")
+                {
+                    if (table_location_decomposed.authority == target_decomposed.authority)
+                        use_base_storage = true;
+                }
+            }
+        }
+
+        if (use_base_storage)
+            return {base_storage, target_decomposed.key};
+    }
+    #endif
+
+    /// Fallback for schemes not handled above (e.g., abfs, file)
+    if (base_scheme_normalized == target_scheme_normalized && table_location_decomposed.authority == target_decomposed.authority)
+        return {base_storage, target_decomposed.key};
+
+    const std::string cache_key = target_scheme_normalized + "://" + target_decomposed.authority;
+
+    const std::string type_for_factory = factoryTypeForScheme(target_scheme_normalized);
+    if (type_for_factory.empty())
+        throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unsupported storage scheme '{}' in path '{}'", target_scheme_normalized, path);
+
+    /// Handle storage types that need new storage creation
+    return getOrCreateStorageAndKey(
+        cache_key,
+        target_decomposed.key,
+        type_for_factory,
+        secondary_storages,
+        context,
+        [&](Poco::Util::MapConfiguration & cfg, const std::string & config_prefix)
+        {
+            if (target_scheme_normalized == "file")
+            {
+                std::filesystem::path fs_path(target_decomposed.key);
+                std::filesystem::path parent = fs_path.parent_path();
+                std::string dir_path = parent.string();
+
+                if (dir_path.empty() || dir_path == "/")
+                    dir_path = "/";
+                else if (dir_path.back() != '/')
+                    dir_path += '/';
+
+                cfg.setString(config_prefix + ".path", dir_path);
+            }
+            else if (target_scheme_normalized == "abfs")
+            {
+                cfg.setString(config_prefix + ".endpoint", target_scheme_normalized + "://" + target_decomposed.authority);
+            }
+            else if (target_scheme_normalized == "hdfs")
+            {
+                // HDFS endpoint must end with '/'
+                auto endpoint = target_scheme_normalized + "://" + target_decomposed.authority;
+                if (!endpoint.empty() && endpoint.back() != '/')
+                    endpoint.push_back('/');
+                cfg.setString(config_prefix + ".endpoint", endpoint);
+            }
+        });
 }
+
 }
diff --git a/src/Storages/ObjectStorage/Utils.h b/src/Storages/ObjectStorage/Utils.h
index e7964778080b..2d99dbe269b7 100644
--- a/src/Storages/ObjectStorage/Utils.h
+++ b/src/Storages/ObjectStorage/Utils.h
@@ -1,11 +1,35 @@
 #pragma once
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 
+#include <Disks/ObjectStorages/IObjectStorage_fwd.h>
+#include <mutex>
+#include <map>
+
 namespace DB
 {
 
 class IObjectStorage;
 
+/// Thread-safe wrapper for secondary object storages map
+struct SecondaryStorages
+{
+    mutable std::mutex mutex;
+    std::map<std::string, ObjectStoragePtr> storages;
+};
+
+// A URI splitted into components
+//  s3://bucket/a/b -> scheme="s3", authority="bucket", path="/a/b"
+//  file:///var/x    -> scheme="file", authority="",     path="/var/x"
+//  /abs/p           -> scheme="",     authority="",     path="/abs/p"
+struct SchemeAuthorityKey
+{
+    explicit SchemeAuthorityKey(const std::string & uri);
+
+    std::string scheme;
+    std::string authority;
+    std::string key;
+};
+
 std::optional<std::string> checkAndGetNewFileOnInsertIfNeeded(
     const IObjectStorage & object_storage,
     const StorageObjectStorageConfiguration & configuration,
@@ -15,9 +39,8 @@ std::optional<std::string> checkAndGetNewFileOnInsertIfNeeded(
 
 void resolveSchemaAndFormat(
     ColumnsDescription & columns,
-    std::string & format,
     ObjectStoragePtr object_storage,
-    const StorageObjectStorageConfigurationPtr & configuration,
+    StorageObjectStorageConfigurationPtr & configuration,
     std::optional<FormatSettings> format_settings,
     std::string & sample_path,
     const ContextPtr & context);
@@ -32,4 +55,17 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
     const ContextPtr & context_,
     const LoggerPtr & log,
     const std::optional<ReadSettings> & read_settings = std::nullopt);
+
+std::string makeAbsolutePath(const std::string & table_location, const std::string & path);
+
+/// Resolve object storage and key for reading from that storage
+/// If path is relative -- it must be read from base_storage
+/// Otherwise, look for a suitable storage in secondary_storages
+std::pair<DB::ObjectStoragePtr, std::string> resolveObjectStorageForPath(
+    const std::string & table_location,
+    const std::string & path,
+    const DB::ObjectStoragePtr & base_storage,
+    SecondaryStorages & secondary_storages,
+    const DB::ContextPtr & context);
+
 }
diff --git a/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp b/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
index 708e9ae34b9b..60ceecb1e874 100644
--- a/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
+++ b/src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
@@ -14,6 +14,7 @@
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSettings.h>
 #include <Storages/ObjectStorage/StorageObjectStorageDefinitions.h>
+#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 #include <Storages/StorageFactory.h>
 #include <Poco/Logger.h>
 
@@ -37,7 +38,7 @@ namespace
 // LocalObjectStorage is only supported for Iceberg Datalake operations where Avro format is required. For regular file access, use FileStorage instead.
 #if USE_AWS_S3 || USE_AZURE_BLOB_STORAGE || USE_HDFS || USE_AVRO
 
-std::shared_ptr<StorageObjectStorage>
+StoragePtr
 createStorageObjectStorage(const StorageFactory::Arguments & args, StorageObjectStorageConfigurationPtr configuration)
 {
     auto & engine_args = args.engine_args;
@@ -45,7 +46,16 @@ createStorageObjectStorage(const StorageFactory::Arguments & args, StorageObject
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
 
     const auto context = args.getLocalContext();
-    StorageObjectStorageConfiguration::initialize(*configuration, args.engine_args, context, false);
+
+    std::string cluster_name;
+
+    if (args.storage_def->settings)
+    {
+        if (const auto * value = args.storage_def->settings->changes.tryGet("object_storage_cluster"))
+            cluster_name = value->safeGet<std::string>();
+    }
+
+    configuration->initialize(args.engine_args, context, false);
 
     // Use format settings from global server context + settings from
     // the SETTINGS clause of the create query. Settings from current
@@ -72,23 +82,26 @@ createStorageObjectStorage(const StorageFactory::Arguments & args, StorageObject
     ContextMutablePtr context_copy = Context::createCopy(args.getContext());
     Settings settings_copy = args.getLocalContext()->getSettingsCopy();
     context_copy->setSettings(settings_copy);
-    return std::make_shared<StorageObjectStorage>(
+    return std::make_shared<StorageObjectStorageCluster>(
+        cluster_name,
         configuration,
         // We only want to perform write actions (e.g. create a container in Azure) when the table is being created,
         // and we want to avoid it when we load the table after a server restart.
         configuration->createObjectStorage(context, /* is_readonly */ args.mode != LoadingStrictnessLevel::CREATE),
-        context_copy, /// Use global context.
         args.table_id,
         args.columns,
         args.constraints,
+        partition_by,
+        context_copy, /// Use global context.
         args.comment,
         format_settings,
         args.mode,
         configuration->getCatalog(context, args.query.attach),
         args.query.if_not_exists,
-        /* is_datalake_query*/ false,
+        /* is_datalake_query */ false,
         /* distributed_processing */ false,
-        partition_by);
+        /* is_table_function */ false,
+        /* lazy_init */ false);
 }
 
 #endif
@@ -198,13 +211,12 @@ static DataLakeStorageSettingsPtr getDataLakeStorageSettings(const ASTStorage &
 
 void registerStorageIceberg(StorageFactory & factory)
 {
-#if USE_AWS_S3
     factory.registerStorage(
         IcebergDefinition::storage_engine_name,
         [&](const StorageFactory::Arguments & args)
         {
             const auto storage_settings = getDataLakeStorageSettings(*args.storage_def);
-            auto configuration = std::make_shared<StorageS3IcebergConfiguration>(storage_settings);
+            auto configuration = std::make_shared<StorageIcebergConfiguration>(storage_settings);
             return createStorageObjectStorage(args, configuration);
         },
         {
@@ -215,6 +227,7 @@ void registerStorageIceberg(StorageFactory & factory)
             .has_builtin_setting_fn = DataLakeStorageSettings::hasBuiltin,
         });
 
+#    if USE_AWS_S3
     factory.registerStorage(
         IcebergS3Definition::storage_engine_name,
         [&](const StorageFactory::Arguments & args)
@@ -288,7 +301,7 @@ void registerStorageIceberg(StorageFactory & factory)
 #if USE_PARQUET && USE_DELTA_KERNEL_RS
 void registerStorageDeltaLake(StorageFactory & factory)
 {
-#if USE_AWS_S3
+#   if USE_AWS_S3
     factory.registerStorage(
         DeltaLakeDefinition::storage_engine_name,
         [&](const StorageFactory::Arguments & args)
diff --git a/src/Storages/ObjectStorage/tests/gtest_rendezvous_hashing.cpp b/src/Storages/ObjectStorage/tests/gtest_rendezvous_hashing.cpp
index b00c1d609fa1..47a45d925ebf 100644
--- a/src/Storages/ObjectStorage/tests/gtest_rendezvous_hashing.cpp
+++ b/src/Storages/ObjectStorage/tests/gtest_rendezvous_hashing.cpp
@@ -101,7 +101,7 @@ TEST(RendezvousHashing, SingleNode)
     {
         auto iterator = makeIterator();
         std::vector<std::string> replicas = {"replica0", "replica1", "replica2", "replica3"};
-        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
         std::vector<std::string> paths;
         ASSERT_TRUE(extractNForReplica(distributor, paths, 0, 10));
         ASSERT_TRUE(checkHead(paths, {6}));
@@ -110,7 +110,7 @@ TEST(RendezvousHashing, SingleNode)
     {
         auto iterator = makeIterator();
         std::vector<std::string> replicas = {"replica0", "replica1", "replica2", "replica3"};
-        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
         std::vector<std::string> paths;
         ASSERT_TRUE(extractNForReplica(distributor, paths, 1, 10));
         ASSERT_TRUE(checkHead(paths, {0, 2, 4}));
@@ -119,7 +119,7 @@ TEST(RendezvousHashing, SingleNode)
     {
         auto iterator = makeIterator();
         std::vector<std::string> replicas = {"replica0", "replica1", "replica2", "replica3"};
-        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
         std::vector<std::string> paths;
         ASSERT_TRUE(extractNForReplica(distributor, paths, 2, 10));
         ASSERT_TRUE(checkHead(paths, {1, 5, 7, 8}));
@@ -128,7 +128,7 @@ TEST(RendezvousHashing, SingleNode)
     {
         auto iterator = makeIterator();
         std::vector<std::string> replicas = {"replica0", "replica1", "replica2", "replica3"};
-        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
         std::vector<std::string> paths;
         ASSERT_TRUE(extractNForReplica(distributor, paths, 3, 10));
         ASSERT_TRUE(checkHead(paths, {3, 9}));
@@ -139,7 +139,7 @@ TEST(RendezvousHashing, MultipleNodes)
 {
     auto iterator = makeIterator();
     std::vector<std::string> replicas = {"replica0", "replica1", "replica2", "replica3"};
-    StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+    StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
 
     {
         std::vector<std::string> paths;
@@ -171,7 +171,7 @@ TEST(RendezvousHashing, SingleNodeReducedCluster)
     {
         auto iterator = makeIterator();
         std::vector<std::string> replicas = {"replica2", "replica1"};
-        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
         std::vector<std::string> paths;
         ASSERT_TRUE(extractNForReplica(distributor, paths, 0, 10));
         ASSERT_TRUE(checkHead(paths, {1, 5, 6, 7, 8, 9}));
@@ -180,7 +180,7 @@ TEST(RendezvousHashing, SingleNodeReducedCluster)
     {
         auto iterator = makeIterator();
         std::vector<std::string> replicas = {"replica2", "replica1"};
-        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+        StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
         std::vector<std::string> paths;
         ASSERT_TRUE(extractNForReplica(distributor, paths, 1, 10));
         ASSERT_TRUE(checkHead(paths, {0, 2, 3, 4}));
@@ -191,7 +191,7 @@ TEST(RendezvousHashing, MultipleNodesReducedCluster)
 {
     auto iterator = makeIterator();
     std::vector<std::string> replicas = {"replica2", "replica1"};
-    StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+    StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
 
     {
         std::vector<std::string> paths;
@@ -210,7 +210,7 @@ TEST(RendezvousHashing, MultipleNodesReducedClusterOneByOne)
 {
     auto iterator = makeIterator();
     std::vector<std::string> replicas = {"replica2", "replica1"};
-    StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false);
+    StorageObjectStorageStableTaskDistributor distributor(iterator, std::move(replicas), false, 0);
 
     std::vector<std::string> paths0;
     std::vector<std::string> paths1;
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.cpp
index 9edddb8e3639..ac44fd993691 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.cpp
@@ -132,12 +132,14 @@ ObjectStorageQueueIFileMetadata::ObjectStorageQueueIFileMetadata(
     FileStatusPtr file_status_,
     size_t max_loading_retries_,
     std::atomic<size_t> & metadata_ref_count_,
+    bool use_persistent_processing_nodes_,
     LoggerPtr log_)
     : path(path_)
     , node_name(getNodeName(path_))
     , file_status(file_status_)
     , max_loading_retries(max_loading_retries_)
     , metadata_ref_count(metadata_ref_count_)
+    , use_persistent_processing_nodes(use_persistent_processing_nodes_)
     , processing_node_path(processing_node_path_)
     , processed_node_path(processed_node_path_)
     , failed_node_path(failed_node_path_)
@@ -190,6 +192,13 @@ ObjectStorageQueueIFileMetadata::~ObjectStorageQueueIFileMetadata()
     }
 }
 
+std::string ObjectStorageQueueIFileMetadata::getProcessingNodesPath(bool use_persistent_processing_nodes)
+{
+    if (use_persistent_processing_nodes)
+        return "persistent_processing";
+    return "processing";
+}
+
 std::string ObjectStorageQueueIFileMetadata::getNodeName(const std::string & path)
 {
     /// Since with are dealing with paths in object storage which can have "/",
@@ -260,7 +269,7 @@ bool ObjectStorageQueueIFileMetadata::trySetProcessing()
     {
         file_status->onProcessing();
     }
-    else
+    else if (file_state != FileStatus::State::None)
     {
         LOG_TEST(log, "Updating state of {} from {} to {}", path, file_status->state.load(), file_state);
         file_status->updateState(file_state);
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.h
index 3691ea14face..f203cd30123c 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.h
@@ -60,6 +60,7 @@ class ObjectStorageQueueIFileMetadata
         FileStatusPtr file_status_,
         size_t max_loading_retries_,
         std::atomic<size_t> & metadata_ref_count_,
+        bool use_persistent_processing_nodes_,
         LoggerPtr log_);
 
     virtual ~ObjectStorageQueueIFileMetadata();
@@ -129,6 +130,8 @@ class ObjectStorageQueueIFileMetadata
         static NodeMetadata fromString(const std::string & metadata_str);
     };
 
+    static std::string getProcessingNodesPath(bool use_persistent_processing_nodes);
+
 protected:
     virtual std::pair<bool, FileStatus::State> setProcessingImpl() = 0;
     virtual void prepareProcessedRequestsImpl(Coordination::Requests & requests) = 0;
@@ -144,6 +147,7 @@ class ObjectStorageQueueIFileMetadata
     const FileStatusPtr file_status;
     const size_t max_loading_retries;
     const std::atomic<size_t> & metadata_ref_count;
+    const bool use_persistent_processing_nodes;
 
     const std::string processing_node_path;
     const std::string processed_node_path;
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp
index 69c10ffedf72..4a6072c5e7a2 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp
@@ -18,6 +18,7 @@
 #include <Common/getRandomASCIIString.h>
 #include <Common/randomSeed.h>
 #include <Common/DNSResolver.h>
+#include <Interpreters/DDLTask.h>
 #include <shared_mutex>
 #include <Core/ServerUUID.h>
 
@@ -132,14 +133,18 @@ ObjectStorageQueueMetadata::ObjectStorageQueueMetadata(
     const ObjectStorageQueueTableMetadata & table_metadata_,
     size_t cleanup_interval_min_ms_,
     size_t cleanup_interval_max_ms_,
+    bool use_persistent_processing_nodes_,
+    size_t persistent_processing_nodes_ttl_seconds_,
     size_t keeper_multiread_batch_size_)
     : table_metadata(table_metadata_)
     , storage_type(storage_type_)
     , mode(table_metadata.getMode())
     , zookeeper_path(zookeeper_path_)
+    , keeper_multiread_batch_size(keeper_multiread_batch_size_)
     , cleanup_interval_min_ms(cleanup_interval_min_ms_)
     , cleanup_interval_max_ms(cleanup_interval_max_ms_)
-    , keeper_multiread_batch_size(keeper_multiread_batch_size_)
+    , use_persistent_processing_nodes(use_persistent_processing_nodes_)
+    , persistent_processing_node_ttl_seconds(persistent_processing_nodes_ttl_seconds_)
     , buckets_num(table_metadata_.getBucketsNum())
     , log(getLogger("StorageObjectStorageQueue(" + zookeeper_path_.string() + ")"))
     , local_file_statuses(std::make_shared<LocalFileStatuses>())
@@ -208,6 +213,7 @@ ObjectStorageQueueMetadata::FileMetadataPtr ObjectStorageQueueMetadata::getFileM
                 buckets_num,
                 table_metadata.loading_retries,
                 *metadata_ref_count,
+                use_persistent_processing_nodes,
                 log);
         case ObjectStorageQueueMode::UNORDERED:
             return std::make_shared<ObjectStorageQueueUnorderedFileMetadata>(
@@ -216,6 +222,7 @@ ObjectStorageQueueMetadata::FileMetadataPtr ObjectStorageQueueMetadata::getFileM
                 file_status,
                 table_metadata.loading_retries,
                 *metadata_ref_count,
+                use_persistent_processing_nodes,
                 log);
     }
 }
@@ -238,24 +245,30 @@ ObjectStorageQueueMetadata::tryAcquireBucket(const Bucket & bucket, const Proces
 
 void ObjectStorageQueueMetadata::alterSettings(const SettingsChanges & changes, const ContextPtr & context)
 {
+    bool is_initial_query = context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY ||
+                            (context->getZooKeeperMetadataTransaction() && context->getZooKeeperMetadataTransaction()->isInitialQuery());
+
     const fs::path alter_settings_lock_path = zookeeper_path / "alter_settings_lock";
     zkutil::EphemeralNodeHolder::Ptr alter_settings_lock;
     auto zookeeper = getZooKeeper();
 
-    /// We will retry taking alter_settings_lock for the duration of 5 seconds.
-    /// Do we need to add a setting for this?
-    const size_t num_tries = 100;
-    for (size_t i = 0; i < num_tries; ++i)
+    if (is_initial_query)
     {
-        alter_settings_lock = zkutil::EphemeralNodeHolder::tryCreate(alter_settings_lock_path, *zookeeper, toString(getCurrentTime()));
+        /// We will retry taking alter_settings_lock for the duration of 5 seconds.
+        /// Do we need to add a setting for this?
+        const size_t num_tries = 100;
+        for (size_t i = 0; i < num_tries; ++i)
+        {
+            alter_settings_lock = zkutil::EphemeralNodeHolder::tryCreate(alter_settings_lock_path, *zookeeper, toString(getCurrentTime()));
 
-        if (alter_settings_lock)
-            break;
+            if (alter_settings_lock)
+                break;
 
-        if (i == num_tries - 1)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to take alter setting lock");
+            if (i == num_tries - 1)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to take alter setting lock");
 
-        sleepForMilliseconds(50);
+            sleepForMilliseconds(50);
+        }
     }
 
     Coordination::Stat stat;
@@ -367,7 +380,11 @@ void ObjectStorageQueueMetadata::alterSettings(const SettingsChanges & changes,
     LOG_TRACE(log, "New metadata: {}", new_metadata_str);
 
     const fs::path table_metadata_path = zookeeper_path / "metadata";
-    zookeeper->set(table_metadata_path, new_metadata_str, stat.version);
+    /// Here we intentionally do not add zk retries,
+    /// because we modify metadata under ephemeral metadata lock,
+    /// so we do not want to retry if it expires.
+    if (is_initial_query)
+        zookeeper->set(table_metadata_path, new_metadata_str, stat.version);
 
     table_metadata.syncChangeableSettings(new_table_metadata);
 }
@@ -473,6 +490,7 @@ ObjectStorageQueueTableMetadata ObjectStorageQueueMetadata::syncWithKeeper(
                 buckets_num,
                 table_metadata.loading_retries,
                 noop,
+                /* use_persistent_processing_nodes */false, /// Processing nodes will not be created.
                 log).prepareProcessedAtStartRequests(requests, zookeeper);
         }
 
@@ -707,6 +725,7 @@ void ObjectStorageQueueMetadata::unregisterNonActive(const StorageID & storage_i
 
     Coordination::Error code = Coordination::Error::ZOK;
 
+    bool allow_remove_recursive = true;
     for (size_t i = 0; i < 1000; ++i)
     {
         Coordination::Requests requests;
@@ -719,7 +738,7 @@ void ObjectStorageQueueMetadata::unregisterNonActive(const StorageID & storage_i
         try
         {
             zk_client = getZooKeeper();
-            supports_remove_recursive = zk_client->isFeatureEnabled(DB::KeeperFeatureFlag::REMOVE_RECURSIVE);
+            supports_remove_recursive = allow_remove_recursive && zk_client->isFeatureEnabled(DB::KeeperFeatureFlag::REMOVE_RECURSIVE);
 
             Coordination::Stat stat;
             std::string registry_str;
@@ -764,7 +783,7 @@ void ObjectStorageQueueMetadata::unregisterNonActive(const StorageID & storage_i
                 if (supports_remove_recursive)
                 {
                     requests.push_back(zkutil::makeCheckRequest(registry_path, stat.version));
-                    requests.push_back(zkutil::makeRemoveRecursiveRequest(zookeeper_path, std::numeric_limits<uint32_t>::max()));
+                    requests.push_back(zkutil::makeRemoveRecursiveRequest(*zk_client, zookeeper_path, /*remove_nodes_limit=*/10000));
                 }
                 else
                 {
@@ -833,6 +852,12 @@ void ObjectStorageQueueMetadata::unregisterNonActive(const StorageID & storage_i
             return;
         }
 
+        if (!responses.empty() && supports_remove_recursive && code == Coordination::Error::ZNOTEMPTY) /// potentiall we reached RemoveRecursive node limit, let's try without it
+        {
+            allow_remove_recursive = false;
+            continue;
+        }
+
         if (Coordination::isHardwareError(code)
             || code == Coordination::Error::ZBADVERSION)
             continue;
@@ -1032,6 +1057,8 @@ void ObjectStorageQueueMetadata::cleanupThreadFuncImpl()
     }
     /// TODO because of this lock we might not update local file statuses on time on one of the nodes.
 
+    cleanupPersistentProcessingNodes(zk_client);
+
     const fs::path zookeeper_processed_path = zookeeper_path / "processed";
     const fs::path zookeeper_failed_path = zookeeper_path / "failed";
 
@@ -1250,4 +1277,99 @@ void ObjectStorageQueueMetadata::cleanupThreadFuncImpl()
     LOG_TRACE(log, "Node limits check finished");
 }
 
+void ObjectStorageQueueMetadata::updateSettings(const SettingsChanges & changes)
+{
+    for (const auto & change : changes)
+    {
+        if (change.name == "cleanup_interval_min_ms")
+            cleanup_interval_min_ms = change.value.safeGet<UInt64>();
+        if (change.name == "cleanup_interval_max_ms")
+            cleanup_interval_max_ms = change.value.safeGet<UInt64>();
+        if (change.name == "use_persistent_processing_nodes")
+            use_persistent_processing_nodes = change.value.safeGet<bool>();
+        if (change.name == "persistent_processing_node_ttl_seconds")
+            persistent_processing_node_ttl_seconds = change.value.safeGet<UInt64>();
+    }
+}
+
+void ObjectStorageQueueMetadata::cleanupPersistentProcessingNodes(zkutil::ZooKeeperPtr zk_client)
+{
+    const fs::path zookeeper_persistent_processing_path = zookeeper_path
+        / ObjectStorageQueueIFileMetadata::getProcessingNodesPath(true);
+
+    Strings persistent_processing_nodes;
+    auto code = zk_client->tryGetChildren(zookeeper_persistent_processing_path, persistent_processing_nodes);
+    if (code != Coordination::Error::ZOK)
+    {
+        if (code == Coordination::Error::ZNONODE)
+        {
+            LOG_TEST(log, "Path {} does not exist", zookeeper_persistent_processing_path.string());
+            return;
+        }
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected error: {}", magic_enum::enum_name(code));
+    }
+
+    auto current_time = getCurrentTime();
+    Strings nodes_to_remove;
+    Strings get_batch;
+    auto get_paths = [&]
+    {
+        auto response = zk_client->tryGet(get_batch);
+
+        for (size_t i = 0; i < response.size(); ++i)
+        {
+            if (response[i].error == Coordination::Error::ZNONODE)
+            {
+                LOG_ERROR(log, "Failed to fetch node metadata {}", get_batch[i]);
+                continue;
+            }
+
+            LOG_TEST(
+                log, "Node: {}, mtime: {}, ttl sec: {}, current time: {}",
+                get_batch[i], response[i].stat.mtime, persistent_processing_node_ttl_seconds.load(), current_time);
+
+            if (response[i].stat.mtime / 1000 + persistent_processing_node_ttl_seconds < current_time)
+                nodes_to_remove.push_back(get_batch[i]);
+        }
+        get_batch.clear();
+    };
+
+    for (const auto & node : persistent_processing_nodes)
+    {
+        get_batch.push_back(zookeeper_persistent_processing_path / node);
+        try
+        {
+            if (get_batch.size() == keeper_multiread_batch_size)
+                get_paths();
+        }
+        catch (const zkutil::KeeperException & e)
+        {
+            if (!Coordination::isHardwareError(e.code))
+            {
+                LOG_WARNING(log, "Unexpected exception: {}", getCurrentExceptionMessage(true));
+                chassert(false);
+            }
+
+            /// Will retry with a new zk connection.
+            throw;
+        }
+    }
+    if (!get_batch.empty())
+        get_paths();
+
+    if (nodes_to_remove.empty())
+    {
+        if (!persistent_processing_nodes.empty())
+            LOG_TRACE(log, "No persistent processing nodes to remove, "
+                     "total persistent processing nodes: {}", persistent_processing_nodes.size());
+        return;
+    }
+
+    for (const auto & node : nodes_to_remove)
+        zk_client->remove(node);
+
+    LOG_DEBUG(log, "Removed {} persistent processing nodes", nodes_to_remove.size());
+}
+
 }
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
index 1592e77e3d34..1c3eb00ef219 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
@@ -59,6 +59,8 @@ class ObjectStorageQueueMetadata
         const ObjectStorageQueueTableMetadata & table_metadata_,
         size_t cleanup_interval_min_ms_,
         size_t cleanup_interval_max_ms_,
+        bool use_persistent_processing_nodes_,
+        size_t persistent_processing_nodes_ttl_seconds_,
         size_t keeper_multiread_batch_size_);
 
     ~ObjectStorageQueueMetadata();
@@ -148,9 +150,17 @@ class ObjectStorageQueueMetadata
     /// Set local ref count for metadata.
     void setMetadataRefCount(std::atomic<size_t> & ref_count_) { chassert(!metadata_ref_count); metadata_ref_count = &ref_count_; }
 
+    void updateSettings(const SettingsChanges & changes);
+
+    std::pair<size_t, size_t> getCleanupIntervalMS() const { return {cleanup_interval_min_ms, cleanup_interval_max_ms }; }
+
+    bool usePersistentProcessingNode() const { return use_persistent_processing_nodes; }
+    size_t getPersistentProcessingNodeTTLSeconds() const { return persistent_processing_node_ttl_seconds; }
+
 private:
     void cleanupThreadFunc();
     void cleanupThreadFuncImpl();
+    void cleanupPersistentProcessingNodes(zkutil::ZooKeeperPtr zk_client);
 
     void migrateToBucketsInKeeper(size_t value);
 
@@ -164,8 +174,13 @@ class ObjectStorageQueueMetadata
     const ObjectStorageType storage_type;
     const ObjectStorageQueueMode mode;
     const fs::path zookeeper_path;
-    const size_t cleanup_interval_min_ms, cleanup_interval_max_ms;
     const size_t keeper_multiread_batch_size;
+
+    std::atomic<size_t> cleanup_interval_min_ms;
+    std::atomic<size_t> cleanup_interval_max_ms;
+    std::atomic<bool> use_persistent_processing_nodes;
+    std::atomic<size_t> persistent_processing_node_ttl_seconds;
+
     size_t buckets_num;
     std::unique_ptr<ThreadFromGlobalPool> update_registry_thread;
 
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.cpp
index f444beb1f895..50947d528f85 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.cpp
@@ -124,15 +124,17 @@ ObjectStorageQueueOrderedFileMetadata::ObjectStorageQueueOrderedFileMetadata(
     size_t buckets_num_,
     size_t max_loading_retries_,
     std::atomic<size_t> & metadata_ref_count_,
+    bool use_persistent_processing_nodes_,
     LoggerPtr log_)
     : ObjectStorageQueueIFileMetadata(
         path_,
-        /* processing_node_path */zk_path_ / "processing" / getNodeName(path_),
+        /* processing_node_path */zk_path_ / getProcessingNodesPath(use_persistent_processing_nodes_) / getNodeName(path_),
         /* processed_node_path */getProcessedPath(zk_path_, path_, buckets_num_),
         /* failed_node_path */zk_path_ / "failed" / getNodeName(path_),
         file_status_,
         max_loading_retries_,
         metadata_ref_count_,
+        use_persistent_processing_nodes_,
         log_)
     , buckets_num(buckets_num_)
     , zk_path(zk_path_)
@@ -149,12 +151,14 @@ std::vector<std::string> ObjectStorageQueueOrderedFileMetadata::getMetadataPaths
 {
     if (DB::useBucketsForProcessing(buckets_num))
     {
-        std::vector<std::string> paths{"buckets", "failed", "processing"};
+        std::vector<std::string> paths{"buckets", "failed", "processing", "persistent_processing"};
         for (size_t i = 0; i < buckets_num; ++i)
             paths.push_back("buckets/" + toString(i));
         return paths;
     }
-    return {"failed", "processing"};
+    /// We do not return "processed" node here,
+    /// because we do not want it to be created in advance.
+    return {"failed", "processing", "persistent_processing"};
 }
 
 bool ObjectStorageQueueOrderedFileMetadata::getMaxProcessedFile(
@@ -274,8 +278,9 @@ std::pair<bool, ObjectStorageQueueIFileMetadata::FileStatus::State> ObjectStorag
     processing_id = node_metadata.processing_id = getRandomASCIIString(10);
     auto processor_info = getProcessorInfo(processing_id.value());
 
-    const size_t max_num_tries = 1000;
+    const size_t max_num_tries = 100;
     Coordination::Error code;
+    std::string failed_path;
     for (size_t i = 0; i < max_num_tries; ++i)
     {
         std::optional<NodeMetadata> processed_node;
@@ -343,7 +348,12 @@ std::pair<bool, ObjectStorageQueueIFileMetadata::FileStatus::State> ObjectStorag
         const auto failed_path_doesnt_exist_idx = 0;
         zkutil::addCheckNotExistsRequest(requests, *zk_client, failed_node_path);
         const auto create_processing_path_idx = requests.size();
-        requests.push_back(zkutil::makeCreateRequest(processing_node_path, node_metadata.toString(), zkutil::CreateMode::Ephemeral));
+
+        requests.push_back(
+            zkutil::makeCreateRequest(
+                processing_node_path,
+                node_metadata.toString(),
+                use_persistent_processing_nodes ? zkutil::CreateMode::Persistent : zkutil::CreateMode::Ephemeral));
 
         bool create_if_not_exists_enabled = zk_client->isFeatureEnabled(DB::KeeperFeatureFlag::CREATE_IF_NOT_EXISTS);
         if (create_if_not_exists_enabled)
@@ -386,6 +396,18 @@ std::pair<bool, ObjectStorageQueueIFileMetadata::FileStatus::State> ObjectStorag
             return {true, FileStatus::State::None};
         }
 
+        /// Requests:
+        /// 1. check failed node does not exist
+        /// 2. check processing node does not exist
+        /// 3. create processing id node if not exists
+        /// 4. set processing id
+        /// 5. if has bucket, check bucket version
+        /// 6. check processed node version did not change
+
+        auto failed_idx = zkutil::getFailedOpIndex(code, responses);
+        failed_path = requests[failed_idx]->getPath();
+        LOG_DEBUG(log, "Code: {}, failed idx: {}, failed path: {}", code, failed_idx, failed_path);
+
         if (has_request_failed(failed_path_doesnt_exist_idx))
             return {false, FileStatus::State::Failed};
 
@@ -408,13 +430,12 @@ std::pair<bool, ObjectStorageQueueIFileMetadata::FileStatus::State> ObjectStorag
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected state of zookeeper transaction: {}", code);
 
         /// most likely the processing node id path node was removed or created so let's try again
-        LOG_TRACE(log, "Retrying setProcessing because processing node id path is unexpectedly missing or was created (error code: {})", code);
+        LOG_DEBUG(log, "Retrying setProcessing because processing node id path is unexpectedly missing or was created (error code: {})", code);
     }
 
-    throw Exception(
-        ErrorCodes::LOGICAL_ERROR,
-        "Failed to set file processing within {} retries, last error: {}",
-        max_num_tries, code);
+    LOG_WARNING(log, "Failed to set file processing within {} retries, last error {} for path {}", max_num_tries, code, failed_path);
+    chassert(false); /// Catch in CI.
+    return {false, FileStatus::State::None};
 }
 
 void ObjectStorageQueueOrderedFileMetadata::prepareProcessedAtStartRequests(
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.h
index 4c52cfb7814f..3d9bd102861d 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.h
@@ -31,6 +31,7 @@ class ObjectStorageQueueOrderedFileMetadata : public ObjectStorageQueueIFileMeta
         size_t buckets_num_,
         size_t max_loading_retries_,
         std::atomic<size_t> & metadata_ref_count_,
+        bool use_persistent_processing_nodes_,
         LoggerPtr log_);
 
     struct BucketHolder;
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSettings.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSettings.cpp
index 90de2a63fb8d..ec26e440e846 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSettings.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSettings.cpp
@@ -38,6 +38,8 @@ namespace ErrorCodes
     DECLARE(UInt64, polling_backoff_ms, 30 * 1000, "Polling backoff", 0) \
     DECLARE(UInt32, cleanup_interval_min_ms, 60000, "For unordered mode. Polling backoff min for cleanup", 0) \
     DECLARE(UInt32, cleanup_interval_max_ms, 60000, "For unordered mode. Polling backoff max for cleanup", 0) \
+    DECLARE(Bool, use_persistent_processing_nodes, false, "Whether persistent nodes should be used for processing nodes in keeper", 0) \
+    DECLARE(UInt32, persistent_processing_node_ttl_seconds, 60 * 60, "Cleanup period for abandoned processing nodes", 0) \
     DECLARE(UInt64, buckets, 0, "Number of buckets for Ordered mode parallel processing", 0) \
     DECLARE(UInt64, list_objects_batch_size, 1000, "Size of a list batch in object storage", 0) \
     DECLARE(UInt64, min_insert_block_size_rows_for_materialized_views, 0, "Override for profile setting min_insert_block_size_rows_for_materialized_views", 0) \
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
index 64bd1084d3c8..3b3189429e94 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
@@ -593,6 +593,18 @@ ObjectStorageQueueSource::FileIterator::getNextKeyFromAcquiredBucket(size_t proc
         if (current_bucket_holder && current_bucket_holder->isZooKeeperSessionExpired())
         {
             LOG_TRACE(log, "ZooKeeper session expired, bucket {} not longer hold", current_bucket_holder->getBucket());
+
+            for (auto & [bucket, bucket_info] : listed_keys_cache)
+            {
+                /// Reset current processor for the keys
+                /// to avoid the above error "Expected current processor {} to be equal to {} for bucket {}".
+                if (bucket_info.processor.has_value() && bucket_info.processor.value() == current_processor)
+                {
+                    LOG_DEBUG(log, "Resetting processor ({}) for bucket {}", current_processor, bucket);
+                    bucket_info.processor.reset();
+                }
+            }
+
             current_bucket_holder = {};
         }
 
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.cpp
index 36850c775188..001546e42664 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.cpp
@@ -16,6 +16,7 @@ namespace
     {
         return Context::getGlobalContextInstance()->getZooKeeper();
     }
+
 }
 
 ObjectStorageQueueUnorderedFileMetadata::ObjectStorageQueueUnorderedFileMetadata(
@@ -24,15 +25,17 @@ ObjectStorageQueueUnorderedFileMetadata::ObjectStorageQueueUnorderedFileMetadata
     FileStatusPtr file_status_,
     size_t max_loading_retries_,
     std::atomic<size_t> & metadata_ref_count_,
+    bool use_persistent_processing_nodes_,
     LoggerPtr log_)
     : ObjectStorageQueueIFileMetadata(
         path_,
-        /* processing_node_path */zk_path / "processing" / getNodeName(path_),
+        /* processing_node_path */zk_path / getProcessingNodesPath(use_persistent_processing_nodes_) / getNodeName(path_),
         /* processed_node_path */zk_path / "processed" / getNodeName(path_),
         /* failed_node_path */zk_path / "failed" / getNodeName(path_),
         file_status_,
         max_loading_retries_,
         metadata_ref_count_,
+        use_persistent_processing_nodes_,
         log_)
 {
 }
@@ -54,7 +57,11 @@ ObjectStorageQueueUnorderedFileMetadata::prepareProcessingRequestsImpl(Coordinat
     zkutil::addCheckNotExistsRequest(requests, *zk_client, failed_node_path);
 
     result_indexes.create_processing_node_idx = requests.size();
-    requests.push_back(zkutil::makeCreateRequest(processing_node_path, node_metadata.toString(), zkutil::CreateMode::Ephemeral));
+    requests.push_back(
+        zkutil::makeCreateRequest(
+            processing_node_path,
+            node_metadata.toString(),
+            use_persistent_processing_nodes ? zkutil::CreateMode::Persistent : zkutil::CreateMode::Ephemeral));
 
     if (zk_client->isFeatureEnabled(DB::KeeperFeatureFlag::CREATE_IF_NOT_EXISTS))
     {
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.h
index bdd7ab46dea3..02e01b3a788c 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueUnorderedFileMetadata.h
@@ -17,9 +17,10 @@ class ObjectStorageQueueUnorderedFileMetadata : public ObjectStorageQueueIFileMe
         FileStatusPtr file_status_,
         size_t max_loading_retries_,
         std::atomic<size_t> & metadata_ref_count_,
+        bool use_persistent_processing_nodes_,
         LoggerPtr log_);
 
-    static std::vector<std::string> getMetadataPaths() { return {"processed", "failed", "processing"}; }
+    static std::vector<std::string> getMetadataPaths() { return {"processed", "failed", "processing", "persistent_processing"}; }
 
     /// Return vector of indexes of filtered paths.
     static void filterOutProcessedAndFailed(
diff --git a/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp b/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp
index 04b0804886c9..0d334fcd4d10 100644
--- a/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp
+++ b/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp
@@ -4,6 +4,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/FailPoint.h>
 #include <Common/randomSeed.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Settings.h>
 #include <Core/ServerSettings.h>
@@ -59,11 +60,15 @@ namespace Setting
     extern const SettingsBool s3queue_enable_logging_to_s3queue_log;
     extern const SettingsBool stream_like_engine_allow_direct_select;
     extern const SettingsBool use_concurrency_control;
+    extern const SettingsUInt64 keeper_max_retries;
+    extern const SettingsUInt64 keeper_retry_initial_backoff_ms;
+    extern const SettingsUInt64 keeper_retry_max_backoff_ms;
 }
 
 namespace FailPoints
 {
     extern const char object_storage_queue_fail_commit[];
+    extern const char object_storage_queue_fail_commit_once[];
     extern const char object_storage_queue_fail_startup[];
 }
 
@@ -99,6 +104,8 @@ namespace ObjectStorageQueueSetting
     extern const ObjectStorageQueueSettingsBool enable_hash_ring_filtering;
     extern const ObjectStorageQueueSettingsUInt64 min_insert_block_size_rows_for_materialized_views;
     extern const ObjectStorageQueueSettingsUInt64 min_insert_block_size_bytes_for_materialized_views;
+    extern const ObjectStorageQueueSettingsBool use_persistent_processing_nodes;
+    extern const ObjectStorageQueueSettingsUInt32 persistent_processing_node_ttl_seconds;
 }
 
 namespace ErrorCodes
@@ -110,6 +117,7 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int NOT_IMPLEMENTED;
     extern const int FAULT_INJECTED;
+    extern const int KEEPER_EXCEPTION;
 }
 
 namespace
@@ -133,7 +141,8 @@ namespace
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                             "Setting `cleanup_interval_min_ms` ({}) must be less or equal to `cleanup_interval_max_ms` ({})",
-                            queue_settings[ObjectStorageQueueSetting::cleanup_interval_min_ms].value, queue_settings[ObjectStorageQueueSetting::cleanup_interval_max_ms].value);
+                            queue_settings[ObjectStorageQueueSetting::cleanup_interval_min_ms].value,
+                            queue_settings[ObjectStorageQueueSetting::cleanup_interval_max_ms].value);
         }
     }
 
@@ -219,12 +228,12 @@ StorageObjectStorageQueue::StorageObjectStorageQueue(
     validateSettings(*queue_settings_, is_attach);
 
     object_storage = configuration->createObjectStorage(context_, /* is_readonly */true);
-    FormatFactory::instance().checkFormatName(configuration->format);
+    FormatFactory::instance().checkFormatName(configuration->getFormat());
     configuration->check(context_);
 
     ColumnsDescription columns{columns_};
     std::string sample_path;
-    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, sample_path, context_);
+    resolveSchemaAndFormat(columns, object_storage, configuration, format_settings, sample_path, context_);
     configuration->check(context_);
 
     StorageInMemoryMetadata storage_metadata;
@@ -239,7 +248,7 @@ StorageObjectStorageQueue::StorageObjectStorageQueue(
     LOG_INFO(log, "Using zookeeper path: {}", zk_path.string());
 
     auto table_metadata = ObjectStorageQueueMetadata::syncWithKeeper(
-        zk_path, *queue_settings_, storage_metadata.getColumns(), configuration_->format, context_, is_attach, log);
+        zk_path, *queue_settings_, storage_metadata.getColumns(), configuration_->getFormat(), context_, is_attach, log);
 
     ObjectStorageType storage_type = engine_name == "S3Queue" ? ObjectStorageType::S3 : ObjectStorageType::Azure;
 
@@ -249,6 +258,8 @@ StorageObjectStorageQueue::StorageObjectStorageQueue(
         std::move(table_metadata),
         (*queue_settings_)[ObjectStorageQueueSetting::cleanup_interval_min_ms],
         (*queue_settings_)[ObjectStorageQueueSetting::cleanup_interval_max_ms],
+        (*queue_settings_)[ObjectStorageQueueSetting::use_persistent_processing_nodes],
+        (*queue_settings_)[ObjectStorageQueueSetting::persistent_processing_node_ttl_seconds],
         getContext()->getServerSettings()[ServerSetting::keeper_multiread_batch_size]);
 
     size_t task_count = (*queue_settings_)[ObjectStorageQueueSetting::parallel_inserts] ? (*queue_settings_)[ObjectStorageQueueSetting::processing_threads_num] : 1;
@@ -367,7 +378,7 @@ void StorageObjectStorageQueue::renameInMemory(const StorageID & new_table_id)
 
 bool StorageObjectStorageQueue::supportsSubsetOfColumns(const ContextPtr & context_) const
 {
-    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->format, context_, format_settings);
+    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->getFormat(), context_, format_settings);
 }
 
 class ReadFromObjectStorageQueue : public SourceStepWithFilter
@@ -823,18 +834,53 @@ void StorageObjectStorageQueue::commit(
         ProfileEvents::increment(ProfileEvents::ObjectStorageQueueRemovedObjects, successful_objects.size());
     }
 
-    auto zk_client = getZooKeeper();
-    Coordination::Responses responses;
+    auto context = getContext();
+    const auto & settings = context->getSettingsRef();
+    ZooKeeperRetriesControl zk_retry{
+        getName(),
+        log,
+        ZooKeeperRetriesInfo{
+            settings[Setting::keeper_max_retries],
+            settings[Setting::keeper_retry_initial_backoff_ms],
+            settings[Setting::keeper_retry_max_backoff_ms],
+            context->getProcessListElement()}};
 
-    fiu_do_on(FailPoints::object_storage_queue_fail_commit, {
-        throw Exception(ErrorCodes::FAULT_INJECTED, "Failed to commit processed files");
+    std::optional<Coordination::Error> code;
+    Coordination::Responses responses;
+    size_t try_num = 0;
+    zk_retry.retryLoop([&]
+    {
+        ++try_num;
+        auto zk_client = getZooKeeper();
+        fiu_do_on(FailPoints::object_storage_queue_fail_commit, {
+            throw zkutil::KeeperException::fromMessage(Coordination::Error::ZCONNECTIONLOSS, "Failed to commit processed files");
+        });
+        fiu_do_on(FailPoints::object_storage_queue_fail_commit_once, {
+            throw zkutil::KeeperException::fromMessage(Coordination::Error::ZCONNECTIONLOSS, "Failed to commit processed files");
+        });
+
+        code = zk_client->tryMulti(requests, responses);
+    },
+    [&]
+    {
+        LOG_TRACE(
+            log, "Failed to commit processed files at try {}/{}",
+            try_num, toString(settings[Setting::keeper_max_retries].value));
     });
 
-    auto code = zk_client->tryMulti(requests, responses);
-    if (code != Coordination::Error::ZOK)
+    if (!code.has_value())
+    {
+        throw Exception(
+            ErrorCodes::KEEPER_EXCEPTION,
+            "Failed to commit files with {} retries, last error message: {}",
+            settings[Setting::keeper_max_retries].value, zk_retry.getLastKeeperErrorMessage());
+    }
+
+    chassert(code.value() == Coordination::Error::ZOK || Coordination::isUserError(code.value()));
+    if (code.value() != Coordination::Error::ZOK)
     {
         ProfileEvents::increment(ProfileEvents::ObjectStorageQueueUnsuccessfulCommits);
-        throw zkutil::KeeperMultiException(code, requests, responses);
+        throw zkutil::KeeperMultiException(code.value(), requests, responses);
     }
 
     ProfileEvents::increment(ProfileEvents::ObjectStorageQueueSuccessfulCommits);
@@ -880,6 +926,10 @@ static const std::unordered_set<std::string_view> changeable_settings_unordered_
     "list_objects_batch_size",
     "min_insert_block_size_rows_for_materialized_views",
     "min_insert_block_size_bytes_for_materialized_views",
+    "cleanup_interval_max_ms",
+    "cleanup_interval_min_ms",
+    "use_persistent_processing_nodes",
+    "persistent_processing_node_ttl_seconds",
 };
 
 static const std::unordered_set<std::string_view> changeable_settings_ordered_mode
@@ -897,6 +947,10 @@ static const std::unordered_set<std::string_view> changeable_settings_ordered_mo
     "list_objects_batch_size",
     "min_insert_block_size_rows_for_materialized_views",
     "min_insert_block_size_bytes_for_materialized_views",
+    "cleanup_interval_max_ms",
+    "cleanup_interval_min_ms",
+    "use_persistent_processing_nodes",
+    "persistent_processing_node_ttl_seconds",
 };
 
 static std::string normalizeSetting(const std::string & name)
@@ -1142,31 +1196,30 @@ void StorageObjectStorageQueue::alter(
 
             if (change.name == "polling_min_timeout_ms")
                 polling_min_timeout_ms = change.value.safeGet<UInt64>();
-            if (change.name == "polling_max_timeout_ms")
+            else if (change.name == "polling_max_timeout_ms")
                 polling_max_timeout_ms = change.value.safeGet<UInt64>();
-            if (change.name == "polling_backoff_ms")
+            else if (change.name == "polling_backoff_ms")
                 polling_backoff_ms = change.value.safeGet<UInt64>();
-
-            if (change.name == "max_processed_files_before_commit")
+            else if (change.name == "max_processed_files_before_commit")
                 commit_settings.max_processed_files_before_commit = change.value.safeGet<UInt64>();
-            if (change.name == "max_processed_rows_before_commit")
+            else if (change.name == "max_processed_rows_before_commit")
                 commit_settings.max_processed_rows_before_commit = change.value.safeGet<UInt64>();
-            if (change.name == "max_processed_bytes_before_commit")
+            else if (change.name == "max_processed_bytes_before_commit")
                 commit_settings.max_processed_bytes_before_commit = change.value.safeGet<UInt64>();
-            if (change.name == "max_processing_time_sec_before_commit")
+            else if (change.name == "max_processing_time_sec_before_commit")
                 commit_settings.max_processing_time_sec_before_commit = change.value.safeGet<UInt64>();
-
-            if (change.name == "min_insert_block_size_rows_for_materialized_views")
+            else if (change.name == "min_insert_block_size_rows_for_materialized_views")
                 min_insert_block_size_rows_for_materialized_views = change.value.safeGet<UInt64>();
-            if (change.name == "min_insert_block_size_bytes_for_materialized_views")
+            else if (change.name == "min_insert_block_size_bytes_for_materialized_views")
                 min_insert_block_size_bytes_for_materialized_views = change.value.safeGet<UInt64>();
-
-            if (change.name == "list_objects_batch_size")
+            else if (change.name == "list_objects_batch_size")
                 list_objects_batch_size = change.value.safeGet<UInt64>();
-            if (change.name == "enable_hash_ring_filtering")
+            else if (change.name == "enable_hash_ring_filtering")
                 enable_hash_ring_filtering = change.value.safeGet<bool>();
         }
 
+        files_metadata->updateSettings(changed_settings);
+
         DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
         setInMemoryMetadata(new_metadata);
     }
@@ -1235,10 +1288,14 @@ ObjectStorageQueueSettings StorageObjectStorageQueue::getSettings() const
     settings[ObjectStorageQueueSetting::last_processed_path] = table_metadata.last_processed_path;
     settings[ObjectStorageQueueSetting::tracked_file_ttl_sec] = table_metadata.tracked_files_ttl_sec;
     settings[ObjectStorageQueueSetting::tracked_files_limit] = table_metadata.tracked_files_limit;
-    settings[ObjectStorageQueueSetting::cleanup_interval_min_ms] = 0;
-    settings[ObjectStorageQueueSetting::cleanup_interval_max_ms] = 0;
     settings[ObjectStorageQueueSetting::buckets] = table_metadata.buckets;
 
+    auto cleanup_interval_ms = files_metadata->getCleanupIntervalMS();
+    settings[ObjectStorageQueueSetting::cleanup_interval_min_ms] = cleanup_interval_ms.first;
+    settings[ObjectStorageQueueSetting::cleanup_interval_max_ms] = cleanup_interval_ms.second;
+    settings[ObjectStorageQueueSetting::persistent_processing_node_ttl_seconds] = files_metadata->getPersistentProcessingNodeTTLSeconds();
+    settings[ObjectStorageQueueSetting::use_persistent_processing_nodes] = files_metadata->usePersistentProcessingNode();
+
     {
         std::lock_guard lock(mutex);
         settings[ObjectStorageQueueSetting::polling_min_timeout_ms] = polling_min_timeout_ms;
diff --git a/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.h b/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.h
index 9627934ca61d..d7bc2bfd5208 100644
--- a/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.h
+++ b/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.h
@@ -57,7 +57,7 @@ class StorageObjectStorageQueue : public IStorage, WithContext
 
     void renameInMemory(const StorageID & new_table_id) override;
 
-    const auto & getFormatName() const { return configuration->format; }
+    const auto & getFormatName() const { return configuration->getFormat(); }
 
     const fs::path & getZooKeeperPath() const { return zk_path; }
 
diff --git a/src/Storages/ObjectStorageQueue/registerQueueStorage.cpp b/src/Storages/ObjectStorageQueue/registerQueueStorage.cpp
index 43460ccda4da..56a80b2e53f1 100644
--- a/src/Storages/ObjectStorageQueue/registerQueueStorage.cpp
+++ b/src/Storages/ObjectStorageQueue/registerQueueStorage.cpp
@@ -41,7 +41,7 @@ StoragePtr createQueueStorage(const StorageFactory::Arguments & args)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
 
     auto configuration = std::make_shared<Configuration>();
-    StorageObjectStorageConfiguration::initialize(*configuration, args.engine_args, args.getContext(), false);
+    configuration->initialize(args.engine_args, args.getContext(), false);
 
     // Use format settings from global server context + settings from
     // the SETTINGS clause of the create query. Settings from current
diff --git a/src/Storages/PartitionCommands.cpp b/src/Storages/PartitionCommands.cpp
index c12da89d7ed4..d0e7b4895687 100644
--- a/src/Storages/PartitionCommands.cpp
+++ b/src/Storages/PartitionCommands.cpp
@@ -130,6 +130,37 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
         res.with_name = command_ast->with_name;
         return res;
     }
+    if (command_ast->type == ASTAlterCommand::EXPORT_PART)
+    {
+        PartitionCommand res;
+        res.type = EXPORT_PART;
+        res.partition = command_ast->partition->clone();
+        res.part = command_ast->part;
+        res.to_database = command_ast->to_database;
+        res.to_table = command_ast->to_table;
+        if (command_ast->to_table_function)
+        {
+            res.to_table_function = command_ast->to_table_function->ptr();
+            if (command_ast->partition_by_expr)
+                res.partition_by_expr = command_ast->partition_by_expr->clone();
+        }
+        return res;
+    }
+    if (command_ast->type == ASTAlterCommand::EXPORT_PARTITION)
+    {
+        PartitionCommand res;
+        res.type = EXPORT_PARTITION;
+        res.partition = command_ast->partition->clone();
+        res.to_database = command_ast->to_database;
+        res.to_table = command_ast->to_table;
+        if (command_ast->to_table_function)
+        {
+            res.to_table_function = command_ast->to_table_function->ptr();
+            if (command_ast->partition_by_expr)
+                res.partition_by_expr = command_ast->partition_by_expr->clone();
+        }
+        return res;
+    }
     return {};
 }
 
@@ -171,6 +202,10 @@ std::string PartitionCommand::typeToString() const
         return "UNFREEZE ALL";
     case PartitionCommand::Type::REPLACE_PARTITION:
         return "REPLACE PARTITION";
+    case PartitionCommand::Type::EXPORT_PART:
+        return "EXPORT PART";
+    case PartitionCommand::Type::EXPORT_PARTITION:
+        return "EXPORT PARTITION";
     default:
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Uninitialized partition command");
     }
diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h
index 917e510f24b4..fe5df1bdc07a 100644
--- a/src/Storages/PartitionCommands.h
+++ b/src/Storages/PartitionCommands.h
@@ -33,6 +33,8 @@ struct PartitionCommand
         UNFREEZE_ALL_PARTITIONS,
         UNFREEZE_PARTITION,
         REPLACE_PARTITION,
+        EXPORT_PART,
+        EXPORT_PARTITION,
     };
 
     Type type = UNKNOWN;
@@ -50,10 +52,14 @@ struct PartitionCommand
     String from_table;
     bool replace = true;
 
-    /// For MOVE PARTITION
+    /// For MOVE PARTITION and EXPORT PART and EXPORT PARTITION
     String to_database;
     String to_table;
 
+    /// For EXPORT PART and EXPORT PARTITION with table functions
+    ASTPtr to_table_function;
+    ASTPtr partition_by_expr;
+
     /// For FETCH PARTITION - path in ZK to the shard, from which to download the partition.
     String from_zookeeper_path;
 
diff --git a/src/Storages/PartitionedSink.cpp b/src/Storages/PartitionedSink.cpp
index 078237483154..2a3df191dd92 100644
--- a/src/Storages/PartitionedSink.cpp
+++ b/src/Storages/PartitionedSink.cpp
@@ -26,10 +26,12 @@ namespace ErrorCodes
 
 PartitionedSink::PartitionedSink(
     std::shared_ptr<IPartitionStrategy> partition_strategy_,
+    std::shared_ptr<SinkCreator> sink_creator_,
     ContextPtr context_,
     SharedHeader source_header_)
     : SinkToStorage(source_header_)
     , partition_strategy(partition_strategy_)
+    , sink_creator(sink_creator_)
     , context(context_)
     , source_header(source_header_)
 {
@@ -41,7 +43,7 @@ SinkPtr PartitionedSink::getSinkForPartitionKey(StringRef partition_key)
     auto it = partition_id_to_sink.find(partition_key);
     if (it == partition_id_to_sink.end())
     {
-        auto sink = createSinkForPartition(partition_key.toString());
+        auto sink = sink_creator->createSinkForPartition(partition_key.toString());
         std::tie(it, std::ignore) = partition_id_to_sink.emplace(partition_key, sink);
     }
 
diff --git a/src/Storages/PartitionedSink.h b/src/Storages/PartitionedSink.h
index 444624ba6c8e..bc446477e9dd 100644
--- a/src/Storages/PartitionedSink.h
+++ b/src/Storages/PartitionedSink.h
@@ -17,10 +17,17 @@ namespace DB
 class PartitionedSink : public SinkToStorage
 {
 public:
+    struct SinkCreator
+    {
+        virtual ~SinkCreator() = default;
+        virtual SinkPtr createSinkForPartition(const String & partition_id) = 0;
+    };
+
     static constexpr auto PARTITION_ID_WILDCARD = "{_partition_id}";
 
     PartitionedSink(
         std::shared_ptr<IPartitionStrategy> partition_strategy_,
+        std::shared_ptr<SinkCreator> sink_creator_,
         ContextPtr context_,
         SharedHeader source_header_);
 
@@ -34,16 +41,15 @@ class PartitionedSink : public SinkToStorage
 
     void onFinish() override;
 
-    virtual SinkPtr createSinkForPartition(const String & partition_id) = 0;
-
     static void validatePartitionKey(const String & str, bool allow_slash);
 
     static String replaceWildcards(const String & haystack, const String & partition_id);
 
+
 protected:
     std::shared_ptr<IPartitionStrategy> partition_strategy;
-
 private:
+    std::shared_ptr<SinkCreator> sink_creator;
     ContextPtr context;
     SharedHeader source_header;
 
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index 0c76eb070b5c..061727b988bb 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -331,42 +331,11 @@ ASTPtr StorageMaterializedPostgreSQL::getColumnDeclaration(const DataTypePtr & d
     if (which.isArray())
         return makeASTDataType("Array", getColumnDeclaration(typeid_cast<const DataTypeArray *>(data_type.get())->getNestedType()));
 
-    /// getName() for decimal returns 'Decimal(precision, scale)', will get an error with it
-    if (which.isDecimal())
-    {
-        auto make_decimal_expression = [&](std::string type_name)
-        {
-            auto ast_expression = std::make_shared<ASTDataType>();
-
-            ast_expression->name = type_name;
-            ast_expression->arguments = std::make_shared<ASTExpressionList>();
-            ast_expression->arguments->children.emplace_back(std::make_shared<ASTLiteral>(getDecimalScale(*data_type)));
-
-            return ast_expression;
-        };
-
-        if (which.isDecimal32())
-            return make_decimal_expression("Decimal32");
-
-        if (which.isDecimal64())
-            return make_decimal_expression("Decimal64");
-
-        if (which.isDecimal128())
-            return make_decimal_expression("Decimal128");
-
-        if (which.isDecimal256())
-            return make_decimal_expression("Decimal256");
-    }
-
     if (which.isDateTime64())
-    {
-        auto ast_expression = std::make_shared<ASTDataType>();
+        return makeASTDataType("DateTime64", std::make_shared<ASTLiteral>(static_cast<UInt32>(6)));
 
-        ast_expression->name = "DateTime64";
-        ast_expression->arguments = std::make_shared<ASTExpressionList>();
-        ast_expression->arguments->children.emplace_back(std::make_shared<ASTLiteral>(static_cast<UInt32>(6)));
-        return ast_expression;
-    }
+    if (which.isDecimal())
+        return makeASTDataType("Decimal", std::make_shared<ASTLiteral>(getDecimalPrecision(*data_type)), std::make_shared<ASTLiteral>(getDecimalScale(*data_type)));
 
     return makeASTDataType(data_type->getName());
 }
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index d42892a77e2b..3b6873a7fe41 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -307,6 +307,7 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
         result.sample_block.erase("_part_offset");
         result.sample_block.insert(std::move(new_column));
         result.with_parent_part_offset = true;
+        std::erase_if(result.required_columns, [](const String & s) { return s.contains("_part_offset"); });
     }
 
     auto block = result.sample_block;
@@ -321,7 +322,8 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
         /// Subcolumns can be used in projection only when the original column is used.
         if (columns.hasSubcolumn(column_with_type_name.name))
         {
-            if (!block.has(Nested::splitName(column_with_type_name.name).first))
+            auto subcolumn = columns.getColumnOrSubcolumn(GetColumnsOptions::All, column_with_type_name.name);
+            if (!block.has(subcolumn.getNameInStorage()))
                 throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Projections cannot contain individual subcolumns: {}", column_with_type_name.name);
             /// Also remove this subcolumn from the required columns as we have the original column.
             std::erase_if(result.required_columns, [&](const String & column_name){ return column_name == column_with_type_name.name; });
@@ -435,7 +437,8 @@ void ProjectionDescription::recalculateWithNewColumns(const ColumnsDescription &
     *this = getProjectionFromAST(definition_ast, new_columns, query_context);
 }
 
-Block ProjectionDescription::calculate(const Block & block, ContextPtr context, const IColumnPermutation * perm_ptr) const
+Block ProjectionDescription::calculate(
+    const Block & block, UInt64 starting_offset, ContextPtr context, const IColumnPermutation * perm_ptr) const
 {
     auto mut_context = Context::createCopy(context);
     /// We ignore aggregate_functions_null_for_empty cause it changes aggregate function types.
@@ -457,31 +460,34 @@ Block ProjectionDescription::calculate(const Block & block, ContextPtr context,
             makeASTFunction("equals", std::make_shared<ASTIdentifier>(RowExistsColumn::name), std::make_shared<ASTLiteral>(1)));
     }
 
-    /// Create "_part_offset" column when needed for projection with parent part offsets
+    /// Only keep required columns
     Block source_block = block;
+    for (const auto & column : required_columns)
+        source_block.insert(block.getByName(column));
+
+    /// Create "_part_offset" column when needed for projection with parent part offsets
     if (with_parent_part_offset)
     {
         chassert(sample_block.has("_parent_part_offset"));
-
-        /// Add "_part_offset" column if not present (needed for insertions but not mutations - materialize projections)
-        if (!source_block.has("_part_offset"))
+        chassert(!source_block.has("_part_offset"));
+        auto uint64 = std::make_shared<DataTypeUInt64>();
+        auto column = uint64->createColumn();
+        auto & offset = assert_cast<ColumnUInt64 &>(*column).getData();
+        offset.resize_exact(block.rows());
+        if (perm_ptr)
         {
-            auto uint64 = std::make_shared<DataTypeUInt64>();
-            auto column = uint64->createColumn();
-            auto & offset = assert_cast<ColumnUInt64 &>(*column).getData();
-            offset.resize_exact(block.rows());
-            if (perm_ptr)
-            {
-                for (size_t i = 0; i < block.rows(); ++i)
-                    offset[(*perm_ptr)[i]] = i;
-            }
-            else
-            {
-                iota(offset.data(), offset.size(), UInt64(0));
-            }
-
-            source_block.insert({std::move(column), std::move(uint64), "_part_offset"});
+            /// Insertion path
+            chassert(starting_offset == 0);
+            for (size_t i = 0; i < block.rows(); ++i)
+                offset[(*perm_ptr)[i]] = i;
         }
+        else
+        {
+            /// Rebuilding path
+            iota(offset.data(), offset.size(), starting_offset);
+        }
+
+        source_block.insert({std::move(column), std::move(uint64), "_part_offset"});
     }
 
     auto builder = InterpreterSelectQuery(
@@ -503,22 +509,20 @@ Block ProjectionDescription::calculate(const Block & block, ContextPtr context,
     pipeline.complete(sink);
     CompletedPipelineExecutor executor(pipeline);
     executor.execute();
-    Block projection_block;
-    if (sink->isAccumulatedSomething())
+
+    /// Always return the proper header, even if nothing was accumulated, in case the caller needs to use it
+    Block projection_block = sink->isAccumulatedSomething() ? sink->getPort().getHeader().cloneWithColumns(sink->detachAccumulatedColumns())
+                                                            : sink->getPort().getHeader().cloneEmpty();
+    /// Rename parent _part_offset to _parent_part_offset column
+    if (with_parent_part_offset)
     {
-      projection_block = sink->getPort().getHeader().cloneWithColumns(sink->detachAccumulatedColumns());
-
-      /// Rename parent _part_offset to _parent_part_offset column
-      if (with_parent_part_offset)
-      {
-          chassert(projection_block.has("_part_offset"));
-          chassert(!projection_block.has("_parent_part_offset"));
-
-          auto new_column = projection_block.getByName("_part_offset");
-          new_column.name = "_parent_part_offset";
-          projection_block.erase("_part_offset");
-          projection_block.insert(std::move(new_column));
-      }
+        chassert(projection_block.has("_part_offset"));
+        chassert(!projection_block.has("_parent_part_offset"));
+
+        auto new_column = projection_block.getByName("_part_offset");
+        new_column.name = "_parent_part_offset";
+        projection_block.erase("_part_offset");
+        projection_block.insert(std::move(new_column));
     }
 
     return projection_block;
diff --git a/src/Storages/ProjectionsDescription.h b/src/Storages/ProjectionsDescription.h
index 493537d7c94e..bbc29014dd20 100644
--- a/src/Storages/ProjectionsDescription.h
+++ b/src/Storages/ProjectionsDescription.h
@@ -103,6 +103,11 @@ struct ProjectionDescription
      * @brief Calculates the projection result for a given input block.
      *
      * @param block The input block used to evaluate the projection.
+     * @param starting_offset The absolute starting row index of the current `block` within the
+     *        source data part. It is used to calculate the value of the virtual `_part_offset`
+     *        column (i.e., `_part_offset = starting_offset + row_index`). This column is
+     *        essential for mapping projection rows back to their original positions in the
+     *        parent part during merge or mutation.
      * @param context The query context. A copy will be made internally with adjusted settings.
      * @param perm_ptr Optional pointer to a permutation vector. If provided, it is used to map
      *        the output rows back to their original order in the parent block. This is necessary
@@ -111,7 +116,7 @@ struct ProjectionDescription
      *
      * @return The resulting block after executing the projection query.
      */
-    Block calculate(const Block & block, ContextPtr context, const IColumnPermutation * perm_ptr = nullptr) const;
+    Block calculate(const Block & block, UInt64 starting_offset, ContextPtr context, const IColumnPermutation * perm_ptr = nullptr) const;
 
     String getDirectoryName() const { return name + ".proj"; }
 };
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index d1ddc010f76e..b0a9454a9636 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -31,6 +31,7 @@
 #include <Common/Logger.h>
 #include <Common/logger_useful.h>
 #include <Common/Exception.h>
+#include <Common/filesystemHelpers.h>
 #include <Common/JSONBuilder.h>
 #include <Core/Settings.h>
 
@@ -210,10 +211,24 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
 {
     setInMemoryMetadata(metadata_);
     setSettings(std::move(settings_));
+
     if (rocksdb_dir.empty())
     {
+        /// We create tables under the database directory by default and enforce user_files path check for explicitly declared paths
         rocksdb_dir = context_->getPath() + relative_data_path_;
     }
+    else
+    {
+        bool is_local = context_->getApplicationType() == Context::ApplicationType::LOCAL;
+        fs::path user_files_path = is_local ? "" : fs::canonical(getContext()->getUserFilesPath());
+        if (fs::path(rocksdb_dir).is_relative())
+            rocksdb_dir = user_files_path / rocksdb_dir;
+        rocksdb_dir = fs::absolute(rocksdb_dir).lexically_normal();
+
+        if (!is_local && !fileOrSymlinkPathStartsWith(fs::path(rocksdb_dir), user_files_path))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path must be inside user-files path: {}", user_files_path.string());
+    }
+
     if (mode < LoadingStrictnessLevel::ATTACH)
     {
         fs::create_directories(rocksdb_dir);
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.cpp b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
index 9099671592a4..27606bdd0c33 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
@@ -54,7 +54,7 @@ void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr con
 
     using RocksDBStoragePtr = std::shared_ptr<StorageEmbeddedRocksDB>;
     std::map<String, std::map<String, RocksDBStoragePtr>> tables;
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         if (!db.second->canContainRocksDBTables())
             continue;
diff --git a/src/Storages/SelectQueryInfo.cpp b/src/Storages/SelectQueryInfo.cpp
index b08b511e2701..6965822427d6 100644
--- a/src/Storages/SelectQueryInfo.cpp
+++ b/src/Storages/SelectQueryInfo.cpp
@@ -25,12 +25,11 @@ std::unordered_map<std::string, ColumnWithTypeAndName> SelectQueryInfo::buildNod
     if (planner_context)
     {
         auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
-        const auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
         for (const auto & [column_identifier, column_name] : table_expression_data.getColumnIdentifierToColumnName())
         {
             /// ALIAS columns cannot be used in the filter expression without being calculated in ActionsDAG,
             /// so they should not be added to the input nodes.
-            if (alias_column_expressions.contains(column_name))
+            if (table_expression_data.hasAliasColumn(column_name))
                 continue;
             const auto & column = table_expression_data.getColumnOrThrow(column_name);
             node_name_to_input_node_column.emplace(column_identifier, ColumnWithTypeAndName(column.type, column_name));
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index 60218f5d4b4c..21a5e11f52df 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -1,5 +1,6 @@
 #include <Storages/StorageBuffer.h>
 
+#include <Access/Common/AccessFlags.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/Utils.h>
 #include <Interpreters/Context.h>
@@ -94,7 +95,6 @@ namespace ErrorCodes
     extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
 }
 
-
 std::unique_lock<std::mutex> StorageBuffer::Buffer::lockForReading() const
 {
     return lockImpl(/* read= */true);
@@ -138,6 +138,11 @@ StoragePtr StorageBuffer::getDestinationTable() const
 }
 
 
+std::string StorageBuffer::Thresholds::toString() const
+{
+    return fmt::format("time={}, rows={}, bytes={}", time, rows, bytes);
+}
+
 StorageBuffer::StorageBuffer(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
@@ -182,6 +187,8 @@ StorageBuffer::StorageBuffer(
             num_shards, 0, num_shards);
     }
     flush_handle = bg_pool.createTask(log->name() + "/Bg", [this]{ backgroundFlush(); });
+
+    LOG_TRACE(log, "Buffer(flush: ({}), min: ({}), max: ({}))", flush_thresholds.toString(), min_thresholds.toString(), max_thresholds.toString());
 }
 
 
@@ -290,6 +297,7 @@ void StorageBuffer::read(
 
     if (auto destination = getDestinationTable())
     {
+        local_context->checkAccess(AccessType::SELECT, destination->getStorageID(), column_names);
         auto destination_lock
             = destination->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef()[Setting::lock_acquire_timeout]);
 
@@ -642,13 +650,14 @@ static void appendBlock(LoggerPtr log, const Block & from, Block & to)
 }
 
 
-class BufferSink : public SinkToStorage
+class BufferSink : public SinkToStorage, WithContext
 {
 public:
     explicit BufferSink(
         StorageBuffer & storage_,
-        const StorageMetadataPtr & metadata_snapshot_)
-        : SinkToStorage(std::make_shared<const Block>(metadata_snapshot_->getSampleBlock()))
+        const StorageMetadataPtr & metadata_snapshot_,
+        const ContextPtr & context_)
+        : SinkToStorage(std::make_shared<const Block>(metadata_snapshot_->getSampleBlock())), WithContext(context_)
         , storage(storage_)
         , metadata_snapshot(metadata_snapshot_)
     {
@@ -669,6 +678,7 @@ class BufferSink : public SinkToStorage
         StoragePtr destination = storage.getDestinationTable();
         if (destination)
         {
+            getContext()->checkAccess(AccessType::INSERT, destination->getStorageID());
             destination = DatabaseCatalog::instance().tryGetTable(storage.destination_id, storage.getContext());
             if (destination.get() == &storage)
                 throw Exception(ErrorCodes::INFINITE_LOOP, "Destination table is myself. Write will cause infinite loop.");
@@ -727,7 +737,7 @@ class BufferSink : public SinkToStorage
         insertIntoBuffer(block, *least_busy_buffer, metadata_snapshot->metadata_version);
         least_busy_lock.unlock();
 
-        storage.reschedule();
+        storage.reschedule(0);
     }
 private:
     StorageBuffer & storage;
@@ -766,9 +776,9 @@ class BufferSink : public SinkToStorage
 };
 
 
-SinkToStoragePtr StorageBuffer::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/, bool /*async_insert*/)
+SinkToStoragePtr StorageBuffer::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, bool /*async_insert*/)
 {
-    return std::make_shared<BufferSink>(*this, metadata_snapshot);
+    return std::make_shared<BufferSink>(*this, metadata_snapshot, local_context);
 }
 
 
@@ -1089,27 +1099,23 @@ void StorageBuffer::writeBlockToDestination(const Block & block, StoragePtr tabl
 
 void StorageBuffer::backgroundFlush()
 {
+    try
     {
-        auto thread_group = ThreadGroup::createForBackgroundProcess(getContext());
-        ThreadGroupSwitcher group_switcher(thread_group, "BufferBgrFlush");
-
-        try
-        {
-            flushAllBuffers(true);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
+        flushAllBuffers(true);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
     }
 
-    reschedule();
+    reschedule(BACKGROUND_RESCHEDULE_MIN_DELAY);
 }
 
-void StorageBuffer::reschedule()
+void StorageBuffer::reschedule(size_t min_delay)
 {
     time_t min_first_write_time = std::numeric_limits<time_t>::max();
-    time_t rows = 0;
+    size_t rows = 0;
+    size_t processed_buffers = 0;
 
     for (auto & buffer : buffers)
     {
@@ -1125,6 +1131,7 @@ void StorageBuffer::reschedule()
         std::unique_lock lock(buffer.tryLock());
         if (lock.owns_lock())
         {
+            ++processed_buffers;
             if (!buffer.data.empty())
             {
                 min_first_write_time = std::min(min_first_write_time, buffer.first_write_time);
@@ -1135,15 +1142,37 @@ void StorageBuffer::reschedule()
 
     /// will be rescheduled via INSERT
     if (!rows)
+    {
+        LOG_TRACE(log, "Skipping reschedule (processed buffers: {})", processed_buffers);
         return;
+    }
 
     time_t current_time = time(nullptr);
     time_t time_passed = current_time - min_first_write_time;
 
-    size_t min = std::max<ssize_t>(min_thresholds.time - time_passed, 1);
-    size_t max = std::max<ssize_t>(max_thresholds.time - time_passed, 1);
-    size_t flush = std::max<ssize_t>(flush_thresholds.time - time_passed, 1);
-    flush_handle->scheduleAfter(std::min({min, max, flush}) * 1000);
+    /// checkThresholdsImpl() uses strict comparison (> not >=), so we need to add offset to original time values
+    static constexpr time_t THRESHOLD_COMPARISON_OFFSET = 1;
+
+    /// For minimal threshold min_delay is ignored, since otherwise it will be triggered too frequently, once it is reached
+    /// (while the Buffer cannot be flushed due to other min thresholds).
+    size_t min = std::max<ssize_t>(min_thresholds.time + THRESHOLD_COMPARISON_OFFSET - time_passed, 1);
+    size_t max = std::max<ssize_t>(max_thresholds.time + THRESHOLD_COMPARISON_OFFSET - time_passed, min_delay);
+    size_t reschedule_sec = 0;
+    if (flush_thresholds.time)
+    {
+        size_t flush = std::max<ssize_t>(flush_thresholds.time + THRESHOLD_COMPARISON_OFFSET - time_passed, min_delay);
+        reschedule_sec = std::min({min, max, flush});
+    }
+    else
+    {
+        reschedule_sec = std::min({min, max});
+    }
+    /// Schedule flush in background immediately, otherwise in case of frequent INSERTs we will never schedule the background flush
+    if (reschedule_sec == 0)
+        flush_handle->schedule();
+    else
+        flush_handle->scheduleAfter(reschedule_sec * 1000);
+    LOG_TRACE(log, "Reschedule in {} sec (processed buffers: {}, rows in processed buffers: {}, time passed: {})", reschedule_sec, processed_buffers, rows, time_passed);
 }
 
 void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index d68fb1ee1a95..d8de9b92922c 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -52,6 +52,8 @@ friend class BufferSink;
         time_t time = 0;  /// The number of seconds from the insertion of the first row into the block.
         size_t rows = 0;  /// The number of rows in the block.
         size_t bytes = 0; /// The number of (uncompressed) bytes in the block.
+
+        std::string toString() const;
     };
 
     /** num_shards - the level of internal parallelism (the number of independent buffers)
@@ -182,12 +184,14 @@ friend class BufferSink;
     void writeBlockToDestination(const Block & block, StoragePtr table);
 
     void backgroundFlush();
-    void reschedule();
+    void reschedule(size_t min_delay);
 
     StoragePtr getDestinationTable() const;
 
     BackgroundSchedulePool & bg_pool;
     BackgroundSchedulePoolTaskHolder flush_handle;
+
+    static constexpr size_t BACKGROUND_RESCHEDULE_MIN_DELAY = 1;
 };
 
 }
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index f5b86d8f783f..d230002be591 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -41,6 +41,7 @@
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
+#include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
@@ -51,6 +52,7 @@
 #include <Parsers/parseQuery.h>
 
 #include <Analyzer/ColumnNode.h>
+#include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/TableFunctionNode.h>
@@ -87,6 +89,7 @@
 
 #include <TableFunctions/TableFunctionView.h>
 #include <TableFunctions/TableFunctionFactory.h>
+#include <Storages/StorageTableFunction.h>
 
 #include <Storages/buildQueryTreeForShard.h>
 #include <Storages/IStorageCluster.h>
@@ -102,6 +105,7 @@
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sinks/EmptySink.h>
 
+#include <Core/Names.h>
 #include <Core/Settings.h>
 #include <Core/SettingsEnums.h>
 
@@ -115,9 +119,9 @@
 #include <memory>
 #include <filesystem>
 #include <cassert>
-
 #include <boost/algorithm/string/find_iterator.hpp>
 #include <boost/algorithm/string/finder.hpp>
+#include <fmt/ranges.h>
 
 
 namespace fs = std::filesystem;
@@ -148,6 +152,29 @@ namespace CurrentMetrics
 
 namespace DB
 {
+namespace
+{
+void replaceCurrentDatabaseFunction(ASTPtr & ast, const ContextPtr & context)
+{
+    if (!ast)
+        return;
+
+    if (auto * func = ast->as<ASTFunction>())
+    {
+        if (func->name == "currentDatabase")
+        {
+            ast = evaluateConstantExpressionForDatabaseName(ast, context);
+            return;
+        }
+    }
+
+    for (auto & child : ast->children)
+        replaceCurrentDatabaseFunction(child, context);
+}
+
+
+}
+
 namespace Setting
 {
     extern const SettingsBool allow_experimental_analyzer;
@@ -178,6 +205,8 @@ namespace Setting
     extern const SettingsUInt64 allow_experimental_parallel_reading_from_replicas;
     extern const SettingsBool prefer_global_in_and_join;
     extern const SettingsBool enable_global_with_statement;
+    extern const SettingsBool allow_experimental_hybrid_table;
+    extern const SettingsBool enable_alias_marker;
 }
 
 namespace DistributedSetting
@@ -198,6 +227,8 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
     extern const int STORAGE_REQUIRES_PARAMETER;
     extern const int BAD_ARGUMENTS;
+    extern const int UNKNOWN_DATABASE;
+    extern const int UNKNOWN_TABLE;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int INCORRECT_NUMBER_OF_COLUMNS;
     extern const int INFINITE_LOOP;
@@ -209,6 +240,7 @@ namespace ErrorCodes
     extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
+    extern const int SUPPORT_IS_DISABLED;
 }
 
 namespace ActionLocks
@@ -522,6 +554,10 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
     if (to_stage == QueryProcessingStage::WithMergeableState)
         return QueryProcessingStage::WithMergeableState;
 
+    // TODO: check logic
+    if (!segments.empty())
+        nodes += segments.size();
+
     /// If there is only one node, the query can be fully processed by the
     /// shard, initiator will work as a proxy only.
     if (nodes == 1)
@@ -564,6 +600,9 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
 bool StorageDistributed::isShardingKeySuitsQueryTreeNodeExpression(
     const QueryTreeNodePtr & expr, const SelectQueryInfo & query_info) const
 {
+    if (!segments.empty())
+        return false;
+
     ColumnsWithTypeAndName empty_input_columns;
     ColumnNodePtrWithHashSet empty_correlated_columns_set;
     // When comparing sharding key expressions, we need to ignore table qualifiers in column names
@@ -604,6 +643,7 @@ bool StorageDistributed::isShardingKeySuitsQueryTreeNodeExpression(
     return allOutputsDependsOnlyOnAllowedNodes(sharding_key_dag, irreducibe_nodes, matches);
 }
 
+// TODO: support additional segments
 std::optional<QueryProcessingStage::Enum> StorageDistributed::getOptimizedQueryProcessingStageAnalyzer(const SelectQueryInfo & query_info, const Settings & settings) const
 {
     bool optimize_sharding_key_aggregation = settings[Setting::optimize_skip_unused_shards] && settings[Setting::optimize_distributed_group_by_sharding_key]
@@ -662,6 +702,7 @@ std::optional<QueryProcessingStage::Enum> StorageDistributed::getOptimizedQueryP
     return QueryProcessingStage::Complete;
 }
 
+// TODO: support additional segments
 std::optional<QueryProcessingStage::Enum> StorageDistributed::getOptimizedQueryProcessingStage(const SelectQueryInfo & query_info, const Settings & settings) const
 {
     bool optimize_sharding_key_aggregation = settings[Setting::optimize_skip_unused_shards] && settings[Setting::optimize_distributed_group_by_sharding_key]
@@ -771,9 +812,11 @@ static bool requiresObjectColumns(const ColumnsDescription & all_columns, ASTPtr
 
 StorageSnapshotPtr StorageDistributed::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const
 {
+    /// TODO: support additional segments
     return getStorageSnapshotForQuery(metadata_snapshot, nullptr, query_context);
 }
 
+/// TODO: support additional segments
 StorageSnapshotPtr StorageDistributed::getStorageSnapshotForQuery(
     const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query, ContextPtr /*query_context*/) const
 {
@@ -803,7 +846,7 @@ namespace
 
 class ReplaseAliasColumnsVisitor : public InDepthQueryTreeVisitor<ReplaseAliasColumnsVisitor>
 {
-    static QueryTreeNodePtr getColumnNodeAliasExpression(const QueryTreeNodePtr & node)
+    QueryTreeNodePtr getColumnNodeAliasExpression(const QueryTreeNodePtr & node) const
     {
         const auto * column_node = node->as<ColumnNode>();
         if (!column_node || !column_node->hasExpression())
@@ -816,16 +859,149 @@ class ReplaseAliasColumnsVisitor : public InDepthQueryTreeVisitor<ReplaseAliasCo
             return nullptr;
 
         auto column_expression = column_node->getExpression();
-        column_expression->setAlias(column_node->getColumnName());
-        return column_expression;
+        const auto & column_name = column_node->getColumnName();
+
+        if (!context->getSettingsRef()[Setting::enable_alias_marker])
+        {
+            column_expression->setAlias(column_name);
+            return column_expression;
+        }
+
+        String alias_id;
+        const auto & source_alias = column_source->getAlias();
+        if (!source_alias.empty())
+            alias_id = source_alias + "." + column_name;
+        else
+            alias_id = column_name;
+
+        if (auto * function_node = column_expression->as<FunctionNode>();
+            function_node && function_node->getFunctionName() == "__aliasMarker")
+        {
+            auto & arguments = function_node->getArguments().getNodes();
+            if (arguments.size() == 2)
+                arguments[1] = std::make_shared<ConstantNode>(alias_id, std::make_shared<DataTypeString>());
+
+            column_expression->setAlias(column_name);
+            return column_expression;
+        }
+
+        QueryTreeNodes arguments;
+        arguments.reserve(2);
+        arguments.emplace_back(std::move(column_expression));
+        arguments.emplace_back(std::make_shared<ConstantNode>(alias_id, std::make_shared<DataTypeString>()));
+
+        auto alias_marker_node = std::make_shared<FunctionNode>("__aliasMarker");
+        alias_marker_node->getArguments().getNodes() = std::move(arguments);
+        alias_marker_node->setAlias(column_name);
+        resolveOrdinaryFunctionNodeByName(*alias_marker_node, "__aliasMarker", context);
+
+        return alias_marker_node;
     }
 
 public:
+    explicit ReplaseAliasColumnsVisitor(ContextPtr context_) : context(std::move(context_)) {}
+
     void visitImpl(QueryTreeNodePtr & node)
     {
         if (auto column_expression = getColumnNodeAliasExpression(node))
             node = column_expression;
     }
+
+private:
+    ContextPtr context;
+};
+
+using ColumnNameToColumnNodeMap = std::unordered_map<std::string, ColumnNodePtr>;
+
+ColumnNameToColumnNodeMap buildColumnNodesForTableExpression(const QueryTreeNodePtr & table_expression_node, const ContextPtr & context)
+{
+    const TableNode * table_node = table_expression_node->as<TableNode>();
+    const TableFunctionNode * table_function_node = table_expression_node->as<TableFunctionNode>();
+    if (!table_node && !table_function_node)
+        return {};
+
+    // Rebuild per-column nodes (including ALIAS expressions) for the replacement table expression.
+    const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
+    auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
+    if (storage_snapshot->storage.supportsSubcolumns())
+        get_column_options.withSubcolumns();
+
+    auto column_names_and_types = storage_snapshot->getColumns(get_column_options);
+    const auto & columns_description = storage_snapshot->metadata->getColumns();
+
+    ColumnNameToColumnNodeMap column_name_to_node;
+    column_name_to_node.reserve(column_names_and_types.size());
+
+    for (const auto & column_name_and_type : column_names_and_types)
+    {
+        const auto & column_default = columns_description.getDefault(column_name_and_type.name);
+        if (column_default && column_default->kind == ColumnDefaultKind::Alias)
+        {
+            auto alias_expression = buildQueryTree(column_default->expression, context);
+            QueryAnalysisPass(table_expression_node).run(alias_expression, context);
+            if (!alias_expression->getResultType()->equals(*column_name_and_type.type))
+                alias_expression = buildCastFunction(alias_expression, column_name_and_type.type, context, true);
+
+            auto column_node = std::make_shared<ColumnNode>(column_name_and_type, std::move(alias_expression), table_expression_node);
+            column_name_to_node.emplace(column_name_and_type.name, std::move(column_node));
+        }
+        else
+        {
+            auto column_node = std::make_shared<ColumnNode>(column_name_and_type, table_expression_node);
+            column_name_to_node.emplace(column_name_and_type.name, std::move(column_node));
+        }
+    }
+
+    return column_name_to_node;
+}
+
+class ReplaceColumnNodesForTableExpressionVisitor : public InDepthQueryTreeVisitor<ReplaceColumnNodesForTableExpressionVisitor>
+{
+public:
+    ReplaceColumnNodesForTableExpressionVisitor(
+        const QueryTreeNodePtr & from_,
+        const QueryTreeNodePtr & to_,
+        const ColumnNameToColumnNodeMap & column_name_to_node_)
+        : from(from_), to(to_), column_name_to_node(column_name_to_node_)
+    {}
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        auto * column_node = node->as<ColumnNode>();
+        if (!column_node)
+            return;
+
+        auto column_source = column_node->getColumnSourceOrNull();
+        if (!column_source)
+            return;
+
+        if (column_source.get() != from.get())
+            return;
+
+        auto it = column_name_to_node.find(column_node->getColumnName());
+        if (it != column_name_to_node.end())
+        {
+            auto replacement = it->second->clone();
+            replacement->setAlias(column_node->getAlias());
+            node = std::move(replacement);
+        }
+        else
+        {
+            // Preserve the column name but rebind its source to the replacement table expression.
+            column_node->setColumnSource(to);
+        }
+    }
+
+    static bool needChildVisit(const QueryTreeNodePtr &, const QueryTreeNodePtr & child_node)
+    {
+        auto child_node_type = child_node->getNodeType();
+        return !(child_node_type == QueryTreeNodeType::QUERY || child_node_type == QueryTreeNodeType::UNION);
+    }
+
+private:
+    QueryTreeNodePtr from;
+    QueryTreeNodePtr to;
+    const ColumnNameToColumnNodeMap & column_name_to_node;
 };
 
 class RewriteInToGlobalInVisitor : public InDepthQueryTreeVisitorWithContext<RewriteInToGlobalInVisitor>
@@ -909,7 +1085,8 @@ bool rewriteJoinToGlobalJoinIfNeeded(QueryTreeNodePtr join_tree)
 QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
     const StorageSnapshotPtr & distributed_storage_snapshot,
     const StorageID & remote_storage_id,
-    const ASTPtr & remote_table_function)
+    const ASTPtr & remote_table_function,
+    const ASTPtr & additional_filter = nullptr)
 {
     auto & planner_context = query_info.planner_context;
     const auto & query_context = planner_context->getQueryContext();
@@ -976,8 +1153,55 @@ QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
 
     replacement_table_expression->setAlias(query_info.table_expression->getAlias());
 
-    auto query_tree_to_modify = query_info.query_tree->cloneAndReplace(query_info.table_expression, std::move(replacement_table_expression));
-    ReplaseAliasColumnsVisitor replase_alias_columns_visitor;
+    QueryTreeNodePtr filter;
+    if (additional_filter)
+    {
+        const auto & context = query_info.planner_context->getQueryContext();
+
+        filter = buildQueryTree(additional_filter->clone(), query_context);
+        // Resolve now; alias expressions are normalized later for the merged query.
+        QueryAnalysisPass(replacement_table_expression).run(filter, context);
+    }
+
+    auto query_tree_to_modify = query_info.query_tree->cloneAndReplace(query_info.table_expression, replacement_table_expression);
+
+    // Apply additional filter if provided
+    if (filter)
+    {
+        auto & query = query_tree_to_modify->as<QueryNode &>();
+        query.getWhere() = query.hasWhere()
+            ? mergeConditionNodes({query.getWhere(), filter}, query_context)
+            : std::move(filter);
+    }
+
+    if (additional_filter)
+    {
+        auto replacement_columns = buildColumnNodesForTableExpression(replacement_table_expression, query_context);
+
+        /**
+         * When Hybrid injects a segment predicate, the query tree may end up mixing
+         * two different column interpretations for the same name:
+         * - SELECT list columns are resolved against the Hybrid schema (physical columns).
+         * - WHERE predicate columns are resolved against the segment schema (ALIAS columns).
+         *
+         * If we later expand alias columns only in one place, the analyzer can see
+         * two different expressions with the same alias (e.g. `computed` as a column
+         * vs `value * 2 AS computed`), which triggers MULTIPLE_EXPRESSIONS_FOR_ALIAS.
+         *
+         * To prevent this, we rebuild ColumnNodes from the replacement table expression
+         * (including fully-resolved ALIAS expressions) and rewrite the whole query tree
+         * so all references to the replaced table share the same column source and
+         * the same alias semantics. This keeps SELECT and WHERE consistent before
+         * ReplaseAliasColumnsVisitor performs final alias expansion.
+         */
+        ReplaceColumnNodesForTableExpressionVisitor replace_query_columns_visitor(
+            replacement_table_expression,
+            replacement_table_expression,
+            replacement_columns);
+        replace_query_columns_visitor.visit(query_tree_to_modify);
+    }
+
+    ReplaseAliasColumnsVisitor replase_alias_columns_visitor(query_context);
     replase_alias_columns_visitor.visit(query_tree_to_modify);
 
     const auto & settings = query_context->getSettingsRef();
@@ -995,6 +1219,7 @@ QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
     }
 
     return buildQueryTreeForShard(query_info.planner_context, query_tree_to_modify, /*allow_global_join_for_right_table*/ false);
+
 }
 
 }
@@ -1013,30 +1238,90 @@ void StorageDistributed::read(
 
     SelectQueryInfo modified_query_info = query_info;
 
+    std::vector<SelectQueryInfo> additional_query_infos;
+
     const auto & settings = local_context->getSettingsRef();
+    auto metadata_ptr = getInMemoryMetadataPtr();
+
+    auto describe_segment_target = [&](const HybridSegment & segment) -> String
+    {
+        if (segment.storage_id)
+            return segment.storage_id->getNameForLogs();
+        if (segment.table_function_ast)
+            return segment.table_function_ast->formatForLogging();
+        chassert(false, "Hybrid segment is missing both storage_id and table_function_ast");
+        return String{"<unknown_segment>"};
+    };
+
+    auto describe_base_target = [&]() -> String
+    {
+       if (remote_table_function_ptr)
+          return remote_table_function_ptr->formatForLogging();
+       if (!remote_database.empty())
+          return remote_database + "." + remote_table;
+       return remote_table;
+    };
+
+    String base_target = describe_base_target();
+
+    const bool log_hybrid_query_rewrites = (!segments.empty() || base_segment_predicate);
+
+    auto log_rewritten_query = [&](const String & target, const ASTPtr & ast)
+    {
+        if (!log_hybrid_query_rewrites || !ast)
+            return;
+
+        LOG_TRACE(log, "rewriteSelectQuery (target: {}) -> {}", target, ast->formatForLogging());
+    };
 
     if (settings[Setting::allow_experimental_analyzer])
     {
-        StorageID remote_storage_id = StorageID{remote_database, remote_table};
+        StorageID remote_storage_id = StorageID::createEmpty();
+        if (!remote_table_function_ptr)
+            remote_storage_id = StorageID{remote_database, remote_table};
 
         auto query_tree_distributed = buildQueryTreeDistributed(modified_query_info,
             query_info.initial_storage_snapshot ? query_info.initial_storage_snapshot : storage_snapshot,
             remote_storage_id,
-            remote_table_function_ptr);
+            remote_table_function_ptr,
+            base_segment_predicate);
         Block block = *InterpreterSelectQueryAnalyzer::getSampleBlock(query_tree_distributed, local_context, SelectQueryOptions(processed_stage).analyze());
         /** For distributed tables we do not need constants in header, since we don't send them to remote servers.
           * Moreover, constants can break some functions like `hostName` that are constants only for local queries.
           */
         for (auto & column : block)
             column.column = column.column->convertToFullColumnIfConst();
+
         header = std::make_shared<const Block>(std::move(block));
 
         modified_query_info.query = queryNodeToDistributedSelectQuery(query_tree_distributed);
 
         modified_query_info.query_tree = std::move(query_tree_distributed);
+        log_rewritten_query(base_target, modified_query_info.query);
+
+        if (!segments.empty())
+        {
+            for (const auto & segment : segments)
+            {
+                // Create a modified query info with the segment predicate
+                SelectQueryInfo additional_query_info = query_info;
+
+                auto additional_query_tree = buildQueryTreeDistributed(additional_query_info,
+                    query_info.initial_storage_snapshot ? query_info.initial_storage_snapshot : storage_snapshot,
+                    segment.storage_id ? *segment.storage_id : StorageID::createEmpty(),
+                    segment.storage_id ? nullptr :  segment.table_function_ast,
+                    segment.predicate_ast);
 
-        /// Return directly (with correct header) if no shard to query.
-        if (modified_query_info.getCluster()->getShardsInfo().empty())
+                additional_query_info.query = queryNodeToDistributedSelectQuery(additional_query_tree);
+                additional_query_info.query_tree = std::move(additional_query_tree);
+                log_rewritten_query(describe_segment_target(segment), additional_query_info.query);
+
+                additional_query_infos.push_back(std::move(additional_query_info));
+            }
+        }
+
+        // For empty shards - avoid early return if we have additional segments
+        if (modified_query_info.getCluster()->getShardsInfo().empty() && segments.empty())
             return;
     }
     else
@@ -1045,9 +1330,39 @@ void StorageDistributed::read(
 
         modified_query_info.query = ClusterProxy::rewriteSelectQuery(
             local_context, modified_query_info.query,
-            remote_database, remote_table, remote_table_function_ptr);
+            remote_database, remote_table, remote_table_function_ptr,
+            base_segment_predicate);
+        log_rewritten_query(base_target, modified_query_info.query);
 
-        if (modified_query_info.getCluster()->getShardsInfo().empty())
+        if (!segments.empty())
+        {
+            for (const auto & segment : segments)
+            {
+                SelectQueryInfo additional_query_info = query_info;
+
+                if (segment.storage_id)
+                {
+                    additional_query_info.query = ClusterProxy::rewriteSelectQuery(
+                        local_context, additional_query_info.query,
+                        segment.storage_id->database_name, segment.storage_id->table_name,
+                        nullptr,
+                        segment.predicate_ast);
+                }
+                else
+                {
+                    additional_query_info.query = ClusterProxy::rewriteSelectQuery(
+                        local_context, additional_query_info.query,
+                        "", "", segment.table_function_ast,
+                        segment.predicate_ast);
+                }
+
+                log_rewritten_query(describe_segment_target(segment), additional_query_info.query);
+                additional_query_infos.push_back(std::move(additional_query_info));
+            }
+        }
+
+        // For empty shards - avoid early return if we have additional segments
+        if (modified_query_info.getCluster()->getShardsInfo().empty() && segments.empty())
         {
             Pipe pipe(std::make_shared<NullSource>(header));
             auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
@@ -1059,35 +1374,40 @@ void StorageDistributed::read(
     }
 
     const auto & snapshot_data = assert_cast<const SnapshotData &>(*storage_snapshot->data);
-    ClusterProxy::SelectStreamFactory select_stream_factory =
-        ClusterProxy::SelectStreamFactory(
+
+    if (!modified_query_info.getCluster()->getShardsInfo().empty() || !additional_query_infos.empty())
+    {
+        ClusterProxy::SelectStreamFactory select_stream_factory =
+            ClusterProxy::SelectStreamFactory(
+                header,
+                snapshot_data.objects_by_shard,
+                storage_snapshot,
+                processed_stage);
+
+        auto shard_filter_generator = ClusterProxy::getShardFilterGeneratorForCustomKey(
+            *modified_query_info.getCluster(), local_context, metadata_ptr->columns);
+
+        ClusterProxy::executeQuery(
+            query_plan,
             header,
-            snapshot_data.objects_by_shard,
-            storage_snapshot,
-            processed_stage);
-
-    auto shard_filter_generator = ClusterProxy::getShardFilterGeneratorForCustomKey(
-        *modified_query_info.getCluster(), local_context, getInMemoryMetadataPtr()->columns);
-
-    ClusterProxy::executeQuery(
-        query_plan,
-        header,
-        processed_stage,
-        remote_storage,
-        remote_table_function_ptr,
-        select_stream_factory,
-        log,
-        local_context,
-        modified_query_info,
-        sharding_key_expr,
-        sharding_key_column_name,
-        *distributed_settings,
-        shard_filter_generator,
-        is_remote_function);
-
-    /// This is a bug, it is possible only when there is no shards to query, and this is handled earlier.
-    if (!query_plan.isInitialized())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline is not initialized");
+            processed_stage,
+            remote_storage,
+            remote_table_function_ptr,
+            select_stream_factory,
+            log,
+            local_context,
+            modified_query_info,
+            sharding_key_expr,
+            sharding_key_column_name,
+            *distributed_settings,
+            shard_filter_generator,
+            is_remote_function,
+            additional_query_infos);
+
+        /// This is a bug, it is possible only when there is no shards to query, and this is handled earlier.
+        if (!query_plan.isInitialized())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline is not initialized");
+    }
 }
 
 
@@ -2071,6 +2391,37 @@ void StorageDistributed::delayInsertOrThrowIfNeeded() const
     }
 }
 
+void StorageDistributed::setHybridLayout(std::vector<HybridSegment> segments_)
+{
+    segments = std::move(segments_);
+    log = getLogger("Hybrid (" + getStorageID().table_name + ")");
+
+    auto virtuals = createVirtuals();
+    // or _segment_index?
+    virtuals.addEphemeral("_table_index", std::make_shared<DataTypeUInt32>(), "Index of the table function in Hybrid (0 for main table, 1+ for additional segments)");
+    setVirtuals(virtuals);
+}
+
+void StorageDistributed::setCachedColumnsToCast(ColumnsDescription columns)
+{
+    cached_columns_to_cast = std::move(columns);
+    if (!cached_columns_to_cast.empty() && log)
+    {
+        Names columns_with_types;
+        const auto cached_columns = cached_columns_to_cast.getAllPhysical();
+        columns_with_types.reserve(cached_columns.size());
+        for (const auto & col : cached_columns)
+            columns_with_types.emplace_back(col.name + " " + col.type->getName());
+        LOG_DEBUG(log, "Hybrid auto-cast will apply to: [{}]", fmt::join(columns_with_types, ", "));
+    }
+}
+
+ColumnsDescription StorageDistributed::getColumnsToCast() const
+{
+    return cached_columns_to_cast;
+}
+
+
 void registerStorageDistributed(StorageFactory & factory)
 {
     factory.registerStorage("Distributed", [](const StorageFactory::Arguments & args)
@@ -2175,6 +2526,283 @@ void registerStorageDistributed(StorageFactory & factory)
     });
 }
 
+void registerStorageHybrid(StorageFactory & factory)
+{
+    factory.registerStorage("Hybrid", [](const StorageFactory::Arguments & args) -> StoragePtr
+    {
+        ASTs & engine_args = args.engine_args;
+
+        if (engine_args.size() < 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                            "Storage Hybrid requires at least 2 arguments, got {}", engine_args.size());
+
+        const ContextPtr & global_context = args.getContext();
+        ContextPtr local_context = args.getLocalContext();
+        if (!local_context)
+            local_context = global_context;
+
+        if (args.mode <= LoadingStrictnessLevel::CREATE
+            && !local_context->getSettingsRef()[Setting::allow_experimental_hybrid_table])
+        {
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                "Experimental Hybrid table engine is not enabled (the setting 'allow_experimental_hybrid_table')");
+        }
+
+        // Validate first argument - must be a table function
+        ASTPtr first_arg = engine_args[0];
+        if (const auto * func = first_arg->as<ASTFunction>())
+        {
+            // Check if it's a valid table function name
+            if (!TableFunctionFactory::instance().isTableFunctionName(func->name))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "First argument must be a table function, got: {}", func->name);
+
+            // Check if it's one of the supported remote table functions
+            if (func->name != "remote" && func->name != "remoteSecure" &&
+                func->name != "cluster" && func->name != "clusterAllReplicas")
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "First argument must be one of: remote, remoteSecure, cluster, clusterAllReplicas, got: {}", func->name);
+        }
+        else
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "First argument must be a table function, got: {}", first_arg->getID());
+        }
+
+        // Now handle the first table function (which must be a TableFunctionRemote)
+        auto table_function = TableFunctionFactory::instance().get(first_arg, local_context);
+        if (!table_function)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid table function in Hybrid engine");
+
+        // Capture the physical columns reported by the first segment (table function)
+        ColumnsDescription first_segment_columns = table_function->getActualTableStructure(local_context, true);
+
+        // For schema inference, prefer user-provided columns, otherwise use the physical ones
+        ColumnsDescription columns_to_use = args.columns;
+        if (columns_to_use.empty())
+            columns_to_use = first_segment_columns;
+
+        const auto physical_columns = columns_to_use.getAllPhysical();
+
+        NameSet columns_to_cast_names;
+        auto validate_segment_schema = [&](const ColumnsDescription & segment_columns, const String & segment_name)
+        {
+            for (const auto & column : physical_columns)
+            {
+                // all columns defined as physical in hybrid should exists in segments (but can be aliases there)
+                auto found = segment_columns.tryGetColumn(GetColumnsOptions(GetColumnsOptions::AllPhysicalAndAliases), column.name);
+                if (!found)
+                {
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Hybrid segment {} is missing column '{}' required by Hybrid schema",
+                        segment_name, column.name);
+                }
+
+                // if the type of the column is the segment differs - we need to add it to the list of columns which require casts
+                if (!found->type->equals(*column.type))
+                    columns_to_cast_names.emplace(column.name);
+            }
+        };
+
+        validate_segment_schema(first_segment_columns, engine_args[0]->formatForLogging());
+
+        // Execute the table function to get the underlying storage
+        StoragePtr storage = table_function->execute(
+            first_arg,
+            local_context,
+            args.table_id.table_name,
+            columns_to_use,
+            false, // use_global_context = false
+            false); // is_insert_query = false
+
+        // table function execution wraps the actual storage in a StorageTableFunctionProxy, to make initialize it lazily in queries
+        // here we need to get the nested storage
+        if (auto proxy = std::dynamic_pointer_cast<StorageTableFunctionProxy>(storage))
+        {
+            storage = proxy->getNested();
+        }
+
+        // Cast to StorageDistributed to access its methods
+        auto distributed_storage = std::dynamic_pointer_cast<StorageDistributed>(storage);
+        if (!distributed_storage)
+        {
+            // Debug: Print the actual type we got
+            std::string actual_type = storage ? storage->getName() : "nullptr";
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "TableFunctionRemote did not return a StorageDistributed or StorageProxy, got: {}", actual_type);
+        }
+
+        auto validate_predicate = [&](ASTPtr & predicate, size_t argument_index)
+        {
+            try
+            {
+                auto syntax_result = TreeRewriter(local_context).analyze(predicate, physical_columns);
+                ExpressionAnalyzer(predicate, syntax_result, local_context).getActions(true);
+            }
+            catch (const Exception & e)
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Argument #{} must be a valid SQL expression: {}", argument_index, e.message());
+            }
+        };
+
+        ASTPtr second_arg = engine_args[1];
+        validate_predicate(second_arg, 1);
+        distributed_storage->setBaseSegmentPredicate(second_arg);
+
+        // Parse additional table function pairs (if any)
+        std::vector<StorageDistributed::HybridSegment> segment_definitions;
+        for (size_t i = 2; i < engine_args.size(); i += 2)
+        {
+            if (i + 1 >= engine_args.size())
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                                "Table function pairs must have both table function and predicate, got odd number of arguments");
+
+            ASTPtr table_function_ast = engine_args[i];
+            ASTPtr predicate_ast = engine_args[i + 1];
+
+            validate_predicate(predicate_ast, i + 1);
+
+            // Validate table function or table identifier
+            if (const auto * func = table_function_ast->as<ASTFunction>())
+            {
+                // It's a table function - validate it
+                if (!TableFunctionFactory::instance().isTableFunctionName(func->name))
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Argument #{}: additional table function must be a valid table function, got: {}", i, func->name);
+                }
+
+                // Normalize arguments (evaluate `currentDatabase()`, expand named collections, etc.).
+                // TableFunctionFactory::get mutates the AST in-place inside TableFunctionRemote::parseArguments.
+                ASTPtr normalized_table_function_ast = table_function_ast->clone();
+                auto additional_table_function = TableFunctionFactory::instance().get(normalized_table_function_ast, local_context);
+                ColumnsDescription segment_columns = additional_table_function->getActualTableStructure(local_context, true);
+                replaceCurrentDatabaseFunction(normalized_table_function_ast, local_context);
+
+                validate_segment_schema(segment_columns, normalized_table_function_ast->formatForLogging());
+
+                // It's a table function - store the AST and cached schema for later execution
+                segment_definitions.emplace_back(normalized_table_function_ast, predicate_ast);
+            }
+            else if (const auto * ast_identifier = table_function_ast->as<ASTIdentifier>())
+            {
+                // It's an identifier - try to convert it to a table identifier
+                auto table_identifier = ast_identifier->createTable();
+                if (!table_identifier)
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Argument #{}: identifier '{}' cannot be converted to table identifier", i, ast_identifier->name());
+                }
+
+                StoragePtr validated_table;
+                try
+                {
+                    // Parse table identifier to get StorageID
+                    StorageID storage_id(table_identifier);
+
+                    // Fill database for unqualified identifiers using current database (or the target table database).
+                    if (storage_id.database_name.empty())
+                    {
+                        String default_database = local_context->getCurrentDatabase();
+                        if (default_database.empty())
+                            default_database = args.table_id.database_name;
+
+                        if (default_database.empty())
+                        {
+                            throw Exception(ErrorCodes::UNKNOWN_DATABASE,
+                                "Argument #{}: table identifier '{}' does not specify database and no default database is selected",
+                                i, ast_identifier->name());
+                        }
+
+                        storage_id.database_name = default_database;
+
+                        // Update AST so the table definition stores a fully qualified name.
+                        auto qualified_identifier = std::make_shared<ASTTableIdentifier>(storage_id.database_name, storage_id.table_name);
+                        qualified_identifier->alias = ast_identifier->alias;
+                        qualified_identifier->prefer_alias_to_column_name = ast_identifier->prefer_alias_to_column_name;
+                        table_function_ast = qualified_identifier;
+                        engine_args[i] = table_function_ast;
+                    }
+
+                    // Sanity check: verify the table exists
+                    try
+                    {
+                        auto database = DatabaseCatalog::instance().getDatabase(storage_id.database_name, local_context);
+                        if (!database)
+                        {
+                            throw Exception(ErrorCodes::UNKNOWN_DATABASE,
+                                "Database '{}' does not exist", storage_id.database_name);
+                        }
+
+                        auto table = database->tryGetTable(storage_id.table_name, local_context);
+                        if (!table)
+                        {
+                            throw Exception(ErrorCodes::UNKNOWN_TABLE,
+                                "Table '{}.{}' does not exist", storage_id.database_name, storage_id.table_name);
+                        }
+                        validated_table = table;
+                    }
+                    catch (const Exception & e)
+                    {
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Argument #{}: table '{}' validation failed: {}", i, ast_identifier->name(), e.message());
+                    }
+
+                    ColumnsDescription segment_columns;
+
+                    if (validated_table)
+                        segment_columns = validated_table->getInMemoryMetadataPtr()->getColumns();
+
+                    validate_segment_schema(segment_columns, storage_id.getNameForLogs());
+
+                    segment_definitions.emplace_back(table_function_ast, predicate_ast, storage_id);
+                }
+                catch (const Exception & e)
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Argument #{}: invalid table identifier '{}': {}", i, ast_identifier->name(), e.message());
+                }
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Argument #{}: additional argument must be either a table function or table identifier, got: {}", i, table_function_ast->getID());
+            }
+
+        }
+
+        // Fix the database and table names - this is the same pattern used in InterpreterCreateQuery
+        // The TableFunctionRemote creates a StorageDistributed with "_table_function" database,
+        // but we need to rename it to the correct database and table names
+        distributed_storage->renameInMemory({args.table_id.database_name, args.table_id.table_name, args.table_id.uuid});
+
+        // Store segment definitions for later use
+        distributed_storage->setHybridLayout(std::move(segment_definitions));
+        if (!columns_to_cast_names.empty())
+        {
+            NamesAndTypesList cast_cols;
+
+            // 'physical' columns of Hybrid will be read from segments, and may need CASTS
+            for (const auto & col : physical_columns)
+            {
+                if (columns_to_cast_names.contains(col.name))
+                    cast_cols.emplace_back(col.name, col.type);
+            }
+            distributed_storage->setCachedColumnsToCast(ColumnsDescription(cast_cols));
+        }
+
+        return distributed_storage;
+    },
+    {
+        .supports_settings = false,
+        .supports_parallel_insert = true,
+        .supports_schema_inference = true,
+        .source_access_type = AccessTypeObjects::Source::REMOTE,
+    });
+}
+
 bool StorageDistributed::initializeDiskOnConfigChange(const std::set<String> & new_added_disks)
 {
     if (!storage_policy || !data_volume)
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 75354edb7ffc..9526fc647fbc 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -50,6 +50,27 @@ class StorageDistributed final : public IStorage, WithContext
     friend class StorageSystemDistributionQueue;
 
 public:
+    /// Structure to hold table function AST, predicate, optional StorageID, and cached physical columns for the segment.
+    /// Cached columns let us detect schema mismatches and enable features like hybrid_table_auto_cast_columns without
+    /// re-fetching remote headers on every query.
+    struct HybridSegment
+    {
+        ASTPtr table_function_ast;
+        ASTPtr predicate_ast;
+        std::optional<StorageID> storage_id; // For table identifiers instead of table functions
+
+        HybridSegment(ASTPtr table_function_ast_, ASTPtr predicate_ast_)
+            : table_function_ast(std::move(table_function_ast_))
+            , predicate_ast(std::move(predicate_ast_))
+        {}
+
+        HybridSegment(ASTPtr table_function_ast_, ASTPtr predicate_ast_, StorageID storage_id_)
+            : table_function_ast(std::move(table_function_ast_))
+            , predicate_ast(std::move(predicate_ast_))
+            , storage_id(std::move(storage_id_))
+        {}
+    };
+
     StorageDistributed(
         const StorageID & id_,
         const ColumnsDescription & columns_,
@@ -70,7 +91,12 @@ class StorageDistributed final : public IStorage, WithContext
 
     ~StorageDistributed() override;
 
-    std::string getName() const override { return "Distributed"; }
+    std::string getName() const override
+    {
+        return (segments.empty() && !base_segment_predicate)
+            ? "Distributed"
+            : "Hybrid";
+    }
 
     bool supportsSampling() const override { return true; }
     bool supportsFinal() const override { return true; }
@@ -149,6 +175,20 @@ class StorageDistributed final : public IStorage, WithContext
 
     size_t getShardCount() const;
 
+    /// Set optional predicate applied to the base segment
+    void setBaseSegmentPredicate(ASTPtr predicate) { base_segment_predicate = std::move(predicate); }
+
+    /// Set segment definitions for Hybrid engine along with cached schema info
+    void setHybridLayout(std::vector<HybridSegment> segments_);
+    void setCachedColumnsToCast(ColumnsDescription columns);
+
+    /// Getter methods for ClusterProxy::executeQuery
+    StorageID getRemoteStorageID() const { return remote_storage; }
+    ColumnsDescription getColumnsToCast() const;
+    ExpressionActionsPtr getShardingKeyExpression() const { return sharding_key_expr; }
+    const DistributedSettings * getDistributedSettings() const { return distributed_settings.get(); }
+    bool isRemoteFunction() const { return is_remote_function; }
+
     bool initializeDiskOnConfigChange(const std::set<String> & new_added_disks) override;
 
 private:
@@ -283,6 +323,21 @@ class StorageDistributed final : public IStorage, WithContext
     pcg64 rng;
 
     bool is_remote_function;
+
+    /// Additional filter expression for Hybrid engine
+    ASTPtr base_segment_predicate;
+
+    /// Additional segments for Hybrid engine
+    std::vector<HybridSegment> segments;
+
+    /// Hybrid build the list of columns which need to be casted once during CREATE/ATTACH
+    /// those are columns which type differs from the expected at least on one segment.
+    /// is is used by HybridCastsPass and hybrid_table_auto_cast_columns feature
+    /// without cache that would require reading the headers of the segments before every query
+    /// which may trigger extra DESCRIBE call in case of remote queries.
+    /// Subsequent segment DDL changes are not auto-detected;
+    /// reattach/recreate the Hybrid table to refresh.
+    ColumnsDescription cached_columns_to_cast;
 };
 
 }
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 8c524dacea51..ea9fef7b4dd4 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -527,8 +527,7 @@ namespace
 
         void setSchemaToLastFile(const ColumnsDescription & columns) override
         {
-            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_file]
-                || getContext()->getSettingsRef()[Setting::schema_inference_mode] != SchemaInferenceMode::UNION)
+            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_file])
                 return;
 
             /// For union mode, schema can be different for different files, so we need to
@@ -537,17 +536,6 @@ namespace
             StorageFile::getSchemaCache(getContext()).addColumns(cache_key, columns);
         }
 
-        void setResultingSchema(const ColumnsDescription & columns) override
-        {
-            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_file]
-                || getContext()->getSettingsRef()[Setting::schema_inference_mode] != SchemaInferenceMode::DEFAULT)
-                return;
-
-            /// For default mode we cache resulting schema for all paths.
-            auto cache_keys = getKeysForSchemaCache(paths, *format, format_settings, getContext());
-            StorageFile::getSchemaCache(getContext()).addManyColumns(cache_keys, columns);
-        }
-
         String getLastFilePath() const override
         {
             if (current_index != 0)
@@ -793,8 +781,7 @@ namespace
 
         void setSchemaToLastFile(const ColumnsDescription & columns) override
         {
-            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_file]
-                || getContext()->getSettingsRef()[Setting::schema_inference_mode] != SchemaInferenceMode::UNION)
+            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_file])
                 return;
 
             /// For union mode, schema can be different for different files in archive, so we need to
@@ -804,22 +791,6 @@ namespace
             schema_cache.addColumns(cache_key, columns);
         }
 
-        void setResultingSchema(const ColumnsDescription & columns) override
-        {
-            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_file]
-                || getContext()->getSettingsRef()[Setting::schema_inference_mode] != SchemaInferenceMode::DEFAULT)
-                return;
-
-            /// For default mode we cache resulting schema for all paths.
-            /// Also add schema for initial paths (maybe with globes) in cache,
-            /// so next time we won't iterate through files (that can be expensive).
-            for (const auto & archive : archive_info.paths_to_archives)
-                paths_for_schema_cache.emplace_back(fmt::format("{}::{}", archive, archive_info.path_in_archive));
-            auto & schema_cache = StorageFile::getSchemaCache(getContext());
-            auto cache_keys = getKeysForSchemaCache(paths_for_schema_cache, *format, format_settings, getContext());
-            schema_cache.addManyColumns(cache_keys, columns);
-        }
-
         void setFormatName(const String & format_name) override
         {
             format = format_name;
@@ -1029,8 +1000,9 @@ bool StorageFile::canMoveConditionsToPrewhere() const
 
 std::optional<NameSet> StorageFile::supportedPrewhereColumns() const
 {
-    /// Currently don't support prewhere for virtual columns and columns with default expressions.
-    return getInMemoryMetadataPtr()->getColumnsWithoutDefaultExpressions();
+    /// Currently don't support prewhere for virtual columns, columns with default expressions,
+    /// and columns taken from file path (hive partitioning).
+    return getInMemoryMetadataPtr()->getColumnsWithoutDefaultExpressions(/*exclude=*/ hive_partition_columns_to_read_from_file_path);
 }
 
 IStorage::ColumnSizeByName StorageFile::getColumnSizes() const
@@ -1175,19 +1147,12 @@ void StorageFile::setStorageMetadata(CommonArguments args)
 
     auto & storage_columns = storage_metadata.columns;
 
-    if (args.getContext()->getSettingsRef()[Setting::use_hive_partitioning])
-    {
-        HivePartitioningUtils::extractPartitionColumnsFromPathAndEnrichStorageColumns(
-           storage_columns,
-           hive_partition_columns_to_read_from_file_path,
-           sample_path,
-           args.columns.empty(),
-           format_settings,
-           args.getContext());
-    }
-
-    /// If the `partition_strategy` argument is ever implemented for File storage, this must be updated
-    file_columns = storage_columns.getAllPhysical();
+    std::tie(hive_partition_columns_to_read_from_file_path, std::ignore) = HivePartitioningUtils::setupHivePartitioningForFileURLLikeStorage(
+        storage_columns,
+        sample_path,
+        args.columns.empty(),
+        format_settings,
+        args.getContext());
 
     setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns));
     setInMemoryMetadata(storage_metadata);
@@ -1548,6 +1513,16 @@ Chunk StorageFileSource::generate()
                 chunk_size = input_format->getApproxBytesReadForChunk();
             progress(num_rows, chunk_size ? chunk_size : chunk.bytes());
 
+            /// The order is important, hive partition columns must be added before virtual columns
+            /// because they are part of the schema
+            if (!hive_partition_columns_to_read_from_file_path.empty())
+            {
+                HivePartitioningUtils::addPartitionColumnsToChunk(
+                    chunk,
+                    hive_partition_columns_to_read_from_file_path,
+                    current_path);
+            }
+
             /// Enrich with virtual columns.
             VirtualColumnUtils::addRequestedFileLikeStorageVirtualsToChunk(
                 chunk, requested_virtual_columns,
@@ -1558,15 +1533,6 @@ Chunk StorageFileSource::generate()
                     .last_modified = current_file_last_modified
                 }, getContext());
 
-            // The order is important, it must be added after virtual columns..
-            if (!hive_partition_columns_to_read_from_file_path.empty())
-            {
-                HivePartitioningUtils::addPartitionColumnsToChunk(
-                    chunk,
-                    hive_partition_columns_to_read_from_file_path,
-                    current_path);
-            }
-
             return chunk;
         }
 
@@ -1995,7 +1961,7 @@ class StorageFileSink final : public SinkToStorage, WithContext
     std::unique_lock<std::shared_timed_mutex> lock;
 };
 
-class PartitionedStorageFileSink : public PartitionedSink
+class PartitionedStorageFileSink : public PartitionedSink::SinkCreator
 {
 public:
     PartitionedStorageFileSink(
@@ -2010,7 +1976,7 @@ class PartitionedStorageFileSink : public PartitionedSink
         const String format_name_,
         ContextPtr context_,
         int flags_)
-        : PartitionedSink(partition_strategy_, context_, std::make_shared<const Block>(metadata_snapshot_->getSampleBlock()))
+        : partition_strategy(partition_strategy_)
         , path(path_)
         , metadata_snapshot(metadata_snapshot_)
         , table_name_for_log(table_name_for_log_)
@@ -2026,11 +1992,12 @@ class PartitionedStorageFileSink : public PartitionedSink
 
     SinkPtr createSinkForPartition(const String & partition_id) override
     {
-        std::string filepath = partition_strategy->getPathForWrite(path, partition_id);
+        const auto file_path_generator = std::make_shared<ObjectStorageWildcardFilePathGenerator>(path);
+        std::string filepath = file_path_generator->getPathForWrite(partition_id);
 
         fs::create_directories(fs::path(filepath).parent_path());
 
-        validatePartitionKey(filepath, true);
+        PartitionedSink::validatePartitionKey(filepath, true);
         checkCreationIsAllowed(context, context->getUserFilesPath(), filepath, /*can_be_directory=*/ true);
         return std::make_shared<StorageFileSink>(
             metadata_snapshot,
@@ -2047,6 +2014,7 @@ class PartitionedStorageFileSink : public PartitionedSink
     }
 
 private:
+    std::shared_ptr<IPartitionStrategy> partition_strategy;
     const String path;
     StorageMetadataPtr metadata_snapshot;
     String table_name_for_log;
@@ -2098,7 +2066,7 @@ SinkToStoragePtr StorageFile::write(
             has_wildcards,
             /* partition_columns_in_data_file */true);
 
-        return std::make_shared<PartitionedStorageFileSink>(
+        auto sink_creator = std::make_shared<PartitionedStorageFileSink>(
             partition_strategy,
             metadata_snapshot,
             getStorageID().getNameForLogs(),
@@ -2110,6 +2078,13 @@ SinkToStoragePtr StorageFile::write(
             format_name,
             context,
             flags);
+
+        return std::make_shared<PartitionedSink>(
+            partition_strategy,
+            sink_creator,
+            context,
+            std::make_shared<const Block>(metadata_snapshot->getSampleBlock())
+        );
     }
 
     String path;
@@ -2135,6 +2110,7 @@ SinkToStoragePtr StorageFile::write(
                 String new_path;
                 do
                 {
+
                     new_path = path.substr(0, pos) + "." + std::to_string(index) + (pos == std::string::npos ? "" : path.substr(pos));
                     ++index;
                 }
@@ -2246,9 +2222,10 @@ void registerStorageFile(StorageFactory & factory)
         "File",
         [](const StorageFactory::Arguments & factory_args)
         {
+            auto context = factory_args.getLocalContext();
             StorageFile::CommonArguments storage_args
             {
-                WithContext(factory_args.getContext()),
+                WithContext(context),
                 factory_args.table_id,
                 {},
                 {},
@@ -2335,7 +2312,7 @@ void registerStorageFile(StorageFactory & factory)
                 return std::make_shared<StorageFile>(source_fd, storage_args);
 
             /// User's file
-            return std::make_shared<StorageFile>(source_path, factory_args.getContext()->getUserFilesPath(), false, storage_args);
+            return std::make_shared<StorageFile>(source_path, context->getUserFilesPath(), false, storage_args);
         },
         storage_features);
 }
diff --git a/src/Storages/StorageFileCluster.cpp b/src/Storages/StorageFileCluster.cpp
index e47d45d8cd2d..34d5474869af 100644
--- a/src/Storages/StorageFileCluster.cpp
+++ b/src/Storages/StorageFileCluster.cpp
@@ -68,19 +68,13 @@ StorageFileCluster::StorageFileCluster(
 
     auto & storage_columns = storage_metadata.columns;
 
-    if (context->getSettingsRef()[Setting::use_hive_partitioning])
-    {
-        const std::string sample_path = paths.empty() ? "" : paths.front();
-
-        HivePartitioningUtils::extractPartitionColumnsFromPathAndEnrichStorageColumns(
-            storage_columns,
-            hive_partition_columns_to_read_from_file_path,
-            sample_path,
-            columns_.empty(),
-            std::nullopt,
-            context
-        );
-    }
+    /// Not grabbing the file_columns because it is not necessary to do it here.
+    std::tie(hive_partition_columns_to_read_from_file_path, std::ignore) = HivePartitioningUtils::setupHivePartitioningForFileURLLikeStorage(
+        storage_columns,
+        paths.empty() ? "" : paths.front(),
+        columns_.empty(),
+        std::nullopt,
+        context);
 
     storage_metadata.setConstraints(constraints_);
     setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns));
@@ -101,21 +95,52 @@ void StorageFileCluster::updateQueryToSendIfNeeded(DB::ASTPtr & query, const Sto
     );
 }
 
+class FileTaskIterator : public TaskIterator
+{
+public:
+    FileTaskIterator(const Strings & files,
+        std::optional<StorageFile::ArchiveInfo> archive_info,
+        const ActionsDAG::Node * predicate,
+        const NamesAndTypesList & virtual_columns,
+        const NamesAndTypesList & hive_partition_columns_to_read_from_file_path,
+        const ContextPtr & context,
+        bool distributed_processing = false)
+        : iterator(files
+            , archive_info
+            , predicate
+            , virtual_columns
+            , hive_partition_columns_to_read_from_file_path
+            , context
+            , distributed_processing) {}
+
+    ~FileTaskIterator() override = default;
+
+    ClusterFunctionReadTaskResponsePtr operator()(size_t /* number_of_current_replica */) const override
+    {
+        auto file = iterator.next();
+        if (file.empty())
+            return std::make_shared<ClusterFunctionReadTaskResponse>();
+        return std::make_shared<ClusterFunctionReadTaskResponse>(std::move(file));
+    }
+
+private:
+    mutable StorageFileSource::FilesIterator iterator;
+};
+
 RemoteQueryExecutor::Extension StorageFileCluster::getTaskIteratorExtension(
     const ActionsDAG::Node * predicate,
     const ActionsDAG * /* filter */,
     const ContextPtr & context,
     ClusterPtr) const
 {
-    auto iterator = std::make_shared<StorageFileSource::FilesIterator>(paths, std::nullopt, predicate, getVirtualsList(), hive_partition_columns_to_read_from_file_path, context);
-    auto next_callback = [iter = std::move(iterator)](size_t) mutable -> ClusterFunctionReadTaskResponsePtr
-    {
-        auto file = iter->next();
-        if (file.empty())
-            return std::make_shared<ClusterFunctionReadTaskResponse>();
-        return std::make_shared<ClusterFunctionReadTaskResponse>(std::move(file));
-    };
-    auto callback = std::make_shared<TaskIterator>(std::move(next_callback));
+    auto callback = std::make_shared<FileTaskIterator>(
+        paths,
+        std::nullopt,
+        predicate,
+        getVirtualsList(),
+        hive_partition_columns_to_read_from_file_path,
+        context
+    );
     return RemoteQueryExecutor::Extension{.task_iterator = std::move(callback)};
 }
 
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index afd146173228..7d532c02cce0 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -27,6 +27,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/NestedUtils.h>
+#include <Interpreters/evaluateConstantExpression.h>
 
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
@@ -660,16 +661,21 @@ void registerStorageGenerateRandom(StorageFactory & factory)
 
         if (!engine_args.empty())
         {
-            const auto & ast_literal = engine_args[0]->as<const ASTLiteral &>();
-            if (!ast_literal.value.isNull())
-                random_seed = checkAndGetLiteralArgument<UInt64>(ast_literal, "random_seed");
+            engine_args[0] = evaluateConstantExpressionAsLiteral(engine_args[0], args.getLocalContext());
+            random_seed = checkAndGetLiteralArgument<UInt64>(engine_args[0], "random_seed");
         }
 
         if (engine_args.size() >= 2)
-            max_string_length = checkAndGetLiteralArgument<UInt64>(engine_args[1], "max_string_length");
+        {
+            engine_args[1] = evaluateConstantExpressionAsLiteral(engine_args[1], args.getLocalContext());
+            max_string_length = checkAndGetLiteralArgument<UInt64>(engine_args[0], "max_string_length");
+        }
 
         if (engine_args.size() == 3)
+        {
+            engine_args[2] = evaluateConstantExpressionAsLiteral(engine_args[2], args.getLocalContext());
             max_array_length = checkAndGetLiteralArgument<UInt64>(engine_args[2], "max_array_length");
+        }
 
         return std::make_shared<StorageGenerateRandom>(args.table_id, args.columns, args.comment, max_array_length, max_string_length, random_seed);
     });
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index 5e9ec5ae98e4..cd010a280a68 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -788,11 +788,12 @@ std::unordered_map<std::string, ColumnSize> StorageInMemoryMetadata::getFakeColu
     return sizes;
 }
 
-NameSet StorageInMemoryMetadata::getColumnsWithoutDefaultExpressions() const
+NameSet StorageInMemoryMetadata::getColumnsWithoutDefaultExpressions(const NamesAndTypesList & exclude) const
 {
+    auto exclude_map = exclude.getNameToTypeMap();
     NameSet names;
     for (const auto & col : columns)
-        if (!col.default_desc.expression)
+        if (!col.default_desc.expression && !exclude_map.contains(col.name))
             names.insert(col.name);
     return names;
 }
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index 43af71ed7713..8fcb419fd376 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -289,7 +289,7 @@ struct StorageInMemoryMetadata
     std::unordered_map<std::string, ColumnSize> getFakeColumnSizes() const;
 
     /// Elements of `columns` that have `default_desc.expression == nullptr`.
-    NameSet getColumnsWithoutDefaultExpressions() const;
+    NameSet getColumnsWithoutDefaultExpressions(const NamesAndTypesList & exclude) const;
 };
 
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index 57b4124a4964..f77244086486 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -925,7 +925,12 @@ void StorageKeeperMap::drop()
     ops.emplace_back(zkutil::makeRemoveRequest(zk_tables_path, -1));
     ops.emplace_back(zkutil::makeCreateRequest(zk_dropped_path, "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral));
-    ops.emplace_back(zkutil::makeSetRequest(zk_dropped_lock_version_path, table_unique_id, -1));
+
+    /// 'zk_dropped_lock_version_path' node was added in 25.1, so we need to check if it exists
+    if (client->exists(zk_dropped_lock_version_path))
+        ops.emplace_back(zkutil::makeSetRequest(zk_dropped_lock_version_path, table_unique_id, -1));
+    else
+        ops.emplace_back(zkutil::makeCreateRequest(zk_dropped_lock_version_path, table_unique_id, zkutil::CreateMode::Persistent));
 
     auto code = client->tryMulti(ops, responses);
 
@@ -991,6 +996,7 @@ class KeeperMapBackup : public IBackupEntriesLazyBatch, boost::noncopyable
         auto data_out_compressed = temp_disk->writeFile(data_file_path);
         auto data_out = std::make_unique<CompressedWriteBuffer>(
             *data_out_compressed, CompressionCodecFactory::instance().getDefaultCodec(), max_compress_block_size);
+
         std::vector<std::string> data_children;
         {
             auto holder = with_retries->createRetriesControlHolder("getKeeperMapDataKeys");
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index 11c6f2555bfd..6fa4c07a44d4 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -155,6 +155,7 @@ class LogSource final : public ISource
     using DeserializeStates = std::map<String, DeserializeState>;
     DeserializeStates deserialize_states;
 
+    void readPrefix(const NameAndTypePair & name_and_type, ISerialization::SubstreamsCache & cache, ISerialization::SubstreamsDeserializeStatesCache & deserialize_state_cache);
     void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, size_t max_rows_to_read, ISerialization::SubstreamsCache & cache);
     bool isFinished();
 };
@@ -190,8 +191,17 @@ Chunk LogSource::generate()
     /// How many rows to read for the next block.
     size_t max_rows_to_read = std::min(block_size, rows_limit - rows_read);
     std::unordered_map<String, ISerialization::SubstreamsCache> caches;
+    std::unordered_map<String, ISerialization::SubstreamsDeserializeStatesCache> deserialize_states_caches;
     Block res;
 
+    /// First, read prefixes for all columns/subcolumns.
+    for (const auto & name_and_type : columns)
+    {
+        auto name_and_type_on_disk = getColumnOnDisk(name_and_type);
+        readPrefix(name_and_type_on_disk, caches[name_and_type_on_disk.getNameInStorage()], deserialize_states_caches[name_and_type_on_disk.getNameInStorage()]);
+    }
+
+    /// Second, read the data of all columns/subcolumns.
     for (const auto & name_type : columns)
     {
         ColumnPtr column;
@@ -230,6 +240,35 @@ Chunk LogSource::generate()
     return Chunk(res.getColumns(), num_rows);
 }
 
+void LogSource::readPrefix(const NameAndTypePair & name_and_type, ISerialization::SubstreamsCache & cache, ISerialization::SubstreamsDeserializeStatesCache & deserialize_state_cache)
+{
+    if (deserialize_states.contains(name_and_type.name))
+        return;
+
+    auto serialization = IDataType::getSerialization(name_and_type);
+
+    ISerialization::DeserializeBinaryBulkSettings settings;
+    settings.getter = [&](const ISerialization::SubstreamPath & path) -> ReadBuffer *
+    {
+        if (cache.contains(ISerialization::getSubcolumnNameForStream(path)))
+            return nullptr;
+
+        String data_file_name = ISerialization::getFileNameForStream(name_and_type, path);
+
+        const auto & data_file_it = storage.data_files_by_names.find(data_file_name);
+        if (data_file_it == storage.data_files_by_names.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "No information about file {} in StorageLog", data_file_name);
+        const auto & data_file = *data_file_it->second;
+
+        size_t offset = 0;
+        size_t file_size = file_sizes[data_file.index];
+
+        auto it = streams.try_emplace(data_file_name, storage.disk, data_file.path, offset, file_size, limited_by_file_sizes, read_settings).first;
+        return &it->second.compressed.value();
+    };
+
+    serialization->deserializeBinaryBulkStatePrefix(settings, deserialize_states[name_and_type.name], &deserialize_state_cache);
+}
 
 void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & column,
     size_t max_rows_to_read, ISerialization::SubstreamsCache & cache)
@@ -238,35 +277,25 @@ void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & colu
     const auto & [name, type] = name_and_type;
     auto serialization = IDataType::getSerialization(name_and_type);
 
-    auto create_stream_getter = [&](bool stream_for_prefix)
+    settings.getter = [&] (const ISerialization::SubstreamPath & path) -> ReadBuffer *
     {
-        return [&, stream_for_prefix] (const ISerialization::SubstreamPath & path) -> ReadBuffer *
-        {
-            if (cache.contains(ISerialization::getSubcolumnNameForStream(path)))
-                return nullptr;
+        if (cache.contains(ISerialization::getSubcolumnNameForStream(path)))
+            return nullptr;
 
-            String data_file_name = ISerialization::getFileNameForStream(name_and_type, path);
+        String data_file_name = ISerialization::getFileNameForStream(name_and_type, path);
 
-            const auto & data_file_it = storage.data_files_by_names.find(data_file_name);
-            if (data_file_it == storage.data_files_by_names.end())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "No information about file {} in StorageLog", data_file_name);
-            const auto & data_file = *data_file_it->second;
+        const auto & data_file_it = storage.data_files_by_names.find(data_file_name);
+        if (data_file_it == storage.data_files_by_names.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "No information about file {} in StorageLog", data_file_name);
+        const auto & data_file = *data_file_it->second;
 
-            size_t offset = stream_for_prefix ? 0 : offsets[data_file.index];
-            size_t file_size = file_sizes[data_file.index];
+        size_t offset = offsets[data_file.index];
+        size_t file_size = file_sizes[data_file.index];
 
-            auto it = streams.try_emplace(data_file_name, storage.disk, data_file.path, offset, file_size, limited_by_file_sizes, read_settings).first;
-            return &it->second.compressed.value();
-        };
+        auto it = streams.try_emplace(data_file_name, storage.disk, data_file.path, offset, file_size, limited_by_file_sizes, read_settings).first;
+        return &it->second.compressed.value();
     };
 
-    if (!deserialize_states.contains(name))
-    {
-        settings.getter = create_stream_getter(true);
-        serialization->deserializeBinaryBulkStatePrefix(settings, deserialize_states[name], nullptr);
-    }
-
-    settings.getter = create_stream_getter(false);
     serialization->deserializeBinaryBulkWithMultipleStreams(column, 0, max_rows_to_read, settings, deserialize_states[name], &cache);
 }
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index f32b45d3657c..71e83abf0a17 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -444,9 +444,6 @@ SinkToStoragePtr StorageMaterializedView::write(const ASTPtr & query, const Stor
 void StorageMaterializedView::drop()
 {
     auto table_id = getStorageID();
-    const auto & select_query = getInMemoryMetadataPtr()->getSelectQuery();
-    if (!select_query.select_table_id.empty())
-        DatabaseCatalog::instance().removeViewDependency(select_query.select_table_id, table_id);
 
     if (getInMemoryMetadataPtr()->sql_security_type == SQLSecurityType::DEFINER)
         ViewDefinerDependencies::instance().removeViewDependencies(table_id);
@@ -547,7 +544,7 @@ StorageMaterializedView::prepareRefresh(bool append, ContextMutablePtr refresh_c
     auto inner_table_id = getTargetTableId();
     StorageID target_table = inner_table_id;
 
-    auto select_query = getInMemoryMetadataPtr()->getSelectQuery().select_query;
+    auto select_query = getInMemoryMetadataPtr()->getSelectQuery().select_query->clone();
     InterpreterSetQuery::applySettingsFromQuery(select_query, refresh_context);
 
     if (!append)
@@ -561,7 +558,8 @@ StorageMaterializedView::prepareRefresh(bool append, ContextMutablePtr refresh_c
         /// Pre-check the permissions. Would be awkward if we create a temporary table and can't drop it.
         refresh_context->checkAccess(AccessType::DROP_TABLE | AccessType::CREATE_TABLE | AccessType::SELECT | AccessType::INSERT, db_name);
 
-        auto create_query = std::dynamic_pointer_cast<ASTCreateQuery>(db->getCreateTableQuery(inner_table_id.table_name, getContext()));
+        auto create_query
+            = std::dynamic_pointer_cast<ASTCreateQuery>(db->getCreateTableQuery(inner_table_id.table_name, getContext())->clone());
         create_query->setTable(new_table_name);
         create_query->setDatabase(db_name);
         create_query->create_or_replace = true;
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 1f90afdec6a1..8dddcc968633 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -436,6 +436,7 @@ namespace
                 auto data_out_compressed = temp_disk->writeFile(data_file_path);
                 auto data_out = std::make_unique<CompressedWriteBuffer>(*data_out_compressed, CompressionCodecFactory::instance().getDefaultCodec(), max_compress_block_size);
                 NativeWriter block_out{*data_out, 0, std::make_shared<const Block>(metadata_snapshot->getSampleBlock()), std::nullopt, false, &index};
+
                 for (const auto & block : *blocks)
                     block_out.write(block);
                 data_out->finalize();
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index c858186e8a27..596f0965ced0 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -68,6 +68,7 @@ namespace DB
 namespace Setting
 {
     extern const SettingsBool allow_experimental_analyzer;
+    extern const SettingsBool distributed_aggregation_memory_efficient;
     extern const SettingsSeconds lock_acquire_timeout;
     extern const SettingsFloat max_streams_multiplier_for_merge_tables;
     extern const SettingsUInt64 merge_table_max_tables_to_look_for_schema_inference;
@@ -226,9 +227,11 @@ ColumnsDescription StorageMerge::getColumnsDescriptionFromSourceTablesImpl(
         if (!t)
             return false;
 
-        if (auto id = t->getStorageID(); !access->isGranted(AccessType::SHOW_TABLES, id.database_name, id.table_name))
+        const auto storage_id = t->getStorageID();
+        if (!access->isGranted(AccessType::SHOW_TABLES, storage_id.database_name, storage_id.table_name))
             return false;
 
+        access->checkAccess(AccessType::SHOW_COLUMNS, storage_id.database_name, storage_id.table_name);
         auto structure = t->getInMemoryMetadataPtr()->getColumns();
         String prev_column_name;
         for (const ColumnDescription & column : structure)
@@ -550,16 +553,20 @@ void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const Bu
 
     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. Also, if we are doing a memory efficient distributed agggregation, bucket
+    // order must be preserved.
+    const bool should_not_narrow = query_info.input_order_info || (
+        context->getSettingsRef()[Setting::distributed_aggregation_memory_efficient]
+        && common_processed_stage == QueryProcessingStage::Enum::WithMergeableState);
+    if (!should_not_narrow)
     {
         size_t tables_count = selected_tables.size();
         Float64 num_streams_multiplier = std::min(
             tables_count, std::max(1UL, static_cast<size_t>(context->getSettingsRef()[Setting::max_streams_multiplier_for_merge_tables])));
         size_t num_streams = static_cast<size_t>(requested_num_streams * num_streams_multiplier);
 
-        // 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.
         pipeline.narrow(num_streams);
     }
 
@@ -1436,7 +1443,7 @@ StorageMerge::DatabaseTablesIterators StorageMerge::DatabaseNameOrRegexp::getDat
     else
     {
         /// database_name argument is a regexp
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true});
 
         for (const auto & db : databases)
         {
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index aae11a957aaa..a3bf8b4b8118 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -4,9 +4,12 @@
 #include <ranges>
 
 #include <Backups/BackupEntriesCollector.h>
+#include <Core/BackgroundSchedulePool.h>
+#include <Core/Names.h>
 #include <Core/QueryProcessingStage.h>
 #include <Core/Settings.h>
 #include <Databases/IDatabase.h>
+#include <Disks/supportWritingWithAppend.h>
 #include <IO/SharedThreadPools.h>
 #include <IO/copyData.h>
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
@@ -24,6 +27,7 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <Storages/MergeTree/AlterConversions.h>
 #include <Storages/MergeTree/Compaction/CompactionStatistics.h>
 #include <Storages/MergeTree/Compaction/ConstructFuturePart.h>
 #include <Storages/MergeTree/Compaction/MergePredicates/MergeTreeMergePredicate.h>
@@ -35,12 +39,11 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/MergeTreeSink.h>
+#include <Storages/MergeTree/MergeTreeSinkPatch.h>
+#include <Storages/MergeTree/PatchParts/PatchPartsUtils.h>
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Storages/PartitionCommands.h>
 #include <Storages/buildQueryTreeForShard.h>
-#include <Storages/MergeTree/MergeTreeSinkPatch.h>
-#include <Storages/MergeTree/PatchParts/PatchPartsUtils.h>
-#include <Storages/MergeTree/AlterConversions.h>
 #include <fmt/core.h>
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
@@ -48,8 +51,6 @@
 #include <Common/MemoryTracker.h>
 #include <Common/ProfileEventsScope.h>
 #include <Common/escapeForFileName.h>
-#include <Core/BackgroundSchedulePool.h>
-#include <Core/Names.h>
 
 
 namespace ProfileEvents
@@ -120,6 +121,7 @@ namespace ErrorCodes
     extern const int TABLE_IS_READ_ONLY;
     extern const int TOO_MANY_PARTS;
     extern const int PART_IS_LOCKED;
+    extern const int INCOMPATIBLE_COLUMNS;
 }
 
 namespace ActionLocks
@@ -145,6 +147,19 @@ static MergeTreeTransactionPtr tryGetTransactionForMutation(const MergeTreeMutat
     return {};
 }
 
+static bool supportTransaction(const Disks & disks, LoggerPtr log)
+{
+    for (const auto & disk : disks)
+    {
+        if (!supportWritingWithAppend(disk))
+        {
+            LOG_DEBUG(log, "Disk {} does not support writing with append", disk->getName());
+            return false;
+        }
+    }
+    return true;
+}
+
 StorageMergeTree::StorageMergeTree(
     const StorageID & table_id_,
     const String & relative_data_path_,
@@ -155,17 +170,18 @@ StorageMergeTree::StorageMergeTree(
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> storage_settings_)
     : MergeTreeData(
-        table_id_,
-        metadata_,
-        context_,
-        date_column_name,
-        merging_params_,
-        std::move(storage_settings_),
-        false,      /// require_part_metadata
-        mode)
+          table_id_,
+          metadata_,
+          context_,
+          date_column_name,
+          merging_params_,
+          std::move(storage_settings_),
+          false, /// require_part_metadata
+          mode)
     , reader(*this)
     , writer(*this)
     , merger_mutator(*this)
+    , support_transaction(supportTransaction(getDisks(), log.load()))
 {
     initializeDirectoriesAndFormatVersion(relative_data_path_, LoadingStrictnessLevel::ATTACH <= mode, date_column_name);
 
@@ -183,15 +199,16 @@ StorageMergeTree::StorageMergeTree(
     loadMutations();
     loadDeduplicationLog();
 
-    prewarmCaches(
-        getActivePartsLoadingThreadPool().get(),
-        getMarkCacheToPrewarm(0),
-        getPrimaryIndexCacheToPrewarm(0));
+    prewarmCaches(getActivePartsLoadingThreadPool().get(), getMarkCacheToPrewarm(0), getPrimaryIndexCacheToPrewarm(0));
 }
 
 
 void StorageMergeTree::startup()
 {
+    /// Do not schedule any background jobs if current storage has static data files.
+    if (isStaticStorage())
+        return;
+
     clearEmptyParts();
 
     /// Temporary directories contain incomplete results of merges (after forced restart)
@@ -202,14 +219,10 @@ void StorageMergeTree::startup()
     time_after_previous_cleanup_parts.restart();
     time_after_previous_cleanup_temporary_directories.restart();
 
-    /// Do not schedule any background jobs if current storage has static data files.
-    if (isStaticStorage())
-        return;
-
     try
     {
         background_operations_assignee.start();
-        startBackgroundMovesIfNeeded();
+        startBackgroundMoves();
         startOutdatedAndUnexpectedDataPartsLoadingTask();
     }
     catch (...)
@@ -255,6 +268,11 @@ void StorageMergeTree::shutdown(bool)
 
     if (deduplication_log)
         deduplication_log->shutdown();
+
+    {
+        std::lock_guard lock(export_manifests_mutex);
+        export_manifests.clear();
+    }
 }
 
 
@@ -319,7 +337,7 @@ void StorageMergeTree::read(
         local_context,
         max_block_size,
         num_streams,
-        local_context->getPartitionIdToMaxBlock(),
+        local_context->getPartitionIdToMaxBlock(getStorageID().uuid),
         enable_parallel_reading);
 
     if (plan)
@@ -796,8 +814,7 @@ QueryPipeline StorageMergeTree::updateLightweight(const MutationCommands & comma
             partition_id_to_max_block->emplace(partition_id, block_number);
     }
 
-    context_copy->setPartitionIdToMaxBlock(std::move(partition_id_to_max_block));
-
+    context_copy->setPartitionIdToMaxBlock(getStorageID().uuid, std::move(partition_id_to_max_block));
     /// Updates currently don't work with parallel replicas.
     context_copy->setSetting("max_parallel_replicas", Field(1));
 
@@ -2813,12 +2830,6 @@ MutationCounters StorageMergeTree::getMutationCounters() const
     return mutation_counters;
 }
 
-void StorageMergeTree::startBackgroundMovesIfNeeded()
-{
-    if (areBackgroundMovesNeeded())
-        background_moves_assignee.start();
-}
-
 std::unique_ptr<MergeTreeSettings> StorageMergeTree::getDefaultSettings() const
 {
     return std::make_unique<MergeTreeSettings>(getContext()->getMergeTreeSettings());
@@ -2932,5 +2943,4 @@ CommittingBlocksSet StorageMergeTree::getCommittingBlocks() const
     std::lock_guard lock(committing_blocks_mutex);
     return committing_blocks;
 }
-
 }
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 00cbc7acdad8..8acc15b96487 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -57,7 +57,7 @@ class StorageMergeTree final : public MergeTreeData
 
     bool supportsParallelInsert() const override { return true; }
 
-    bool supportsTransactions() const override { return true; }
+    bool supportsTransactions() const override { return support_transaction; }
 
     void read(
         QueryPlan & query_plan,
@@ -178,6 +178,8 @@ class StorageMergeTree final : public MergeTreeData
     std::map<Int64, PreparedSetsCachePtr::weak_type> mutation_prepared_sets_cache;
     PlainLightweightUpdatesSync lightweight_updates_sync;
 
+    const bool support_transaction;
+
     void loadMutations();
 
     /// Load and initialize deduplication logs. Even if deduplication setting
@@ -286,8 +288,6 @@ class StorageMergeTree final : public MergeTreeData
     std::unique_ptr<PlainCommittingBlockHolder> fillNewPartName(MutableDataPartPtr & part, DataPartsLock & lock);
     std::unique_ptr<PlainCommittingBlockHolder> fillNewPartNameAndResetLevel(MutableDataPartPtr & part, DataPartsLock & lock);
 
-    void startBackgroundMovesIfNeeded() override;
-
     BackupEntries backupMutations(UInt64 version, const String & data_path_in_backup) const;
 
     /// Attaches restored parts to the storage.
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index bc04e59d0135..42202a230fe0 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -59,6 +59,8 @@ namespace Setting
     extern const SettingsBool mongodb_throw_on_unsupported_query;
 }
 
+static constexpr const char * MONGODB_RESERVED_CHARS = "!?#/'\",;:$&()[]*+=@";
+
 void MongoDBConfiguration::checkHosts(const ContextPtr & context) const
 {
     // Because domain records will be resolved inside the driver, we can't check resolved IPs for our restrictions.
@@ -108,6 +110,13 @@ Pipe StorageMongoDB::read(
         std::move(options), std::make_shared<const Block>(std::move(sample_block)), max_block_size));
 }
 
+static String encodeString(const String & str)
+{
+    String encoded;
+    Poco::URI::encode(str, MONGODB_RESERVED_CHARS, encoded);
+    return encoded;
+}
+
 static MongoDBConfiguration getConfigurationImpl(const StorageID * table_id, ASTs engine_args, ContextPtr context, bool allow_excessive_path_in_host)
 {
     MongoDBConfiguration configuration;
@@ -124,10 +133,12 @@ static MongoDBConfiguration getConfigurationImpl(const StorageID * table_id, AST
                 "host", "port", "user", "password", "database", "collection"}, {"options", "oid_columns"});
             String user = named_collection->get<String>("user");
             String auth_string;
-            String escaped_password;
-            Poco::URI::encode(named_collection->get<String>("password"), "!?#/'\",;:$&()[]*+=@", escaped_password);
             if (!user.empty())
-                auth_string = fmt::format("{}:{}@", user, escaped_password);
+            {
+                String escaped_user = encodeString(user);
+                String escaped_password = encodeString(named_collection->get<String>("password"));
+                auth_string = fmt::format("{}:{}@", escaped_user, escaped_password);
+            }
             configuration.uri = std::make_unique<mongocxx::uri>(fmt::format("mongodb://{}{}:{}/{}?{}",
                                                           auth_string,
                                                           named_collection->get<String>("host"),
@@ -154,10 +165,12 @@ static MongoDBConfiguration getConfigurationImpl(const StorageID * table_id, AST
 
             String user = checkAndGetLiteralArgument<String>(engine_args[3], "user");
             String auth_string;
-            String escaped_password;
-            Poco::URI::encode(checkAndGetLiteralArgument<String>(engine_args[4], "password"), "!?#/'\",;:$&()[]*+=@", escaped_password);
             if (!user.empty())
-                auth_string = fmt::format("{}:{}@", user, escaped_password);
+            {
+                String escaped_user = encodeString(user);
+                String escaped_password = encodeString(checkAndGetLiteralArgument<String>(engine_args[4], "password"));
+                auth_string = fmt::format("{}:{}@", escaped_user, escaped_password);
+            }
 
             auto host_port = checkAndGetLiteralArgument<String>(engine_args[0], "host:port");
             auto database_name = checkAndGetLiteralArgument<String>(engine_args[1], "database");
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index b0951c52f99c..4b04fe1915f1 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -7,6 +7,7 @@
 
 #include <base/hex.h>
 #include <base/interpolate.h>
+#include "Common/ZooKeeper/IKeeper.h"
 #include <Common/DateLUTImpl.h>
 #include <Common/FailPoint.h>
 #include <Common/Macros.h>
@@ -32,6 +33,7 @@
 #include <Disks/ObjectStorages/IMetadataStorage.h>
 #include <Disks/SingleDiskVolume.h>
 
+#include <base/sleep.h>
 #include <base/sort.h>
 
 #include <Storages/buildQueryTreeForShard.h>
@@ -67,6 +69,7 @@
 #include <Storages/MergeTree/ZeroCopyLock.h>
 #include <Storages/PartitionCommands.h>
 #include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/System/StorageSystemReplicatedPartitionExports.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeSinkPatch.h>
 #include <Storages/MergeTree/PatchParts/PatchPartsLock.h>
@@ -116,11 +119,19 @@
 #include <Backups/RestorerFromBackup.h>
 
 #include <Common/scope_guard_safe.h>
+#include "Functions/generateSnowflakeID.h"
+#include "Interpreters/StorageID.h"
+#include "QueryPipeline/QueryPlanResourceHolder.h"
+#include "Storages/ExportReplicatedMergeTreePartitionManifest.h"
+#include "Storages/ExportReplicatedMergeTreePartitionTaskEntry.h"
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <IO/SharedThreadPools.h>
 
+#include <base/types.h>
+#include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string.hpp>
 
 #include <algorithm>
 #include <ctime>
@@ -183,6 +194,18 @@ namespace Setting
     extern const SettingsInt64 replication_wait_for_inactive_replica_timeout;
     extern const SettingsUInt64 select_sequential_consistency;
     extern const SettingsBool update_sequential_consistency;
+    extern const SettingsBool allow_experimental_export_merge_tree_part;
+    extern const SettingsBool export_merge_tree_partition_force_export;
+    extern const SettingsUInt64 export_merge_tree_partition_max_retries;
+    extern const SettingsUInt64 export_merge_tree_partition_manifest_ttl;
+    extern const SettingsBool output_format_parallel_formatting;
+    extern const SettingsBool output_format_parquet_parallel_encoding;
+    extern const SettingsMaxThreads max_threads;
+    extern const SettingsMergeTreePartExportFileAlreadyExistsPolicy export_merge_tree_part_file_already_exists_policy;
+    extern const SettingsUInt64 export_merge_tree_part_max_bytes_per_file;
+    extern const SettingsUInt64 export_merge_tree_part_max_rows_per_file;
+    extern const SettingsBool export_merge_tree_part_throw_on_pending_mutations;
+    extern const SettingsBool export_merge_tree_part_throw_on_pending_patch_parts;
 }
 
 namespace MergeTreeSetting
@@ -238,6 +261,8 @@ namespace FailPoints
     extern const char zero_copy_unlock_zk_fail_before_op[];
     extern const char zero_copy_unlock_zk_fail_after_op[];
     extern const char rmt_lightweight_update_sleep_after_block_allocation[];
+    extern const char rmt_merge_selecting_task_pause_when_scheduled[];
+    extern const char rmt_delay_execute_drop_range[];
 }
 
 namespace ErrorCodes
@@ -285,6 +310,13 @@ namespace ErrorCodes
     extern const int FAULT_INJECTED;
     extern const int CANNOT_FORGET_PARTITION;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int INVALID_SETTING_VALUE;
+    extern const int PENDING_MUTATIONS_NOT_ALLOWED;
+}
+
+namespace ServerSetting
+{
+    extern const ServerSettingsBool enable_experimental_export_merge_tree_partition_feature;
 }
 
 namespace ActionLocks
@@ -414,6 +446,9 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , merge_strategy_picker(*this)
     , queue(*this, merge_strategy_picker)
     , fetcher(*this)
+    , export_merge_tree_partition_task_entries_by_key(export_merge_tree_partition_task_entries.get<ExportPartitionTaskEntryTagByCompositeKey>())
+    , export_merge_tree_partition_task_entries_by_transaction_id(export_merge_tree_partition_task_entries.get<ExportPartitionTaskEntryTagByTransactionId>())
+    , export_merge_tree_partition_task_entries_by_create_time(export_merge_tree_partition_task_entries.get<ExportPartitionTaskEntryTagByCreateTime>())
     , cleanup_thread(*this)
     , async_block_ids_cache(*this)
     , part_check_thread(*this)
@@ -460,6 +495,31 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     /// Will be activated by restarting thread.
     mutations_finalizing_task->deactivate();
 
+    if (getContext()->getServerSettings()[ServerSetting::enable_experimental_export_merge_tree_partition_feature])
+    {
+        export_merge_tree_partition_manifest_updater = std::make_shared<ExportPartitionManifestUpdatingTask>(*this);
+
+        export_merge_tree_partition_task_scheduler = std::make_shared<ExportPartitionTaskScheduler>(*this);
+
+        export_merge_tree_partition_updating_task = getContext()->getSchedulePool().createTask(
+            getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::export_merge_tree_partition_updating_task)", [this] { exportMergeTreePartitionUpdatingTask(); });
+
+        export_merge_tree_partition_updating_task->deactivate();
+
+        export_merge_tree_partition_status_handling_task = getContext()->getSchedulePool().createTask(
+            getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::export_merge_tree_partition_status_handling_task)", [this] { exportMergeTreePartitionStatusHandlingTask(); });
+
+        export_merge_tree_partition_status_handling_task->deactivate();
+
+        export_merge_tree_partition_watch_callback = std::make_shared<Coordination::WatchCallback>(export_merge_tree_partition_updating_task->getWatchCallback());
+
+        export_merge_tree_partition_select_task = getContext()->getSchedulePool().createTask(
+            getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::export_merge_tree_partition_select_task)", [this] { selectPartsToExport(); });
+
+        export_merge_tree_partition_select_task->deactivate();
+    }
+
+
     bool has_zookeeper = getContext()->hasZooKeeper() || getContext()->hasAuxiliaryZooKeeper(zookeeper_info.zookeeper_name);
     if (has_zookeeper)
     {
@@ -884,6 +944,7 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodesAttempt() const
     futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/quorum/last_part", String(), zkutil::CreateMode::Persistent));
     futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/quorum/failed_parts", String(), zkutil::CreateMode::Persistent));
     futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/mutations", String(), zkutil::CreateMode::Persistent));
+    futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/exports", String(), zkutil::CreateMode::Persistent));
 
 
     futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/quorum/parallel", String(), zkutil::CreateMode::Persistent));
@@ -1046,6 +1107,8 @@ bool StorageReplicatedMergeTree::createTableIfNotExistsAttempt(const StorageMeta
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/mutations", "",
             zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/exports", "",
+            zkutil::CreateMode::Persistent));
 
         /// And create first replica atomically. See also "createReplica" method that is used to create not the first replicas.
 
@@ -2719,6 +2782,8 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
 {
     LOG_TRACE(log, "Executing DROP_RANGE {}", entry.new_part_name);
 
+    fiu_do_on(FailPoints::rmt_delay_execute_drop_range, { sleepForSeconds(10); });
+
     auto drop_range_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
 
     /// Wait for loading of outdated parts because DROP_RANGE
@@ -4354,6 +4419,160 @@ void StorageReplicatedMergeTree::mutationsFinalizingTask()
     }
 }
 
+void StorageReplicatedMergeTree::exportMergeTreePartitionUpdatingTask()
+{   
+    try
+    {
+        export_merge_tree_partition_manifest_updater->poll();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+    }
+
+
+    export_merge_tree_partition_updating_task->scheduleAfter(30 * 1000);
+}
+
+void StorageReplicatedMergeTree::selectPartsToExport()
+{
+    try
+    {
+        export_merge_tree_partition_task_scheduler->run();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+    }
+
+    export_merge_tree_partition_select_task->scheduleAfter(1000 * 5);
+}
+
+void StorageReplicatedMergeTree::exportMergeTreePartitionStatusHandlingTask()
+{
+    try
+    {
+        export_merge_tree_partition_manifest_updater->handleStatusChanges();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+    }
+}
+
+std::vector<ReplicatedPartitionExportInfo> StorageReplicatedMergeTree::getPartitionExportsInfo() const
+{
+    std::vector<ReplicatedPartitionExportInfo> infos;
+
+    const auto zk = getZooKeeper();
+    const auto exports_path = fs::path(zookeeper_path) / "exports";
+    std::vector<std::string> children;
+    if (Coordination::Error::ZOK != zk->tryGetChildren(exports_path, children))
+    {
+        LOG_INFO(log, "Failed to get children from exports path, returning empty export info list");
+        return infos;
+    }
+
+    for (const auto & child : children)
+    {
+        ReplicatedPartitionExportInfo info;
+
+        const auto export_partition_path = fs::path(exports_path) / child;
+        std::string metadata_json;
+        if (!zk->tryGet(export_partition_path / "metadata.json", metadata_json))
+        {
+            LOG_INFO(log, "Skipping {}: missing metadata.json", child);
+            continue;
+        }
+
+        std::string status;
+        if (!zk->tryGet(export_partition_path / "status", status))
+        {
+            LOG_INFO(log, "Skipping {}: missing status", child);
+            continue;
+        }
+
+        std::vector<std::string> processing_parts;
+        if (Coordination::Error::ZOK != zk->tryGetChildren(export_partition_path / "processing", processing_parts))
+        {
+            LOG_INFO(log, "Skipping {}: missing processing parts", child);
+            continue;
+        }
+
+        const auto parts_to_do = processing_parts.size();
+
+        std::string exception_replica;
+        std::string last_exception;
+        std::string exception_part;
+        std::size_t exception_count = 0;
+
+        const auto exceptions_per_replica_path = export_partition_path / "exceptions_per_replica";
+
+        Strings exception_replicas;
+        if (Coordination::Error::ZOK != zk->tryGetChildren(exceptions_per_replica_path, exception_replicas))
+        {
+            LOG_INFO(log, "Skipping {}: missing exceptions_per_replica", export_partition_path);
+            continue;
+        }
+
+        for (const auto & replica : exception_replicas)
+        {
+            std::string exception_count_string;
+            if (!zk->tryGet(exceptions_per_replica_path / replica / "count", exception_count_string))
+            {
+                LOG_INFO(log, "Skipping {}: missing count", replica);
+                continue;
+            }
+
+            exception_count += std::stoull(exception_count_string.c_str());
+
+            if (last_exception.empty())
+            {
+                const auto last_exception_path = exceptions_per_replica_path / replica / "last_exception";
+                std::string last_exception_string;
+                if (!zk->tryGet(last_exception_path / "exception", last_exception_string))
+                {
+                    LOG_INFO(log, "Skipping {}: missing last_exception/exception", last_exception_path);
+                    continue;
+                }
+
+                std::string exception_part_zk;
+                if (!zk->tryGet(last_exception_path / "part", exception_part_zk))
+                {
+                    LOG_INFO(log, "Skipping {}: missing exception part", last_exception_path);
+                    continue;
+                }
+
+                exception_replica = replica;
+                last_exception = last_exception_string;
+                exception_part = exception_part_zk;
+            }
+        }
+
+        const auto metadata = ExportReplicatedMergeTreePartitionManifest::fromJsonString(metadata_json);
+
+        info.destination_database = metadata.destination_database;
+        info.destination_table = metadata.destination_table;
+        info.partition_id = metadata.partition_id;
+        info.transaction_id = metadata.transaction_id;
+        info.query_id = metadata.query_id;
+        info.create_time = metadata.create_time;
+        info.source_replica = metadata.source_replica;
+        info.parts_count = metadata.number_of_parts;
+        info.parts_to_do = parts_to_do;
+        info.parts = metadata.parts;
+        info.status = status;
+        info.exception_replica = exception_replica;
+        info.last_exception = last_exception;
+        info.exception_part = exception_part;
+        info.exception_count = exception_count;
+
+        infos.emplace_back(std::move(info));
+    }
+
+    return infos;
+}
+
 
 StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::createLogEntryToMergeParts(
     zkutil::ZooKeeperPtr & zookeeper,
@@ -5634,7 +5853,7 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread, const ZooK
             restarting_thread.start(true);
         });
 
-        startBackgroundMovesIfNeeded();
+        startBackgroundMoves();
 
         part_moves_between_shards_orchestrator.start();
 
@@ -5733,6 +5952,13 @@ void StorageReplicatedMergeTree::partialShutdown()
     mutations_updating_task->deactivate();
     mutations_finalizing_task->deactivate();
 
+    if (getContext()->getServerSettings()[ServerSetting::enable_experimental_export_merge_tree_partition_feature])
+    {
+        export_merge_tree_partition_updating_task->deactivate();
+        export_merge_tree_partition_select_task->deactivate();
+        export_merge_tree_partition_status_handling_task->deactivate();
+    }
+
     cleanup_thread.stop();
     async_block_ids_cache.stop();
     part_check_thread.stop();
@@ -5800,6 +6026,17 @@ void StorageReplicatedMergeTree::shutdown(bool)
         /// Wait for all of them
         std::lock_guard lock(data_parts_exchange_ptr->rwlock);
     }
+
+    {
+        std::lock_guard lock(export_merge_tree_partition_mutex);
+        export_merge_tree_partition_task_entries.clear();
+    }
+
+    {
+        std::lock_guard lock(export_manifests_mutex);
+        export_manifests.clear();
+    }
+
     LOG_TRACE(log, "Shutdown finished");
 }
 
@@ -5938,7 +6175,7 @@ void StorageReplicatedMergeTree::readLocalSequentialConsistencyImpl(
 {
     auto max_added_blocks = std::make_shared<PartitionIdToMaxBlock>(getMaxAddedBlocks());
 
-    if (auto additional_blocks = local_context->getPartitionIdToMaxBlock())
+    if (auto additional_blocks = local_context->getPartitionIdToMaxBlock(getStorageID().uuid))
     {
         for (const auto & [partition_id, max_block] : *additional_blocks)
         {
@@ -5990,7 +6227,7 @@ void StorageReplicatedMergeTree::readLocalImpl(
         local_context,
         max_block_size,
         num_streams,
-        local_context->getPartitionIdToMaxBlock(),
+        local_context->getPartitionIdToMaxBlock(getStorageID().uuid),
         enable_parallel_reading);
 
     if (plan)
@@ -7877,6 +8114,221 @@ void StorageReplicatedMergeTree::fetchPartition(
     LOG_TRACE(log, "Fetch took {} sec. ({} tries)", watch.elapsedSeconds(), try_no);
 }
 
+void StorageReplicatedMergeTree::exportPartitionToTable(const PartitionCommand & command, ContextPtr query_context)
+{
+    if (!query_context->getServerSettings()[ServerSetting::enable_experimental_export_merge_tree_partition_feature])
+    {
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Exporting merge tree partition is experimental. Set the server setting `enable_experimental_export_merge_tree_partition_feature` to enable it");
+    }
+
+    const auto dest_database = query_context->resolveDatabase(command.to_database);
+    const auto dest_table = command.to_table;
+    const auto dest_storage_id = StorageID(dest_database, dest_table);
+    auto dest_storage = DatabaseCatalog::instance().getTable({dest_database, dest_table}, query_context);
+
+    if (dest_storage->getStorageID() == this->getStorageID())
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Exporting to the same table is not allowed");
+    }
+
+    if (!dest_storage->supportsImport())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Destination storage {} does not support MergeTree parts or uses unsupported partitioning", dest_storage->getName());
+
+    auto query_to_string = [] (const ASTPtr & ast)
+    {
+        return ast ? ast->formatWithSecretsOneLine() : "";
+    };
+
+    auto src_snapshot = getInMemoryMetadataPtr();
+    auto destination_snapshot = dest_storage->getInMemoryMetadataPtr();
+
+    /// compare all source readable columns with all destination insertable columns
+    /// this allows us to skip ephemeral columns
+    if (src_snapshot->getColumns().getReadable().sizeOfDifference(destination_snapshot->getColumns().getInsertable()))
+        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Tables have different structure");
+
+    if (query_to_string(src_snapshot->getPartitionKeyAST()) != query_to_string(destination_snapshot->getPartitionKeyAST()))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Tables have different partition key");
+
+    zkutil::ZooKeeperPtr zookeeper = getZooKeeperAndAssertNotReadonly();
+
+    const String partition_id = getPartitionIDFromQuery(command.partition, query_context);
+    
+    const auto exports_path = fs::path(zookeeper_path) / "exports";
+
+    const auto export_key = partition_id + "_" + dest_storage_id.getQualifiedName().getFullName();
+
+    const auto partition_exports_path = fs::path(exports_path) / export_key;
+
+    /// check if entry already exists
+    if (zookeeper->exists(partition_exports_path))
+    {
+        LOG_INFO(log, "Export with key {} is already exported or it is being exported. Checking if it has expired so that we can overwrite it", export_key);
+
+        bool has_expired = false;
+
+        if (zookeeper->exists(fs::path(partition_exports_path) / "metadata.json"))
+        {
+            std::string metadata_json;
+            if (zookeeper->tryGet(fs::path(partition_exports_path) / "metadata.json", metadata_json))
+            {
+                const auto manifest = ExportReplicatedMergeTreePartitionManifest::fromJsonString(metadata_json);
+
+                const auto now = time(nullptr);
+                const auto expiration_time = manifest.create_time + manifest.ttl_seconds;
+
+                LOG_INFO(log, "Export with key {} has expiration time {}, now is {}", export_key, expiration_time, now);
+
+                if (static_cast<time_t>(expiration_time) < now)
+                {
+                    has_expired = true;
+                }
+            }
+        }
+
+        if (!has_expired && !query_context->getSettingsRef()[Setting::export_merge_tree_partition_force_export])
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Export with key {} already exported or it is being exported, and it has not expired. Set `export_merge_tree_partition_force_export` to overwrite it.", export_key);
+        }
+
+        LOG_INFO(log, "Overwriting export with key {}", export_key);
+
+        /// Not putting in ops (same transaction) because we can't construct a "tryRemoveRecursive" request.
+        /// It is possible that the zk being used does not support RemoveRecursive requests.
+        /// It is ok for this to be non transactional. Worst case scenario an on-going export is going to be killed and a new task won't be scheduled.
+        zookeeper->tryRemoveRecursive(partition_exports_path);
+    }
+
+    Coordination::Requests ops;
+
+    ops.emplace_back(zkutil::makeCreateRequest(partition_exports_path, "", zkutil::CreateMode::Persistent));
+
+    DataPartsVector parts;
+
+    {
+        auto data_parts_lock = lockParts();
+        parts = getDataPartsVectorInPartitionForInternalUsage(MergeTreeDataPartState::Active, partition_id, &data_parts_lock);
+    }
+
+    if (parts.empty())
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Partition {} doesn't exist", partition_id);
+    }
+
+    const bool throw_on_pending_mutations = query_context->getSettingsRef()[Setting::export_merge_tree_part_throw_on_pending_mutations];
+    const bool throw_on_pending_patch_parts = query_context->getSettingsRef()[Setting::export_merge_tree_part_throw_on_pending_patch_parts];
+
+    MergeTreeData::IMutationsSnapshot::Params mutations_snapshot_params
+    {
+        .metadata_version = getInMemoryMetadataPtr()->getMetadataVersion(),
+        .min_part_metadata_version = MergeTreeData::getMinMetadataVersion(parts),
+        .need_data_mutations = throw_on_pending_mutations,
+        .need_alter_mutations = throw_on_pending_mutations || throw_on_pending_patch_parts,
+        .need_patch_parts = throw_on_pending_patch_parts,
+    };
+
+    const auto mutations_snapshot = getMutationsSnapshot(mutations_snapshot_params);
+
+    std::vector<String> part_names;
+    for (const auto & part : parts)
+    {
+        const auto alter_conversions = getAlterConversionsForPart(part, mutations_snapshot, query_context);
+
+        /// re-check `throw_on_pending_mutations` because `pending_mutations` might have been filled due to `throw_on_pending_patch_parts`
+        if (alter_conversions->hasMutations() && throw_on_pending_mutations)
+        {
+            throw Exception(ErrorCodes::PENDING_MUTATIONS_NOT_ALLOWED,
+                "Partition {} can not be exported because the part {} has pending mutations. Either wait for the mutations to be applied or set `export_merge_tree_part_throw_on_pending_mutations` to false",
+                partition_id,
+                part->name);
+        }
+
+        if (alter_conversions->hasPatches())
+        {
+            throw Exception(ErrorCodes::PENDING_MUTATIONS_NOT_ALLOWED,
+                "Partition {} can not be exported because the part {} has pending patch parts. Either wait for the patch parts to be applied or set `export_merge_tree_part_throw_on_pending_patch_parts` to false",
+                partition_id,
+                part->name);
+        }
+
+        part_names.push_back(part->name);
+    }
+
+    /// TODO arthur somehow check if the list of parts is updated "enough"
+
+    ExportReplicatedMergeTreePartitionManifest manifest;
+
+    manifest.transaction_id = generateSnowflakeIDString();
+    manifest.query_id = query_context->getCurrentQueryId();
+    manifest.partition_id = partition_id;
+    manifest.destination_database = dest_database;
+    manifest.destination_table = dest_table;
+    manifest.source_replica = replica_name;
+    manifest.number_of_parts = part_names.size();
+    manifest.parts = part_names;
+    manifest.create_time = time(nullptr);
+    manifest.max_retries = query_context->getSettingsRef()[Setting::export_merge_tree_partition_max_retries];
+    manifest.ttl_seconds = query_context->getSettingsRef()[Setting::export_merge_tree_partition_manifest_ttl];
+    manifest.max_threads = query_context->getSettingsRef()[Setting::max_threads];
+    manifest.parallel_formatting = query_context->getSettingsRef()[Setting::output_format_parallel_formatting];
+    manifest.parquet_parallel_encoding = query_context->getSettingsRef()[Setting::output_format_parquet_parallel_encoding];
+    manifest.max_bytes_per_file = query_context->getSettingsRef()[Setting::export_merge_tree_part_max_bytes_per_file];
+    manifest.max_rows_per_file = query_context->getSettingsRef()[Setting::export_merge_tree_part_max_rows_per_file];
+
+    manifest.file_already_exists_policy = query_context->getSettingsRef()[Setting::export_merge_tree_part_file_already_exists_policy].value;
+
+    ops.emplace_back(zkutil::makeCreateRequest(
+        fs::path(partition_exports_path) / "metadata.json", 
+        manifest.toJsonString(), 
+        zkutil::CreateMode::Persistent));
+
+    ops.emplace_back(zkutil::makeCreateRequest(
+        fs::path(partition_exports_path) / "exceptions_per_replica", 
+        "", 
+        zkutil::CreateMode::Persistent));
+
+    ops.emplace_back(zkutil::makeCreateRequest(
+        fs::path(partition_exports_path) / "processing", 
+        "", 
+        zkutil::CreateMode::Persistent));
+
+    for (const auto & part : part_names)
+    {
+        ExportReplicatedMergeTreePartitionProcessingPartEntry entry;
+        entry.status = ExportReplicatedMergeTreePartitionProcessingPartEntry::Status::PENDING;
+        entry.part_name = part;
+        entry.retry_count = 0;
+
+        ops.emplace_back(zkutil::makeCreateRequest(
+            fs::path(partition_exports_path) / "processing" / part,
+            entry.toJsonString(),
+            zkutil::CreateMode::Persistent));
+    }
+    
+    ops.emplace_back(zkutil::makeCreateRequest(
+        fs::path(partition_exports_path) / "processed", 
+        "", 
+        zkutil::CreateMode::Persistent));
+
+    ops.emplace_back(zkutil::makeCreateRequest(
+        fs::path(partition_exports_path) / "locks", 
+        "", 
+        zkutil::CreateMode::Persistent));
+
+    /// status: IN_PROGRESS, COMPLETED, FAILED
+    ops.emplace_back(zkutil::makeCreateRequest(
+        fs::path(partition_exports_path) / "status", 
+        "PENDING", 
+        zkutil::CreateMode::Persistent));
+
+    Coordination::Responses responses;
+    Coordination::Error code = zookeeper->tryMulti(ops, responses);
+
+    if (code != Coordination::Error::ZOK)
+        throw zkutil::KeeperException::fromPath(code, partition_exports_path);
+}
+
 
 void StorageReplicatedMergeTree::forgetPartition(const ASTPtr & partition, ContextPtr query_context)
 {
@@ -8175,7 +8627,7 @@ QueryPipeline StorageReplicatedMergeTree::updateLightweight(const MutationComman
 
     const auto & block_numbers = update_holder.partition_block_numbers.getBlockNumbers();
     auto partitions = std::make_shared<PartitionIdToMaxBlock>(block_numbers.begin(), block_numbers.end());
-    context_copy->setPartitionIdToMaxBlock(std::move(partitions));
+    context_copy->setPartitionIdToMaxBlock(getStorageID().uuid, std::move(partitions));
 
     /// Updates currently don't work with parallel replicas.
     context_copy->setSetting("max_parallel_replicas", Field(1));
@@ -8186,7 +8638,7 @@ QueryPipeline StorageReplicatedMergeTree::updateLightweight(const MutationComman
         auto sync_timeout = query_context->getSettingsRef()[Setting::receive_timeout].totalMilliseconds();
 
         std::set<CommittingBlock::Op> ops{CommittingBlock::Op::NewPart, CommittingBlock::Op::Mutation};
-        waitForCommittingOpsToFinish(zookeeper, context_copy->getPartitionIdToMaxBlock(), ops, backoff_ms, sync_timeout);
+        waitForCommittingOpsToFinish(zookeeper, context_copy->getPartitionIdToMaxBlock(getStorageID().uuid), ops, backoff_ms, sync_timeout);
     }
 
     auto pipeline = updateLightweightImpl(commands, context_copy);
@@ -8491,12 +8943,13 @@ void StorageReplicatedMergeTree::clearLockedBlockNumbersInPartition(
                 LOG_WARNING(log, new_version_warning, paths_to_get[i], result.data);
 
             Stopwatch time_waiting;
-            const auto & stop_waiting = [this, &time_waiting]()
-            {
-                auto timeout = getContext()->getSettingsRef()[Setting::lock_acquire_timeout].value.seconds();
-                return partial_shutdown_called || (timeout < time_waiting.elapsedSeconds());
-            };
-            zookeeper.waitForDisappear(paths_to_get[i], stop_waiting);
+            const Int64 timeout = getContext()->getSettingsRef()[Setting::lock_acquire_timeout].value.totalSeconds();
+            const auto & stop_waiting
+                = [this, &time_waiting, &timeout]() { return partial_shutdown_called || (timeout < Int64(time_waiting.elapsedSeconds())); };
+
+            if (!zookeeper.waitForDisappear(paths_to_get[i], stop_waiting))
+                throw Exception(
+                    ErrorCodes::TIMEOUT_EXCEEDED, "Path {} does not disappear, timed out after {} seconds", paths_to_get[i], timeout);
         }
     }
 }
@@ -9284,6 +9737,89 @@ CancellationCode StorageReplicatedMergeTree::killPartMoveToShard(const UUID & ta
     return part_moves_between_shards_orchestrator.killPartMoveToShard(task_uuid);
 }
 
+CancellationCode StorageReplicatedMergeTree::killExportPartition(const String & transaction_id)
+{
+    auto try_set_status_to_killed = [this](const zkutil::ZooKeeperPtr & zk, const std::string & status_path)
+    {
+        Coordination::Stat stat;
+        std::string status_from_zk_string;
+
+        if (!zk->tryGet(status_path, status_from_zk_string, &stat))
+        {
+            /// found entry locally, but not in zk. It might have been deleted by another replica and we did not have time to update the local entry.
+            LOG_INFO(log, "Export partition task not found in zk, can not cancel it");
+            return CancellationCode::CancelCannotBeSent;
+        }
+
+        const auto status_from_zk = magic_enum::enum_cast<ExportReplicatedMergeTreePartitionTaskEntry::Status>(status_from_zk_string);
+
+        if (!status_from_zk)
+        {
+            LOG_INFO(log, "Export partition task status is invalid, can not cancel it");
+            return CancellationCode::CancelCannotBeSent;
+        }
+
+        if (status_from_zk.value() != ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING)
+        {
+            LOG_INFO(log, "Export partition task is {}, can not cancel it", String(magic_enum::enum_name(status_from_zk.value())));
+            return CancellationCode::CancelCannotBeSent;
+        }
+
+        if (zk->trySet(status_path, String(magic_enum::enum_name(ExportReplicatedMergeTreePartitionTaskEntry::Status::KILLED)), stat.version) != Coordination::Error::ZOK)
+        {
+            LOG_INFO(log, "Status has been updated while trying to kill the export partition task, can not cancel it");
+            return CancellationCode::CancelCannotBeSent;
+        }
+
+        return CancellationCode::CancelSent;
+    };
+
+    std::lock_guard lock(export_merge_tree_partition_mutex);
+
+    const auto zk = getZooKeeper();
+
+    /// if we have the entry locally, no need to list from zk. we can save some requests.
+    const auto & entry = export_merge_tree_partition_task_entries_by_transaction_id.find(transaction_id);
+    if (entry != export_merge_tree_partition_task_entries_by_transaction_id.end())
+    {
+        LOG_INFO(log, "Export partition task found locally, trying to cancel it");
+        /// found locally, no need to get children on zk
+        if (entry->status != ExportReplicatedMergeTreePartitionTaskEntry::Status::PENDING)
+        {
+            LOG_INFO(log, "Export partition task is not pending, can not cancel it");
+            return CancellationCode::CancelCannotBeSent;
+        }
+
+        return try_set_status_to_killed(zk, fs::path(zookeeper_path) / "exports" / entry->getCompositeKey() / "status");
+    }
+    else
+    {
+        LOG_INFO(log, "Export partition task not found locally, trying to find it on zk");
+        /// for some reason, we don't have the entry locally. ls on zk to find the entry
+        const auto exports_path = fs::path(zookeeper_path) / "exports";
+
+        const auto export_keys = zk->getChildren(exports_path);
+        String export_key_to_be_cancelled;
+
+        for (const auto & export_key : export_keys)
+        {
+            std::string metadata_json;
+            if (!zk->tryGet(fs::path(exports_path) / export_key / "metadata.json", metadata_json))
+                continue;
+            const auto manifest = ExportReplicatedMergeTreePartitionManifest::fromJsonString(metadata_json);
+            if (manifest.transaction_id == transaction_id)
+            {
+                LOG_INFO(log, "Export partition task found on zk, trying to cancel it");
+                return try_set_status_to_killed(zk, fs::path(exports_path) / export_key / "status");
+            }
+        }
+    }
+
+    LOG_INFO(log, "Export partition task not found, can not cancel it");
+
+    return CancellationCode::NotFound;
+}
+
 void StorageReplicatedMergeTree::getCommitPartOps(
     Coordination::Requests & ops,
     const DataPartPtr & part,
@@ -9842,13 +10378,6 @@ MutationCounters StorageReplicatedMergeTree::getMutationCounters() const
     return queue.getMutationCounters();
 }
 
-void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded()
-{
-    if (areBackgroundMovesNeeded())
-        background_moves_assignee.start();
-}
-
-
 std::unique_ptr<MergeTreeSettings> StorageReplicatedMergeTree::getDefaultSettings() const
 {
     return std::make_unique<MergeTreeSettings>(getContext()->getReplicatedMergeTreeSettings());
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 487c3a3f44c0..712ba0ba4183 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -13,6 +13,10 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <Common/randomSeed.h>
+#include "Interpreters/CancellationCode.h"
+#include "Storages/MergeTree/ExportPartitionManifestUpdatingTask.h"
+#include "Storages/MergeTree/ExportPartitionTaskScheduler.h"
+#include <Storages/ExportReplicatedMergeTreePartitionTaskEntry.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cluster.h>
@@ -97,6 +101,8 @@ namespace DB
 class ZooKeeperWithFaultInjection;
 using ZooKeeperWithFaultInjectionPtr = std::shared_ptr<ZooKeeperWithFaultInjection>;
 
+struct ReplicatedPartitionExportInfo;
+
 class StorageReplicatedMergeTree final : public MergeTreeData
 {
 public:
@@ -371,6 +377,8 @@ class StorageReplicatedMergeTree final : public MergeTreeData
     using ShutdownDeadline = std::chrono::time_point<std::chrono::system_clock>;
     void waitForUniquePartsToBeFetchedByOtherReplicas(ShutdownDeadline shutdown_deadline);
 
+    std::vector<ReplicatedPartitionExportInfo> getPartitionExportsInfo() const;
+
 private:
     std::atomic_bool are_restoring_replica {false};
 
@@ -396,6 +404,8 @@ class StorageReplicatedMergeTree final : public MergeTreeData
     friend class MergeFromLogEntryTask;
     friend class MutateFromLogEntryTask;
     friend class ReplicatedMergeMutateTaskBase;
+    friend class ExportPartitionManifestUpdatingTask;
+    friend class ExportPartitionTaskScheduler;
 
     using MergeStrategyPicker = ReplicatedMergeTreeMergeStrategyPicker;
     using LogEntry = ReplicatedMergeTreeLogEntry;
@@ -510,6 +520,26 @@ class StorageReplicatedMergeTree final : public MergeTreeData
     /// A task that marks finished mutations as done.
     BackgroundSchedulePoolTaskHolder mutations_finalizing_task;
 
+    BackgroundSchedulePoolTaskHolder export_merge_tree_partition_updating_task;
+
+    /// mostly handle kill operations
+    BackgroundSchedulePoolTaskHolder export_merge_tree_partition_status_handling_task;
+    std::shared_ptr<ExportPartitionManifestUpdatingTask> export_merge_tree_partition_manifest_updater;
+
+    std::shared_ptr<ExportPartitionTaskScheduler> export_merge_tree_partition_task_scheduler;
+
+    Coordination::WatchCallbackPtr export_merge_tree_partition_watch_callback;
+
+    std::mutex export_merge_tree_partition_mutex;
+
+    BackgroundSchedulePoolTaskHolder export_merge_tree_partition_select_task;
+
+    ExportPartitionTaskEntriesContainer export_merge_tree_partition_task_entries;
+    
+    // Convenience references to indexes
+    ExportPartitionTaskEntriesContainer::index<ExportPartitionTaskEntryTagByCompositeKey>::type & export_merge_tree_partition_task_entries_by_key;
+    ExportPartitionTaskEntriesContainer::index<ExportPartitionTaskEntryTagByTransactionId>::type & export_merge_tree_partition_task_entries_by_transaction_id;
+    ExportPartitionTaskEntriesContainer::index<ExportPartitionTaskEntryTagByCreateTime>::type & export_merge_tree_partition_task_entries_by_create_time;
     /// A thread that removes old parts, log entries, and blocks.
     ReplicatedMergeTreeCleanupThread cleanup_thread;
 
@@ -737,6 +767,14 @@ class StorageReplicatedMergeTree final : public MergeTreeData
     /// Checks if some mutations are done and marks them as done.
     void mutationsFinalizingTask();
 
+    void selectPartsToExport();
+
+    /// update in-memory list of partition exports
+    void exportMergeTreePartitionUpdatingTask();
+
+    /// handle status changes for export partition tasks
+    void exportMergeTreePartitionStatusHandlingTask();
+
     /** Write the selected parts to merge into the log,
       * Call when merge_selecting_mutex is locked.
       * Returns false if any part is not in ZK.
@@ -916,6 +954,7 @@ class StorageReplicatedMergeTree final : public MergeTreeData
     void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr query_context) override;
     void movePartitionToShard(const ASTPtr & partition, bool move_part, const String & to, ContextPtr query_context) override;
     CancellationCode killPartMoveToShard(const UUID & task_uuid) override;
+    CancellationCode killExportPartition(const String & transaction_id) override;
     void fetchPartition(
         const ASTPtr & partition,
         const StorageMetadataPtr & metadata_snapshot,
@@ -923,7 +962,8 @@ class StorageReplicatedMergeTree final : public MergeTreeData
         bool fetch_part,
         ContextPtr query_context) override;
     void forgetPartition(const ASTPtr & partition, ContextPtr query_context) override;
-
+    
+    void exportPartitionToTable(const PartitionCommand &, ContextPtr) override;
 
     /// NOTE: there are no guarantees for concurrent merges. Dropping part can
     /// be concurrently merged into some covering part and dropPart will do
@@ -955,8 +995,6 @@ class StorageReplicatedMergeTree final : public MergeTreeData
 
     MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & params) const override;
 
-    void startBackgroundMovesIfNeeded() override;
-
     /// Attaches restored parts to the storage.
     void attachRestoredParts(MutableDataPartsVector && parts) override;
 
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 10532068dcdf..b377fe5448d3 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -192,19 +192,12 @@ IStorageURLBase::IStorageURLBase(
 
     auto & storage_columns = storage_metadata.columns;
 
-    if (context_->getSettingsRef()[Setting::use_hive_partitioning])
-    {
-        HivePartitioningUtils::extractPartitionColumnsFromPathAndEnrichStorageColumns(
-            storage_columns,
-            hive_partition_columns_to_read_from_file_path,
-            getSampleURI(uri, context_),
-            columns_.empty(),
-            format_settings,
-            context_);
-    }
-
-    /// If the `partition_strategy` argument is ever implemented for URL storage, this must be updated
-    file_columns = storage_columns.getAllPhysical();
+    std::tie(hive_partition_columns_to_read_from_file_path, file_columns) = HivePartitioningUtils::setupHivePartitioningForFileURLLikeStorage(
+        storage_columns,
+        getSampleURI(uri, context_),
+        columns_.empty(),
+        format_settings,
+        context_);
 
     auto virtual_columns_desc = VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns);
     if (!storage_metadata.getColumns().has("_headers"))
@@ -479,16 +472,9 @@ Chunk StorageURLSource::generate()
                 chunk_size = input_format->getApproxBytesReadForChunk();
 
             progress(num_rows, chunk_size ? chunk_size : chunk.bytes());
-            VirtualColumnUtils::addRequestedFileLikeStorageVirtualsToChunk(
-                chunk,
-                requested_virtual_columns,
-                {
-                    .path = curr_uri.getPath(),
-                    .size = current_file_size,
-                },
-                getContext());
 
-            // The order is important, hive partition columns must be added after virtual columns
+            /// The order is important, hive partition columns must be added before virtual columns
+            /// because they are part of the schema
             if (!hive_partition_columns_to_read_from_file_path.empty())
             {
                 const auto path = curr_uri.getPath();
@@ -498,6 +484,15 @@ Chunk StorageURLSource::generate()
                     path);
             }
 
+            VirtualColumnUtils::addRequestedFileLikeStorageVirtualsToChunk(
+                chunk,
+                requested_virtual_columns,
+                {
+                    .path = curr_uri.getPath(),
+                    .size = current_file_size,
+                },
+                getContext());
+
             chassert(dynamic_cast<ReadWriteBufferFromHTTP *>(read_buf.get()));
             if (need_headers_virtual_column)
             {
@@ -732,7 +727,7 @@ void StorageURLSink::cancelBuffers()
         write_buf->cancel();
 }
 
-class PartitionedStorageURLSink : public PartitionedSink
+class PartitionedStorageURLSink : public PartitionedSink::SinkCreator
 {
 public:
     PartitionedStorageURLSink(
@@ -746,7 +741,7 @@ class PartitionedStorageURLSink : public PartitionedSink
         const CompressionMethod compression_method_,
         const HTTPHeaderEntries & headers_,
         const String & http_method_)
-        : PartitionedSink(partition_strategy_, context_, std::make_shared<const Block>(sample_block_))
+        : partition_strategy(partition_strategy_)
         , uri(uri_)
         , format(format_)
         , format_settings(format_settings_)
@@ -761,7 +756,8 @@ class PartitionedStorageURLSink : public PartitionedSink
 
     SinkPtr createSinkForPartition(const String & partition_id) override
     {
-        std::string partition_path = partition_strategy->getPathForWrite(uri, partition_id);
+        const auto file_path_generator = std::make_shared<ObjectStorageWildcardFilePathGenerator>(uri);
+        std::string partition_path = file_path_generator->getPathForWrite(partition_id);
 
         context->getRemoteHostFilter().checkURL(Poco::URI(partition_path));
         return std::make_shared<StorageURLSink>(
@@ -769,6 +765,7 @@ class PartitionedStorageURLSink : public PartitionedSink
     }
 
 private:
+    std::shared_ptr<IPartitionStrategy> partition_strategy;
     const String uri;
     const String format;
     const std::optional<FormatSettings> format_settings;
@@ -810,10 +807,10 @@ std::function<void(std::ostream &)> IStorageURLBase::getReadPOSTDataCallback(
 
 namespace
 {
-    class ReadBufferIterator : public IReadBufferIterator, WithContext
+    class URLReadBufferIterator : public IReadBufferIterator, WithContext
     {
     public:
-        ReadBufferIterator(
+        URLReadBufferIterator(
             const std::vector<String> & urls_to_check_,
             std::optional<String> format_,
             const CompressionMethod & compression_method_,
@@ -930,27 +927,13 @@ namespace
 
         void setSchemaToLastFile(const ColumnsDescription & columns) override
         {
-            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_url]
-                || getContext()->getSettingsRef()[Setting::schema_inference_mode] != SchemaInferenceMode::UNION)
+            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_url])
                 return;
 
             auto key = getKeyForSchemaCache(current_url_option, *format, format_settings, getContext());
             StorageURL::getSchemaCache(getContext()).addColumns(key, columns);
         }
 
-        void setResultingSchema(const ColumnsDescription & columns) override
-        {
-            if (!getContext()->getSettingsRef()[Setting::schema_inference_use_cache_for_url]
-                || getContext()->getSettingsRef()[Setting::schema_inference_mode] != SchemaInferenceMode::DEFAULT)
-                return;
-
-            for (const auto & options : url_options_to_check)
-            {
-                auto keys = getKeysForSchemaCache(options, *format, format_settings, getContext());
-                StorageURL::getSchemaCache(getContext()).addManyColumns(keys, columns);
-            }
-        }
-
         void setFormatName(const String & format_name) override
         {
             format = format_name;
@@ -1057,7 +1040,7 @@ std::pair<ColumnsDescription, String> IStorageURLBase::getTableStructureAndForma
     else
         urls_to_check = {uri};
 
-    ReadBufferIterator read_buffer_iterator(urls_to_check, format, compression_method, headers, format_settings, context);
+    URLReadBufferIterator read_buffer_iterator(urls_to_check, format, compression_method, headers, format_settings, context);
     if (format)
         return {readSchemaFromFormat(*format, format_settings, read_buffer_iterator, context), *format};
     return detectFormatAndReadSchema(format_settings, read_buffer_iterator, context);
@@ -1101,7 +1084,7 @@ bool IStorageURLBase::canMoveConditionsToPrewhere() const
 
 std::optional<NameSet> IStorageURLBase::supportedPrewhereColumns() const
 {
-    return getInMemoryMetadataPtr()->getColumnsWithoutDefaultExpressions();
+    return getInMemoryMetadataPtr()->getColumnsWithoutDefaultExpressions(/*exclude=*/ hive_partition_columns_to_read_from_file_path);
 }
 
 IStorage::ColumnSizeByName IStorageURLBase::getColumnSizes() const
@@ -1450,7 +1433,7 @@ SinkToStoragePtr IStorageURLBase::write(const ASTPtr & query, const StorageMetad
             has_wildcards,
             /* partition_columns_in_data_file */true);
 
-        return std::make_shared<PartitionedStorageURLSink>(
+        auto sink_creator = std::make_shared<PartitionedStorageURLSink>(
             partition_strategy,
             uri,
             format_name,
@@ -1461,6 +1444,8 @@ SinkToStoragePtr IStorageURLBase::write(const ASTPtr & query, const StorageMetad
             compression_method,
             headers,
             http_method);
+
+        return std::make_shared<PartitionedSink>(partition_strategy, sink_creator, context, std::make_shared<const Block>(metadata_snapshot->getSampleBlock()));
     }
 
     return std::make_shared<StorageURLSink>(
@@ -1534,7 +1519,7 @@ StorageURL::StorageURL(
         distributed_processing_)
 {
     context_->getRemoteHostFilter().checkURL(Poco::URI(uri));
-    context_->getHTTPHeaderFilter().checkHeaders(headers);
+    context_->getHTTPHeaderFilter().checkAndNormalizeHeaders(headers);
 }
 
 
@@ -1731,6 +1716,7 @@ void registerStorageURL(StorageFactory & factory)
             ASTs & engine_args = args.engine_args;
             auto configuration = StorageURL::getConfiguration(engine_args, args.getLocalContext());
             auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
+            auto context = args.getLocalContext();
 
             ASTPtr partition_by;
             if (args.storage_def->partition_by)
@@ -1744,7 +1730,7 @@ void registerStorageURL(StorageFactory & factory)
                 args.columns,
                 args.constraints,
                 args.comment,
-                args.getContext(),
+                context,
                 configuration.compression_method,
                 configuration.headers,
                 configuration.http_method,
diff --git a/src/Storages/StorageURLCluster.cpp b/src/Storages/StorageURLCluster.cpp
index 44fe8eaaedd1..695cd0c21b92 100644
--- a/src/Storages/StorageURLCluster.cpp
+++ b/src/Storages/StorageURLCluster.cpp
@@ -57,8 +57,9 @@ StorageURLCluster::StorageURLCluster(
     : IStorageCluster(cluster_name_, table_id_, getLogger("StorageURLCluster (" + table_id_.getFullTableName() + ")"))
     , uri(uri_), format_name(format_)
 {
+    auto headers = configuration_.headers;
     context->getRemoteHostFilter().checkURL(Poco::URI(uri));
-    context->getHTTPHeaderFilter().checkHeaders(configuration_.headers);
+    context->getHTTPHeaderFilter().checkAndNormalizeHeaders(headers);
 
     StorageInMemoryMetadata storage_metadata;
 
@@ -67,10 +68,10 @@ StorageURLCluster::StorageURLCluster(
         ColumnsDescription columns;
         if (format_name == "auto")
             std::tie(columns, format_name) = StorageURL::getTableStructureAndFormatFromData(
-                uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), configuration_.headers, std::nullopt, context);
+                uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), headers, std::nullopt, context);
         else
             columns = StorageURL::getTableStructureFromData(
-                format_, uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), configuration_.headers, std::nullopt, context);
+                format_, uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), headers, std::nullopt, context);
 
         storage_metadata.setColumns(columns);
     }
@@ -78,23 +79,20 @@ StorageURLCluster::StorageURLCluster(
     {
         if (format_name == "auto")
             format_name = StorageURL::getTableStructureAndFormatFromData(
-                uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), configuration_.headers, std::nullopt, context).second;
+                uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), headers, std::nullopt, context).second;
 
         storage_metadata.setColumns(columns_);
     }
 
     auto & storage_columns = storage_metadata.columns;
 
-    if (context->getSettingsRef()[Setting::use_hive_partitioning])
-    {
-        HivePartitioningUtils::extractPartitionColumnsFromPathAndEnrichStorageColumns(
-            storage_columns,
-            hive_partition_columns_to_read_from_file_path,
-            getSampleURI(uri, context),
-            columns_.empty(),
-            std::nullopt,
-            context);
-    }
+    /// Not grabbing the file_columns because it is not necessary to do it here.
+    std::tie(hive_partition_columns_to_read_from_file_path, std::ignore) = HivePartitioningUtils::setupHivePartitioningForFileURLLikeStorage(
+        storage_columns,
+        getSampleURI(uri, context),
+        columns_.empty(),
+        std::nullopt,
+        context);
 
     auto virtual_columns_desc = VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns);
     if (!storage_metadata.getColumns().has("_headers"))
@@ -130,23 +128,45 @@ void StorageURLCluster::updateQueryToSendIfNeeded(ASTPtr & query, const StorageS
     );
 }
 
+class UrlTaskIterator : public TaskIterator
+{
+public:
+    UrlTaskIterator(const String & uri,
+        size_t max_addresses,
+        const ActionsDAG::Node * predicate,
+        const NamesAndTypesList & virtual_columns,
+        const NamesAndTypesList & hive_partition_columns_to_read_from_file_path,
+        const ContextPtr & context)
+        : iterator(uri, max_addresses, predicate, virtual_columns, hive_partition_columns_to_read_from_file_path, context) {}
+
+    ~UrlTaskIterator() override = default;
+
+    ClusterFunctionReadTaskResponsePtr operator()(size_t /* number_of_current_replica */) const override
+    {
+        auto url = iterator.next();
+        if (url.empty())
+            return std::make_shared<ClusterFunctionReadTaskResponse>();
+        return std::make_shared<ClusterFunctionReadTaskResponse>(std::move(url));
+    }
+
+private:
+    mutable StorageURLSource::DisclosedGlobIterator iterator;
+};
+
 RemoteQueryExecutor::Extension StorageURLCluster::getTaskIteratorExtension(
     const ActionsDAG::Node * predicate,
     const ActionsDAG * /* filter */,
     const ContextPtr & context,
     ClusterPtr) const
 {
-    auto iterator = std::make_shared<StorageURLSource::DisclosedGlobIterator>(
-        uri, context->getSettingsRef()[Setting::glob_expansion_max_elements], predicate, getVirtualsList(), hive_partition_columns_to_read_from_file_path, context);
-
-    auto next_callback = [iter = std::move(iterator)](size_t) mutable -> ClusterFunctionReadTaskResponsePtr
-    {
-        auto url = iter->next();
-        if (url.empty())
-            return std::make_shared<ClusterFunctionReadTaskResponse>();
-        return std::make_shared<ClusterFunctionReadTaskResponse>(std::move(url));
-    };
-    auto callback = std::make_shared<TaskIterator>(std::move(next_callback));
+    auto callback = std::make_shared<UrlTaskIterator>(
+        uri,
+        context->getSettingsRef()[Setting::glob_expansion_max_elements],
+        predicate,
+        getVirtualsList(),
+        hive_partition_columns_to_read_from_file_path,
+        context
+    );
     return RemoteQueryExecutor::Extension{.task_iterator = std::move(callback)};
 }
 
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index ff94c8e333a6..da9ddc532e7b 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -178,13 +178,15 @@ void StorageView::read(
 
     if (context->getSettingsRef()[Setting::allow_experimental_analyzer])
     {
-        InterpreterSelectQueryAnalyzer interpreter(current_inner_query, getViewContext(context, storage_snapshot), options, column_names);
+        auto view_context = getViewContext(context, storage_snapshot);
+        InterpreterSelectQueryAnalyzer interpreter(current_inner_query, view_context, options, column_names);
         interpreter.addStorageLimits(*query_info.storage_limits);
         query_plan = std::move(interpreter).extractQueryPlan();
     }
     else
     {
-        InterpreterSelectWithUnionQuery interpreter(current_inner_query, getViewContext(context, storage_snapshot), options, column_names);
+        auto view_context = getViewContext(context, storage_snapshot);
+        InterpreterSelectWithUnionQuery interpreter(current_inner_query, view_context, options, column_names);
         interpreter.addStorageLimits(*query_info.storage_limits);
         interpreter.buildQueryPlan(query_plan);
     }
diff --git a/src/Storages/System/StorageSystemBuildOptions.cpp.in b/src/Storages/System/StorageSystemBuildOptions.cpp.in
index 111f90ea3a2c..3d1a1d525481 100644
--- a/src/Storages/System/StorageSystemBuildOptions.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.cpp.in
@@ -66,6 +66,7 @@ const char * auto_config_build[]
     "GIT_BRANCH", R"IRjaNsZIL9Yh7FQ4(@GIT_BRANCH@)IRjaNsZIL9Yh7FQ4",
     "GIT_DATE", "@GIT_DATE@",
     "GIT_COMMIT_SUBJECT", R"Gi17KJMlbGCjErEN(@GIT_COMMIT_SUBJECT@)Gi17KJMlbGCjErEN",
+    "USE_JWT_CPP", "@USE_JWT_CPP@",
 
     nullptr, nullptr
 };
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 3acd3beb4be4..828918952e41 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -52,7 +52,7 @@ void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr co
     for (const auto & name_and_cluster : context->getClusters())
         writeCluster(res_columns, columns_mask, name_and_cluster, /* replicated= */ nullptr);
 
-    const auto databases = DatabaseCatalog::instance().getDatabases();
+    const auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
     for (const auto & name_and_database : databases)
     {
         if (const auto * replicated = typeid_cast<const DatabaseReplicated *>(name_and_database.second.get()))
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 2425358c9447..8ae1fbb16bfc 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -27,6 +27,7 @@ namespace DB
 namespace Setting
 {
     extern const SettingsSeconds lock_acquire_timeout;
+    extern const SettingsBool show_data_lake_catalogs_in_system_tables;
 }
 namespace ErrorCodes
 {
@@ -441,7 +442,9 @@ void ReadFromSystemColumns::initializePipeline(QueryPipelineBuilder & pipeline,
         /// Add `database` column.
         MutableColumnPtr database_column_mut = ColumnString::create();
 
-        const auto databases = DatabaseCatalog::instance().getDatabases();
+        const auto & context = getContext();
+        const auto & settings = context->getSettingsRef();
+        const auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = settings[Setting::show_data_lake_catalogs_in_system_tables]});
         for (const auto & [database_name, database] : databases)
         {
             if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
diff --git a/src/Storages/System/StorageSystemCompletions.cpp b/src/Storages/System/StorageSystemCompletions.cpp
index 16bdee3ff29d..3664e841c099 100644
--- a/src/Storages/System/StorageSystemCompletions.cpp
+++ b/src/Storages/System/StorageSystemCompletions.cpp
@@ -32,6 +32,7 @@ namespace Setting
 {
     extern const SettingsUInt64 readonly;
     extern const SettingsSeconds lock_acquire_timeout;
+    extern const SettingsBool show_data_lake_catalogs_in_system_tables;
 }
 
 static constexpr const char * DATABASE_CONTEXT = "database";
@@ -96,7 +97,8 @@ void fillDataWithTableColumns(const String & database_name, const String & table
 void fillDataWithDatabasesTablesColumns(MutableColumns & res_columns, const ContextPtr & context)
 {
     const auto & access = context->getAccess();
-    const auto & databases = DatabaseCatalog::instance().getDatabases();
+    const auto & settings = context->getSettingsRef();
+    const auto & databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = settings[Setting::show_data_lake_catalogs_in_system_tables]});
     for (const auto & [database_name, database_ptr] : databases)
     {
         if (!access->isGranted(AccessType::SHOW_DATABASES) || !access->isGranted(AccessType::SHOW_DATABASES, database_name))
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index f056d20d8f08..064736620152 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -95,6 +95,7 @@ const char * auto_contributors[] {
     "Alexandra Latysheva",
     "Alexandre Snarskii",
     "Alexei Averchenko",
+    "Alexei Fedotov",
     "Alexey",
     "Alexey Arno",
     "Alexey Boykov",
@@ -275,11 +276,13 @@ const char * auto_contributors[] {
     "Brian Hunter",
     "Brokenice0415",
     "Bulat Gaifullin",
+    "Bulat Sharipov",
     "Caio Ricciuti",
     "Camden Cheek",
     "Camilo Sierra",
     "Carbyn",
     "Carlos Rodríguez Hernández",
+    "Casey Leask",
     "Caspian",
     "Chandre Van Der Westhuizen",
     "Chang Chen",
@@ -294,6 +297,7 @@ const char * auto_contributors[] {
     "Cheng Pan",
     "Cheryl Tuquib",
     "Chienlung Cheung",
+    "Chris Crane",
     "Christian",
     "Christian Clauss",
     "Christoph Wurm",
@@ -321,6 +325,7 @@ const char * auto_contributors[] {
     "Damian Kula",
     "Damian Maslanka",
     "DamianMaslanka5",
+    "Dan Checkoway",
     "Dan Roscigno",
     "Dan Wu",
     "DanRoscigno",
@@ -357,6 +362,7 @@ const char * auto_contributors[] {
     "Denis Krivak",
     "Denis Zhuravlev",
     "Denny Crane",
+    "Denny [DBA at Innervate]",
     "Denys Golotiuk",
     "Derek Chia",
     "Derek Perkins",
@@ -434,6 +440,7 @@ const char * auto_contributors[] {
     "Eugene Klimov",
     "Eugene Konkov",
     "Evgenia Sudarikova",
+    "Evgenii Leko",
     "Evgenii Pravda",
     "Evgeniia Sudarikova",
     "Evgeniy Gatov",
@@ -458,6 +465,7 @@ const char * auto_contributors[] {
     "Federico Ceratto",
     "Federico Rodriguez",
     "FeehanG",
+    "Felix Mueller",
     "Fellipe Fernandes",
     "Feng Kaiyu",
     "Fern",
@@ -551,6 +559,7 @@ const char * auto_contributors[] {
     "Hosun Lee",
     "HowePa",
     "HuFuwang",
+    "Huanlin Xiao",
     "Hui Wang",
     "HumanUser",
     "Hung Duong",
@@ -709,6 +718,7 @@ const char * auto_contributors[] {
     "Koblikov Mihail",
     "KochetovNicolai",
     "Konstantin Bogdanov",
+    "Konstantin Dorichev",
     "Konstantin Grabar",
     "Konstantin Ilchenko",
     "Konstantin Lebedev",
@@ -779,6 +789,7 @@ const char * auto_contributors[] {
     "Luis Bosque",
     "Luke Gannon",
     "Lv Feng",
+    "László Várady",
     "Léo Ercolanelli",
     "M0r64n",
     "M1eyu2018",
@@ -821,6 +832,7 @@ const char * auto_contributors[] {
     "Marta Paes",
     "Marti Raudsepp",
     "Martijn Bakker",
+    "Maruth Goyal",
     "Marvin Taschenberger",
     "Masha",
     "Mathieu Rey",
@@ -939,6 +951,7 @@ const char * auto_contributors[] {
     "Neeke Gao",
     "Neng Liu",
     "NengLiu",
+    "Nick",
     "Nick-71",
     "Nickita",
     "Nickita Taranov",
@@ -949,6 +962,7 @@ const char * auto_contributors[] {
     "Nicolae Vartolomei",
     "Niek",
     "Nihal Z.",
+    "Nihal Z. Miaji",
     "Nik",
     "NikBarykin",
     "Nikhil Nadig",
@@ -1075,6 +1089,7 @@ const char * auto_contributors[] {
     "Rafael Acevedo",
     "Rafael David Tinoco",
     "Rafael Roquetto",
+    "Rajakavitha Kodhandapani",
     "Rajkumar",
     "Rajkumar Varada",
     "Ramazan Polat",
@@ -1088,10 +1103,12 @@ const char * auto_contributors[] {
     "RegulusZ",
     "Reilee",
     "Reinaldy Rafli",
+    "Renat Bilalov",
     "Reto Kromer",
     "Ri",
     "Rich Raposa",
     "RinChanNOWWW",
+    "Rishabh Bhardwaj",
     "Robert Coelho",
     "Robert Hodges",
     "Robert Schulze",
@@ -1123,6 +1140,7 @@ const char * auto_contributors[] {
     "Rory Crispin",
     "Roy Bellingan",
     "Roy Kim",
+    "RuS2m",
     "Ruihang Xia",
     "Ruslan",
     "Ruslan Mardugalliamov",
@@ -1139,9 +1157,11 @@ const char * auto_contributors[] {
     "Sachin Singh",
     "SadiHassan",
     "Safronov Michail",
+    "Sahith Vibudhi",
     "Saif Ullah",
     "SaltTan",
     "Salvatore Mesoraca",
+    "Sam Radovich",
     "Samay Sharma",
     "Sameer Tamsekar",
     "Sami Kerola",
@@ -1202,6 +1222,7 @@ const char * auto_contributors[] {
     "Shanfeng Pang",
     "Shani Elharrar",
     "Shankar Iyer",
+    "Shaohua Wang",
     "Sharath K S",
     "Shaun Struwig",
     "Sherry Wang",
@@ -1229,6 +1250,7 @@ const char * auto_contributors[] {
     "SmitaRKulkarni",
     "Snow",
     "Sofia Antipushina",
+    "Somrat Dutta",
     "Song Liyong",
     "Sorck",
     "Srikanth Chekuri",
@@ -1241,6 +1263,7 @@ const char * auto_contributors[] {
     "Stepan",
     "Stepan Herold",
     "Stephan",
+    "Stephen Chi",
     "Steve-金勇",
     "StianBerger",
     "Stig Bakken",
@@ -1293,6 +1316,7 @@ const char * auto_contributors[] {
     "Tobias Lins",
     "Todd Yocum",
     "Tom Bombadil",
+    "Tom Quist",
     "Tom Risse",
     "Tomas Barton",
     "Tomer Shafir",
@@ -1381,6 +1405,7 @@ const char * auto_contributors[] {
     "Vladimir Valerianov",
     "Vladimir Varankin",
     "Vladimir Zhirov",
+    "Vladislav Gnezdilov",
     "Vladislav Rassokhin",
     "Vladislav Smirnov",
     "Vladislav V",
@@ -1389,6 +1414,7 @@ const char * auto_contributors[] {
     "Volodya Giro",
     "Volodyachan",
     "Volodymyr Kuznetsov",
+    "Vrishab V Srivatsa",
     "Vsevolod Orlov",
     "Vxider",
     "Vyacheslav Alipov",
@@ -1440,6 +1466,7 @@ const char * auto_contributors[] {
     "Your Name",
     "Yu, Peng",
     "Yuko Takagi",
+    "Yunchi Pang",
     "Yuntao Wu",
     "Yuri Dyachenko",
     "Yurii Vlasenko",
@@ -1454,6 +1481,7 @@ const char * auto_contributors[] {
     "Yutong Xiao",
     "Z.H.",
     "Zach Naimon",
+    "Zakhar Kravchuk",
     "Zawa-II",
     "Zawa_ll",
     "Zaynulla",
@@ -1472,6 +1500,7 @@ const char * auto_contributors[] {
     "Ziy1-Tan",
     "Zoe Steinkamp",
     "Zoran Pandovski",
+    "Zypperia",
     "[데이터플랫폼팀] 이호선",
     "a.palagashvili",
     "aaapetrenko",
@@ -1483,11 +1512,13 @@ const char * auto_contributors[] {
     "abyss7",
     "achimbab",
     "achulkov2",
+    "ackingliu",
     "adevyatova",
     "ageraab",
     "akazz",
     "akonyaev",
     "akuzm",
+    "albertchae",
     "alburthoffman",
     "alekar",
     "alekseik1",
@@ -1504,6 +1535,7 @@ const char * auto_contributors[] {
     "alexeyerm",
     "alexeypavlenko",
     "alfredlu",
+    "alistairjevans",
     "allegrinisante",
     "alsu",
     "amesaru",
@@ -1588,6 +1620,7 @@ const char * auto_contributors[] {
     "cjw",
     "clarkcaoliu",
     "clickhouse-adrianfraguela",
+    "clickhouse-gh[bot]",
     "clickhouse-robot-curie",
     "clundro",
     "cluster",
@@ -1601,6 +1634,8 @@ const char * auto_contributors[] {
     "conicliu",
     "copperybean",
     "coraxster",
+    "craigfinnelly",
+    "cuiyanxiang",
     "cw5121",
     "cwkyaoyao",
     "d.v.semenov",
@@ -1615,6 +1650,7 @@ const char * auto_contributors[] {
     "davydovska",
     "ddavid",
     "decaseal",
+    "demko",
     "dependabot-preview[bot]",
     "dependabot[bot]",
     "detailyang",
@@ -1633,6 +1669,7 @@ const char * auto_contributors[] {
     "dmitriy",
     "dmitry kuzmin",
     "dongyifeng",
+    "dorki",
     "ducle.canh",
     "e-mhui",
     "eaxdev",
@@ -1926,6 +1963,7 @@ const char * auto_contributors[] {
     "minhthucdao",
     "mkalfon",
     "mlkui",
+    "mlorek",
     "mmav",
     "mnkonkova",
     "mo-avatar",
@@ -2018,6 +2056,7 @@ const char * auto_contributors[] {
     "redclusive",
     "renwujie",
     "rfraposa",
+    "rickykwokmeraki",
     "rienath",
     "ritaank",
     "rnbondarenko",
@@ -2033,6 +2072,7 @@ const char * auto_contributors[] {
     "robot-metrika-test",
     "rodrigargar",
     "rogeryk",
+    "romainsalles",
     "roman",
     "romanzhukov",
     "rondo_1895",
@@ -2050,6 +2090,7 @@ const char * auto_contributors[] {
     "santrancisco",
     "sarielwxm",
     "satanson",
+    "saurabhojha",
     "save-my-heart",
     "scanhex12",
     "sdairs",
@@ -2080,12 +2121,14 @@ const char * auto_contributors[] {
     "slu",
     "slvrtrn",
     "snyk-bot",
+    "somratdutta",
     "songenjie",
     "sperlingxx",
     "spff",
     "spongedc",
     "spume",
     "spyros87",
+    "ssive7b",
     "sslouis",
     "stan",
     "stavrolia",
@@ -2096,6 +2139,7 @@ const char * auto_contributors[] {
     "sundy-li",
     "sundyli",
     "sunlisheng",
+    "sunningli",
     "sunny",
     "sunny19930321",
     "svladykin",
@@ -2177,6 +2221,7 @@ const char * auto_contributors[] {
     "xbthink",
     "xc0derx",
     "xiao",
+    "xiaohuanlin",
     "xiaolei565",
     "xiebin",
     "xiedeyantu",
@@ -2208,6 +2253,7 @@ const char * auto_contributors[] {
     "yinpeiqi",
     "yjant",
     "ylchou",
+    "ylw510",
     "yokofly",
     "yonesko",
     "youenn lebras",
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index e871a0ff8f76..c054075ae690 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -255,8 +255,8 @@ void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, Context
         ddl_task_status_paths.push_back(ddl_zookeeper_path / task_path / "finished");
     }
 
-    auto ddl_tasks_info = zookeeper->get(ddl_task_full_paths);
-    auto ddl_task_statuses = zookeeper->getChildren(ddl_task_status_paths);
+    auto ddl_tasks_info = zookeeper->tryGet(ddl_task_full_paths);
+    auto ddl_task_statuses = zookeeper->tryGetChildren(ddl_task_status_paths);
 
     for (size_t i = 0; i < ddl_task_paths.size(); ++i)
     {
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.cpp b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
index 32ca0781c32f..808caa7dab78 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.cpp
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
@@ -261,11 +261,13 @@ void ReadFromSystemDataSkippingIndices::initializePipeline(QueryPipelineBuilder
 {
     MutableColumnPtr column = ColumnString::create();
 
-    const auto databases = DatabaseCatalog::instance().getDatabases();
+    const auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
     for (const auto & [database_name, database] : databases)
     {
         if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
             continue;
+        if (!database->canContainMergeTreeTables())
+            continue;
 
         /// Lazy database can contain only very primitive tables,
         /// it cannot contain tables with data skipping indices.
diff --git a/src/Storages/System/StorageSystemDatabases.cpp b/src/Storages/System/StorageSystemDatabases.cpp
index 12b3b266c301..4db9bcd2cfef 100644
--- a/src/Storages/System/StorageSystemDatabases.cpp
+++ b/src/Storages/System/StorageSystemDatabases.cpp
@@ -11,11 +11,18 @@
 #include <Storages/System/StorageSystemDatabases.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Common/logger_useful.h>
+#include <Core/Settings.h>
 
 
 namespace DB
 {
 
+namespace Setting
+{
+    extern const SettingsBool show_data_lake_catalogs_in_system_tables;
+}
+
+
 ColumnsDescription StorageSystemDatabases::getColumnsDescription()
 {
     auto description = ColumnsDescription
@@ -42,7 +49,7 @@ static String getEngineFull(const ContextPtr & ctx, const DatabasePtr & database
     while (true)
     {
         String name = database->getDatabaseName();
-        guard = DatabaseCatalog::instance().getDDLGuard(name, "");
+        guard = DatabaseCatalog::instance().getDDLGuard(name, "", nullptr);
 
         /// Ensure that the database was not renamed before we acquired the lock
         auto locked_database = DatabaseCatalog::instance().tryGetDatabase(name);
@@ -111,8 +118,8 @@ void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr c
 {
     const auto access = context->getAccess();
     const bool need_to_check_access_for_databases = !access->isGranted(AccessType::SHOW_DATABASES);
-
-    const auto databases = DatabaseCatalog::instance().getDatabases();
+    const auto & settings = context->getSettingsRef();
+    const auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = settings[Setting::show_data_lake_catalogs_in_system_tables]});
     ColumnPtr filtered_databases_column = getFilteredDatabases(databases, predicate, context);
 
     for (size_t i = 0; i < filtered_databases_column->size(); ++i)
diff --git a/src/Storages/System/StorageSystemDistributionQueue.cpp b/src/Storages/System/StorageSystemDistributionQueue.cpp
index ff9cb6aa50c4..5c364622bbff 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.cpp
+++ b/src/Storages/System/StorageSystemDistributionQueue.cpp
@@ -121,7 +121,7 @@ void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, Cont
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> tables;
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         /// Check if database can contain distributed tables
         if (!db.second->canContainDistributedTables())
diff --git a/src/Storages/System/StorageSystemExports.cpp b/src/Storages/System/StorageSystemExports.cpp
new file mode 100644
index 000000000000..fad8b43d0d2f
--- /dev/null
+++ b/src/Storages/System/StorageSystemExports.cpp
@@ -0,0 +1,72 @@
+#include <Storages/System/StorageSystemExports.h>
+#include <Access/ContextAccess.h>
+#include <Interpreters/Context.h>
+#include <DataTypes/DataTypeString.h>
+#include <Storages/MergeTree/ExportList.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Interpreters/DatabaseCatalog.h>
+
+
+namespace DB
+{
+
+ColumnsDescription StorageSystemExports::getColumnsDescription()
+{
+    return ColumnsDescription
+    {
+        {"source_database", std::make_shared<DataTypeString>(), "Name of the source database."},
+        {"source_table", std::make_shared<DataTypeString>(), "Name of the source table."},
+        {"destination_database", std::make_shared<DataTypeString>(), "Name of the destination database."},
+        {"destination_table", std::make_shared<DataTypeString>(), "Name of the destination table."},
+        {"create_time", std::make_shared<DataTypeDateTime>(), "Date and time when the export command was received in the server."},
+        {"part_name", std::make_shared<DataTypeString>(), "Name of the part"},
+        {"query_id", std::make_shared<DataTypeString>(), "Query ID of the export operation."},
+        {"destination_file_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "File paths where the part is being exported."},
+        {"elapsed", std::make_shared<DataTypeFloat64>(), "The time elapsed (in seconds) since the export started."},
+        {"rows_read", std::make_shared<DataTypeUInt64>(), "The number of rows read from the exported part."},
+        {"total_rows_to_read", std::make_shared<DataTypeUInt64>(), "The total number of rows to read from the exported part."},
+        {"total_size_bytes_compressed", std::make_shared<DataTypeUInt64>(), "The total size of the compressed data in the exported part."},
+        {"total_size_bytes_uncompressed", std::make_shared<DataTypeUInt64>(), "The total size of the uncompressed data in the exported part."},
+        {"bytes_read_uncompressed", std::make_shared<DataTypeUInt64>(), "The number of uncompressed bytes read from the exported part."},
+        {"memory_usage", std::make_shared<DataTypeUInt64>(), "Current memory usage in bytes for the export operation."},
+        {"peak_memory_usage", std::make_shared<DataTypeUInt64>(), "Peak memory usage in bytes during the export operation."},
+    };
+}
+
+void StorageSystemExports::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
+{
+    const auto access = context->getAccess();
+    const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
+
+    for (const auto & export_info : context->getExportsList().get())
+    {
+        if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, export_info.source_database, export_info.source_table))
+            continue;
+
+        size_t i = 0;
+        res_columns[i++]->insert(export_info.source_database);
+        res_columns[i++]->insert(export_info.source_table);
+        res_columns[i++]->insert(export_info.destination_database);
+        res_columns[i++]->insert(export_info.destination_table);
+        res_columns[i++]->insert(export_info.create_time);
+        res_columns[i++]->insert(export_info.part_name);
+        res_columns[i++]->insert(export_info.query_id);
+        Array destination_file_paths_array;
+        destination_file_paths_array.reserve(export_info.destination_file_paths.size());
+        for (const auto & file_path : export_info.destination_file_paths)
+            destination_file_paths_array.push_back(file_path);
+        res_columns[i++]->insert(destination_file_paths_array);
+        res_columns[i++]->insert(export_info.elapsed);
+        res_columns[i++]->insert(export_info.rows_read);
+        res_columns[i++]->insert(export_info.total_rows_to_read);
+        res_columns[i++]->insert(export_info.total_size_bytes_compressed);
+        res_columns[i++]->insert(export_info.total_size_bytes_uncompressed);
+        res_columns[i++]->insert(export_info.bytes_read_uncompressed);
+        res_columns[i++]->insert(export_info.memory_usage);
+        res_columns[i++]->insert(export_info.peak_memory_usage);
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemExports.h b/src/Storages/System/StorageSystemExports.h
new file mode 100644
index 000000000000..e13fbfa26aaa
--- /dev/null
+++ b/src/Storages/System/StorageSystemExports.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+class StorageSystemExports final : public IStorageSystemOneBlock
+{
+public:
+    std::string getName() const override { return "SystemExports"; }
+
+    static ColumnsDescription getColumnsDescription();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemFilesystemCache.cpp b/src/Storages/System/StorageSystemFilesystemCache.cpp
index 2e9ba4daafb7..fd3c10f2e5e2 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCache.cpp
@@ -45,9 +45,15 @@ StorageSystemFilesystemCache::StorageSystemFilesystemCache(const StorageID & tab
 
 void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
-    auto caches = FileCacheFactory::instance().getAll();
+    auto caches_by_name = FileCacheFactory::instance().getAll();
+    std::unordered_set<FileCacheFactory::FileCacheDataPtr> caches;
+    for (const auto & [_, cache_data] : caches_by_name)
+        caches.insert(cache_data);
+    std::unordered_map<FileCacheFactory::FileCacheDataPtr, std::vector<std::string>> caches_by_instance;
+    for (const auto & [cache_name, cache_data] : caches_by_name)
+        caches_by_instance[cache_data].push_back(cache_name);
 
-    for (const auto & [cache_name, cache_data] : caches)
+    for (const auto & cache_data : caches)
     {
         const auto & cache = cache_data->cache;
         if (!cache->isInitialized())
@@ -55,36 +61,39 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
 
         cache->iterate([&](const FileSegment::Info & file_segment)
         {
-            size_t i = 0;
-            res_columns[i++]->insert(cache_name);
-            res_columns[i++]->insert(cache->getBasePath());
+            for (const auto & cache_name : caches_by_instance.at(cache_data))
+            {
+                size_t i = 0;
+                res_columns[i++]->insert(cache_name);
+                res_columns[i++]->insert(cache->getBasePath());
 
-            /// Do not use `file_segment->getPath` here because it will lead to nullptr dereference
-            /// (because file_segments in getSnapshot doesn't have `cache` field set)
+                /// Do not use `file_segment->getPath` here because it will lead to nullptr dereference
+                /// (because file_segments in getSnapshot doesn't have `cache` field set)
 
-            const auto path = cache->getFileSegmentPath(
-                file_segment.key, file_segment.offset, file_segment.kind,
-                FileCache::UserInfo(file_segment.user_id, file_segment.user_weight));
-            res_columns[i++]->insert(path);
-            res_columns[i++]->insert(file_segment.key.toString());
-            res_columns[i++]->insert(file_segment.range_left);
-            res_columns[i++]->insert(file_segment.range_right);
-            res_columns[i++]->insert(file_segment.size);
-            res_columns[i++]->insert(FileSegment::stateToString(file_segment.state));
-            res_columns[i++]->insert(file_segment.download_finished_time);
-            res_columns[i++]->insert(file_segment.cache_hits);
-            res_columns[i++]->insert(file_segment.references);
-            res_columns[i++]->insert(file_segment.downloaded_size);
-            res_columns[i++]->insert(toString(file_segment.kind));
-            res_columns[i++]->insert(file_segment.is_unbound);
-            res_columns[i++]->insert(file_segment.user_id);
+                const auto path = cache->getFileSegmentPath(
+                    file_segment.key, file_segment.offset, file_segment.kind,
+                    FileCache::UserInfo(file_segment.user_id, file_segment.user_weight));
+                res_columns[i++]->insert(path);
+                res_columns[i++]->insert(file_segment.key.toString());
+                res_columns[i++]->insert(file_segment.range_left);
+                res_columns[i++]->insert(file_segment.range_right);
+                res_columns[i++]->insert(file_segment.size);
+                res_columns[i++]->insert(FileSegment::stateToString(file_segment.state));
+                res_columns[i++]->insert(file_segment.download_finished_time);
+                res_columns[i++]->insert(file_segment.cache_hits);
+                res_columns[i++]->insert(file_segment.references);
+                res_columns[i++]->insert(file_segment.downloaded_size);
+                res_columns[i++]->insert(toString(file_segment.kind));
+                res_columns[i++]->insert(file_segment.is_unbound);
+                res_columns[i++]->insert(file_segment.user_id);
 
-            std::error_code ec;
-            auto size = fs::file_size(path, ec);
-            if (!ec)
-                res_columns[i++]->insert(size);
-            else
-                res_columns[i++]->insertDefault();
+                std::error_code ec;
+                auto size = fs::file_size(path, ec);
+                if (!ec)
+                    res_columns[i++]->insert(size);
+                else
+                    res_columns[i++]->insertDefault();
+            }
         }, FileCache::getCommonUser().user_id);
     }
 }
diff --git a/src/Storages/System/StorageSystemGraphite.cpp b/src/Storages/System/StorageSystemGraphite.cpp
index ef13c3c24da0..8e0dd1e20260 100644
--- a/src/Storages/System/StorageSystemGraphite.cpp
+++ b/src/Storages/System/StorageSystemGraphite.cpp
@@ -35,7 +35,7 @@ ColumnsDescription StorageSystemGraphite::getColumnsDescription()
  */
 static StorageSystemGraphite::Configs getConfigs(ContextPtr context)
 {
-    const Databases databases = DatabaseCatalog::instance().getDatabases();
+    const Databases databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
     StorageSystemGraphite::Configs graphite_configs;
 
     for (const auto & db : databases)
diff --git a/src/Storages/System/StorageSystemIcebergHistory.cpp b/src/Storages/System/StorageSystemIcebergHistory.cpp
index d3588bc93077..87b85120e668 100644
--- a/src/Storages/System/StorageSystemIcebergHistory.cpp
+++ b/src/Storages/System/StorageSystemIcebergHistory.cpp
@@ -15,7 +15,7 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromSystemNumbersStep.h>
 #include <Storages/SelectQueryInfo.h>
-#include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 #include <Access/ContextAccess.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h>
@@ -31,6 +31,7 @@ namespace DB
 namespace Setting
 {
     extern const SettingsSeconds lock_acquire_timeout;
+    extern const SettingsBool use_iceberg_metadata_files_cache;
 }
 
 ColumnsDescription StorageSystemIcebergHistory::getColumnsDescription()
@@ -49,9 +50,14 @@ ColumnsDescription StorageSystemIcebergHistory::getColumnsDescription()
 void StorageSystemIcebergHistory::fillData([[maybe_unused]] MutableColumns & res_columns, [[maybe_unused]] ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
 #if USE_AVRO
-    const auto access = context->getAccess();
+    ContextMutablePtr context_copy = Context::createCopy(context);
+    Settings settings_copy = context_copy->getSettingsCopy();
+    settings_copy[Setting::use_iceberg_metadata_files_cache] = false;
+    context_copy->setSettings(settings_copy);
 
-    auto add_history_record = [&](const DatabaseTablesIteratorPtr & it, StorageObjectStorage * object_storage)
+    const auto access = context_copy->getAccess();
+
+    auto add_history_record = [&](const DatabaseTablesIteratorPtr & it, StorageObjectStorageCluster * object_storage)
     {
         if (!access->isGranted(AccessType::SHOW_TABLES, it->databaseName(), it->name()))
             return;
@@ -60,9 +66,9 @@ void StorageSystemIcebergHistory::fillData([[maybe_unused]] MutableColumns & res
         /// to handle properly all possible errors which we can get when attempting to read metadata of iceberg table
         try
         {
-            if (IcebergMetadata * iceberg_metadata = dynamic_cast<IcebergMetadata *>(object_storage->getExternalMetadata(context)); iceberg_metadata)
+            if (IcebergMetadata * iceberg_metadata = dynamic_cast<IcebergMetadata *>(object_storage->getExternalMetadata(context_copy)); iceberg_metadata)
             {
-                IcebergMetadata::IcebergHistory iceberg_history_items = iceberg_metadata->getHistory(context);
+                IcebergMetadata::IcebergHistory iceberg_history_items = iceberg_metadata->getHistory(context_copy);
 
                 for (auto & iceberg_history_item : iceberg_history_items)
                 {
@@ -87,20 +93,20 @@ void StorageSystemIcebergHistory::fillData([[maybe_unused]] MutableColumns & res
 
     if (show_tables_granted)
     {
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true});
         for (const auto & db: databases)
         {
             /// with last flag we are filtering out all non iceberg table
-            for (auto iterator = db.second->getLightweightTablesIterator(context, {}, true); iterator->isValid(); iterator->next())
+            for (auto iterator = db.second->getLightweightTablesIterator(context_copy, {}, true); iterator->isValid(); iterator->next())
             {
                 StoragePtr storage = iterator->table();
 
-                TableLockHolder lock = storage->tryLockForShare(context->getCurrentQueryId(), context->getSettingsRef()[Setting::lock_acquire_timeout]);
+                TableLockHolder lock = storage->tryLockForShare(context_copy->getCurrentQueryId(), context_copy->getSettingsRef()[Setting::lock_acquire_timeout]);
                 if (!lock)
                     // Table was dropped while acquiring the lock, skipping table
                     continue;
 
-                if (auto * object_storage_table = dynamic_cast<StorageObjectStorage *>(storage.get()))
+                if (auto * object_storage_table = dynamic_cast<StorageObjectStorageCluster *>(storage.get()))
                 {
                     add_history_record(iterator, object_storage_table);
                 }
diff --git a/src/Storages/System/StorageSystemKafkaConsumers.cpp b/src/Storages/System/StorageSystemKafkaConsumers.cpp
index 8a0e1dc3c7b8..a8ecd6034f42 100644
--- a/src/Storages/System/StorageSystemKafkaConsumers.cpp
+++ b/src/Storages/System/StorageSystemKafkaConsumers.cpp
@@ -163,7 +163,7 @@ void StorageSystemKafkaConsumers::fillData(MutableColumns & res_columns, Context
             return;
         add_rows(it, kafka_table);
     };
-    auto databases = DatabaseCatalog::instance().getDatabases();
+    auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
     for (const auto & db : databases)
     {
         for (auto it = db.second->getTablesIterator(context); it->isValid(); it->next())
diff --git a/src/Storages/System/StorageSystemMerges.cpp b/src/Storages/System/StorageSystemMerges.cpp
index 0fca5dc84a2b..c8c569ff4696 100644
--- a/src/Storages/System/StorageSystemMerges.cpp
+++ b/src/Storages/System/StorageSystemMerges.cpp
@@ -1,5 +1,5 @@
-#include <Interpreters/Context.h>
 #include <Storages/MergeTree/MergeList.h>
+#include <Interpreters/Context.h>
 #include <Storages/System/StorageSystemMerges.h>
 #include <Access/ContextAccess.h>
 
diff --git a/src/Storages/System/StorageSystemMutations.cpp b/src/Storages/System/StorageSystemMutations.cpp
index f2b54b361806..738ca1c38c92 100644
--- a/src/Storages/System/StorageSystemMutations.cpp
+++ b/src/Storages/System/StorageSystemMutations.cpp
@@ -68,7 +68,7 @@ void StorageSystemMutations::fillData(MutableColumns & res_columns, ContextPtr c
 
     /// Collect a set of *MergeTree tables.
     std::map<String, std::map<String, StoragePtr>> merge_tree_tables;
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         /// Check if database can contain MergeTree tables
         if (!db.second->canContainMergeTreeTables())
diff --git a/src/Storages/System/StorageSystemNamedCollections.cpp b/src/Storages/System/StorageSystemNamedCollections.cpp
index 12618558a177..cf8a38374bd2 100644
--- a/src/Storages/System/StorageSystemNamedCollections.cpp
+++ b/src/Storages/System/StorageSystemNamedCollections.cpp
@@ -3,6 +3,7 @@
 #include <base/EnumReflection.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeMap.h>
 #include <Interpreters/Context.h>
@@ -17,6 +18,11 @@
 namespace DB
 {
 
+namespace Setting
+{
+    extern const SettingsBool format_display_secrets_in_show_and_select;
+}
+
 ColumnsDescription StorageSystemNamedCollections::getColumnsDescription()
 {
     return ColumnsDescription
@@ -54,6 +60,9 @@ void StorageSystemNamedCollections::fillData(MutableColumns & res_columns, Conte
         auto & key_column = tuple_column.getColumn(0);
         auto & value_column = tuple_column.getColumn(1);
         bool access_secrets = access->isGranted(AccessType::SHOW_NAMED_COLLECTIONS_SECRETS);
+        access_secrets &= access->isGranted(AccessType::displaySecretsInShowAndSelect);
+        access_secrets &= context->getSettingsRef()[Setting::format_display_secrets_in_show_and_select];
+        access_secrets &= context->displaySecretsInShowAndSelect();
 
         size_t size = 0;
         for (const auto & key : collection->getKeys())
diff --git a/src/Storages/System/StorageSystemObjectStorageQueueSettings.cpp b/src/Storages/System/StorageSystemObjectStorageQueueSettings.cpp
index a6cf0ab255cd..d9b08ae474cb 100644
--- a/src/Storages/System/StorageSystemObjectStorageQueueSettings.cpp
+++ b/src/Storages/System/StorageSystemObjectStorageQueueSettings.cpp
@@ -58,7 +58,7 @@ void StorageSystemObjectStorageQueueSettings<type>::fillData(
     const bool show_tables_granted = access->isGranted(AccessType::SHOW_TABLES);
     if (show_tables_granted)
     {
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
         for (const auto & db : databases)
         {
             for (auto iterator = db.second->getTablesIterator(context); iterator->isValid(); iterator->next())
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
index 58c61ca42aa0..65db49a8c887 100644
--- a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
@@ -59,7 +59,7 @@ void StorageSystemPartMovesBetweenShards::fillData(MutableColumns & res_columns,
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> replicated_tables;
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         /// Check if database can contain replicated tables
         if (!db.second->canContainMergeTreeTables())
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index 51ba81ef0169..3fd6a8f37b83 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -118,7 +118,7 @@ StoragesInfoStream::StoragesInfoStream(std::optional<ActionsDAG> filter_by_datab
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
     {
-        Databases databases = DatabaseCatalog::instance().getDatabases();
+        Databases databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
 
         /// Add column 'database'.
         MutableColumnPtr database_column_mut = ColumnString::create();
diff --git a/src/Storages/System/StorageSystemProjections.cpp b/src/Storages/System/StorageSystemProjections.cpp
index f3352b510748..44b8ce12a3a7 100644
--- a/src/Storages/System/StorageSystemProjections.cpp
+++ b/src/Storages/System/StorageSystemProjections.cpp
@@ -248,11 +248,13 @@ void ReadFromSystemProjections::initializePipeline(QueryPipelineBuilder & pipeli
 {
     MutableColumnPtr column = ColumnString::create();
 
-    const auto databases = DatabaseCatalog::instance().getDatabases();
+    const auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false});
     for (const auto & [database_name, database] : databases)
     {
         if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
             continue;
+        if (!database->canContainMergeTreeTables())
+            continue;
 
         /// Lazy database can contain only very primitive tables, it cannot contain tables with projections.
         /// Skip it to avoid unnecessary tables loading in the Lazy database.
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index aac54c244d23..03479fa7c507 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -332,7 +332,7 @@ void StorageSystemReplicas::read(
 
     /// We collect a set of replicated tables.
     std::map<String, std::map<String, StoragePtr>> replicated_tables;
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         /// Check if database can contain replicated tables
         if (!db.second->canContainMergeTreeTables())
diff --git a/src/Storages/System/StorageSystemReplicatedPartitionExports.cpp b/src/Storages/System/StorageSystemReplicatedPartitionExports.cpp
new file mode 100644
index 000000000000..00a8a78af55d
--- /dev/null
+++ b/src/Storages/System/StorageSystemReplicatedPartitionExports.cpp
@@ -0,0 +1,145 @@
+#include <Storages/System/StorageSystemReplicatedPartitionExports.h>
+#include <Access/ContextAccess.h>
+#include <Interpreters/Context.h>
+#include <DataTypes/DataTypeString.h>
+#include <Storages/MergeTree/ExportList.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include "Columns/ColumnString.h"
+#include "Storages/VirtualColumnUtils.h"
+
+
+namespace DB
+{
+
+ColumnsDescription StorageSystemReplicatedPartitionExports::getColumnsDescription()
+{
+    return ColumnsDescription
+    {
+        {"source_database", std::make_shared<DataTypeString>(), "Name of the source database."},
+        {"source_table", std::make_shared<DataTypeString>(), "Name of the source table."},
+        {"destination_database", std::make_shared<DataTypeString>(), "Name of the destination database."},
+        {"destination_table", std::make_shared<DataTypeString>(), "Name of the destination table."},
+        {"create_time", std::make_shared<DataTypeDateTime>(), "Date and time when the export command was submitted"},
+        {"partition_id", std::make_shared<DataTypeString>(), "ID of the partition"},
+        {"transaction_id", std::make_shared<DataTypeString>(), "ID of the transaction."},
+        {"query_id", std::make_shared<DataTypeString>(), "Query ID of the export operation."},
+        {"source_replica", std::make_shared<DataTypeString>(), "Name of the source replica."},
+        {"parts", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "List of part names to be exported."},
+        {"parts_count", std::make_shared<DataTypeUInt64>(), "Number of parts in the export."},
+        {"parts_to_do", std::make_shared<DataTypeUInt64>(), "Number of parts pending to be exported."},
+        {"status", std::make_shared<DataTypeString>(), "Status of the export."},
+        {"exception_replica", std::make_shared<DataTypeString>(), "Replica that caused the last exception"},
+        {"last_exception", std::make_shared<DataTypeString>(), "Last exception message of any part (not necessarily the last global exception)"},
+        {"exception_part", std::make_shared<DataTypeString>(), "Part that caused the last exception"},
+        {"exception_count", std::make_shared<DataTypeUInt64>(), "Number of global exceptions"},
+    };
+}
+
+void StorageSystemReplicatedPartitionExports::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const
+{
+    const auto access = context->getAccess();
+    const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
+
+    std::map<String, std::map<String, StoragePtr>> replicated_merge_tree_tables;
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = true}))
+    {
+        /// Check if database can contain MergeTree tables
+        if (!db.second->canContainMergeTreeTables())
+            continue;
+
+        const bool check_access_for_tables = check_access_for_databases && !access->isGranted(AccessType::SHOW_TABLES, db.first);
+
+        for (auto iterator = db.second->getTablesIterator(context); iterator->isValid(); iterator->next())
+        {
+            const auto & table = iterator->table();
+            if (!table)
+                continue;
+
+            StorageReplicatedMergeTree * table_replicated = dynamic_cast<StorageReplicatedMergeTree *>(table.get());
+            if (!table_replicated)
+                continue;
+
+            if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, db.first, iterator->name()))
+                continue;
+
+            replicated_merge_tree_tables[db.first][iterator->name()] = table;
+        }
+    }
+
+    MutableColumnPtr col_database_mut = ColumnString::create();
+    MutableColumnPtr col_table_mut = ColumnString::create();
+
+    for (auto & db : replicated_merge_tree_tables)
+    {
+        for (auto & table : db.second)
+        {
+            col_database_mut->insert(db.first);
+            col_table_mut->insert(table.first);
+        }
+    }
+
+    ColumnPtr col_database = std::move(col_database_mut);
+    ColumnPtr col_table = std::move(col_table_mut);
+
+    /// Determine what tables are needed by the conditions in the query.
+    {
+        Block filtered_block
+        {
+            { col_database, std::make_shared<DataTypeString>(), "database" },
+            { col_table, std::make_shared<DataTypeString>(), "table" },
+        };
+
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
+
+        if (!filtered_block.rows())
+            return;
+
+        col_database = filtered_block.getByName("database").column;
+        col_table = filtered_block.getByName("table").column;
+    }
+
+    for (size_t i_storage = 0; i_storage < col_database->size(); ++i_storage)
+    {
+        const auto database = (*col_database)[i_storage].safeGet<String>();
+        const auto table = (*col_table)[i_storage].safeGet<String>();
+
+        std::vector<ReplicatedPartitionExportInfo> partition_exports_info;
+        {
+            const IStorage * storage = replicated_merge_tree_tables[database][table].get();
+            if (const auto * replicated_merge_tree = dynamic_cast<const StorageReplicatedMergeTree *>(storage))
+                partition_exports_info = replicated_merge_tree->getPartitionExportsInfo();
+        }
+
+        for (const ReplicatedPartitionExportInfo & info : partition_exports_info)
+        {
+            std::size_t i = 0;
+            res_columns[i++]->insert(database);
+            res_columns[i++]->insert(table);
+            res_columns[i++]->insert(info.destination_database);
+            res_columns[i++]->insert(info.destination_table);
+            res_columns[i++]->insert(info.create_time);
+            res_columns[i++]->insert(info.partition_id);
+            res_columns[i++]->insert(info.transaction_id);
+            res_columns[i++]->insert(info.query_id);
+            res_columns[i++]->insert(info.source_replica);
+            Array parts_array;
+            parts_array.reserve(info.parts.size());
+            for (const auto & part : info.parts)
+                parts_array.push_back(part); 
+            res_columns[i++]->insert(parts_array);
+            res_columns[i++]->insert(info.parts_count);
+            res_columns[i++]->insert(info.parts_to_do);
+            res_columns[i++]->insert(info.status);
+            res_columns[i++]->insert(info.exception_replica);
+            res_columns[i++]->insert(info.last_exception);
+            res_columns[i++]->insert(info.exception_part);
+            res_columns[i++]->insert(info.exception_count);
+        }
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemReplicatedPartitionExports.h b/src/Storages/System/StorageSystemReplicatedPartitionExports.h
new file mode 100644
index 000000000000..d57844cbb34e
--- /dev/null
+++ b/src/Storages/System/StorageSystemReplicatedPartitionExports.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+namespace DB
+{
+
+class Context;
+
+struct ReplicatedPartitionExportInfo
+{
+    String destination_database;
+    String destination_table;
+    String partition_id;
+    String transaction_id;
+    String query_id;
+    time_t create_time;
+    String source_replica;
+    size_t parts_count;
+    size_t parts_to_do;
+    std::vector<String> parts;
+    String status;
+    std::string exception_replica;
+    std::string last_exception;
+    std::string exception_part;
+    size_t exception_count;
+};
+
+class StorageSystemReplicatedPartitionExports final : public IStorageSystemOneBlock
+{
+public:
+
+    std::string getName() const override { return "SystemReplicatedPartitionExports"; }
+
+    static ColumnsDescription getColumnsDescription();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemReplicationQueue.cpp b/src/Storages/System/StorageSystemReplicationQueue.cpp
index 4faaee1ebb73..645a0e387b91 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.cpp
+++ b/src/Storages/System/StorageSystemReplicationQueue.cpp
@@ -78,7 +78,7 @@ void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, Conte
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> replicated_tables;
-    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    for (const auto & db : DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = false}))
     {
         /// Check if database can contain replicated tables
         if (!db.second->canContainMergeTreeTables())
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 2da1a6878f10..32b9e3213e68 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -22,6 +22,8 @@
 #include <QueryPipeline/Pipe.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
+#include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageView.h>
 #include <Storages/System/getQueriedColumnsMaskAndHeader.h>
@@ -70,7 +72,8 @@ ColumnPtr getFilteredDatabases(const ActionsDAG::Node * predicate, ContextPtr co
 {
     MutableColumnPtr column = ColumnString::create();
 
-    const auto databases = DatabaseCatalog::instance().getDatabases();
+    const auto & settings = context->getSettingsRef();
+    const auto databases = DatabaseCatalog::instance().getDatabases(GetDatabasesOptions{.with_datalake_catalogs = settings[Setting::show_data_lake_catalogs_in_system_tables]});
     for (const auto & database_name : databases | boost::adaptors::map_keys)
     {
         if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
@@ -125,8 +128,7 @@ ColumnPtr getFilteredTables(
         {
             auto table_it = database->getLightweightTablesIterator(context,
                                                                    /* filter_by_table_name */ {},
-                                                                   /* skip_not_loaded */ false,
-                                                                   !context->getSettingsRef()[DB::Setting::show_data_lake_catalogs_in_system_tables]);
+                                                                   /* skip_not_loaded */ false);
             for (; table_it->isValid(); table_it->next())
             {
                 database_column->insert(table_it->name());
@@ -444,8 +446,7 @@ class TablesBlockSource : public ISource
             if (!tables_it || !tables_it->isValid())
                 tables_it = database->getLightweightTablesIterator(context,
                         /* filter_by_table_name */ {},
-                        /* skip_not_loaded */ false,
-                        !context->getSettingsRef()[DB::Setting::show_data_lake_catalogs_in_system_tables]);
+                        /* skip_not_loaded */ false);
 
             const bool need_table = needTable(database, getPort().getHeader());
 
@@ -604,18 +605,69 @@ class TablesBlockSource : public ISource
                 ASTPtr expression_ptr;
                 if (columns_mask[src_index++])
                 {
-                    if (metadata_snapshot && (expression_ptr = metadata_snapshot->getPartitionKeyAST()))
-                        res_columns[res_index++]->insert(format({context, *expression_ptr}));
-                    else
-                        res_columns[res_index++]->insertDefault();
+                    bool inserted = false;
+                    try
+                    {
+                        // Extract from specific DataLake metadata if suitable
+                        if (auto * obj = dynamic_cast<StorageObjectStorageCluster *>(table.get()))
+                        {
+                            if (auto * dl_meta = obj->getExternalMetadata(context))
+                            {
+                                if (auto p = dl_meta->partitionKey(context); p.has_value())
+                                {
+                                    res_columns[res_index++]->insert(*p);
+                                    inserted = true;
+                                }
+                            }
+                        }
+                    }
+                    catch (const Exception &)
+                    {
+                        /// Failed to get info from Iceberg. It's not critical, just log it.
+                        tryLogCurrentException("StorageSystemTables");
+                    }
+
+                    if (!inserted)
+                    {
+                        if (metadata_snapshot && (expression_ptr = metadata_snapshot->getPartitionKeyAST()))
+                            res_columns[res_index++]->insert(format({context, *expression_ptr}));
+                        else
+                            res_columns[res_index++]->insertDefault();
+                    }
                 }
 
                 if (columns_mask[src_index++])
                 {
-                    if (metadata_snapshot && (expression_ptr = metadata_snapshot->getSortingKey().expression_list_ast))
-                        res_columns[res_index++]->insert(format({context, *expression_ptr}));
-                    else
-                        res_columns[res_index++]->insertDefault();
+                    bool inserted = false;
+
+                    try
+                    {
+                        // Extract from specific DataLake metadata if suitable
+                        if (auto * obj = dynamic_cast<StorageObjectStorageCluster *>(table.get()))
+                        {
+                            if (auto * dl_meta = obj->getExternalMetadata(context))
+                            {
+                                if (auto p = dl_meta->sortingKey(context); p.has_value())
+                                {
+                                    res_columns[res_index++]->insert(*p);
+                                    inserted = true;
+                                }
+                            }
+                        }
+                    }
+                    catch (const Exception &)
+                    {
+                        /// Failed to get info from Iceberg. It's not critical, just log it.
+                        tryLogCurrentException("StorageSystemTables");
+                    }
+
+                    if (!inserted)
+                    {
+                        if (metadata_snapshot && (expression_ptr = metadata_snapshot->getSortingKey().expression_list_ast))
+                            res_columns[res_index++]->insert(format({context, *expression_ptr}));
+                        else
+                            res_columns[res_index++]->insertDefault();
+                    }
                 }
 
                 if (columns_mask[src_index++])
@@ -820,7 +872,10 @@ class TablesBlockSource : public ISource
                         res_columns[res_index++]->insert(dependents_databases);
                     if (columns_mask[src_index++])
                         res_columns[res_index++]->insert(dependents_tables);
-
+                }
+                else
+                {
+                    src_index += 4;
                 }
 
                 if (columns_mask[src_index++])
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index 9e996d5ca2b9..d6ce54003aea 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -1,10 +1,11 @@
 #include <Storages/System/StorageSystemKeywords.h>
+#include <Storages/System/StorageSystemReplicatedPartitionExports.h>
 #include "config.h"
 
 #include <Databases/IDatabase.h>
 #include <Storages/System/attachSystemTables.h>
 #include <Storages/System/attachSystemTablesImpl.h>
-
+#include <Core/ServerSettings.h>
 #include <Storages/System/StorageSystemAggregateFunctionCombinators.h>
 #include <Storages/System/StorageSystemAsynchronousMetrics.h>
 #include <Storages/System/StorageSystemAsyncLoader.h>
@@ -30,6 +31,7 @@
 #include <Storages/System/StorageSystemMacros.h>
 #include <Storages/System/StorageSystemMerges.h>
 #include <Storages/System/StorageSystemMoves.h>
+#include <Storages/System/StorageSystemExports.h>
 #include <Storages/System/StorageSystemReplicatedFetches.h>
 #include <Storages/System/StorageSystemMetrics.h>
 #include <Storages/System/StorageSystemHistogramMetrics.h>
@@ -103,6 +105,7 @@
 #include <Storages/System/StorageSystemViewRefreshes.h>
 #include <Storages/System/StorageSystemDNSCache.h>
 #include <Storages/System/StorageSystemIcebergHistory.h>
+#include <Storages/System/StorageSystemExports.h>
 #include <Interpreters/Context.h>
 
 #include <Poco/Util/LayeredConfiguration.h>
@@ -127,6 +130,11 @@
 namespace DB
 {
 
+namespace ServerSetting
+{
+    extern const ServerSettingsBool enable_experimental_export_merge_tree_partition_feature;
+}
+
 void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, bool has_zookeeper)
 {
     attachNoDescription<StorageSystemOne>(context, system_database, "one", "This table contains a single row with a single dummy UInt8 column containing the value 0. Used when the table is not specified explicitly, for example in queries like `SELECT 1`.");
@@ -208,6 +216,11 @@ void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, b
     attach<StorageSystemDimensionalMetrics>(context, system_database, "dimensional_metrics", "Contains dimensional metrics, which have multiple dimensions (labels) to provide more granular information. For example, counting failed merges by their error code. This table is always up to date.");
     attach<StorageSystemMerges>(context, system_database, "merges", "Contains a list of merges currently executing merges of MergeTree tables and their progress. Each merge operation is represented by a single row.");
     attach<StorageSystemMoves>(context, system_database, "moves", "Contains information about in-progress data part moves of MergeTree tables. Each data part movement is represented by a single row.");
+    attach<StorageSystemExports>(context, system_database, "exports", "Contains a list of exports currently executing exports of MergeTree tables and their progress. Each export operation is represented by a single row.");
+    if (context->getServerSettings()[ServerSetting::enable_experimental_export_merge_tree_partition_feature])
+    {
+        attach<StorageSystemReplicatedPartitionExports>(context, system_database, "replicated_partition_exports", "Contains a list of partition exports of ReplicatedMergeTree tables and their progress. Each export operation is represented by a single row.");
+    }
     attach<StorageSystemMutations>(context, system_database, "mutations", "Contains a list of mutations and their progress. Each mutation command is represented by a single row.");
     attachNoDescription<StorageSystemReplicas>(context, system_database, "replicas", "Contains information and status of all table replicas on current server. Each replica is represented by a single row.");
     attach<StorageSystemReplicationQueue>(context, system_database, "replication_queue", "Contains information about tasks from replication queues stored in ClickHouse Keeper, or ZooKeeper, for each table replica.");
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index d2c201b4219f..bd0db1f52248 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -23,6 +23,7 @@
 #include <Parsers/ASTSubquery.h>
 
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/FilterDescription.h>
@@ -64,7 +65,7 @@ namespace DB
 namespace VirtualColumnUtils
 {
 
-void buildSetsForDAG(const ActionsDAG & dag, const ContextPtr & context)
+void buildSetsForDagImpl(const ActionsDAG & dag, const ContextPtr & context, bool ordered)
 {
     for (const auto & node : dag.getNodes())
     {
@@ -80,13 +81,28 @@ void buildSetsForDAG(const ActionsDAG & dag, const ContextPtr & context)
                 if (!future_set->get())
                 {
                     if (auto * set_from_subquery = typeid_cast<FutureSetFromSubquery *>(future_set.get()))
-                        set_from_subquery->buildSetInplace(context);
+                    {
+                        if (ordered)
+                            set_from_subquery->buildOrderedSetInplace(context);
+                        else
+                            set_from_subquery->buildSetInplace(context);
+                    }
                 }
             }
         }
     }
 }
 
+void buildSetsForDAG(const ActionsDAG & dag, const ContextPtr & context)
+{
+    buildSetsForDagImpl(dag, context, /* ordered = */ false);
+}
+
+void buildOrderedSetsForDAG(const ActionsDAG & dag, const ContextPtr & context)
+{
+    buildSetsForDagImpl(dag, context, /* ordered = */ true);
+}
+
 ExpressionActionsPtr buildFilterExpression(ActionsDAG dag, ContextPtr context)
 {
     buildSetsForDAG(dag, context);
@@ -297,18 +313,23 @@ void addRequestedFileLikeStorageVirtualsToChunk(
         else if (virtual_column.name == "_row_number")
         {
 #if USE_PARQUET
-            auto chunk_info = chunk.getChunkInfos().get<ChunkInfoRowNumOffset>();
+            auto chunk_info = chunk.getChunkInfos().get<ChunkInfoRowNumbers>();
             if (chunk_info)
             {
                 size_t row_num_offset = chunk_info->row_num_offset;
+                const auto & applied_filter = chunk_info->applied_filter;
+                size_t num_indices = applied_filter.has_value() ? applied_filter->size() : chunk.getNumRows();
                 auto column = ColumnInt64::create();
-                for (size_t i = 0; i < chunk.getNumRows(); ++i)
-                    column->insertValue(i + row_num_offset);
-                chunk.addColumn(std::move(column));
+                for (size_t i = 0; i < num_indices; ++i)
+                    if (!applied_filter.has_value() || applied_filter.value()[i])
+                        column->insertValue(i + row_num_offset);
+                auto null_map = ColumnUInt8::create(chunk.getNumRows(), 0);
+                chunk.addColumn(ColumnNullable::create(std::move(column), std::move(null_map)));
                 return;
             }
 #endif
-            chunk.addColumn(virtual_column.type->createColumnConst(chunk.getNumRows(), -1)->convertToFullColumnIfConst());
+            /// Row numbers not known, _row_number = NULL.
+            chunk.addColumn(virtual_column.type->createColumnConstWithDefaultValue(chunk.getNumRows())->convertToFullColumnIfConst());
         }
     }
 }
diff --git a/src/Storages/VirtualColumnUtils.h b/src/Storages/VirtualColumnUtils.h
index 6dd4cd00054b..7c8829080eb3 100644
--- a/src/Storages/VirtualColumnUtils.h
+++ b/src/Storages/VirtualColumnUtils.h
@@ -40,6 +40,9 @@ void filterBlockWithExpression(const ExpressionActionsPtr & actions, Block & blo
 /// Builds sets used by ActionsDAG inplace.
 void buildSetsForDAG(const ActionsDAG & dag, const ContextPtr & context);
 
+/// Builds ordered sets used by ActionsDAG inplace.
+void buildOrderedSetsForDAG(const ActionsDAG & dag, const ContextPtr & context);
+
 /// Checks if all functions used in DAG are deterministic.
 bool isDeterministic(const ActionsDAG::Node * node);
 
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index c2ed28a648b4..ea37616d4686 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -646,10 +646,6 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
 
     builder = select.buildQueryPipeline();
 
-    builder.addSimpleTransform([&](const SharedHeader & current_header)
-    {
-        return std::make_shared<MaterializingTransform>(current_header);
-    });
     builder.addSimpleTransform(
         [&](const SharedHeader & current_header)
         {
diff --git a/src/Storages/extractKeyExpressionList.cpp b/src/Storages/extractKeyExpressionList.cpp
index 5f9d73bf533c..1a7c37c58b93 100644
--- a/src/Storages/extractKeyExpressionList.cpp
+++ b/src/Storages/extractKeyExpressionList.cpp
@@ -21,7 +21,7 @@ namespace DB
 
         /// Primary key consists of one column.
         auto res = std::make_shared<ASTExpressionList>();
-        res->children.push_back(node);
+        res->children.push_back(node->clone());
         return res;
     }
 }
diff --git a/src/Storages/extractTableFunctionFromSelectQuery.cpp b/src/Storages/extractTableFunctionFromSelectQuery.cpp
index 57302036c889..064f538eeae7 100644
--- a/src/Storages/extractTableFunctionFromSelectQuery.cpp
+++ b/src/Storages/extractTableFunctionFromSelectQuery.cpp
@@ -9,7 +9,7 @@
 namespace DB
 {
 
-ASTFunction * extractTableFunctionFromSelectQuery(ASTPtr & query)
+ASTTableExpression * extractTableExpressionASTPtrFromSelectQuery(ASTPtr & query)
 {
     auto * select_query = query->as<ASTSelectQuery>();
     if (!select_query || !select_query->tables())
@@ -17,10 +17,36 @@ ASTFunction * extractTableFunctionFromSelectQuery(ASTPtr & query)
 
     auto * tables = select_query->tables()->as<ASTTablesInSelectQuery>();
     auto * table_expression = tables->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression->as<ASTTableExpression>();
-    if (!table_expression->table_function)
+    return table_expression;
+}
+
+ASTPtr extractTableFunctionASTPtrFromSelectQuery(ASTPtr & query)
+{
+    auto table_expression = extractTableExpressionASTPtrFromSelectQuery(query);
+    return table_expression ? table_expression->table_function : nullptr;
+}
+
+ASTPtr extractTableASTPtrFromSelectQuery(ASTPtr & query)
+{
+    auto table_expression = extractTableExpressionASTPtrFromSelectQuery(query);
+    return table_expression ? table_expression->database_and_table_name : nullptr;
+}
+
+ASTFunction * extractTableFunctionFromSelectQuery(ASTPtr & query)
+{
+    auto table_function_ast = extractTableFunctionASTPtrFromSelectQuery(query);
+    if (!table_function_ast)
         return nullptr;
 
-    return table_expression->table_function->as<ASTFunction>();
+    return table_function_ast->as<ASTFunction>();
+}
+
+ASTExpressionList * extractTableFunctionArgumentsFromSelectQuery(ASTPtr & query)
+{
+    auto * table_function = extractTableFunctionFromSelectQuery(query);
+    if (!table_function)
+        return nullptr;
+    return table_function->arguments->as<ASTExpressionList>();
 }
 
 }
diff --git a/src/Storages/extractTableFunctionFromSelectQuery.h b/src/Storages/extractTableFunctionFromSelectQuery.h
index c69cc7ce6c52..2a845477df82 100644
--- a/src/Storages/extractTableFunctionFromSelectQuery.h
+++ b/src/Storages/extractTableFunctionFromSelectQuery.h
@@ -1,12 +1,17 @@
 #pragma once
 
 #include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTExpressionList.h>
 
 namespace DB
 {
+struct ASTTableExpression;
 
+ASTTableExpression * extractTableExpressionASTPtrFromSelectQuery(ASTPtr & query);
+ASTPtr extractTableFunctionASTPtrFromSelectQuery(ASTPtr & query);
+ASTPtr extractTableASTPtrFromSelectQuery(ASTPtr & query);
 ASTFunction * extractTableFunctionFromSelectQuery(ASTPtr & query);
+ASTExpressionList * extractTableFunctionArgumentsFromSelectQuery(ASTPtr & query);
 
 }
diff --git a/src/Storages/prepareReadingFromFormat.cpp b/src/Storages/prepareReadingFromFormat.cpp
index 16df4688d340..e84005511bb4 100644
--- a/src/Storages/prepareReadingFromFormat.cpp
+++ b/src/Storages/prepareReadingFromFormat.cpp
@@ -46,15 +46,17 @@ ReadFromFormatInfo prepareReadingFromFormat(
             columns_to_read.push_back(column_name);
     }
 
-    /// Create header for Source that will contain all requested columns including virtual and hive columns at the end
-    /// (because they will be added to the chunk after reading regular columns).
     info.source_header = storage_snapshot->getSampleBlockForColumns(columns_to_read);
-    for (const auto & requested_virtual_column : info.requested_virtual_columns)
-        info.source_header.insert({requested_virtual_column.type->createColumn(), requested_virtual_column.type, requested_virtual_column.name});
 
+    /// Create header for Source that will contain all requested columns including hive columns (which should be part of the schema) and virtual at the end
+    /// (because they will be added to the chunk after reading regular columns).
+    /// The order is important, hive partition columns must be added before virtual columns because they are part of the schema
     for (const auto & column_from_file_path : info.hive_partition_columns_to_read_from_file_path)
         info.source_header.insert({column_from_file_path.type->createColumn(), column_from_file_path.type, column_from_file_path.name});
 
+    for (const auto & requested_virtual_column : info.requested_virtual_columns)
+        info.source_header.insert({requested_virtual_column.type->createColumn(), requested_virtual_column.type, requested_virtual_column.name});
+
     /// Set requested columns that should be read from data.
     info.requested_columns = storage_snapshot->getColumnsByNames(GetColumnsOptions(GetColumnsOptions::All).withSubcolumns(), columns_to_read);
 
@@ -232,7 +234,12 @@ ReadFromFormatInfo prepareReadingFromFormat(
     }
 
     /// Create header for InputFormat with columns that will be read from the data.
-    info.format_header = storage_snapshot->getSampleBlockForColumns(info.columns_description.getNamesOfPhysical());
+    for (const auto & column : info.columns_description)
+    {
+        /// Never read hive partition columns from the data file. This fixes https://github.com/ClickHouse/ClickHouse/issues/87515
+        if (!hive_parameters.hive_partition_columns_to_read_from_file_path_map.contains(column.name))
+            info.format_header.insert(ColumnWithTypeAndName{column.type, column.name});
+    }
 
     info.serialization_hints = getSerializationHintsForFileLikeStorage(storage_snapshot->metadata, context);
 
@@ -315,6 +322,8 @@ void ReadFromFormatInfo::serialize(IQueryPlanStep::Serialization & ctx) const
     requested_virtual_columns.writeTextWithNamesInStorage(ctx.out);
     serialization_hints.writeJSON(ctx.out);
 
+    ctx.out << "\n";
+
     hive_partition_columns_to_read_from_file_path.writeTextWithNamesInStorage(ctx.out);
     writeBinary(prewhere_info != nullptr, ctx.out);
     if (prewhere_info != nullptr)
@@ -352,6 +361,8 @@ ReadFromFormatInfo ReadFromFormatInfo::deserialize(IQueryPlanStep::Deserializati
     readString(json, ctx.in);
     result.serialization_hints = SerializationInfoByName::readJSONFromString(result.columns_description.getAll(), SerializationInfoSettings{}, json);
 
+    ctx.in >> "\n";
+
     result.hive_partition_columns_to_read_from_file_path.readTextWithNamesInStorage(ctx.in);
     bool has_prewhere_info;
     readBinary(has_prewhere_info, ctx.in);
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
index 3d050fb9633b..74cb706cccec 100644
--- a/src/Storages/registerStorages.cpp
+++ b/src/Storages/registerStorages.cpp
@@ -13,6 +13,7 @@ void registerStorageNull(StorageFactory & factory);
 void registerStorageMerge(StorageFactory & factory);
 void registerStorageBuffer(StorageFactory & factory);
 void registerStorageDistributed(StorageFactory & factory);
+void registerStorageHybrid(StorageFactory & factory);
 void registerStorageMemory(StorageFactory & factory);
 void registerStorageFile(StorageFactory & factory);
 void registerStorageURL(StorageFactory & factory);
@@ -122,6 +123,7 @@ void registerStorages()
     registerStorageMerge(factory);
     registerStorageBuffer(factory);
     registerStorageDistributed(factory);
+    registerStorageHybrid(factory);
     registerStorageMemory(factory);
     registerStorageFile(factory);
     registerStorageURL(factory);
diff --git a/src/Storages/tests/gtest_delta_kernel.cpp b/src/Storages/tests/gtest_delta_kernel.cpp
index bd1900304887..a3e36c53f6e6 100644
--- a/src/Storages/tests/gtest_delta_kernel.cpp
+++ b/src/Storages/tests/gtest_delta_kernel.cpp
@@ -1,9 +1,10 @@
 #include "config.h"
 
+#include <gtest/gtest.h>
+
 #if USE_DELTA_KERNEL_RS
 
 #include <base/scope_guard.h>
-#include <gtest/gtest.h>
 #include <Common/tests/gtest_global_context.h>
 #include <Common/tests/gtest_global_register.h>
 #include <Common/logger_useful.h>
@@ -69,3 +70,19 @@ TEST_F(DeltaKernelTest, ExpressionVisitor)
 }
 
 #endif
+
+#if USE_PARQUET
+
+#include <Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <Core/Field.h>
+
+/// Regression test for segfault
+TEST(DeltaLakeMetadata, GetFieldValueNullableDateTime64)
+{
+    auto nullable_datetime64_type = std::make_shared<DB::DataTypeNullable>(std::make_shared<DB::DataTypeDateTime64>(6, "UTC"));
+    ASSERT_NO_THROW(DB::DeltaLakeMetadata::getFieldValue("2024-01-15 10:30:45.123456", nullable_datetime64_type));
+}
+
+#endif
diff --git a/src/TableFunctions/ITableFunction.cpp b/src/TableFunctions/ITableFunction.cpp
index 3f59a8c48a11..8fc0211417bd 100644
--- a/src/TableFunctions/ITableFunction.cpp
+++ b/src/TableFunctions/ITableFunction.cpp
@@ -44,7 +44,7 @@ StoragePtr ITableFunction::execute(const ASTPtr & ast_function, ContextPtr conte
         if (is_insert_query)
             type_to_check = AccessType::WRITE;
 
-        context->getAccess()->checkAccessWithFilter(type_to_check, toStringSource(*access_object), getFunctionURI());
+        context->getAccess()->checkAccessWithFilter(type_to_check, toStringSource(*access_object), getFunctionURINormalized());
     }
 
     auto table_function_properties = TableFunctionFactory::instance().tryGetProperties(getName());
diff --git a/src/TableFunctions/ITableFunction.h b/src/TableFunctions/ITableFunction.h
index b3701915a3b5..f60ffd005c8b 100644
--- a/src/TableFunctions/ITableFunction.h
+++ b/src/TableFunctions/ITableFunction.h
@@ -78,7 +78,7 @@ class ITableFunction : public std::enable_shared_from_this<ITableFunction>
 
     virtual bool supportsReadingSubsetOfColumns(const ContextPtr &) { return true; }
 
-    virtual bool canBeUsedToCreateTable() const { return true; }
+    virtual void validateUseToCreateTable() const {}
 
     // INSERT INTO TABLE FUNCTION ... PARTITION BY
     // Set partition by expression so `ITableFunctionObjectStorage` can construct a proper representation
@@ -106,6 +106,8 @@ class ITableFunction : public std::enable_shared_from_this<ITableFunction>
     /// For example for s3Cluster the database storage name is S3Cluster, and we need to check
     /// privileges as if it was S3.
     virtual const char * getNonClusteredStorageEngineName() const;
+
+protected:
     /// The URI of function for permission checking. Can be empty string if not applicable.
     /// For example for url('https://foo.bar') URI would be 'https://foo.bar'.
     virtual const String & getFunctionURI() const
@@ -113,6 +115,20 @@ class ITableFunction : public std::enable_shared_from_this<ITableFunction>
         static const String empty;
         return empty;
     }
+
+    String getFunctionURINormalized() const
+    {
+        try
+        {
+            Poco::URI uri(getFunctionURI());
+            uri.normalize();
+            return uri.toString();
+        }
+        catch (const Poco::Exception &)
+        {
+            return "";
+        }
+    }
 };
 
 /// Properties of table function that are independent of argument types and parameters.
diff --git a/src/TableFunctions/ITableFunctionCluster.h b/src/TableFunctions/ITableFunctionCluster.h
index 5345e1a0f0db..975322d054b3 100644
--- a/src/TableFunctions/ITableFunctionCluster.h
+++ b/src/TableFunctions/ITableFunctionCluster.h
@@ -16,6 +16,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int CLUSTER_DOESNT_EXIST;
     extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
 /// Base class for *Cluster table functions that require cluster_name for the first argument.
@@ -46,9 +47,13 @@ class ITableFunctionCluster : public Base
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected table function name: {}", table_function->name);
     }
 
-    bool canBeUsedToCreateTable() const override { return false; }
     bool isClusterFunction() const override { return true; }
 
+    void validateUseToCreateTable() const override
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function '{}' cannot be used to create a table", getName());
+    }
+
 protected:
     void parseArguments(const ASTPtr & ast, ContextPtr context) override
     {
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index 6904f26b2878..810ba5c49a3b 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -62,8 +62,6 @@ class ITableFunctionXDBC : public ITableFunction
 
     void startBridgeIfNot(ContextPtr context) const;
 
-    const String & getFunctionURI() const override { return connection_string; }
-
     String connection_string;
     String schema_name;
     String remote_table_name;
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 27ea162be3b6..0d6a6ab176a2 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -11,6 +11,7 @@
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Formats/FormatFactory.h>
+#include <Storages/HivePartitioningUtils.h>
 
 
 namespace DB
@@ -114,9 +115,22 @@ ColumnsDescription TableFunctionFile::getActualTableStructure(ContextPtr context
             archive_info
                 = StorageFile::getArchiveInfo(path_to_archive, filename, context->getUserFilesPath(), context, total_bytes_to_read);
 
+        ColumnsDescription columns;
         if (format == "auto")
-            return StorageFile::getTableStructureAndFormatFromFile(paths, compression_method, std::nullopt, context, archive_info).first;
-        return StorageFile::getTableStructureFromFile(format, paths, compression_method, std::nullopt, context, archive_info);
+            columns = StorageFile::getTableStructureAndFormatFromFile(paths, compression_method, std::nullopt, context, archive_info).first;
+        else
+            columns = StorageFile::getTableStructureFromFile(format, paths, compression_method, std::nullopt, context, archive_info);
+
+        auto sample_path = paths.empty() ? String{} : paths.front();
+
+        HivePartitioningUtils::setupHivePartitioningForFileURLLikeStorage(
+            columns,
+            sample_path,
+            /* inferred_schema */ true,
+            /* format_settings */ std::nullopt,
+            context);
+
+        return columns;
     }
 
     return parseColumnsListFromString(structure, context);
diff --git a/src/TableFunctions/TableFunctionLoop.cpp b/src/TableFunctions/TableFunctionLoop.cpp
index 258a7c2f3b65..3fe18ea962f0 100644
--- a/src/TableFunctions/TableFunctionLoop.cpp
+++ b/src/TableFunctions/TableFunctionLoop.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include <Access/Common/AccessFlags.h>
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/Context.h>
@@ -118,6 +119,7 @@ namespace DB
             storage = database->tryGetTable(loop_table_name, context);
             if (!storage)
                 throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table '{}' not found in database '{}'", loop_table_name, database_name);
+            context->checkAccess(AccessType::SELECT, database_name, loop_table_name);
         }
         else
         {
diff --git a/src/TableFunctions/TableFunctionObjectStorage.cpp b/src/TableFunctions/TableFunctionObjectStorage.cpp
index 7ddf06b40319..3cb5f26be4c1 100644
--- a/src/TableFunctions/TableFunctionObjectStorage.cpp
+++ b/src/TableFunctions/TableFunctionObjectStorage.cpp
@@ -25,7 +25,7 @@
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeStorageSettings.h>
-
+#include <Storages/HivePartitioningUtils.h>
 
 namespace DB
 {
@@ -125,7 +125,7 @@ template <typename Definition, typename Configuration, bool is_data_lake>
 ColumnsDescription TableFunctionObjectStorage<
     Definition, Configuration, is_data_lake>::getActualTableStructure(ContextPtr context, bool is_insert_query) const
 {
-    if (configuration->structure == "auto")
+    if (configuration->getStructure() == "auto")
     {
         if (const auto access_object = getSourceAccessObject())
             context->checkAccess(AccessType::READ, toStringSource(*access_object));
@@ -141,16 +141,23 @@ ColumnsDescription TableFunctionObjectStorage<
         ColumnsDescription columns;
         resolveSchemaAndFormat(
             columns,
-            configuration->format,
             std::move(storage),
             configuration,
             /* format_settings */std::nullopt,
             sample_path,
             context);
 
+        HivePartitioningUtils::setupHivePartitioningForObjectStorage(
+            columns,
+            configuration,
+            sample_path,
+            /* inferred_schema */ true,
+            /* format_settings */ std::nullopt,
+            context);
+
         return columns;
     }
-    return parseColumnsListFromString(configuration->structure, context);
+    return parseColumnsListFromString(configuration->getStructure(), context);
 }
 
 template <typename Definition, typename Configuration, bool is_data_lake>
@@ -164,8 +171,8 @@ StoragePtr TableFunctionObjectStorage<Definition, Configuration, is_data_lake>::
     chassert(configuration);
     ColumnsDescription columns;
 
-    if (configuration->structure != "auto")
-        columns = parseColumnsListFromString(configuration->structure, context);
+    if (configuration->getStructure() != "auto")
+        columns = parseColumnsListFromString(configuration->getStructure(), context);
     else if (!structure_hint.empty())
         columns = structure_hint;
     else if (!cached_columns.empty())
@@ -183,6 +190,10 @@ StoragePtr TableFunctionObjectStorage<Definition, Configuration, is_data_lake>::
 
     const auto is_secondary_query = context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
 
+    bool can_use_distributed_iterator =
+        client_info.collaborate_with_initiator &&
+        context->hasClusterFunctionReadTaskCallback();
+
     if (can_use_parallel_replicas && !is_secondary_query && !is_insert_query)
     {
         storage = std::make_shared<StorageObjectStorageCluster>(
@@ -193,16 +204,21 @@ StoragePtr TableFunctionObjectStorage<Definition, Configuration, is_data_lake>::
             columns,
             ConstraintsDescription{},
             partition_by,
-            context);
+            context,
+            /* comment */ String{},
+            /* format_settings */ std::nullopt, /// No format_settings
+            /* mode */ LoadingStrictnessLevel::CREATE,
+            configuration->getCatalog(context, /* attach */ false),
+            /* if_not_exists */ false,
+            /* is_datalake_query */ false,
+            /* distributed_processing */ can_use_distributed_iterator,
+            /* is_table_function */ true,
+            /* lazy_init */ false);
 
         storage->startup();
         return storage;
     }
 
-    bool can_use_distributed_iterator =
-        client_info.collaborate_with_initiator &&
-        context->hasClusterFunctionReadTaskCallback();
-
     storage = std::make_shared<StorageObjectStorage>(
         configuration,
         getObjectStorage(context, !is_insert_query),
@@ -228,18 +244,7 @@ void registerTableFunctionObjectStorage(TableFunctionFactory & factory)
 {
     UNUSED(factory);
 #if USE_AWS_S3
-    factory.registerFunction<TableFunctionObjectStorage<S3Definition, StorageS3Configuration>>(
-    {
-        .documentation =
-        {
-            .description=R"(The table function can be used to read the data stored on AWS S3.)",
-            .examples{{S3Definition::name, "SELECT * FROM s3(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction
-        },
-        .allow_readonly = false
-    });
-
-    factory.registerFunction<TableFunctionObjectStorage<GCSDefinition, StorageS3Configuration>>(
+    factory.registerFunction<TableFunctionObjectStorage<GCSDefinition, StorageS3Configuration, false>>(
     {
         .documentation =
         {
@@ -250,7 +255,7 @@ void registerTableFunctionObjectStorage(TableFunctionFactory & factory)
         .allow_readonly = false
     });
 
-    factory.registerFunction<TableFunctionObjectStorage<COSNDefinition, StorageS3Configuration>>(
+    factory.registerFunction<TableFunctionObjectStorage<COSNDefinition, StorageS3Configuration, false>>(
     {
         .documentation =
         {
@@ -261,7 +266,7 @@ void registerTableFunctionObjectStorage(TableFunctionFactory & factory)
         .allow_readonly = false
     });
 
-    factory.registerFunction<TableFunctionObjectStorage<OSSDefinition, StorageS3Configuration>>(
+    factory.registerFunction<TableFunctionObjectStorage<OSSDefinition, StorageS3Configuration, false>>(
     {
         .documentation =
         {
@@ -272,58 +277,29 @@ void registerTableFunctionObjectStorage(TableFunctionFactory & factory)
         .allow_readonly = false
     });
 #endif
-
-#if USE_AZURE_BLOB_STORAGE
-    factory.registerFunction<TableFunctionObjectStorage<AzureDefinition, StorageAzureConfiguration>>(
-    {
-        .documentation =
-        {
-            .description=R"(The table function can be used to read the data stored on Azure Blob Storage.)",
-            .examples{
-            {
-                AzureDefinition::name,
-                "SELECT * FROM  azureBlobStorage(connection_string|storage_account_url, container_name, blobpath, "
-                "[account_name, account_key, format, compression, structure])", ""
-            }},
-            .category = FunctionDocumentation::Category::TableFunction
-        },
-        .allow_readonly = false
-    });
-#endif
-#if USE_HDFS
-    factory.registerFunction<TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration>>(
-    {
-        .documentation =
-        {
-            .description=R"(The table function can be used to read the data stored on HDFS virtual filesystem.)",
-            .examples{
-            {
-                HDFSDefinition::name,
-                "SELECT * FROM  hdfs(url, format, compression, structure])", ""
-            }},
-            .category = FunctionDocumentation::Category::TableFunction
-        },
-        .allow_readonly = false
-    });
-#endif
 }
 
 #if USE_AZURE_BLOB_STORAGE
-template class TableFunctionObjectStorage<AzureDefinition, StorageAzureConfiguration>;
-template class TableFunctionObjectStorage<AzureClusterDefinition, StorageAzureConfiguration>;
+template class TableFunctionObjectStorage<AzureDefinition, StorageAzureConfiguration, false>;
+template class TableFunctionObjectStorage<AzureClusterDefinition, StorageAzureConfiguration, false>;
 #endif
 
 #if USE_AWS_S3
-template class TableFunctionObjectStorage<S3Definition, StorageS3Configuration>;
-template class TableFunctionObjectStorage<S3ClusterDefinition, StorageS3Configuration>;
-template class TableFunctionObjectStorage<GCSDefinition, StorageS3Configuration>;
-template class TableFunctionObjectStorage<COSNDefinition, StorageS3Configuration>;
-template class TableFunctionObjectStorage<OSSDefinition, StorageS3Configuration>;
+template class TableFunctionObjectStorage<S3Definition, StorageS3Configuration, false>;
+template class TableFunctionObjectStorage<S3ClusterDefinition, StorageS3Configuration, false>;
+template class TableFunctionObjectStorage<GCSDefinition, StorageS3Configuration, false>;
+template class TableFunctionObjectStorage<COSNDefinition, StorageS3Configuration, false>;
+template class TableFunctionObjectStorage<OSSDefinition, StorageS3Configuration, false>;
 #endif
 
 #if USE_HDFS
-template class TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration>;
-template class TableFunctionObjectStorage<HDFSClusterDefinition, StorageHDFSConfiguration>;
+template class TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration, false>;
+template class TableFunctionObjectStorage<HDFSClusterDefinition, StorageHDFSConfiguration, false>;
+#endif
+
+#if USE_AVRO
+template class TableFunctionObjectStorage<IcebergClusterDefinition, StorageIcebergConfiguration, true>;
+template class TableFunctionObjectStorage<IcebergLocalClusterDefinition, StorageLocalIcebergConfiguration, true>;
 #endif
 
 #if USE_AVRO && USE_AWS_S3
@@ -340,6 +316,11 @@ template class TableFunctionObjectStorage<IcebergHDFSClusterDefinition, StorageH
 
 #if USE_PARQUET && USE_AWS_S3 && USE_DELTA_KERNEL_RS
 template class TableFunctionObjectStorage<DeltaLakeClusterDefinition, StorageS3DeltaLakeConfiguration, true>;
+template class TableFunctionObjectStorage<DeltaLakeS3ClusterDefinition, StorageS3DeltaLakeConfiguration, true>;
+#endif
+
+#if USE_PARQUET && USE_AWS_S3 && USE_DELTA_KERNEL_RS
+template class TableFunctionObjectStorage<DeltaLakeAzureClusterDefinition, StorageAzureDeltaLakeConfiguration, true>;
 #endif
 
 #if USE_AWS_S3
@@ -349,37 +330,6 @@ template class TableFunctionObjectStorage<HudiClusterDefinition, StorageS3HudiCo
 #if USE_AVRO
 void registerTableFunctionIceberg(TableFunctionFactory & factory)
 {
-#if USE_AWS_S3
-    factory.registerFunction<TableFunctionIceberg>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on S3 object store. Alias to icebergS3)",
-            .examples{{IcebergDefinition::name, "SELECT * FROM iceberg(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-    factory.registerFunction<TableFunctionIcebergS3>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on S3 object store.)",
-            .examples{{IcebergS3Definition::name, "SELECT * FROM icebergS3(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-
-#endif
-#if USE_AZURE_BLOB_STORAGE
-    factory.registerFunction<TableFunctionIcebergAzure>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on Azure object store.)",
-            .examples{{IcebergAzureDefinition::name, "SELECT * FROM icebergAzure(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-#endif
-#if USE_HDFS
-    factory.registerFunction<TableFunctionIcebergHDFS>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on HDFS virtual filesystem.)",
-            .examples{{IcebergHDFSDefinition::name, "SELECT * FROM icebergHDFS(url)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-#endif
     factory.registerFunction<TableFunctionIcebergLocal>(
         {.documentation
          = {.description = R"(The table function can be used to read the Iceberg table stored locally.)",
@@ -388,70 +338,4 @@ void registerTableFunctionIceberg(TableFunctionFactory & factory)
          .allow_readonly = false});
 }
 #endif
-
-
-#if USE_PARQUET && USE_DELTA_KERNEL_RS
-void registerTableFunctionDeltaLake(TableFunctionFactory & factory)
-{
-#if USE_AWS_S3
-    factory.registerFunction<TableFunctionDeltaLake>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the DeltaLake table stored on S3, alias of deltaLakeS3.)",
-            .examples{{DeltaLakeDefinition::name, "SELECT * FROM deltaLake(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-
-    factory.registerFunction<TableFunctionDeltaLakeS3>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the DeltaLake table stored on S3.)",
-            .examples{{DeltaLakeS3Definition::name, "SELECT * FROM deltaLakeS3(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-#endif
-
-#if USE_AZURE_BLOB_STORAGE
-    factory.registerFunction<TableFunctionDeltaLakeAzure>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the DeltaLake table stored on Azure object store.)",
-            .examples{{DeltaLakeAzureDefinition::name, "SELECT * FROM deltaLakeAzure(connection_string|storage_account_url, container_name, blobpath, \"\n"
- "                \"[account_name, account_key, format, compression, structure])", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-#endif
-    // Register the new local Delta Lake table function
-    factory.registerFunction<TableFunctionDeltaLakeLocal>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the DeltaLake table stored locally.)",
-            .examples{{DeltaLakeLocalDefinition::name, "SELECT * FROM deltaLakeLocal(path)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-}
-#endif
-
-#if USE_AWS_S3
-void registerTableFunctionHudi(TableFunctionFactory & factory)
-{
-    factory.registerFunction<TableFunctionHudi>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Hudi table stored on object store.)",
-            .examples{{HudiDefinition::name, "SELECT * FROM hudi(url, access_key_id, secret_access_key)", ""}},
-            .category = FunctionDocumentation::Category::TableFunction},
-         .allow_readonly = false});
-}
-#endif
-
-void registerDataLakeTableFunctions(TableFunctionFactory & factory)
-{
-    UNUSED(factory);
-#if USE_AVRO
-    registerTableFunctionIceberg(factory);
-#endif
-
-#if USE_PARQUET && USE_DELTA_KERNEL_RS
-    registerTableFunctionDeltaLake(factory);
-#endif
-#if USE_AWS_S3
-    registerTableFunctionHudi(factory);
-#endif
-}
 }
diff --git a/src/TableFunctions/TableFunctionObjectStorage.h b/src/TableFunctions/TableFunctionObjectStorage.h
index 0b56a747ffce..05b8b293d5d4 100644
--- a/src/TableFunctions/TableFunctionObjectStorage.h
+++ b/src/TableFunctions/TableFunctionObjectStorage.h
@@ -37,15 +37,16 @@ class TableFunctionObjectStorage : public ITableFunction
 
     String getName() const override { return name; }
 
-    bool hasStaticStructure() const override { return configuration->structure != "auto"; }
+    bool hasStaticStructure() const override { return configuration->getStructure() != "auto"; }
 
-    bool needStructureHint() const override { return configuration->structure == "auto"; }
+    bool needStructureHint() const override { return configuration->getStructure() == "auto"; }
 
     void setStructureHint(const ColumnsDescription & structure_hint_) override { structure_hint = structure_hint_; }
 
     bool supportsReadingSubsetOfColumns(const ContextPtr & context) override
     {
-        return configuration->format != "auto" && FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->format, context);
+        return configuration->getFormat() != "auto"
+            && FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->getFormat(), context);
     }
 
     std::unordered_set<String> getVirtualsToCheckBeforeUsingStructureHint() const override
@@ -55,7 +56,7 @@ class TableFunctionObjectStorage : public ITableFunction
 
     virtual void parseArgumentsImpl(ASTs & args, const ContextPtr & context)
     {
-        StorageObjectStorageConfiguration::initialize(*getConfiguration(), args, context, true);
+        getConfiguration()->initialize(args, context, true);
     }
 
     static void updateStructureAndFormatArgumentsIfNeeded(
@@ -67,8 +68,8 @@ class TableFunctionObjectStorage : public ITableFunction
         if constexpr (is_data_lake)
         {
             Configuration configuration(createEmptySettings());
-            if (configuration.format == "auto")
-                configuration.format = "Parquet"; /// Default format of data lakes.
+            if (configuration.getFormat() == "auto")
+                configuration.setFormat("Parquet"); /// Default format of data lakes.
 
             configuration.addStructureAndFormatToArgsIfNeeded(args, structure, format, context, /*with_structure=*/true);
         }
@@ -110,21 +111,22 @@ class TableFunctionObjectStorage : public ITableFunction
 };
 
 #if USE_AWS_S3
-using TableFunctionS3 = TableFunctionObjectStorage<S3Definition, StorageS3Configuration>;
+using TableFunctionS3 = TableFunctionObjectStorage<S3Definition, StorageS3Configuration, false>;
 #endif
 
 #if USE_AZURE_BLOB_STORAGE
-using TableFunctionAzureBlob = TableFunctionObjectStorage<AzureDefinition, StorageAzureConfiguration>;
+using TableFunctionAzureBlob = TableFunctionObjectStorage<AzureDefinition, StorageAzureConfiguration, false>;
 #endif
 
 #if USE_HDFS
-using TableFunctionHDFS = TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration>;
+using TableFunctionHDFS = TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration, false>;
 #endif
 
 
 #if USE_AVRO
+using TableFunctionIceberg = TableFunctionObjectStorage<IcebergDefinition, StorageIcebergConfiguration, true>;
+
 #    if USE_AWS_S3
-using TableFunctionIceberg = TableFunctionObjectStorage<IcebergDefinition, StorageS3IcebergConfiguration, true>;
 using TableFunctionIcebergS3 = TableFunctionObjectStorage<IcebergS3Definition, StorageS3IcebergConfiguration, true>;
 #    endif
 #    if USE_AZURE_BLOB_STORAGE
@@ -136,13 +138,13 @@ using TableFunctionIcebergHDFS = TableFunctionObjectStorage<IcebergHDFSDefinitio
 using TableFunctionIcebergLocal = TableFunctionObjectStorage<IcebergLocalDefinition, StorageLocalIcebergConfiguration, true>;
 #endif
 #if USE_PARQUET && USE_DELTA_KERNEL_RS
-#if USE_AWS_S3
+#    if USE_AWS_S3
 using TableFunctionDeltaLake = TableFunctionObjectStorage<DeltaLakeDefinition, StorageS3DeltaLakeConfiguration, true>;
 using TableFunctionDeltaLakeS3 = TableFunctionObjectStorage<DeltaLakeS3Definition, StorageS3DeltaLakeConfiguration, true>;
-#endif
-#if USE_AZURE_BLOB_STORAGE
+#    endif
+#    if USE_AZURE_BLOB_STORAGE
 using TableFunctionDeltaLakeAzure = TableFunctionObjectStorage<DeltaLakeAzureDefinition, StorageAzureDeltaLakeConfiguration, true>;
-#endif
+#    endif
 // New alias for local Delta Lake table function
 using TableFunctionDeltaLakeLocal = TableFunctionObjectStorage<DeltaLakeLocalDefinition, StorageLocalDeltaLakeConfiguration, true>;
 #endif
diff --git a/src/TableFunctions/TableFunctionObjectStorageCluster.cpp b/src/TableFunctions/TableFunctionObjectStorageCluster.cpp
index c636ad4a934c..206a51710509 100644
--- a/src/TableFunctions/TableFunctionObjectStorageCluster.cpp
+++ b/src/TableFunctions/TableFunctionObjectStorageCluster.cpp
@@ -22,8 +22,9 @@ StoragePtr TableFunctionObjectStorageCluster<Definition, Configuration, is_data_
     auto configuration = Base::getConfiguration();
 
     ColumnsDescription columns;
-    if (configuration->structure != "auto")
-        columns = parseColumnsListFromString(configuration->structure, context);
+
+    if (configuration->getStructure() != "auto")
+        columns = parseColumnsListFromString(configuration->getStructure(), context);
     else if (!Base::structure_hint.empty())
         columns = Base::structure_hint;
     else if (!cached_columns.empty())
@@ -69,7 +70,16 @@ StoragePtr TableFunctionObjectStorageCluster<Definition, Configuration, is_data_
             columns,
             ConstraintsDescription{},
             Base::partition_by,
-            context);
+            context,
+            /* comment */ String{},
+            /* format_settings */ std::nullopt, /// No format_settings
+            /* mode */ LoadingStrictnessLevel::CREATE,
+            /* catalog*/ nullptr,
+            /* if_not_exists */ false,
+            /* is_datalake_query */ false,
+            /* distributed_processing */ false,
+            /* is_table_function */ true,
+            /* lazy_init */ true);
     }
 
     storage->startup();
@@ -130,48 +140,90 @@ void registerTableFunctionIcebergCluster(TableFunctionFactory & factory)
 {
     UNUSED(factory);
 
-#if USE_AWS_S3
+    factory.registerFunction<TableFunctionIcebergCluster>(
+        {.documentation
+         = {.description = R"(The table function can be used to read the Iceberg table stored on any object store in parallel for many nodes in a specified cluster.)",
+            .examples{
+#   if USE_AWS_S3
+                {"icebergCluster", "SELECT * FROM icebergCluster(cluster, url, [, NOSIGN | access_key_id, secret_access_key, [session_token]], format, [,compression], storage_type='s3')", ""},
+#   endif
+#   if USE_AZURE_BLOB_STORAGE
+                {"icebergCluster", "SELECT * FROM icebergCluster(cluster, connection_string|storage_account_url, container_name, blobpath, [account_name, account_key, format, compression], storage_type='azure')", ""},
+#   endif
+#   if USE_HDFS
+                {"icebergCluster", "SELECT * FROM icebergCluster(cluster, uri, [format], [structure], [compression_method], storage_type='hdfs')", ""},
+#   endif
+            },
+            .category = FunctionDocumentation::Category::TableFunction},
+         .allow_readonly = false});
+
+    factory.registerFunction<TableFunctionIcebergLocalCluster>(
+        {.documentation
+         = {.description = R"(The table function can be used to read the Iceberg table stored on shared storage in parallel for many nodes in a specified cluster.)",
+            .examples{{IcebergLocalClusterDefinition::name, "SELECT * FROM icebergLocalCluster(cluster, filename, format, [,compression])", ""}},
+            .category = FunctionDocumentation::Category::TableFunction},
+         .allow_readonly = false});
+
+#   if USE_AWS_S3
     factory.registerFunction<TableFunctionIcebergS3Cluster>(
         {.documentation
          = {.description = R"(The table function can be used to read the Iceberg table stored on S3 object store in parallel for many nodes in a specified cluster.)",
             .examples{{IcebergS3ClusterDefinition::name, "SELECT * FROM icebergS3Cluster(cluster, url, [, NOSIGN | access_key_id, secret_access_key, [session_token]], format, [,compression])", ""}},
             .category = FunctionDocumentation::Category::TableFunction},
          .allow_readonly = false});
-#endif
+#   endif
 
-#if USE_AZURE_BLOB_STORAGE
+#   if USE_AZURE_BLOB_STORAGE
     factory.registerFunction<TableFunctionIcebergAzureCluster>(
         {.documentation
          = {.description = R"(The table function can be used to read the Iceberg table stored on Azure object store in parallel for many nodes in a specified cluster.)",
             .examples{{IcebergAzureClusterDefinition::name, "SELECT * FROM icebergAzureCluster(cluster, connection_string|storage_account_url, container_name, blobpath, [account_name, account_key, format, compression])", ""}},
             .category = FunctionDocumentation::Category::TableFunction},
          .allow_readonly = false});
-#endif
+#   endif
 
-#if USE_HDFS
+#   if USE_HDFS
     factory.registerFunction<TableFunctionIcebergHDFSCluster>(
         {.documentation
          = {.description = R"(The table function can be used to read the Iceberg table stored on HDFS virtual filesystem in parallel for many nodes in a specified cluster.)",
             .examples{{IcebergHDFSClusterDefinition::name, "SELECT * FROM icebergHDFSCluster(cluster, uri, [format], [structure], [compression_method])", ""}},
             .category = FunctionDocumentation::Category::TableFunction},
          .allow_readonly = false});
-#endif
+#   endif
 }
 #endif
 
-#if USE_AWS_S3
 #if USE_PARQUET && USE_DELTA_KERNEL_RS
 void registerTableFunctionDeltaLakeCluster(TableFunctionFactory & factory)
 {
+#   if USE_AWS_S3
     factory.registerFunction<TableFunctionDeltaLakeCluster>(
         {.documentation
          = {.description = R"(The table function can be used to read the DeltaLake table stored on object store in parallel for many nodes in a specified cluster.)",
             .examples{{DeltaLakeClusterDefinition::name, "SELECT * FROM deltaLakeCluster(cluster, url, access_key_id, secret_access_key)", ""}},
             .category = FunctionDocumentation::Category::TableFunction},
          .allow_readonly = false});
+
+    factory.registerFunction<TableFunctionDeltaLakeS3Cluster>(
+        {.documentation
+         = {.description = R"(The table function can be used to read the DeltaLake table stored on object store in parallel for many nodes in a specified cluster.)",
+            .examples{{DeltaLakeS3ClusterDefinition::name, "SELECT * FROM deltaLakeS3Cluster(cluster, url, access_key_id, secret_access_key)", ""}},
+            .category = FunctionDocumentation::Category::TableFunction},
+         .allow_readonly = false});
+#   endif
+
+#   if USE_AZURE_BLOB_STORAGE
+    factory.registerFunction<TableFunctionDeltaLakeAzureCluster>(
+        {.documentation
+         = {.description = R"(The table function can be used to read the DeltaLake table stored on object store in parallel for many nodes in a specified cluster.)",
+            .examples{{DeltaLakeAzureClusterDefinition::name, "SELECT * FROM deltaLakeAzureCluster(cluster, url, access_key_id, secret_access_key)", ""}},
+            .category = FunctionDocumentation::Category::TableFunction},
+         .allow_readonly = false});
+#   endif
 }
 #endif
 
+#if USE_AWS_S3
 void registerTableFunctionHudiCluster(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionHudiCluster>(
diff --git a/src/TableFunctions/TableFunctionObjectStorageCluster.h b/src/TableFunctions/TableFunctionObjectStorageCluster.h
index 7cafeb05b230..06044e480590 100644
--- a/src/TableFunctions/TableFunctionObjectStorageCluster.h
+++ b/src/TableFunctions/TableFunctionObjectStorageCluster.h
@@ -12,8 +12,6 @@ namespace DB
 
 class Context;
 
-class StorageS3Settings;
-class StorageAzureBlobSettings;
 class StorageS3Configuration;
 class StorageAzureConfiguration;
 
@@ -45,21 +43,26 @@ class TableFunctionObjectStorageCluster : public ITableFunctionCluster<TableFunc
 
     const char * getStorageEngineName() const override { return Definition::storage_engine_name; }
     const char * getNonClusteredStorageEngineName() const override { return Definition::non_clustered_storage_engine_name; }
-    bool hasStaticStructure() const override { return Base::getConfiguration()->structure != "auto"; }
-    bool needStructureHint() const override { return Base::getConfiguration()->structure == "auto"; }
+    bool hasStaticStructure() const override { return Base::getConfiguration()->getStructure() != "auto"; }
+    bool needStructureHint() const override { return Base::getConfiguration()->getStructure() == "auto"; }
     void setStructureHint(const ColumnsDescription & structure_hint_) override { Base::structure_hint = structure_hint_; }
 };
 
 #if USE_AWS_S3
-using TableFunctionS3Cluster = TableFunctionObjectStorageCluster<S3ClusterDefinition, StorageS3Configuration>;
+using TableFunctionS3Cluster = TableFunctionObjectStorageCluster<S3ClusterDefinition, StorageS3Configuration, false>;
 #endif
 
 #if USE_AZURE_BLOB_STORAGE
-using TableFunctionAzureBlobCluster = TableFunctionObjectStorageCluster<AzureClusterDefinition, StorageAzureConfiguration>;
+using TableFunctionAzureBlobCluster = TableFunctionObjectStorageCluster<AzureClusterDefinition, StorageAzureConfiguration, false>;
 #endif
 
 #if USE_HDFS
-using TableFunctionHDFSCluster = TableFunctionObjectStorageCluster<HDFSClusterDefinition, StorageHDFSConfiguration>;
+using TableFunctionHDFSCluster = TableFunctionObjectStorageCluster<HDFSClusterDefinition, StorageHDFSConfiguration, false>;
+#endif
+
+#if USE_AVRO
+using TableFunctionIcebergCluster = TableFunctionObjectStorageCluster<IcebergClusterDefinition, StorageIcebergConfiguration, true>;
+using TableFunctionIcebergLocalCluster = TableFunctionObjectStorageCluster<IcebergLocalClusterDefinition, StorageLocalIcebergConfiguration, true>;
 #endif
 
 #if USE_AVRO && USE_AWS_S3
@@ -76,6 +79,11 @@ using TableFunctionIcebergHDFSCluster = TableFunctionObjectStorageCluster<Iceber
 
 #if USE_AWS_S3 && USE_PARQUET && USE_DELTA_KERNEL_RS
 using TableFunctionDeltaLakeCluster = TableFunctionObjectStorageCluster<DeltaLakeClusterDefinition, StorageS3DeltaLakeConfiguration, true>;
+using TableFunctionDeltaLakeS3Cluster = TableFunctionObjectStorageCluster<DeltaLakeS3ClusterDefinition, StorageS3DeltaLakeConfiguration, true>;
+#endif
+
+#if USE_AZURE_BLOB_STORAGE && USE_PARQUET && USE_DELTA_KERNEL_RS
+using TableFunctionDeltaLakeAzureCluster = TableFunctionObjectStorageCluster<DeltaLakeAzureClusterDefinition, StorageAzureDeltaLakeConfiguration, true>;
 #endif
 
 #if USE_AWS_S3
diff --git a/src/TableFunctions/TableFunctionObjectStorageClusterFallback.cpp b/src/TableFunctions/TableFunctionObjectStorageClusterFallback.cpp
new file mode 100644
index 000000000000..0ec8b178f6a3
--- /dev/null
+++ b/src/TableFunctions/TableFunctionObjectStorageClusterFallback.cpp
@@ -0,0 +1,478 @@
+#include <Core/Settings.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionObjectStorageClusterFallback.h>
+#include <Common/typeid_cast.h>
+#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
+
+namespace DB
+{
+
+namespace Setting
+{
+    extern const SettingsString object_storage_cluster;
+}
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+}
+
+struct S3ClusterFallbackDefinition
+{
+    static constexpr auto name = "s3";
+    static constexpr auto storage_engine_name = "S3";
+    static constexpr auto storage_engine_cluster_name = "S3Cluster";
+};
+
+struct AzureClusterFallbackDefinition
+{
+    static constexpr auto name = "azureBlobStorage";
+    static constexpr auto storage_engine_name = "Azure";
+    static constexpr auto storage_engine_cluster_name = "AzureBlobStorageCluster";
+};
+
+struct HDFSClusterFallbackDefinition
+{
+    static constexpr auto name = "hdfs";
+    static constexpr auto storage_engine_name = "HDFS";
+    static constexpr auto storage_engine_cluster_name = "HDFSCluster";
+};
+
+struct IcebergClusterFallbackDefinition
+{
+    static constexpr auto name = "iceberg";
+    static constexpr auto storage_engine_name = "UNDEFINED";
+    static constexpr auto storage_engine_cluster_name = "IcebergCluster";
+};
+
+struct IcebergS3ClusterFallbackDefinition
+{
+    static constexpr auto name = "icebergS3";
+    static constexpr auto storage_engine_name = "S3";
+    static constexpr auto storage_engine_cluster_name = "IcebergS3Cluster";
+};
+
+struct IcebergAzureClusterFallbackDefinition
+{
+    static constexpr auto name = "icebergAzure";
+    static constexpr auto storage_engine_name = "Azure";
+    static constexpr auto storage_engine_cluster_name = "IcebergAzureCluster";
+};
+
+struct IcebergHDFSClusterFallbackDefinition
+{
+    static constexpr auto name = "icebergHDFS";
+    static constexpr auto storage_engine_name = "HDFS";
+    static constexpr auto storage_engine_cluster_name = "IcebergHDFSCluster";
+};
+
+struct IcebergLocalClusterFallbackDefinition
+{
+    static constexpr auto name = "icebergLocal";
+    static constexpr auto storage_engine_name = "Local";
+    static constexpr auto storage_engine_cluster_name = "IcebergLocalCluster";
+};
+
+struct DeltaLakeClusterFallbackDefinition
+{
+    static constexpr auto name = "deltaLake";
+    static constexpr auto storage_engine_name = "S3";
+    static constexpr auto storage_engine_cluster_name = "DeltaLakeS3Cluster";
+};
+
+struct DeltaLakeS3ClusterFallbackDefinition
+{
+    static constexpr auto name = "deltaLakeS3";
+    static constexpr auto storage_engine_name = "S3";
+    static constexpr auto storage_engine_cluster_name = "DeltaLakeS3Cluster";
+};
+
+struct DeltaLakeAzureClusterFallbackDefinition
+{
+    static constexpr auto name = "deltaLakeAzure";
+    static constexpr auto storage_engine_name = "Azure";
+    static constexpr auto storage_engine_cluster_name = "DeltaLakeAzureCluster";
+};
+
+struct HudiClusterFallbackDefinition
+{
+    static constexpr auto name = "hudi";
+    static constexpr auto storage_engine_name = "S3";
+    static constexpr auto storage_engine_cluster_name = "HudiS3Cluster";
+};
+
+template <typename Definition, typename Base>
+void TableFunctionObjectStorageClusterFallback<Definition, Base>::parseArgumentsImpl(ASTs & args, const ContextPtr & context)
+{
+    if (args.empty())
+        throw Exception(
+            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "The function {} should have arguments. The first argument must be the cluster name and the rest are the arguments of "
+            "corresponding table function",
+            getName());
+
+    const auto & settings = context->getSettingsRef();
+
+    is_cluster_function = !settings[Setting::object_storage_cluster].value.empty();
+
+    if (is_cluster_function)
+    {
+        ASTPtr cluster_name_arg = std::make_shared<ASTLiteral>(settings[Setting::object_storage_cluster].value);
+        args.insert(args.begin(), cluster_name_arg);
+        BaseCluster::parseArgumentsImpl(args, context);
+        args.erase(args.begin());
+    }
+    else
+        BaseSimple::parseArgumentsImpl(args, context); // NOLINT(bugprone-parent-virtual-call)
+}
+
+template <typename Definition, typename Base>
+StoragePtr TableFunctionObjectStorageClusterFallback<Definition, Base>::executeImpl(
+    const ASTPtr & ast_function,
+    ContextPtr context,
+    const std::string & table_name,
+    ColumnsDescription cached_columns,
+    bool is_insert_query) const
+{
+    if (is_cluster_function)
+    {
+        auto result = BaseCluster::executeImpl(ast_function, context, table_name, cached_columns, is_insert_query);
+        if (auto storage = typeid_cast<std::shared_ptr<StorageObjectStorageCluster>>(result))
+            storage->setClusterNameInSettings(true);
+        return result;
+    }
+    else
+        return BaseSimple::executeImpl(ast_function, context, table_name, cached_columns, is_insert_query); // NOLINT(bugprone-parent-virtual-call)
+}
+
+template <typename Definition, typename Base>
+void TableFunctionObjectStorageClusterFallback<Definition, Base>::validateUseToCreateTable() const
+{
+    if (is_cluster_function)
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Table function '{}' cannot be used to create a table in cluster mode",
+            getName());
+}
+
+#if USE_AWS_S3
+using TableFunctionS3ClusterFallback = TableFunctionObjectStorageClusterFallback<S3ClusterFallbackDefinition, TableFunctionS3Cluster>;
+#endif
+
+#if USE_AZURE_BLOB_STORAGE
+using TableFunctionAzureClusterFallback = TableFunctionObjectStorageClusterFallback<AzureClusterFallbackDefinition, TableFunctionAzureBlobCluster>;
+#endif
+
+#if USE_HDFS
+using TableFunctionHDFSClusterFallback = TableFunctionObjectStorageClusterFallback<HDFSClusterFallbackDefinition, TableFunctionHDFSCluster>;
+#endif
+
+#if USE_AVRO
+using TableFunctionIcebergClusterFallback = TableFunctionObjectStorageClusterFallback<IcebergClusterFallbackDefinition, TableFunctionIcebergCluster>;
+using TableFunctionIcebergLocalClusterFallback = TableFunctionObjectStorageClusterFallback<IcebergLocalClusterFallbackDefinition, TableFunctionIcebergLocalCluster>;
+#endif
+
+#if USE_AVRO && USE_AWS_S3
+using TableFunctionIcebergS3ClusterFallback = TableFunctionObjectStorageClusterFallback<IcebergS3ClusterFallbackDefinition, TableFunctionIcebergS3Cluster>;
+#endif
+
+#if USE_AVRO && USE_AZURE_BLOB_STORAGE
+using TableFunctionIcebergAzureClusterFallback = TableFunctionObjectStorageClusterFallback<IcebergAzureClusterFallbackDefinition, TableFunctionIcebergAzureCluster>;
+#endif
+
+#if USE_AVRO && USE_HDFS
+using TableFunctionIcebergHDFSClusterFallback = TableFunctionObjectStorageClusterFallback<IcebergHDFSClusterFallbackDefinition, TableFunctionIcebergHDFSCluster>;
+#endif
+
+#if USE_AWS_S3 && USE_PARQUET && USE_DELTA_KERNEL_RS
+using TableFunctionDeltaLakeClusterFallback = TableFunctionObjectStorageClusterFallback<DeltaLakeClusterFallbackDefinition, TableFunctionDeltaLakeCluster>;
+using TableFunctionDeltaLakeS3ClusterFallback = TableFunctionObjectStorageClusterFallback<DeltaLakeS3ClusterFallbackDefinition, TableFunctionDeltaLakeS3Cluster>;
+#endif
+
+#if USE_AZURE_BLOB_STORAGE && USE_PARQUET && USE_DELTA_KERNEL_RS
+using TableFunctionDeltaLakeAzureClusterFallback = TableFunctionObjectStorageClusterFallback<DeltaLakeAzureClusterFallbackDefinition, TableFunctionDeltaLakeAzureCluster>;
+#endif
+
+#if USE_AWS_S3
+using TableFunctionHudiClusterFallback = TableFunctionObjectStorageClusterFallback<HudiClusterFallbackDefinition, TableFunctionHudiCluster>;
+#endif
+
+void registerTableFunctionObjectStorageClusterFallback(TableFunctionFactory & factory)
+{
+    UNUSED(factory);
+#if USE_AWS_S3
+    factory.registerFunction<TableFunctionS3ClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the data stored on S3 in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {"s3", "SELECT * FROM s3(url, format, structure)", ""},
+                {"s3", "SELECT * FROM s3(url, format, structure) SETTINGS object_storage_cluster='cluster'", ""}
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_AZURE_BLOB_STORAGE
+    factory.registerFunction<TableFunctionAzureClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the data stored on Azure Blob Storage in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "azureBlobStorage",
+                    "SELECT * FROM azureBlobStorage(connection_string|storage_account_url, container_name, blobpath, "
+                    "[account_name, account_key, format, compression, structure])", ""
+                },
+                {
+                    "azureBlobStorage",
+                    "SELECT * FROM azureBlobStorage(connection_string|storage_account_url, container_name, blobpath, "
+                    "[account_name, account_key, format, compression, structure]) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_HDFS
+    factory.registerFunction<TableFunctionHDFSClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the data stored on HDFS virtual filesystem in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "hdfs",
+                    "SELECT * FROM hdfs(url, format, compression, structure])", ""
+                },
+                {
+                    "hdfs",
+                    "SELECT * FROM hdfs(url, format, compression, structure]) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_AVRO
+    factory.registerFunction<TableFunctionIcebergClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the Iceberg table stored on different object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "iceberg",
+                    "SELECT * FROM iceberg(url, access_key_id, secret_access_key, storage_type='s3')", ""
+                },
+                {
+                    "iceberg",
+                    "SELECT * FROM iceberg(url, access_key_id, secret_access_key, storage_type='s3') "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+                {
+                    "iceberg",
+                    "SELECT * FROM iceberg(url, access_key_id, secret_access_key, storage_type='azure')", ""
+                },
+                {
+                    "iceberg",
+                    "SELECT * FROM iceberg(url, storage_type='hdfs') SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+
+    factory.registerFunction<TableFunctionIcebergLocalClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the Iceberg table stored on shared disk in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "icebergLocal",
+                    "SELECT * FROM icebergLocal(filename)", ""
+                },
+                {
+                    "icebergLocal",
+                    "SELECT * FROM icebergLocal(filename) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_AVRO && USE_AWS_S3
+    factory.registerFunction<TableFunctionIcebergS3ClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the Iceberg table stored on S3 object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "icebergS3",
+                    "SELECT * FROM icebergS3(url, access_key_id, secret_access_key)", ""
+                },
+                {
+                    "icebergS3",
+                    "SELECT * FROM icebergS3(url, access_key_id, secret_access_key) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_AVRO && USE_AZURE_BLOB_STORAGE
+    factory.registerFunction<TableFunctionIcebergAzureClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the Iceberg table stored on Azure object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "icebergAzure",
+                    "SELECT * FROM icebergAzure(url, access_key_id, secret_access_key)", ""
+                },
+                {
+                    "icebergAzure",
+                    "SELECT * FROM icebergAzure(url, access_key_id, secret_access_key) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_AVRO && USE_HDFS
+    factory.registerFunction<TableFunctionIcebergHDFSClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the Iceberg table stored on HDFS virtual filesystem in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "icebergHDFS",
+                    "SELECT * FROM icebergHDFS(url)", ""
+                },
+                {
+                    "icebergHDFS",
+                    "SELECT * FROM icebergHDFS(url) SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+
+#if USE_PARQUET && USE_DELTA_KERNEL_RS
+#   if USE_AWS_S3
+    factory.registerFunction<TableFunctionDeltaLakeClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the DeltaLake table stored on object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "deltaLake",
+                    "SELECT * FROM deltaLake(url, access_key_id, secret_access_key)", ""
+                },
+                {
+                    "deltaLake",
+                    "SELECT * FROM deltaLake(url, access_key_id, secret_access_key) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+    factory.registerFunction<TableFunctionDeltaLakeS3ClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the DeltaLake table stored on object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "deltaLakeS3",
+                    "SELECT * FROM deltaLakeS3(url, access_key_id, secret_access_key)", ""
+                },
+                {
+                    "deltaLakeS3",
+                    "SELECT * FROM deltaLakeS3(url, access_key_id, secret_access_key) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#   endif
+#   if USE_AZURE_BLOB_STORAGE
+    factory.registerFunction<TableFunctionDeltaLakeAzureClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the DeltaLake table stored on object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "deltaLakeAzure",
+                    "SELECT * FROM deltaLakeAzure(url, access_key_id, secret_access_key)", ""
+                },
+                {
+                    "deltaLakeAzure",
+                    "SELECT * FROM deltaLakeAzure(url, access_key_id, secret_access_key) "
+                    "SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#   endif
+#endif
+
+#if USE_AWS_S3
+    factory.registerFunction<TableFunctionHudiClusterFallback>(
+    {
+        .documentation = {
+            .description=R"(The table function can be used to read the Hudi table stored on object store in parallel for many nodes in a specified cluster or from single node.)",
+            .examples{
+                {
+                    "hudi",
+                    "SELECT * FROM hudi(url, access_key_id, secret_access_key)", ""
+                },
+                {
+                    "hudi",
+                    "SELECT * FROM hudi(url, access_key_id, secret_access_key) SETTINGS object_storage_cluster='cluster'", ""
+                },
+            },
+            .category = FunctionDocumentation::Category::TableFunction
+        },
+        .allow_readonly = false
+    }
+    );
+#endif
+}
+
+}
diff --git a/src/TableFunctions/TableFunctionObjectStorageClusterFallback.h b/src/TableFunctions/TableFunctionObjectStorageClusterFallback.h
new file mode 100644
index 000000000000..d81acac2be50
--- /dev/null
+++ b/src/TableFunctions/TableFunctionObjectStorageClusterFallback.h
@@ -0,0 +1,49 @@
+#pragma once
+#include "config.h"
+#include <TableFunctions/TableFunctionObjectStorageCluster.h>
+
+namespace DB
+{
+
+/**
+* Class implementing s3/hdfs/azureBlobStorage(...) table functions,
+* which allow to use simple or distributed function variant based on settings.
+* If setting `object_storage_cluster` is empty,
+* simple single-host variant is used, if setting not empty, cluster variant is used.
+* `SELECT * FROM s3('s3://...', ...) SETTINGS object_storage_cluster='cluster'`
+* is equal to
+* `SELECT * FROM s3Cluster('cluster', 's3://...', ...)`
+*/
+
+template <typename Definition, typename Base>
+class TableFunctionObjectStorageClusterFallback : public Base
+{
+public:
+    using BaseCluster = Base;
+    using BaseSimple = BaseCluster::Base;
+
+    static constexpr auto name = Definition::name;
+
+    String getName() const override { return name; }
+
+    void validateUseToCreateTable() const override;
+
+private:
+    const char * getStorageEngineName() const override
+    {
+        return is_cluster_function ? Definition::storage_engine_cluster_name : Definition::storage_engine_name;
+    }
+
+    StoragePtr executeImpl(
+        const ASTPtr & ast_function,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription cached_columns,
+        bool is_insert_query) const override;
+
+    void parseArgumentsImpl(ASTs & args, const ContextPtr & context) override;
+
+    bool is_cluster_function = false;
+};
+
+}
diff --git a/src/TableFunctions/TableFunctionRemote.h b/src/TableFunctions/TableFunctionRemote.h
index e58d30cf48df..498339231153 100644
--- a/src/TableFunctions/TableFunctionRemote.h
+++ b/src/TableFunctions/TableFunctionRemote.h
@@ -26,6 +26,8 @@ class TableFunctionRemote : public ITableFunction
 
     bool needStructureConversion() const override { return false; }
 
+    void setRemoteTableFunction(ASTPtr remote_table_function_ptr_) { remote_table_function_ptr = remote_table_function_ptr_; }
+
 private:
 
     StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns, bool is_insert_query) const override;
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index 291dfec6991e..28b734b31efd 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -19,6 +19,7 @@
 
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromVector.h>
+#include <Storages/HivePartitioningUtils.h>
 
 
 namespace DB
@@ -110,11 +111,11 @@ StoragePtr TableFunctionURL::getStorage(
         return std::make_shared<StorageURLCluster>(
             global_context,
             parallel_replicas_cluster_name,
-            filename,
-            format,
-            compression_method,
+            source,
+            format_,
+            compression_method_,
             StorageID(getDatabaseName(), table_name),
-            getActualTableStructure(global_context, /* is_insert_query */ true),
+            getActualTableStructure(global_context, true),
             ConstraintsDescription{},
             configuration);
     }
@@ -139,22 +140,37 @@ ColumnsDescription TableFunctionURL::getActualTableStructure(ContextPtr context,
 {
     if (structure == "auto")
     {
+        ColumnsDescription columns;
+
         if (const auto access_object = getSourceAccessObject())
-            context->getAccess()->checkAccessWithFilter(AccessType::READ, toStringSource(*access_object), getFunctionURI());
+            context->getAccess()->checkAccessWithFilter(AccessType::READ, toStringSource(*access_object), getFunctionURINormalized());
         if (format == "auto")
-            return StorageURL::getTableStructureAndFormatFromData(
-                       filename,
-                       chooseCompressionMethod(Poco::URI(filename).getPath(), compression_method),
-                       configuration.headers,
-                       std::nullopt,
-                       context).first;
-
-        return StorageURL::getTableStructureFromData(format,
+        {
+            columns = StorageURL::getTableStructureAndFormatFromData(
+                filename,
+                chooseCompressionMethod(Poco::URI(filename).getPath(), compression_method),
+                configuration.headers,
+                std::nullopt,
+                context).first;
+        }
+        else
+        {
+            columns = StorageURL::getTableStructureFromData(format,
+                filename,
+                chooseCompressionMethod(Poco::URI(filename).getPath(), compression_method),
+                configuration.headers,
+                std::nullopt,
+                context);
+        }
+
+        HivePartitioningUtils::setupHivePartitioningForFileURLLikeStorage(
+            columns,
             filename,
-            chooseCompressionMethod(Poco::URI(filename).getPath(), compression_method),
-            configuration.headers,
-            std::nullopt,
+            /* inferred_schema */ true,
+            /* format_settings */ std::nullopt,
             context);
+
+        return columns;
     }
 
     return parseColumnsListFromString(structure, context);
diff --git a/src/TableFunctions/TableFunctionURLCluster.cpp b/src/TableFunctions/TableFunctionURLCluster.cpp
index 724e9f944608..3d3d81355506 100644
--- a/src/TableFunctions/TableFunctionURLCluster.cpp
+++ b/src/TableFunctions/TableFunctionURLCluster.cpp
@@ -36,7 +36,7 @@ StoragePtr TableFunctionURLCluster::getStorage(
         format,
         compression_method,
         StorageID(getDatabaseName(), table_name),
-        getActualTableStructure(context, /* is_insert_query */ true),
+        getActualTableStructure(context, true),
         ConstraintsDescription{},
         configuration);
 }
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index 643fb9fc94a6..c8497fbfdda2 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -68,7 +68,7 @@ void registerTableFunctions()
 
     registerTableFunctionObjectStorage(factory);
     registerTableFunctionObjectStorageCluster(factory);
-    registerDataLakeTableFunctions(factory);
+    registerTableFunctionObjectStorageClusterFallback(factory);
     registerDataLakeClusterTableFunctions(factory);
 
 #if USE_YTSAURUS
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index 4ee5c17d262d..84f0418bc4e1 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -69,7 +69,7 @@ void registerTableFunctionExplain(TableFunctionFactory & factory);
 
 void registerTableFunctionObjectStorage(TableFunctionFactory & factory);
 void registerTableFunctionObjectStorageCluster(TableFunctionFactory & factory);
-void registerDataLakeTableFunctions(TableFunctionFactory & factory);
+void registerTableFunctionObjectStorageClusterFallback(TableFunctionFactory & factory);
 void registerDataLakeClusterTableFunctions(TableFunctionFactory & factory);
 
 void registerTableFunctionTimeSeries(TableFunctionFactory & factory);
diff --git a/src/configure_config.cmake b/src/configure_config.cmake
index 36907faa70e5..f031d792e9d5 100644
--- a/src/configure_config.cmake
+++ b/src/configure_config.cmake
@@ -216,6 +216,8 @@ if (TARGET ch_contrib::sha3iuf)
     set(USE_SHA3IUF 1)
 endif()
 set (USE_YTSAURUS 1)
-
+if (TARGET ch_contrib::jwt-cpp)
+    set(USE_JWT_CPP 1)
+endif()
 
 set(SOURCE_DIR ${PROJECT_SOURCE_DIR})
diff --git a/tests/README.md b/tests/README.md
index 65985e8a87f2..8b59a8211814 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1 +1,83 @@
-Find CI documents and instructions on running CI checks locally [here](https://clickhouse.com/docs/development/continuous-integration).
+# Local Testing
+
+Upstream provides a utility `praktika`, which is used to run tests both locally and in CI.
+
+## Stateless
+
+### Suite
+
+Fast Test is self-contained and can be run with no extra setup.
+```sh
+python -m ci.praktika run "Fast test"
+```
+
+The stateless suites expect an executable `clickhouse` binary in `ci/tmp`
+I recommend not running suites with the `s3 storage` option as that requires extra setup.
+```sh
+python -m ci.praktika run "Stateless tests (amd_debug, sequential)"
+```
+
+Logs can be found in `ci/tmp` and `ci/tmp/var/log/clickhouse-server`.
+
+### One Test
+
+Running a single test can be done with bare `clickhouse-test` or with the `praktika` utility.
+
+#### clickhouse-test
+
+https://clickhouse.com/docs/development/tests#running-a-test-locally
+
+Start Clickhouse server,
+
+```sh
+cd ci/tmp
+./clickhouse server
+```
+
+then, in another window:
+
+```sh
+tests/clickhouse-test -b ci/tmp/clickhouse 03222_pr_asan_index_granularity
+```
+
+Logs will get written into the `tests/queries/0_stateless` folder.
+
+#### praktika
+
+```sh
+python -m ci.praktika run "Stateless tests (amd_debug, sequential)" --test 01107_atomic_db_detach_attach
+```
+
+You must specify the name of a job from the PR workflow to instruct praktika on the necessary configuration.
+
+## Integration
+
+### Suite
+
+https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/README.md
+
+> The runner searches in this order and uses the first found:
+> ./ci/tmp/clickhouse
+> ./build/programs/clickhouse
+> ./clickhouse
+
+```sh
+python -m ci.praktika run "Integration tests (amd_binary, 4/5)"
+```
+
+Logs can be found in `ci/tmp` and `ci/tmp/var/log/clickhouse-server`.
+
+### One Test
+
+```sh
+cd tests/integration
+./runner --docker-image-version 72c567235d2f7658765b --docker-compose-images-tags=altinityinfra/integration-test:9c789665fa1f2c3b60a8 --binary ../../ci/tmp/clickhouse 'test_storage_hudi/test.py::test_types'
+```
+
+Docker images may or may not need to be specified. Get the tags by examining ci logs.
+Search logs for `integration-test`, look for `"altinityinfra/integration-tests-runner": "72c567235d2f7658765b"`
+and `"altinityinfra/integration-test": "9c789665fa1f2c3b60a8"`
+
+Logs are written to the local dir, which is `tests/integration` in this example.
+
+Note: `runner` has been removed from 25.9 onwards.
diff --git a/tests/broken_tests.yaml b/tests/broken_tests.yaml
new file mode 100644
index 000000000000..11eed3824d6d
--- /dev/null
+++ b/tests/broken_tests.yaml
@@ -0,0 +1,225 @@
+# Name fields should be unique.
+- name: 02844_max_backup_bandwidth_s3
+  reason: INVESTIGATE - Fails on debug
+  message: result differs with reference
+  check_types:
+  - debug
+- name: 00626_replace_partition_from_table
+  reason: INVESTIGATE - Unstable on tsan
+  message: 'DB::Exception: Cannot OPTIMIZE table: Current background tasks memory
+    usage'
+  check_types:
+  - tsan
+- name: 01550_mutation_subquery
+  reason: INVESTIGATE - Unstable on tsan
+  message: 'DB::Exception: Exception happened during execution of mutation'
+  check_types:
+  - tsan
+- name: 02435_rollback_cancelled_queries
+  reason: INVESTIGATE - Unstable on tsan
+  message: 'DB::Exception: There is no current transaction. (INVALID_TRANSACTION)'
+  check_types:
+  - tsan
+- name: 02443_detach_attach_partition
+  reason: INVESTIGATE - Unstable
+  message: 'Cannot rename parts to perform operation on them: Code: 521. DB::ErrnoException: Cannot rename'
+- name: 03441_deltalake_clickhouse_public_datasets
+  reason: INVESTIGATE - S3 sometimes unreachable
+  message: 'Error interacting with object store: Generic S3 error: Error performing GET'
+- name: 03441_deltalake_clickhouse_virtual_columns
+  reason: INVESTIGATE - S3 sometimes unreachable
+  message: 'Error interacting with object store: Generic S3 error: Error performing GET'
+- name: 00167_read_bytes_from_fs
+  reason: INVESTIGATE - Memory limit exceeded
+  message: 'DB::Exception: (total) memory limit exceeded:'
+- name: 02700_s3_part_INT_MAX
+  reason: KNOWN - Memory limit exceeded
+  message: 'DB::Exception: (total) memory limit exceeded:'
+- name: 03572_export_merge_tree_part_to_object_storage
+  reason: INVESTIGATE - Unstable on asan, tsan, msan
+  message: result differs with reference
+  check_types:
+  - asan
+  - tsan
+  - msan
+- name: 03321_clickhouse_local_initialization_not_too_slow_even_under_sanitizers
+  reason: INVESTIGATE - Unstable on msan, tsan
+  message: result differs with reference
+  check_types:
+  - msan
+  - tsan
+- name: 02676_optimize_old_parts_replicated
+  reason: INVESTIGATE - Unstable on tsan
+  message: result differs with reference
+  check_types:
+  - tsan
+- name: 03221_refreshable_matview_progress
+  reason: INVESTIGATE - Unstable on msan
+  message: result differs with reference
+  check_types:
+  - msan
+- name: 02313_filesystem_cache_seeks
+  reason: fails when azure storage is not set up
+  message: 'DB::Exception: Unknown storage policy `azure_cache`'
+- name: 02286_drop_filesystem_cache
+  reason: fails when azure storage is not set up
+  message: 'DB::Exception: Unknown storage policy `azure_cache`'
+- name: 02242_system_filesystem_cache_log_table
+  reason: fails when azure storage is not set up
+  message: 'DB::Exception: Unknown storage policy `azure_cache`'
+- name: 02241_filesystem_cache_on_write_operations
+  reason: fails when azure storage is not set up
+  message: 'DB::Exception: Unknown storage policy `azure_cache`'
+- name: 02240_system_filesystem_cache_table
+  reason: fails when azure storage is not set up
+  message: 'DB::Exception: Unknown storage policy `azure_cache`'
+- name: 02226_filesystem_cache_profile_events
+  reason: fails when azure storage is not set up
+  message: 'DB::Exception: Unknown storage policy `azure_cache`'
+- name: 00024_random_counters
+  reason: INVESTIGATE - random timeout
+  message: Timeout! Processes left in process group
+- name: 03211_nested_json_merges
+  reason: KNOWN - Unstable upstream
+- name: 03644_object_storage_correlated_subqueries
+  reason: KNOWN - Unstable in upstream 25.8.
+- name: test_storage_s3_queue/test_5.py::test_migration[1-s3queue_]
+  reason: KNOWN - Sometimes fails due to test order
+  message: 'Failed: Timeout >900.0s'
+- name: test_storage_s3_queue/test_5.py::test_migration[3-s3queue_]
+  reason: KNOWN - Sometimes fails due to test order
+  message: 'Failed: Timeout >900.0s'
+- name: test_storage_s3_queue/test_5.py::test_migration[1-]
+  reason: KNOWN - Sometimes fails due to test order
+  message: 'Failed: Timeout >900.0s'
+- name: test_storage_s3_queue/test_5.py::test_migration[3-]
+  reason: KNOWN - Sometimes fails due to test order
+  message: 'Failed: Timeout >900.0s'
+- name: test_scheduler_cpu_preemptive/test.py::test_downscaling[cpu-slot-preemption-timeout-1ms]
+  reason: INVESTIGATE - Unstable on tsan, asan
+  message: 'Failed: Timeout >900.0s'
+  check_types:
+  - tsan
+  - asan
+- name: test_grpc_protocol/test.py::test_ipv6_select_one
+  reason: INVESTIGATE - Internal test timeout
+  message: FutureTimeoutError
+- name: test_backup_restore_on_cluster/test_different_versions.py::test_different_versions
+  reason: INVESTIGATE - NETLINK_ERROR
+  message: NETLINK_ERROR
+- name: test_backup_restore_on_cluster/test_cancel_backup.py::test_shutdown_cancels_backup
+  reason: INVESTIGATE - NETLINK_ERROR
+  message: NETLINK_ERROR
+- name: test_backup_restore_on_cluster/test_cancel_backup.py::test_cancel_backup_with_settings
+  reason: INVESTIGATE - NETLINK_ERROR
+  message: NETLINK_ERROR
+- name: test_overcommit_tracker/test.py::test_user_overcommit
+  reason: INVESTIGATE - AssertionError on tsan
+  message: 'AssertionError: all tasks are killed'
+  check_types:
+  - tsan
+- name: test_storage_delta/test.py::test_concurrent_queries[False]
+  reason: INVESTIGATE - Unstable test
+- name: test_storage_s3_queue/test_0.py::test_streaming_to_many_views[unordered]
+  reason: 'KNOWN - Unstable upstream'
+- name: test_storage_s3_queue/test_0.py::test_streaming_to_many_views[ordered]
+  reason: 'KNOWN - Unstable upstream'
+- name: test_storage_s3_queue/test_2.py::test_shards_distributed[unordered-1]
+  reason: 'KNOWN - Unstable upstream'
+- name: test_storage_s3_queue/test_2.py::test_shards_distributed[unordered-8]
+  reason: 'KNOWN - Unstable upstream'
+- name: test_storage_s3_queue/test_2.py::test_shards_distributed[ordered-1]
+  reason: 'KNOWN - Unstable upstream'
+- name: test_storage_s3_queue/test_2.py::test_shards_distributed[ordered-2]
+  reason: 'KNOWN - Unstable upstream'
+- name: test_storage_s3_queue/test_4.py::test_list_and_delete_race
+  reason: 'KNOWN - Unstable upstream'
+  message: AssertionError
+- name: test_storage_s3_queue/test_5.py::test_failed_startup
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_mv_settings[1-ordered]
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_persistent_processing_nodes_cleanup
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_detach_attach_table
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_persistent_processing
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_shutdown_order
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_mv_settings[1-unordered]
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_mv_settings[9999999999-unordered]
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_mv_settings[9999999999-ordered]
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_storage_s3_queue/test_5.py::test_create_or_replace_table
+  reason: 'INVESTIGATE: Unstable on tsan'
+  check_types:
+  - tsan
+- name: test_database_hms/test.py::test_list_tables
+  reason: 'KNOWN: Occasional timeout'
+  message: docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds
+- name: test_database_hms/test.py::test_many_namespaces
+  reason: 'KNOWN: Occasional timeout'
+  message: docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds
+- name: test_database_hms/test.py::test_select
+  reason: 'KNOWN: Occasional timeout'
+  message: docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds
+- name: test_database_hms/test.py::test_tables_with_same_location
+  reason: 'KNOWN: Occasional timeout'
+  message: docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds
+- name: test_database_hms/test.py::test_hide_sensitive_info
+  reason: 'KNOWN: Occasional timeout'
+  message: docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds
+- name: test_keeper_memory_soft_limit/test.py::test_soft_limit_create
+  reason: 'FIXME: Unstable in current version. Fixed in recent upstream.'
+- name: test_s3_cache_locality/test.py::test_cache_locality[0]
+  reason: 'INVESTIGATE: Timeout or AssertionError'
+- name: test_dirty_pages_force_purge/test.py::test_dirty_pages_force_purge
+  reason: 'KNOWN: https://github.com/Altinity/ClickHouse/issues/1369'
+- name: test_async_load_databases/test.py::test_materialized_views_cascaded_multiple
+  reason: 'KNOWN: Flaky upstream test. Fixed in upstream PR #88573 but not backported to 25.8.'
+  message: AssertionError
+- name: test_async_load_databases/test.py::test_materialized_views_replicated
+  reason: 'KNOWN: Flaky upstream test. Fixed in upstream PR #88573 but not backported to 25.8.'
+  message: 'DATABASE_ALREADY_EXISTS'
+
+# Regex rules should be ordered from most specific to least specific.
+# regex: true applies to name, message, and not_message fields, but not to reason or check_types fields.
+
+# Match all sanitizer related timeouts in stateless tests
+# Note that this style of multiline string is inserting a space before each |.
+# Make sure to include final punctuation marks as each sub-pattern has a space appended.
+- name: \d{5}_.*
+  reason: 'KNOWN: Random timeout with sanitizer'
+  message: 'Timeout! Processes left in process group
+     |DB::Exception: Timeout exceeded:?
+     |Timeout exceeded while receiving data from server\.
+     |DB::Exception: Estimated query execution time \((\d+\.\d+) seconds\) is too long\.
+     |curl: \(28\) Operation timed out'
+  not_message: 'Sanitizer trap|Sanitizer assert'
+  regex: true
+  check_types:
+  - tsan
+  - asan
+  - msan
+  - ubsan
diff --git a/tests/ci/changelog.py b/tests/ci/changelog.py
index e7e37979b88c..9de200e2bf54 100755
--- a/tests/ci/changelog.py
+++ b/tests/ci/changelog.py
@@ -21,6 +21,7 @@
     get_abs_path,
     get_version_from_repo,
     get_version_from_tag,
+    get_version_from_string,
 )
 
 # This array gives the preferred category order, and is also used to
@@ -48,13 +49,14 @@
 
 class Description:
     def __init__(
-        self, number: int, user: NamedUser, html_url: str, entry: str, category: str
+        self, number: int, user: NamedUser, html_url: str, entry: str, category: str, backport_pr: int = None
     ):
         self.number = number
         self.html_url = html_url
         self.user = gh.get_user_cached(user._rawData["login"])  # type: ignore
         self.entry = entry
         self.category = category
+        self.backport_pr = backport_pr
 
     @property
     def formatted_entry(self) -> str:
@@ -72,20 +74,21 @@ def formatted_entry(self) -> str:
             r"\1[#\3](\2)",
             entry,
         )
-        # It's possible that we face a secondary rate limit.
-        # In this case we should sleep until we get it
-        while True:
-            try:
-                user_name = self.user.name if self.user.name else self.user.login
-                break
-            except UnknownObjectException:
-                user_name = self.user.login
-                break
-            except RateLimitExceededException:
-                gh.sleep_on_rate_limit()
+        # # It's possible that we face a secondary rate limit.
+        # # In this case we should sleep until we get it
+        # while True:
+        #     try:
+        #         user_name = self.user.name if self.user.name else self.user.login
+        #         break
+        #     except UnknownObjectException:
+        #         user_name = self.user.login
+        #         break
+        #     except RateLimitExceededException:
+        #         gh.sleep_on_rate_limit()
+
+        backport_clause = '' if self.backport_pr is None else f' via {self.backport_pr}'
         return (
-            f"* {entry} [#{self.number}]({self.html_url}) "
-            f"([{user_name}]({self.user.html_url}))."
+            f"* {entry} (#{self.number} by @{self.user.login}{backport_clause})"
         )
 
     # Sort PR descriptions by numbers
@@ -155,7 +158,7 @@ def parse_args() -> argparse.Namespace:
     )
     parser.add_argument(
         "--repo",
-        default="ClickHouse/ClickHouse",
+        default="Altinity/ClickHouse",
         help="a repository to query for pull-requests from GitHub",
     )
     parser.add_argument(
@@ -196,13 +199,14 @@ def parse_args() -> argparse.Namespace:
 # Returns None if the PR should not be mentioned in changelog.
 def generate_description(item: PullRequest, repo: Repository) -> Optional[Description]:
     backport_number = item.number
-    if item.head.ref.startswith("backport/"):
+    # NOTE(vnemkov): intentionally without trailing slash, so it will match upstream's 'backport/' and our 'backports/' branch names.
+    if item.head.ref.startswith("backport"):
         branch_parts = item.head.ref.split("/")
         if len(branch_parts) == 3:
             try:
                 item = gh.get_pull_cached(repo, int(branch_parts[-1]))
             except Exception as e:
-                logging.warning("unable to get backported PR, exception: %s", e)
+                logging.warning(f"unable to get backported PR for %s, exception %s", item, e)
         else:
             logging.warning(
                 "The branch %s doesn't match backport template, using PR %s as is",
@@ -292,8 +296,9 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
     ):
         category = "Bug Fix (user-visible misbehavior in an official stable release)"
 
+    backport_pr = None
     if backport_number != item.number:
-        entry = f"Backported in #{backport_number}: {entry}"
+        backport_pr = backport_number
 
     if not entry:
         # Shouldn't happen, because description check in CI should catch such PRs.
@@ -309,7 +314,7 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
             category = c
             break
 
-    return Description(item.number, item.user, item.html_url, entry, category)
+    return Description(item.number, item.user, item.html_url, entry, category, backport_pr=backport_pr)
 
 
 def write_changelog(
@@ -395,6 +400,19 @@ def get_year(prs: PullRequests) -> int:
 
 
 def get_branch_and_patch_by_tag(tag: str) -> Tuple[Optional[str], Optional[int]]:
+    try:
+        try:
+            patch = get_version_from_string(tag.removeprefix('v')).patch
+            branch = runner.run(f"git branch --contains {tag} | head -n1", stderr=DEVNULL).strip()
+        except:
+            # most likely the `tag` is not a tag, but a commit
+            patch = 999999999999
+            branch = runner.run(f"git branch --contains {tag} | head -n1", stderr=DEVNULL).strip().removeprefix('*').strip()
+
+        return branch, patch
+    except:
+        logging.exception(f"Failed to get branch from a tag {tag} using git commands", exc_info=True)
+
     tag = tag.removeprefix("v")
     versions = tag.split(".")
     if len(versions) < 4:
diff --git a/tests/ci/ci.py b/tests/ci/ci.py
index 50b5a81f04ac..f7ee94e279f4 100644
--- a/tests/ci/ci.py
+++ b/tests/ci/ci.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import argparse
 import concurrent.futures
 import json
@@ -265,11 +267,13 @@ def _pre_action(s3, job_name, batch, indata, pr_info):
 
     # for release/master branches reports must be from the same branch
     report_prefix = ""
-    if pr_info.is_master or pr_info.is_release:
+    if pr_info.is_master or pr_info.is_release or pr_info.is_push_event:
         # do not set report prefix for scheduled or dispatched wf (in case it started from feature branch while
         #   testing), otherwise reports won't be found
         if not (pr_info.is_scheduled or pr_info.is_dispatched):
             report_prefix = Utils.normalize_string(pr_info.head_ref)
+    elif pr_info.is_pr:
+        report_prefix = str(pr_info.number)
     print(
         f"Use report prefix [{report_prefix}], pr_num [{pr_info.number}], head_ref [{pr_info.head_ref}]"
     )
diff --git a/tests/ci/ci_buddy.py b/tests/ci/ci_buddy.py
index 07b748180cd3..33dec4938692 100644
--- a/tests/ci/ci_buddy.py
+++ b/tests/ci/ci_buddy.py
@@ -97,7 +97,9 @@ def _get_webhooks():
         return json_string
 
     def post(self, message: str, channels: List[str]) -> None:
-        print(f"Posting slack message, dry_run [{self.dry_run}]")
+        print(f"Would've posted slack message, dry_run [{self.dry_run}], message: {message}")
+        # NOTE(vnemkov): we don't use slack for CI/CD no need to post messages
+        return
         if self.dry_run:
             urls = [self.channels[Channels.DRY_RUN]]
         else:
diff --git a/tests/ci/ci_cache.py b/tests/ci/ci_cache.py
index ec4fdba77fe7..aae11b9ca8ef 100644
--- a/tests/ci/ci_cache.py
+++ b/tests/ci/ci_cache.py
@@ -41,7 +41,7 @@ class CiCache:
         release - for jobs being executed on the release branch including master branch (not a PR branch)
     """
 
-    _REQUIRED_DIGESTS = [CI.JobNames.DOCS_CHECK, CI.BuildNames.PACKAGE_RELEASE]
+    _REQUIRED_DIGESTS = [CI.BuildNames.PACKAGE_RELEASE]
     _S3_CACHE_PREFIX = "CI_cache_v1"
     _CACHE_BUILD_REPORT_PREFIX = "build_report"
     _RECORD_FILE_EXTENSION = ".ci"
@@ -980,7 +980,6 @@ def apply(
         "ClickBench (aarch64)": "45c07c4aa6",
         "Docker server image": "6a24d5b187",
         "Docker keeper image": "6a24d5b187",
-        "Docs check": "4764154c62",
         "Fast test": "cb269133f2",
         "Style check": "ffffffffff",
         "Stress test (msan)": "aa298abf10",
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 2ecb8e2e637c..7cdf8dd5e01d 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -383,27 +383,29 @@ class CI:
             required_builds=[BuildNames.PACKAGE_ASAN],
             release_only=True,
             num_batches=4,
-            timeout=10800,
+            timeout=4 * 3600,
         ),
         JobNames.INTEGRATION_TEST_ASAN_OLD_ANALYZER: CommonJobConfigs.INTEGRATION_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_ASAN],
             num_batches=6,
-            timeout=9000,  # the job timed out with default value (7200)
+            timeout=4 * 3600,  # the job timed out with default value (7200)
         ),
         JobNames.INTEGRATION_TEST_TSAN: CommonJobConfigs.INTEGRATION_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_TSAN],
             num_batches=6,
-            timeout=9000,  # the job timed out with default value (7200)
+            timeout=4 * 3600,  # the job timed out with default value (7200)
         ),
         JobNames.INTEGRATION_TEST_AARCH64_DISTRIBUTED_PLAN: CommonJobConfigs.INTEGRATION_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_AARCH64],
             num_batches=6,
             runner_type=Runners.FUNC_TESTER_AARCH64,
+            timeout=4 * 3600,
         ),
         JobNames.INTEGRATION_TEST: CommonJobConfigs.INTEGRATION_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_RELEASE],
             num_batches=6,
-            release_only=True,
+            timeout=4 * 3600,
+            # release_only=True,
         ),
         JobNames.INTEGRATION_TEST_FLAKY: CommonJobConfigs.INTEGRATION_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_ASAN],
@@ -528,10 +530,6 @@ class CI:
             required_builds=[BuildNames.PACKAGE_RELEASE, BuildNames.PACKAGE_AARCH64]
         ),
         JobNames.DOCS_CHECK: JobConfig(
-            digest=DigestConfig(
-                include_paths=["**/*.md", "./docs", "tests/ci/docs_check.py"],
-                docker=["clickhouse/docs-builder"],
-            ),
             run_command="docs_check.py",
             runner_type=Runners.FUNC_TESTER,
         ),
@@ -545,7 +543,7 @@ class CI:
                     "./tests/clickhouse-test",
                 ],
                 exclude_files=[".md"],
-                docker=["clickhouse/fasttest"],
+                docker=["altinityinfra/fasttest"],
             ),
             run_command="fast_test_check.py",
             timeout=2400,
@@ -562,6 +560,14 @@ class CI:
             timeout=2400,
             runner_type=Runners.STYLE_CHECKER,
         ),
+        JobNames.SIGN_RELEASE: JobConfig(
+            required_builds=[BuildNames.PACKAGE_RELEASE],
+            runner_type=Runners.STYLE_CHECKER,
+        ),
+        JobNames.SIGN_AARCH64: JobConfig(
+            required_builds=[BuildNames.PACKAGE_AARCH64],
+            runner_type=Runners.STYLE_CHECKER_AARCH64,
+        ),
     }
 
     @classmethod
diff --git a/tests/ci/ci_definitions.py b/tests/ci/ci_definitions.py
index 46ecdd25afd4..3369e5efc0e9 100644
--- a/tests/ci/ci_definitions.py
+++ b/tests/ci/ci_definitions.py
@@ -59,12 +59,12 @@ class Runners(metaclass=WithIter):
     GitHub runner's labels
     """
 
-    BUILDER = "builder"
-    BUILDER_AARCH64 = "builder-aarch64"
-    STYLE_CHECKER = "style-checker"
-    STYLE_CHECKER_AARCH64 = "style-checker-aarch64"
-    FUNC_TESTER = "func-tester"
-    FUNC_TESTER_AARCH64 = "func-tester-aarch64"
+    BUILDER = "altinity-builder"
+    BUILDER_AARCH64 = "altinity-builder-aarch64"
+    STYLE_CHECKER = "altinity-style-checker"
+    STYLE_CHECKER_AARCH64 = "altinity-style-checker-aarch64"
+    FUNC_TESTER = "altinity-func-tester"
+    FUNC_TESTER_AARCH64 = "altinity-func-tester-aarch64"
     FUZZER_UNIT_TESTER = "fuzzer-unit-tester"
 
 
@@ -228,6 +228,8 @@ class JobNames(metaclass=WithIter):
 
     DOCS_CHECK = "Docs check"
     BUGFIX_VALIDATE = "Bugfix validation (integration tests)"
+    SIGN_RELEASE = "Sign release"
+    SIGN_AARCH64 = "Sign aarch64"
 
 
 # hack to concatenate Build and non-build jobs under JobNames class
@@ -344,7 +346,7 @@ class JobConfig:
     # label that enables job in CI, if set digest isn't used
     run_by_labels: List[str] = field(default_factory=list)
     # to run always regardless of the job digest or/and label
-    run_always: bool = False
+    run_always: bool = True
     # disables CI await for a given job
     disable_await: bool = False
     # if the job needs to be run on the release branch, including master (building packages, docker server).
@@ -397,7 +399,7 @@ class CommonJobConfigs:
         job_name_keyword="compatibility",
         digest=DigestConfig(
             include_paths=["./tests/ci/compatibility_check.py"],
-            docker=["clickhouse/test-old-ubuntu", "clickhouse/test-old-centos"],
+            docker=["altinityinfra/test-old-ubuntu", "altinityinfra/test-old-centos"],
         ),
         run_command="compatibility_check.py",
         runner_type=Runners.STYLE_CHECKER,
@@ -406,7 +408,7 @@ class CommonJobConfigs:
         job_name_keyword="install",
         digest=DigestConfig(
             include_paths=["./tests/ci/install_check.py"],
-            docker=["clickhouse/install-deb-test", "clickhouse/install-rpm-test"],
+            docker=["altinityinfra/install-deb-test", "altinityinfra/install-rpm-test"],
         ),
         run_command='install_check.py "$CHECK_NAME"',
         runner_type=Runners.STYLE_CHECKER,
@@ -424,7 +426,7 @@ class CommonJobConfigs:
                 "./tests/docker_scripts/",
             ],
             exclude_files=[".md"],
-            docker=["clickhouse/stateless-test"],
+            docker=["altinityinfra/stateless-test"],
         ),
         run_command='functional_test_check.py "$CHECK_NAME"',
         runner_type=Runners.FUNC_TESTER,
@@ -441,7 +443,7 @@ class CommonJobConfigs:
                 "./tests/docker_scripts/",
             ],
             exclude_files=[".md"],
-            docker=["clickhouse/stress-test"],
+            docker=["altinityinfra/stress-test"],
         ),
         run_command="stress_check.py",
         runner_type=Runners.FUNC_TESTER,
@@ -452,7 +454,7 @@ class CommonJobConfigs:
         digest=DigestConfig(
             include_paths=["./tests/ci/upgrade_check.py", "./tests/docker_scripts/"],
             exclude_files=[".md"],
-            docker=["clickhouse/stress-test"],
+            docker=["altinityinfra/stress-test"],
         ),
         run_command="upgrade_check.py",
         runner_type=Runners.FUNC_TESTER,
@@ -477,7 +479,7 @@ class CommonJobConfigs:
             include_paths=[
                 "./tests/ci/ci_fuzzer_check.py",
             ],
-            docker=["clickhouse/fuzzer"],
+            docker=["altinityinfra/fuzzer"],
         ),
         run_command="ci_fuzzer_check.py",
         run_always=True,
@@ -489,7 +491,7 @@ class CommonJobConfigs:
             include_paths=[
                 "./tests/ci/ci_fuzzer_check.py",
             ],
-            docker=["clickhouse/fuzzer"],
+            docker=["altinityinfra/fuzzer"],
         ),
         run_command="ci_fuzzer_check.py",
         run_always=True,
@@ -500,7 +502,7 @@ class CommonJobConfigs:
         digest=DigestConfig(
             include_paths=["./tests/ci/unit_tests_check.py"],
             exclude_files=[".md"],
-            docker=["clickhouse/unit-test"],
+            docker=["altinityinfra/unit-test"],
         ),
         run_command="unit_tests_check.py",
         runner_type=Runners.FUZZER_UNIT_TESTER,
@@ -513,7 +515,7 @@ class CommonJobConfigs:
                 "./tests/performance/",
             ],
             exclude_files=[".md"],
-            docker=["clickhouse/performance-comparison"],
+            docker=["altinityinfra/performance-comparison"],
         ),
         run_command="performance_comparison_check.py",
         runner_type=Runners.FUNC_TESTER,
@@ -531,7 +533,7 @@ class CommonJobConfigs:
         digest=DigestConfig(
             include_paths=["./tests/ci/sqllogic_test.py"],
             exclude_files=[".md"],
-            docker=["clickhouse/sqllogic-test"],
+            docker=["altinityinfra/sqllogic-test"],
         ),
         run_command="sqllogic_test.py",
         timeout=10800,
@@ -543,7 +545,7 @@ class CommonJobConfigs:
         digest=DigestConfig(
             include_paths=["./tests/ci/sqltest.py"],
             exclude_files=[".md"],
-            docker=["clickhouse/sqltest"],
+            docker=["altinityinfra/sqltest"],
         ),
         run_command="sqltest.py",
         timeout=10800,
@@ -560,7 +562,7 @@ class CommonJobConfigs:
     DOCKER_SERVER = JobConfig(
         job_name_keyword="docker",
         required_on_release_branch=True,
-        run_command='docker_server.py --check-name "$CHECK_NAME" --tag-type head --allow-build-reuse',
+        run_command='docker_server.py --check-name "$CHECK_NAME" --tag-type head --allow-build-reuse --push --version="$CLICKHOUSE_VERSION_STRING"',
         digest=DigestConfig(
             include_paths=[
                 "tests/ci/docker_server.py",
@@ -577,7 +579,7 @@ class CommonJobConfigs:
             include_paths=[
                 "tests/ci/clickbench.py",
             ],
-            docker=["clickhouse/clickbench"],
+            docker=["altinityinfra/clickbench"],
         ),
         run_command='clickbench.py "$CHECK_NAME"',
         timeout=900,
@@ -606,7 +608,7 @@ class CommonJobConfigs:
                 "./tests/performance",
             ],
             exclude_files=[".md"],
-            docker=["clickhouse/binary-builder"],
+            docker=["altinityinfra/binary-builder"],
             git_submodules=True,
         ),
         run_command="build_check.py $BUILD_NAME",
@@ -617,7 +619,6 @@ class CommonJobConfigs:
 REQUIRED_CHECKS = [
     StatusNames.PR_CHECK,
     JobNames.BUILD_CHECK,
-    JobNames.DOCS_CHECK,
     JobNames.FAST_TEST,
     JobNames.STATELESS_TEST_RELEASE,
     JobNames.STATELESS_TEST_ASAN_DISTRIBUTED_PLAN,
diff --git a/tests/ci/ci_fuzzer_check.py b/tests/ci/ci_fuzzer_check.py
index 39c67f54dbe6..495b9f920fda 100644
--- a/tests/ci/ci_fuzzer_check.py
+++ b/tests/ci/ci_fuzzer_check.py
@@ -12,7 +12,7 @@
 from tee_popen import TeePopen
 from pr_info import PRInfo
 
-IMAGE_NAME = "clickhouse/fuzzer"
+IMAGE_NAME = "altinityinfra/fuzzer"
 
 
 def get_run_command(
@@ -25,6 +25,7 @@ def get_run_command(
     )
     envs = [
         f"-e FUZZER_TO_RUN='{fuzzer_name}'",
+        f"-e BASE_BRANCH='{PRInfo().base_ref}'",
     ]
 
     env_str = " ".join(envs)
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index dcf719e1e275..c270b9ec864c 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -9,7 +9,7 @@
 
 import requests
 
-from env_helper import GITHUB_REPOSITORY
+from env_helper import CLICKHOUSE_TEST_STAT_URL, CLICKHOUSE_TEST_STAT_PASSWORD, CLICKHOUSE_TEST_STAT_LOGIN
 from get_robot_token import get_parameter_from_ssm
 from pr_info import PRInfo
 from report import TestResults
@@ -28,12 +28,12 @@ def __init__(
         self, url: Optional[str] = None, auth: Optional[Dict[str, str]] = None
     ):
         if url is None:
-            url = get_parameter_from_ssm("clickhouse-test-stat-url")
+            url = CLICKHOUSE_TEST_STAT_URL
 
         self.url = url
         self.auth = auth or {
-            "X-ClickHouse-User": get_parameter_from_ssm("clickhouse-test-stat-login"),
-            "X-ClickHouse-Key": get_parameter_from_ssm("clickhouse-test-stat-password"),
+            "X-ClickHouse-User": CLICKHOUSE_TEST_STAT_LOGIN,
+            "X-ClickHouse-Key": CLICKHOUSE_TEST_STAT_PASSWORD,
         }
 
     @staticmethod
@@ -212,11 +212,11 @@ def prepare_tests_results_for_clickhouse(
     report_url: str,
     check_name: str,
 ) -> List[dict]:
-    base_ref = pr_info.base_ref
-    base_repo = pr_info.base_name
-    head_ref = pr_info.head_ref
-    head_repo = pr_info.head_name
-    pull_request_url = f"https://github.com/{GITHUB_REPOSITORY}/commits/{head_ref}"
+    pull_request_url = "https://github.com/Altinity/ClickHouse/commits/master"
+    base_ref = "master"
+    head_ref = "master"
+    base_repo = pr_info.repo_full_name
+    head_repo = pr_info.repo_full_name
     if pr_info.number != 0:
         pull_request_url = pr_info.pr_html_url
 
diff --git a/tests/ci/commit_status_helper.py b/tests/ci/commit_status_helper.py
index 56e0608e9652..0e101d67f022 100644
--- a/tests/ci/commit_status_helper.py
+++ b/tests/ci/commit_status_helper.py
@@ -32,6 +32,7 @@
 )
 from s3_helper import S3Helper
 from upload_result_helper import upload_results
+from get_robot_token import get_best_robot_token
 
 RETRY = 5
 CommitStatuses = List[CommitStatus]
@@ -155,9 +156,11 @@ def set_status_comment(commit: Commit, pr_info: PRInfo) -> None:
         # CI Running status is deprecated for ClickHouse repo
         return
 
-    # to reduce number of parameters, the Github is constructed on the fly
-    gh = Github()
-    gh.__requester = commit._requester  # type:ignore #pylint:disable=protected-access
+    gh = Github(**commit.requester.kwargs)
+    # Check that requests work at all
+    logging.info('Rate limit response for current GH token: %s',
+            gh.requester.graphql_query('rateLimit { limit remaining resetAt used }', {}))
+
     repo = get_repo(gh)
     statuses = sorted(get_commit_filtered_statuses(commit), key=lambda x: x.context)
     statuses = [
diff --git a/tests/ci/compatibility_check.py b/tests/ci/compatibility_check.py
index ca1a8619ccbc..174086917ec9 100644
--- a/tests/ci/compatibility_check.py
+++ b/tests/ci/compatibility_check.py
@@ -17,8 +17,8 @@
 from report import FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from stopwatch import Stopwatch
 
-IMAGE_UBUNTU = "clickhouse/test-old-ubuntu"
-IMAGE_CENTOS = "clickhouse/test-old-centos"
+IMAGE_UBUNTU = "altinityinfra/test-old-ubuntu"
+IMAGE_CENTOS = "altinityinfra/test-old-centos"
 DOWNLOAD_RETRIES_COUNT = 5
 
 
diff --git a/tests/ci/create_release.py b/tests/ci/create_release.py
index 2ac25ad8304a..c593dbe9dae4 100755
--- a/tests/ci/create_release.py
+++ b/tests/ci/create_release.py
@@ -534,7 +534,7 @@ def update_release_info(self, dry_run: bool) -> "ReleaseInfo":
                     url = "dry-run"
                 print(f"ChangeLog PR url [{url}]")
                 self.changelog_pr = url
-            self.docker = f"docker run --rm clickhouse/clickhouse:{self.version} clickhouse --version"
+            self.docker = f"docker run --rm altinityinfra/clickhouse:{self.version} clickhouse --version"
         else:
             # new release branch - find version bump pr on a master branch
             branch = self.get_version_bump_branch()
diff --git a/tests/ci/docker_images_helper.py b/tests/ci/docker_images_helper.py
index 7e2a14fb3ba5..638ea5dbd394 100644
--- a/tests/ci/docker_images_helper.py
+++ b/tests/ci/docker_images_helper.py
@@ -7,8 +7,7 @@
 from typing import Any, Dict, List, Optional
 
 from ci_utils import Shell, Utils
-from env_helper import DOCKER_TAG, ROOT_DIR
-from get_robot_token import get_parameter_from_ssm
+from env_helper import DOCKER_TAG, ROOT_DIR, DOCKER_PASSWORD
 
 IMAGES_FILE_PATH = Path("docker/images.json")
 
@@ -20,9 +19,9 @@ def docker_login(relogin: bool = True) -> None:
         "docker system info | grep --quiet -E 'Username|Registry'"
     ):
         Shell.check(  # pylint: disable=unexpected-keyword-arg
-            "docker login --username 'robotclickhouse' --password-stdin",
+            "docker login --username 'altinityinfra' --password-stdin",
             strict=True,
-            stdin_str=get_parameter_from_ssm("dockerhub_robot_password"),
+            stdin_str=DOCKER_PASSWORD,
             encoding="utf-8",
         )
 
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index 95160e82513f..2abb41a5d60e 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -56,7 +56,7 @@ def parse_args() -> argparse.Namespace:
         "--version",
         type=version_arg,
         default=get_version_from_repo(git=git).string,
-        help="a version to build, automaticaly got from version_helper, accepts either "
+        help="a version to build, automatically got from version_helper, accepts either "
         "tag ('refs/tags/' is removed automatically) or a normal 22.2.2.2 format",
     )
     parser.add_argument(
@@ -184,8 +184,8 @@ def buildx_args(
     args = [
         f"--platform=linux/{arch}",
         f"--label=build-url={GITHUB_RUN_URL}",
-        f"--label=com.clickhouse.build.githash={git.sha}",
-        f"--label=com.clickhouse.build.version={version}",
+        f"--label=com.altinity.build.githash={git.sha}",
+        f"--label=com.altinity.build.version={version}",
     ]
     if direct_urls:
         args.append(f"--build-arg=DIRECT_DOWNLOAD_URLS='{' '.join(direct_urls)}'")
@@ -211,7 +211,7 @@ def build_and_push_image(
     init_args = ["docker", "buildx", "build"]
     if push:
         init_args.append("--push")
-        init_args.append("--output=type=image,push-by-digest=true")
+        init_args.append("--output=type=image")
         init_args.append(f"--tag={image.repo}")
     else:
         init_args.append("--output=type=docker")
@@ -302,7 +302,7 @@ def test_docker_library(test_results: TestResults) -> None:
         tr.name
         for tr in test_results
         if (
-            tr.name.startswith("clickhouse/clickhouse-server")
+            tr.name.startswith("altinityinfra/clickhouse-server")
             and "alpine" not in tr.name
         )
     ]
@@ -362,10 +362,10 @@ def main():
         assert not args.image_path and not args.image_repo
         if "server image" in args.check_name:
             image_path = "docker/server"
-            image_repo = "clickhouse/clickhouse-server"
+            image_repo = "altinityinfra/clickhouse-server"
         elif "keeper image" in args.check_name:
             image_path = "docker/keeper"
-            image_repo = "clickhouse/clickhouse-keeper"
+            image_repo = "altinityinfra/clickhouse-keeper"
         else:
             assert False, "Invalid --check-name"
     else:
@@ -382,7 +382,8 @@ def main():
         push = True
 
     image = DockerImageData(image_path, image_repo, False)
-    tags = gen_tags(args.version, args.tag_type)
+    tags = [f'{pr_info.number}-{args.version}']
+
     repo_urls = {}
     direct_urls: Dict[str, List[str]] = {}
 
diff --git a/tests/ci/env_helper.py b/tests/ci/env_helper.py
index 2492c67913b4..ac22e90a9288 100644
--- a/tests/ci/env_helper.py
+++ b/tests/ci/env_helper.py
@@ -18,7 +18,7 @@
 CLOUDFLARE_TOKEN = os.getenv("CLOUDFLARE_TOKEN")
 GITHUB_EVENT_PATH = os.getenv("GITHUB_EVENT_PATH", "")
 GITHUB_JOB = os.getenv("GITHUB_JOB_OVERRIDDEN", "") or os.getenv("GITHUB_JOB", "local")
-GITHUB_REPOSITORY = os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse")
+GITHUB_REPOSITORY = os.getenv("GITHUB_REPOSITORY", "Altinity/ClickHouse")
 GITHUB_RUN_ID = os.getenv("GITHUB_RUN_ID", "0")
 GITHUB_SERVER_URL = os.getenv("GITHUB_SERVER_URL", "https://github.com")
 GITHUB_UPSTREAM_REPOSITORY = os.getenv(
@@ -29,9 +29,13 @@
 IMAGES_PATH = os.getenv("IMAGES_PATH", TEMP_PATH)
 REPO_COPY = os.getenv("REPO_COPY", GITHUB_WORKSPACE)
 RUNNER_TEMP = os.getenv("RUNNER_TEMP", p.abspath(p.join(module_dir, "./tmp")))
-S3_BUILDS_BUCKET = os.getenv("S3_BUILDS_BUCKET", "clickhouse-builds")
-S3_BUILDS_BUCKET_PUBLIC = "clickhouse-builds"
-S3_TEST_REPORTS_BUCKET = os.getenv("S3_TEST_REPORTS_BUCKET", "clickhouse-test-reports")
+
+S3_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID")
+S3_BUILDS_BUCKET = os.getenv("S3_BUILDS_BUCKET", "altinity-build-artifacts")
+S3_BUILDS_BUCKET_PUBLIC = "altinity-build-artifacts"
+S3_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY")
+S3_TEST_REPORTS_BUCKET = os.getenv("S3_TEST_REPORTS_BUCKET", "altinity-build-artifacts")
+
 S3_URL = os.getenv("S3_URL", "https://s3.amazonaws.com")
 S3_DOWNLOAD = os.getenv("S3_DOWNLOAD", S3_URL)
 S3_ARTIFACT_DOWNLOAD_TEMPLATE = (
@@ -39,3 +43,8 @@
     "{pr_or_release}/{commit}/{build_name}/{artifact}"
 )
 CI_CONFIG_PATH = f"{TEMP_PATH}/ci_config.json"
+CLICKHOUSE_TEST_STAT_LOGIN = os.getenv("CLICKHOUSE_TEST_STAT_LOGIN")
+CLICKHOUSE_TEST_STAT_PASSWORD = os.getenv("CLICKHOUSE_TEST_STAT_PASSWORD")
+CLICKHOUSE_TEST_STAT_URL = os.getenv("CLICKHOUSE_TEST_STAT_URL")
+DOCKER_PASSWORD = os.getenv("DOCKER_PASSWORD")
+ROBOT_TOKEN = os.getenv("ROBOT_TOKEN")
diff --git a/tests/ci/get_robot_token.py b/tests/ci/get_robot_token.py
index 662057f72d52..f9b30beb178f 100644
--- a/tests/ci/get_robot_token.py
+++ b/tests/ci/get_robot_token.py
@@ -10,6 +10,7 @@
 from github.GithubException import BadCredentialsException
 from github.NamedUser import NamedUser
 
+from env_helper import ROBOT_TOKEN
 
 @dataclass
 class Token:
@@ -56,12 +57,15 @@ def get_parameters_from_ssm(
 
     return results
 
+# NOTE(Arthur Passos): Original CI code uses the "_original" version of this method. Each robot token is rate limited
+# and the original implementation selects the "best one". To make it simpler and iterate faster,
+# we are using only one robot and keeping the method signature. In the future we might reconsider
+# having multiple robot tokens
+def get_best_robot_token():
+    return ROBOT_TOKEN
 
-ROBOT_TOKEN = None  # type: Optional[Token]
-
-
-def get_best_robot_token(tokens_path: str = "/github-tokens") -> str:
-    global ROBOT_TOKEN  # pylint:disable=global-statement
+def get_best_robot_token_original(tokens_path: str = "/github-tokens") -> str:
+    global ROBOT_TOKEN
     if ROBOT_TOKEN is not None:
         return ROBOT_TOKEN.value
     client = boto3.client("ssm", region_name="us-east-1")
diff --git a/tests/ci/git_helper.py b/tests/ci/git_helper.py
index 511f985bc2ab..e24f83de3eda 100644
--- a/tests/ci/git_helper.py
+++ b/tests/ci/git_helper.py
@@ -18,13 +18,30 @@
 
 logger = logging.getLogger(__name__)
 
+class VersionType:
+    LTS = "lts"
+    NEW = "new"
+    PRESTABLE = "altinityedge"
+    STABLE = "altinitystable"
+    TESTING = "altinitytest"
+    ANTALYA = "altinityantalya"
+
+    VALID = (NEW, TESTING, PRESTABLE, STABLE, LTS, ANTALYA,
+            # NOTE (vnemkov): we don't use those directly, but it is used in unit-tests
+            "stable",
+            "prestable",
+            "testing",
+    )
+
 # ^ and $ match subline in `multiple\nlines`
 # \A and \Z match only start and end of the whole string
+# NOTE (vnemkov): support both upstream tag style: v22.x.y.z-lts and Altinity tag style: v22.x.y.z.altinitystable
+# Because at early release stages there could be no Altinity tag set on commit, only upstream one.
 RELEASE_BRANCH_REGEXP = r"\A\d+[.]\d+\Z"
 TAG_REGEXP = (
     r"\Av\d{2}"  # First two digits of major part
     r"([.][1-9]\d*){3}"  # minor.patch.tweak parts
-    r"-(new|testing|prestable|stable|lts)\Z"  # suffix with a version type
+    fr"[\.-]({'|'.join(VersionType.VALID)})\Z"  # suffix with a version type
 )
 SHA_REGEXP = re.compile(r"\A([0-9]|[a-f]){40}\Z")
 
@@ -33,9 +50,9 @@
 
 with tempfile.NamedTemporaryFile("w", delete=False) as f:
     GIT_KNOWN_HOSTS_FILE = f.name
-    GIT_PREFIX = (  # All commits to remote are done as robot-clickhouse
-        "git -c user.email=robot-clickhouse@users.noreply.github.com "
-        "-c user.name=robot-clickhouse -c commit.gpgsign=false "
+    GIT_PREFIX = (  # All commits to remote are done as altinity-robot
+        "git -c user.email=altinity-robot@users.noreply.github.com "
+        "-c user.name=altinity-robot -c commit.gpgsign=false "
         "-c core.sshCommand="
         f"'ssh -o UserKnownHostsFile={GIT_KNOWN_HOSTS_FILE} "
         "-o StrictHostKeyChecking=accept-new'"
@@ -234,6 +251,7 @@ def __init__(self, ignore_no_tags: bool = False):
         self.sha_short = ""
         self.commits_since_latest = 0
         self.commits_since_new = 0
+        self.commits_since_upstream = 0 # commits since upstream tag
         self.update()
 
     def update(self):
@@ -252,13 +270,19 @@ def update(self):
             return
         self._update_tags()
 
+    def _commits_since(self, ref_name):
+        return int(
+            self.run(f"git rev-list {ref_name}..HEAD --count")
+        )
+
     def _update_tags(self, suppress_stderr: bool = False) -> None:
         stderr = subprocess.DEVNULL if suppress_stderr else None
         self.latest_tag = self.run("git describe --tags --abbrev=0", stderr=stderr)
-        # Format should be: {latest_tag}-{commits_since_tag}-g{sha_short}
-        self.commits_since_latest = int(
-            self.run(f"git rev-list {self.latest_tag}..HEAD --count")
-        )
+        self.commits_since_latest = self._commits_since(self.latest_tag)
+
+        self.latest_upstream_tag = self.run("git describe --tags --abbrev=0 --match='*-*'", stderr=stderr)
+        self.commits_since_upstream = None if not self.latest_upstream_tag else self._commits_since(self.latest_upstream_tag)
+
         if self.latest_tag.endswith("-new"):
             # We won't change the behaviour of the the "latest_tag"
             # So here we set "new_tag" to the previous tag in the graph, that will allow
@@ -267,9 +291,7 @@ def _update_tags(self, suppress_stderr: bool = False) -> None:
                 f"git describe --tags --abbrev=0 --exclude='{self.latest_tag}'",
                 stderr=stderr,
             )
-            self.commits_since_new = int(
-                self.run(f"git rev-list {self.new_tag}..HEAD --count")
-            )
+            self.commits_since_new = self._commits_since(self.new_tag)
 
     @staticmethod
     def check_tag(value: str) -> None:
diff --git a/tests/ci/jepsen_check.py b/tests/ci/jepsen_check.py
index 274ed31d9840..b5d4c5309a5b 100644
--- a/tests/ci/jepsen_check.py
+++ b/tests/ci/jepsen_check.py
@@ -26,10 +26,10 @@
 KEEPER_DESIRED_INSTANCE_COUNT = 3
 SERVER_DESIRED_INSTANCE_COUNT = 4
 
-KEEPER_IMAGE_NAME = "clickhouse/keeper-jepsen-test"
+KEEPER_IMAGE_NAME = "altinityinfra/keeper-jepsen-test"
 KEEPER_CHECK_NAME = CI.JobNames.JEPSEN_KEEPER
 
-SERVER_IMAGE_NAME = "clickhouse/server-jepsen-test"
+SERVER_IMAGE_NAME = "altinityinfra/server-jepsen-test"
 SERVER_CHECK_NAME = CI.JobNames.JEPSEN_SERVER
 
 SUCCESSFUL_TESTS_ANCHOR = "# Successful tests"
diff --git a/tests/ci/libfuzzer_test_check.py b/tests/ci/libfuzzer_test_check.py
index 338397ca6d22..cce6adcbd79c 100644
--- a/tests/ci/libfuzzer_test_check.py
+++ b/tests/ci/libfuzzer_test_check.py
@@ -239,7 +239,7 @@ def main():
         run_by_hash_num = 0
         run_by_hash_total = 0
 
-    docker_image = pull_image(get_docker_image("clickhouse/stateless-test"))
+    docker_image = pull_image(get_docker_image("altinityinfra/stateless-test"))
 
     fuzzers_path = temp_path / "fuzzers"
     fuzzers_path.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index 3a9f0df6128c..914804bdd2de 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -84,12 +84,16 @@ def get_pr_for_commit(sha, ref):
                 return pr
             our_prs.append(pr)
         logging.warning(
-            "Cannot find PR with required ref %s, sha %s - returning first one",
+            "Cannot find PR with required ref %s, sha %s",
             ref,
             sha,
         )
-        first_pr = our_prs[0]
-        return first_pr
+        # NOTE(vnemkov): IMO returning possibly unrelated PR is bad and breaks CI/CD down the road
+        # if len(our_prs) != 0:
+        #     first_pr = our_prs[0]
+        #     return first_pr
+        # else:
+        return None
     except Exception as ex:
         logging.error(
             "Cannot fetch PR info from commit ref %s, sha %s, exception: %s",
@@ -140,8 +144,10 @@ def __init__(
         ref = github_event.get("ref", "refs/heads/master")
         if ref and ref.startswith("refs/heads/"):
             ref = ref[11:]
+        # e.g. "refs/pull/509/merge" or "refs/tags/v24.3.12.76.altinitystable"
+        self.ref = ref  # type: str
         # Default values
-        self.base_ref = ""  # type: str
+        self.base_ref = github_event.get("base_ref","")  # type: str
         self.base_name = ""  # type: str
         self.head_ref = ""  # type: str
         self.head_name = ""  # type: str
@@ -247,7 +253,7 @@ def __init__(
             pull_request = get_pr_for_commit(self.sha, github_event["ref"])
 
             if pull_request is None or pull_request["state"] == "closed":
-                # it's merged PR to master
+                # it's merged PR to master, or there is no PR (build against specific commit or tag)
                 self.number = 0
                 if pull_request:
                     self.merged_pr = pull_request["number"]
@@ -256,9 +262,13 @@ def __init__(
                 self.base_name = self.repo_full_name
                 self.head_ref = ref
                 self.head_name = self.repo_full_name
-                self.diff_urls.append(
-                    self.compare_url(github_event["before"], self.sha)
-                )
+                before_sha = github_event["before"]
+                # in case of just a tag on exsiting commit, "before_sha" is 0000000000000000000000000000000000000000
+                # Hence it is a special case and basically nothing changed, there is no need to compose a diff url
+                if not all(x == '0' for x in before_sha):
+                    self.diff_urls.append(
+                        self.compare_url(before_sha, self.sha)
+                    )
             else:
                 self.number = pull_request["number"]
                 self.labels = {label["name"] for label in pull_request["labels"]}
diff --git a/tests/ci/release/extract-package-info.py b/tests/ci/release/extract-package-info.py
new file mode 100644
index 000000000000..72012092d199
--- /dev/null
+++ b/tests/ci/release/extract-package-info.py
@@ -0,0 +1,176 @@
+#! /usr/bin/env python3
+
+import os
+import sys
+import argparse
+from datetime import datetime, timezone
+
+import requests
+from packaging import version
+
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN") or os.getenv("GH_TOKEN")
+GITHUB_REPO = "Altinity/ClickHouse"
+
+
+def generate_time(folder_time: str = None) -> str:
+    """Generate time string.
+    """
+    if folder_time:
+        return folder_time
+
+    return datetime.now(timezone.utc).strftime("%Y-%m-%dT%H-%M-%S.%f")[:-3]
+
+
+def file_exists(url: str) -> bool:
+    """Check if a file exists at the given URL.
+    """
+    try:
+        response = requests.head(url, allow_redirects=True)
+        return response.status_code == 200
+    except requests.RequestException:
+        return False
+
+
+def set_env_variable(name: str, value: str) -> None:
+    """Set an environment variable. Works for both GitHub Actions and standalone scripts.
+    """
+    os.environ[name] = str(value)
+
+    github_env = os.getenv("GITHUB_ENV")
+    if github_env:
+        with open(github_env, "a") as f:
+            f.write(f"{name}={value}\n")
+    print(f"✓ Set {name}={value}")
+
+
+def get_repo_prefix(altinity_build_feature: str) -> str:
+    """Get the repository prefix based on the Altinity build feature.
+    """
+    repo_prefix_map = {
+        "altinityhotfix": "hotfix-",
+        "altinityfips": "fips-",
+        "altinityantalya": "antalya-",
+        "altinitystable": "",
+        "altinitytest": "",
+    }
+
+    if altinity_build_feature not in repo_prefix_map:
+        print(f"Error: Build feature not supported: {altinity_build_feature}", file=sys.stderr)
+        sys.exit(1)
+
+    return repo_prefix_map[altinity_build_feature]
+
+
+def get_run_details(run_url: str) -> dict:
+    """Fetch run details for a given run .
+    """
+    run_id = run_url.split("/")[-1]
+
+    headers = {
+        "Authorization": f"token {GITHUB_TOKEN}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    url = f"https://api.github.com/repos/{GITHUB_REPO}/actions/runs/{run_id}"
+    response = requests.get(url, headers=headers)
+
+    if response.status_code != 200:
+        raise Exception(
+            f"Failed to fetch run details: {response.status_code} {response.text}"
+        )
+
+    return response.json()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument(
+        "--artifact-dest-bucket",
+        type=str,
+        default=os.getenv("S3_STORAGE_BUCKET", "altinity-test-reports"),
+        help="S3 bucket where artifacts are moved to (default: S3_STORAGE_BUCKET env var or 'altinity-test-reports')"
+    )
+
+    parser.add_argument(
+        "--artifact-src-bucket",
+        type=str,
+        default=os.getenv("SRC_BUCKET", "altinity-build-artifacts"),
+        help="S3 bucket where artifacts are stored (default: SRC_BUCKET env var or 'altinity-build-artifacts')"
+    )
+
+    parser.add_argument(
+        "--folder-time",
+        type=str,
+        default=os.getenv("FOLDER_TIME"),
+        help="Folder time string (optional, will be auto-generated if not provided)"
+    )
+
+    parser.add_argument(
+        "--package-version",
+        type=str,
+        required=True,
+        help="Package version"
+        )
+
+    parser.add_argument(
+        "--workflow-url",
+        type=str,
+        required=True
+    )
+
+    args = parser.parse_args()
+
+    folder_time = generate_time(args.folder_time)
+
+    run_details = get_run_details(args.workflow_url)
+    commit_sha = run_details["head_commit"]["id"]
+    branch_name = run_details["head_branch"]
+    if len(run_details["pull_requests"]) > 0:
+        pr_number = run_details["pull_requests"][0]["number"]
+    else:
+        pr_number = 0
+
+    package_version = version.parse(".".join(args.package_version.split(".")[:-1]))
+    print(f"Parsed version: {package_version} (from {args.package_version})")
+
+    altinity_build_feature = args.package_version.split(".")[-1]
+    repo_prefix = get_repo_prefix(altinity_build_feature)
+
+    if pr_number != 0:
+        artifact_url = f"PRs/{pr_number}/{commit_sha}"
+        test_results_url = f"PRs/{pr_number}" if package_version >= version.parse("25.6") else pr_number
+    elif package_version >= version.parse("25.6"):
+        artifact_url = f"REFs/{branch_name}/{commit_sha}"
+        test_results_url = f"REFs/{branch_name}/{commit_sha}"
+    else:
+        artifact_url = f"{package_version.major}.{package_version.minor}/{commit_sha}"
+        test_results_url = 0
+    print(f"Artifact URL: {artifact_url}")
+
+    set_env_variable("COMMIT_HASH", commit_sha)
+    set_env_variable("DEST_URL", f"s3://{args.artifact_dest_bucket}/builds/stable/v{package_version}/{folder_time}")
+    set_env_variable("DOCKER_VERSION", f"{pr_number}-{args.package_version}")
+    set_env_variable("FOLDER_TIME", folder_time)
+    set_env_variable("MAJOR_VERSION", str(package_version.major))
+    set_env_variable("NEEDS_BINARY_PROCESSING", package_version >= version.parse("24"))
+    set_env_variable("PR_NUMBER", str(pr_number))
+    set_env_variable("REPO_PREFIX", repo_prefix)
+    set_env_variable("SRC_URL", f"s3://{args.artifact_src_bucket}/{artifact_url}")
+    set_env_variable("TEST_RESULTS_SRC", str(test_results_url))
+
+    # Validate clickhouse-server amd64 deb file with correct version exists
+    if package_version >= version.parse("25.6"):
+        deb_exists = file_exists(f"https://s3.amazonaws.com/{args.artifact_src_bucket}/{artifact_url}/build_amd_release/clickhouse-server_{args.package_version}_amd64.deb")
+        set_env_variable("BUILD_DIR", "build_amd_release")
+    else:
+        deb_exists = file_exists(f"https://s3.amazonaws.com/{args.artifact_src_bucket}/{artifact_url}/package_release/clickhouse-server_{args.package_version}_amd64.deb")
+        set_env_variable("BUILD_DIR", "package_release")
+
+    if not deb_exists:
+        print(f"\n✗ ERROR: Required DEB file not found", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/release/packaging/ansible/inventory/localhost.yml b/tests/ci/release/packaging/ansible/inventory/localhost.yml
new file mode 100644
index 000000000000..0025585e3922
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/inventory/localhost.yml
@@ -0,0 +1,81 @@
+all:
+  hosts:
+    localhost:
+      ansible_connection: local
+      ansible_python_interpreter: "{{ ansible_playbook_python }}"
+      repo_dns_name: "builds.staging.altinity.cloud"
+      aws_region: "us-east-1"
+      repo_subtitle: "Staging Builds"
+      repo_title: "Altinity {{ repo_subtitle }}"
+      repo_name: "altinity-staging"
+      repo_deb_dist: "stable"
+      repo_install_packages: "clickhouse-server clickhouse-client"
+      deb_pkg_names:
+        - "clickhouse-client_{{ pkgver }}_amd64.deb"
+        - "clickhouse-common-static_{{ pkgver }}_amd64.deb"
+        - "clickhouse-common-static-dbg_{{ pkgver }}_amd64.deb"
+        - "clickhouse-server_{{ pkgver }}_amd64.deb"
+        - "clickhouse-client_{{ pkgver }}_arm64.deb"
+        - "clickhouse-common-static_{{ pkgver }}_arm64.deb"
+        - "clickhouse-common-static-dbg_{{ pkgver }}_arm64.deb"
+        - "clickhouse-server_{{ pkgver }}_arm64.deb"
+        - "clickhouse-keeper_{{ pkgver }}_amd64.deb"
+        - "clickhouse-keeper_{{ pkgver }}_arm64.deb"
+      rpm_pkg_names:
+        - "clickhouse-client-{{ pkgver }}.x86_64.rpm"
+        - "clickhouse-common-static-{{ pkgver }}.x86_64.rpm"
+        - "clickhouse-common-static-dbg-{{ pkgver }}.x86_64.rpm"
+        - "clickhouse-server-{{ pkgver }}.x86_64.rpm"
+        - "clickhouse-client-{{ pkgver }}.aarch64.rpm"
+        - "clickhouse-common-static-{{ pkgver }}.aarch64.rpm"
+        - "clickhouse-common-static-dbg-{{ pkgver }}.aarch64.rpm"
+        - "clickhouse-server-{{ pkgver }}.aarch64.rpm"
+        - "clickhouse-keeper-{{ pkgver }}.x86_64.rpm"
+        - "clickhouse-keeper-{{ pkgver }}.aarch64.rpm"
+      tgz_pkg_names:
+        - "clickhouse-client-{{ pkgver }}-amd64.tgz"
+        - "clickhouse-common-static-{{ pkgver }}-amd64.tgz"
+        - "clickhouse-common-static-dbg-{{ pkgver }}-amd64.tgz"
+        - "clickhouse-server-{{ pkgver }}-amd64.tgz"
+        - "clickhouse-client-{{ pkgver }}-arm64.tgz"
+        - "clickhouse-common-static-{{ pkgver }}-arm64.tgz"
+        - "clickhouse-common-static-dbg-{{ pkgver }}-arm64.tgz"
+        - "clickhouse-server-{{ pkgver }}-arm64.tgz"
+        - "clickhouse-keeper-{{ pkgver }}-amd64.tgz"
+        - "clickhouse-keeper-{{ pkgver }}-arm64.tgz"
+      sha512_pkg_names:
+        - "clickhouse-client-{{ pkgver }}-amd64.tgz.sha512"
+        - "clickhouse-common-static-{{ pkgver }}-amd64.tgz.sha512"
+        - "clickhouse-common-static-dbg-{{ pkgver }}-amd64.tgz.sha512"
+        - "clickhouse-server-{{ pkgver }}-amd64.tgz.sha512"
+        - "clickhouse-client-{{ pkgver }}-arm64.tgz.sha512"
+        - "clickhouse-common-static-{{ pkgver }}-arm64.tgz.sha512"
+        - "clickhouse-common-static-dbg-{{ pkgver }}-arm64.tgz.sha512"
+        - "clickhouse-server-{{ pkgver }}-arm64.tgz.sha512"
+        - "clickhouse-keeper-{{ pkgver }}-amd64.tgz.sha512"
+        - "clickhouse-keeper-{{ pkgver }}-arm64.tgz.sha512"
+      tgz_repos:
+        - "tgz-repo"
+        - "fips-tgz-repo"
+        - "antalya-tgz-repo"
+        - "hotfix-tgz-repo"
+      src_repos:
+        - "src-repo"
+        - "fips-src-repo"
+        - "antalya-src-repo"
+        - "hotfix-src-repo"
+      bin_repos:
+        - "bin-repo"
+        - "fips-bin-repo"
+        - "antalya-bin-repo"
+        - "hotfix-bin-repo"
+      apt_repos:
+        - "apt-repo"
+        - "fips-apt-repo"
+        - "antalya-apt-repo"
+        - "hotfix-apt-repo"
+      yum_repos:
+        - "yum-repo"
+        - "fips-yum-repo"
+        - "antalya-yum-repo"
+        - "hotfix-yum-repo"
diff --git a/tests/ci/release/packaging/ansible/roles/get_cloudfront_info/tasks/main.yml b/tests/ci/release/packaging/ansible/roles/get_cloudfront_info/tasks/main.yml
new file mode 100644
index 000000000000..b65d0cdad385
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/get_cloudfront_info/tasks/main.yml
@@ -0,0 +1,34 @@
+- name: Get existing CloudFront information
+  community.aws.cloudfront_info:
+    distribution: yes
+    domain_name_alias: "{{ repo_dns_name }}"
+  register: cloudfront_info
+
+- name: Get current CloudFront origin path
+  set_fact:
+    cloudfront_origin_path: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Origins.Items[0].OriginPath }}"
+
+- name: Calculate the source S3 path
+  set_fact:
+    s3_repo_source_path: "s3://{{ repo_dns_name }}{{ cloudfront_origin_path }}"
+
+- name: Decide on the target (blue/green)
+  set_fact:
+    new_cloudfront_origin_path: "{{ '/Green' if cloudfront_origin_path == '/Blue' else '/Blue' }}"
+  when: 'not (push_to_active|default(false))'
+
+- name: Update the active site, when push_to_active is defined
+  set_fact:
+    new_cloudfront_origin_path: "{{ cloudfront_origin_path }}"
+  when: 'push_to_active|default(false)'
+
+- name: Calculate the target S3 path
+  set_fact:
+    s3_repo_target_path: "s3://{{ repo_dns_name }}{{ new_cloudfront_origin_path }}"
+
+- name: Show the source S3 path
+  debug:
+    msg:
+      - "Active path (current live site): {{ s3_repo_source_path }}"
+      - "Target path (to be updated):     {{ s3_repo_target_path }}"
+
diff --git a/tests/ci/release/packaging/ansible/roles/publish_pkgs/tasks/main.yml b/tests/ci/release/packaging/ansible/roles/publish_pkgs/tasks/main.yml
new file mode 100644
index 000000000000..627a77d62743
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/publish_pkgs/tasks/main.yml
@@ -0,0 +1,98 @@
+- name: Log the configuration being used
+  debug:
+    msg:
+      - 'Repo DNS Name:  {{ repo_dns_name }}'
+      - 'Repo Title:     {{ repo_title }}'
+      - 'Repo Subtitle:  {{ repo_subtitle }}'
+      - 'Repo Name:      {{ repo_name }}'
+      - 'Origin Path:    {{ new_cloudfront_origin_path|default("None") }}'
+      - 'Push to Active: {{ push_to_active|default(false) }}'
+
+- name: Create directory index files
+  shell: "{{ ansible_playbook_python }} {{ (playbook_dir + '/../dirindex/dirindexgen.py') | realpath }} {{ repo_dns_name }} {{ new_cloudfront_origin_path }}"
+
+- name: Get static content source path
+  set_fact:
+    static_path: "{{ (playbook_dir + '/../static') | realpath }}"
+
+- name: Get list of static content files
+  find:
+    paths: "{{ static_path }}"
+    file_type: file
+    recurse: true
+  register: static_files
+
+- name: Generate target filenames for source filenames
+  set_fact:
+    target_filenames: >-
+      {{
+        target_filenames | default({}) |
+        combine(
+          {
+            item.path:
+              item.path | regex_replace('^' + (static_path | regex_escape) + '/(.*)$', '\1')
+          }
+        )
+      }}
+  loop: "{{ static_files.files }}"
+  loop_control:
+    label: "{{ item.path }}"
+
+- name: Template HTML files to S3
+  amazon.aws.aws_s3:
+    bucket: "{{ repo_dns_name }}"
+    object: "{{ new_cloudfront_origin_path }}/{{ target_filenames[item.path] }}"
+    content: "{{ lookup('template', item.path) }}"
+    metadata: "Content-Type={{ lookup('pipe', 'file -b --mime-type ' + item.path) }}"
+    mode: put
+  when: 'item.path | basename | splitext | last == ".html"'
+  loop: "{{ static_files.files }}"
+  loop_control:
+    label: "{{ item.path }}"
+
+- name: Copy other static files to S3
+  amazon.aws.aws_s3:
+    bucket: "{{ repo_dns_name }}"
+    object: "{{ new_cloudfront_origin_path }}/{{ target_filenames[item.path] }}"
+    src: "{{ item.path }}"
+    metadata: "Content-Type={{ lookup('pipe', 'file -b --mime-type ' + item.path) }}"
+    mode: put
+  when: 'item.path | basename | splitext | last != ".html"'
+  loop: "{{ static_files.files }}"
+  loop_control:
+    label: "{{ item.path }}"
+
+- name: Update CloudFront distribution
+  community.aws.cloudfront_distribution:
+    region: "{{ aws_region }}"
+    state: present
+    caller_reference: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.CallerReference }}"
+    origins:
+      - id: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Origins.Items[0].Id }}"
+        domain_name: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Origins.Items[0].DomainName }}"
+        origin_path: "{{ new_cloudfront_origin_path | default(omit) }}"
+        custom_origin_config:
+          origin_protocol_policy: "http-only"
+    aliases:
+      - "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Aliases.Items[0] }}"
+    viewer_certificate:
+      acm_certificate_arn: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.ViewerCertificate.ACMCertificateArn }}"
+      ssl_support_method: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.ViewerCertificate.SSLSupportMethod }}"
+    logging:
+      bucket: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Logging.Bucket }}"
+      enabled: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Logging.Enabled }}"
+      include_cookies: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Logging.IncludeCookies }}"
+      prefix: "{{ cloudfront_info.cloudfront[repo_dns_name].Distribution.DistributionConfig.Logging.Prefix }}"
+  when: 'not (push_to_active|default(false))'
+  register: distribution
+
+- name: Invalidate CloudFront cache
+  community.aws.cloudfront_invalidation:
+    alias: "{{ repo_dns_name }}"
+    target_paths:
+      - "/*"
+  register: invalidation
+
+- name: Wait for CloudFront invalidation to be complete
+  shell: "aws cloudfront wait invalidation-completed --distribution-id {{ distribution.id }} --id {{ invalidation.invalidation.id }}"
+
diff --git a/tests/ci/release/packaging/ansible/roles/update_bin_repo/tasks/main.yml b/tests/ci/release/packaging/ansible/roles/update_bin_repo/tasks/main.yml
new file mode 100644
index 000000000000..998d496e397d
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_bin_repo/tasks/main.yml
@@ -0,0 +1,61 @@
+- name: Make new dirs
+  shell:
+    cmd: |
+      mkdir -p {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/self-extracting/
+      mkdir -p {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/non-self-extracting/
+  loop:
+    - amd64
+    - arm64
+  when: (pkgver | regex_replace('^(\\d+).*$', '\\1')) is version('24', '>=')
+
+- name: Copy new binaries
+  shell:
+    cmd: |
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/clickhouse {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/self-extracting/clickhouse
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/clickhouse-stripped {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/self-extracting/clickhouse-stripped
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/non-self-extracting/clickhouse {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/non-self-extracting/clickhouse
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/non-self-extracting/clickhouse-stripped {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/non-self-extracting/clickhouse-stripped
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/non-self-extracting/clickhouse-with-symtable {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/non-self-extracting/clickhouse-with-symtable
+  loop:
+    - amd64
+    - arm64
+  when: (pkgver | regex_replace('^(\\d+).*$', '\\1')) is version('24', '>=')
+
+- name: Sha512 encrypt the binaries
+  shell: echo $(sha512sum {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }} | cut -d ' ' -f 1) >> {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}.sha512
+  loop:
+    - amd64/v{{ pkgver }}/self-extracting/clickhouse
+    - amd64/v{{ pkgver }}/self-extracting/clickhouse-stripped
+    - amd64/v{{ pkgver }}/non-self-extracting/clickhouse
+    - amd64/v{{ pkgver }}/non-self-extracting/clickhouse-stripped
+    - amd64/v{{ pkgver }}/non-self-extracting/clickhouse-with-symtable
+    - arm64/v{{ pkgver }}/self-extracting/clickhouse
+    - arm64/v{{ pkgver }}/self-extracting/clickhouse-stripped
+    - arm64/v{{ pkgver }}/non-self-extracting/clickhouse
+    - arm64/v{{ pkgver }}/non-self-extracting/clickhouse-stripped
+    - arm64/v{{ pkgver }}/non-self-extracting/clickhouse-with-symtable
+  when: (pkgver | regex_replace('^(\\d+).*$', '\\1')) is version('24', '>=')
+
+- name: Copy new binaries
+  shell:
+    cmd: |
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/clickhouse {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/clickhouse
+      mv /home/runner/.cache/tmp/packages/{{ item }}-bin/clickhouse-stripped {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}/v{{ pkgver }}/clickhouse-stripped
+  loop:
+    - amd64
+    - arm64
+  when: (pkgver | regex_replace('^(\\d+).*$', '\\1')) is version('24', '<')
+
+- name: Sha512 encrypt the binaries
+  shell: echo $(sha512sum {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }} | cut -d ' ' -f 1) >> {{ local_repo_path }}/{{ repo_prefix }}bin-repo/{{ item }}.sha512
+  loop:
+    - amd64/v{{ pkgver }}/clickhouse
+    - amd64/v{{ pkgver }}/clickhouse-stripped
+    - arm64/v{{ pkgver }}/clickhouse
+    - arm64/v{{ pkgver }}/clickhouse-stripped
+  when: (pkgver | regex_replace('^(\\d+).*$', '\\1')) is version('24', '<')
+
+- name: Sync remaining repos between source and target
+  shell: 'aws s3 sync --delete "{{ local_repo_path }}/{{ item }}" "{{ s3_repo_target_path }}/{{ item }}"'
+  loop: "{{ bin_repos }}"
+  when: cloudfront_origin_path != ""
diff --git a/tests/ci/release/packaging/ansible/roles/update_deb_repo/tasks/main.yml b/tests/ci/release/packaging/ansible/roles/update_deb_repo/tasks/main.yml
new file mode 100644
index 000000000000..7e0ed3be36f6
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_deb_repo/tasks/main.yml
@@ -0,0 +1,68 @@
+- name: Copy new debs
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}apt-repo/pool/main/{{ item }}"
+  loop: "{{ deb_pkg_names }}"
+
+- name: Copy library-bridge and obdc-bridge if version newer than 24.8
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}apt-repo/pool/main/{{ item }}"
+  loop:
+    - "clickhouse-library-bridge_{{ pkgver }}_amd64.deb"
+    - "clickhouse-library-bridge_{{ pkgver }}_arm64.deb"
+    - "clickhouse-odbc-bridge_{{ pkgver }}_amd64.deb"
+    - "clickhouse-odbc-bridge_{{ pkgver }}_arm64.deb"
+
+- name: Sign new debs
+  shell: "dpkg-sig -k {{ gpg_key_id }} --sign builder {{ local_repo_path }}/{{ repo_prefix }}apt-repo/pool/main/{{ item }}"
+  loop: "{{ deb_pkg_names }}"
+
+- name: Sign library-bridge and obdc-bridge if version newer than 24.8
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: "dpkg-sig -k {{ gpg_key_id }} --sign builder {{ local_repo_path }}/{{ repo_prefix }}apt-repo/pool/main/{{ item }}"
+  loop:
+    - "clickhouse-library-bridge_{{ pkgver }}_amd64.deb"
+    - "clickhouse-library-bridge_{{ pkgver }}_arm64.deb"
+    - "clickhouse-odbc-bridge_{{ pkgver }}_amd64.deb"
+    - "clickhouse-odbc-bridge_{{ pkgver }}_arm64.deb"
+
+- name: Set up apt-ftparchive config
+  template:
+    src: "{{ item }}"
+    dest: "/home/runner/.cache/tmp/{{ item }}"
+  loop:
+    - "apt-ftparchive.conf"
+    - "apt-ftparchive-{{ repo_deb_dist }}.conf"
+
+- name: Build {{ repo_prefix }}apt repo
+  become: yes
+  shell:
+    chdir: "{{ local_repo_path }}/{{ repo_prefix }}apt-repo"
+    cmd: |
+      set -xe
+      apt-ftparchive generate /home/runner/.cache/tmp/apt-ftparchive.conf
+      apt-ftparchive -c /home/runner/.cache/tmp/apt-ftparchive-{{ repo_deb_dist }}.conf release dists/{{ repo_deb_dist }} > dists/{{ repo_deb_dist }}/Release
+
+- name: Sign {{ repo_prefix }}apt repo
+  shell:
+    chdir: "{{ local_repo_path }}/{{ repo_prefix }}apt-repo"
+    cmd: |
+      set -xe
+      gpg -a --yes --output dists/{{ repo_deb_dist }}/Release.gpg --detach-sign dists/{{ repo_deb_dist }}/Release
+      gpg -a --yes --clearsign --output dists/{{ repo_deb_dist }}/InRelease --detach-sign dists/{{ repo_deb_dist }}/Release
+
+- name: Get file info for contents of generated repo
+  stat:
+    path: "{{ local_repo_path }}/{{ repo_prefix }}apt-repo/dists/{{ repo_deb_dist }}/Contents-amd64"
+  register: contents_stat
+
+- name: Make sure the generated repo has content
+  assert:
+    that: "contents_stat.stat.size is defined and contents_stat.stat.size > 0"
+    fail_msg: "Repo generated by apt-ftparchive has no contents"
+
+- name: Export GPG public key to repo
+  shell: "gpg --export --armor '{{ gpg_key_name }}' > '{{ local_repo_path }}/{{ repo_prefix }}apt-repo/pubkey.gpg'"
+
+- name: Sync apt repos between source and target
+  shell: "aws s3 sync '{{ local_repo_path }}/{{ item }}' '{{ s3_repo_target_path }}/{{ item }}'"
+  loop: "{{ apt_repos }}"
+  when: cloudfront_origin_path != ""
diff --git a/tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive-stable.conf b/tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive-stable.conf
new file mode 100644
index 000000000000..1568a5cd3900
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive-stable.conf
@@ -0,0 +1,6 @@
+APT::FTPArchive::Release::Codename "stable";
+APT::FTPArchive::Release::Origin "Test repo";
+APT::FTPArchive::Release::Components "main";
+APT::FTPArchive::Release::Label "Test repo packages";
+APT::FTPArchive::Release::Architectures "all amd64 arm64";
+APT::FTPArchive::Release::Suite "stable";
diff --git a/tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive.conf b/tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive.conf
new file mode 100644
index 000000000000..86b965752d11
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive.conf
@@ -0,0 +1,17 @@
+Dir {
+	ArchiveDir "{{ local_repo_path }}/{{ repo_prefix }}apt-repo";
+};
+Default {
+	Packages::Compress ". gzip bzip2";
+	Sources::Compress ". gzip bzip2";
+	Contents::Compress ". gzip bzip2";
+};
+TreeDefault {
+	Directory "pool/$(SECTION)";
+	Packages "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages";
+	Contents "$(DIST)/Contents-$(ARCH)";
+};
+Tree "dists/stable" {
+	Sections "main";
+	Architectures "all amd64 arm64";
+}
diff --git a/tests/ci/release/packaging/ansible/roles/update_rpm_repo/tasks/main.yml b/tests/ci/release/packaging/ansible/roles/update_rpm_repo/tasks/main.yml
new file mode 100644
index 000000000000..6364b1542a91
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_rpm_repo/tasks/main.yml
@@ -0,0 +1,51 @@
+- name: Copy new rpms
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}yum-repo/{{ item }}"
+  loop: "{{ rpm_pkg_names }}"
+
+- name: Copy library-bridge and obdc-bridge if version is 24.8
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}yum-repo/{{ item }}"
+  loop:
+    - "clickhouse-library-bridge-{{ pkgver }}.x86_64.rpm"
+    - "clickhouse-library-bridge-{{ pkgver }}.aarch64.rpm"
+    - "clickhouse-odbc-bridge-{{ pkgver }}.x86_64.rpm"
+    - "clickhouse-odbc-bridge-{{ pkgver }}.aarch64.rpm"
+
+- name: Create rpmmacros file
+  template:
+    src: "rpmmacros.j2"
+    dest: "/home/runner/.cache/tmp/rpmmacros"
+
+- name: Sign new RPMs
+  shell: 'GPG_TTY=$(tty) rpmsign --addsign --load "/home/runner/.cache/tmp/rpmmacros" "{{ local_repo_path }}/{{ repo_prefix }}yum-repo/{{ item }}"'
+  loop: "{{ rpm_pkg_names }}"
+
+- name: Sign library-bridge and obdc-bridge if version is 24.8
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: 'GPG_TTY=$(tty) rpmsign --addsign --load "/home/runner/.cache/tmp/rpmmacros" "{{ local_repo_path }}/{{ repo_prefix }}yum-repo/{{ item }}"'
+  loop:
+    - "clickhouse-library-bridge-{{ pkgver }}.x86_64.rpm"
+    - "clickhouse-library-bridge-{{ pkgver }}.aarch64.rpm"
+    - "clickhouse-odbc-bridge-{{ pkgver }}.x86_64.rpm"
+    - "clickhouse-odbc-bridge-{{ pkgver }}.aarch64.rpm"
+
+- name: Build and sign yum repo
+  shell:
+    chdir: "{{ local_repo_path }}/{{ repo_prefix }}yum-repo"
+    cmd: |
+      set -e
+      createrepo --update .
+      gpg --detach-sign --armor --yes repodata/repomd.xml
+
+- name: Export GPG public key to repo
+  shell: 'gpg --export --armor "{{ gpg_key_name }}" > "{{ local_repo_path }}/{{ repo_prefix }}yum-repo/RPM-GPG-KEY-{{ repo_name }}"'
+
+- name: Export .repo file to repo
+  template:
+    src: "repo.j2"
+    dest: "{{ local_repo_path }}/{{ repo_prefix }}yum-repo/{{ repo_name }}.repo"
+
+- name: Sync yum repos between source and target
+  shell: 'aws s3 sync "{{ local_repo_path }}/{{ item }}" "{{ s3_repo_target_path }}/{{ item }}"'
+  loop: "{{ yum_repos }}"
+  when: cloudfront_origin_path != ""
diff --git a/tests/ci/release/packaging/ansible/roles/update_rpm_repo/templates/repo.j2 b/tests/ci/release/packaging/ansible/roles/update_rpm_repo/templates/repo.j2
new file mode 100644
index 000000000000..6104a0a62ca2
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_rpm_repo/templates/repo.j2
@@ -0,0 +1,7 @@
+[{{ repo_name }}]
+name={{ repo_title }}
+baseurl=https://{{ repo_dns_name }}/{{ repo_prefix }}yum-repo
+enabled=1
+repo_gpgcheck=1
+gpgcheck=1
+gpgkey=https://{{ repo_dns_name }}/{{ repo_prefix }}yum-repo/RPM-GPG-KEY-{{ repo_name }}
diff --git a/tests/ci/release/packaging/ansible/roles/update_rpm_repo/templates/rpmmacros.j2 b/tests/ci/release/packaging/ansible/roles/update_rpm_repo/templates/rpmmacros.j2
new file mode 100644
index 000000000000..8a01079c703a
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_rpm_repo/templates/rpmmacros.j2
@@ -0,0 +1,2 @@
+%_gpg_name {{ gpg_key_name }}
+%__gpg /usr/bin/gpg
diff --git a/tests/ci/release/packaging/ansible/roles/update_tar_repo/tasks/main.yml b/tests/ci/release/packaging/ansible/roles/update_tar_repo/tasks/main.yml
new file mode 100644
index 000000000000..b5e0185537f8
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/roles/update_tar_repo/tasks/main.yml
@@ -0,0 +1,60 @@
+- name: Copy new tgz
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }}"
+  loop: "{{ tgz_pkg_names }}"
+
+- name: Copy library-bridge and obdc-bridge tgz if version is 24.8
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }}"
+  loop:
+    - "clickhouse-library-bridge-{{ pkgver }}-amd64.tgz"
+    - "clickhouse-library-bridge-{{ pkgver }}-arm64.tgz"
+    - "clickhouse-odbc-bridge-{{ pkgver }}-amd64.tgz"
+    - "clickhouse-odbc-bridge-{{ pkgver }}-arm64.tgz"
+
+- name: Copy new tgz sha512
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }}"
+  loop: "{{ sha512_pkg_names }}"
+
+- name: Copy library-bridge and obdc-bridge sha512 if version is 24.8
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: "mv /home/runner/.cache/tmp/packages/{{ item }} {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }}"
+  loop:
+    - "clickhouse-library-bridge-{{ pkgver }}-amd64.tgz.sha512"
+    - "clickhouse-library-bridge-{{ pkgver }}-arm64.tgz.sha512"
+    - "clickhouse-odbc-bridge-{{ pkgver }}-amd64.tgz.sha512"
+    - "clickhouse-odbc-bridge-{{ pkgver }}-arm64.tgz.sha512"
+
+- name: Verify sha512 from repo
+  shell: "cat {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }}.sha512 | grep $(sha512sum {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }} | cut -d ' ' -f 1) || SHA_VERIFICATION='fail'"
+  loop: "{{ tgz_pkg_names }}"
+
+- name: Verify library-bridge and obdc-bridge sha512 from repo
+  when: (pkgver | regex_replace('^(\\d+\\.\\d+).*$', '\\1')) is version('24.8', '==')
+  shell: "cat {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }}.sha512 | grep $(sha512sum {{ local_repo_path }}/{{ repo_prefix }}tgz-repo/{{ item }} | cut -d ' ' -f 1) || SHA_VERIFICATION='fail'"
+  loop:
+    - "clickhouse-library-bridge-{{ pkgver }}-amd64.tgz"
+    - "clickhouse-library-bridge-{{ pkgver }}-arm64.tgz"
+    - "clickhouse-odbc-bridge-{{ pkgver }}-amd64.tgz"
+    - "clickhouse-odbc-bridge-{{ pkgver }}-arm64.tgz"
+
+- name: save verification output
+  shell: "echo $SHA_VERIFICATION"
+  register: SHA_VERIFICATION
+
+- name: Verify the sha512s match
+  fail:
+    msg: "Failure, sha512 does not match."
+  when: SHA_VERIFICATION == "fail"
+
+- name: Sync remaining repos between source and target
+  shell: 'aws s3 sync --delete "{{ local_repo_path }}/{{ item }}" "{{ s3_repo_target_path }}/{{ item }}"'
+  loop: "{{ tgz_repos }}"
+  when: cloudfront_origin_path != ""
+
+- name: Copy new src
+  shell: "mv /home/runner/.cache/tmp/packages/clickhouse-{{ pkgver }}.src.tar.gz {{ local_repo_path }}/{{ repo_prefix }}src-repo/clickhouse-{{ pkgver }}.src.tar.gz"
+
+- name: Sync remaining repos between source and target
+  shell: 'aws s3 sync --delete "{{ local_repo_path }}/{{ item }}" "{{ s3_repo_target_path }}/{{ item }}"'
+  loop: "{{ src_repos }}"
+  when: cloudfront_origin_path != ""
diff --git a/tests/ci/release/packaging/ansible/sign-and-release.yml b/tests/ci/release/packaging/ansible/sign-and-release.yml
new file mode 100644
index 000000000000..0b6dfc069044
--- /dev/null
+++ b/tests/ci/release/packaging/ansible/sign-and-release.yml
@@ -0,0 +1,8 @@
+- hosts: localhost
+  roles:
+    - get_cloudfront_info
+    - update_bin_repo
+    - update_deb_repo
+    - update_rpm_repo
+    - update_tar_repo
+    - publish_pkgs
diff --git a/tests/ci/release/packaging/dirindex/dirindexgen.py b/tests/ci/release/packaging/dirindex/dirindexgen.py
new file mode 100755
index 000000000000..27733a9e62d4
--- /dev/null
+++ b/tests/ci/release/packaging/dirindex/dirindexgen.py
@@ -0,0 +1,140 @@
+#!/bin/env python3
+
+import argparse
+import re
+import textwrap
+import boto3
+from natsort import natsorted
+
+
+def folder_list_add(folders, key, value):
+    p = key.split('/')
+    if len(p) > 1:
+        if '' not in folders:
+            folders[''] = [set(), dict()]
+        folders[''][0].add(p[0])
+    for i in range(len(p)-1):
+        base = '/'.join(p[:i+1])
+        if base not in folders:
+            folders[base] = [set(), dict()]
+        if i == len(p)-2:
+            folders[base][1][p[i+1]] = value
+        else:
+            folders[base][0].add(p[i+1])
+
+
+def human_readable_size(size, decimal_places=2):
+    for unit in ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']:
+        if size < 1024.0 or unit == 'PiB':
+            break
+        size /= 1024.0
+    return f"{size:.{decimal_places}f} {unit}"
+
+
+def folderjoin(items, slashes=False):
+    result = "/".join([item.strip("/") for item in items if item != "" and item != "/"])
+    if slashes:
+        if not result.startswith("/"):
+            result = "/" + result
+        if not result.endswith("/"):
+            result = result + "/"
+    return result
+
+
+def is_bin_repo_arch_folder(folder):
+    """
+    Check if the folder is a bin-repo architecture folder that should use natural sorting.
+    Matches patterns like: bin-repo/arm64, antalya-bin-repo/amd64, fips-bin-repo/arm64, etc.
+    """
+    # Match folders ending with (bin-repo|antalya-bin-repo|fips-bin-repo|hotfix-bin-repo)/(arm64|amd64)
+    pattern = r'(bin-repo|antalya-bin-repo|fips-bin-repo|hotfix-bin-repo)/(arm64|amd64)$'
+    return bool(re.search(pattern, folder))
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(dest='fqdn', help="Name of S3 bucket and domain name")
+    parser.add_argument(dest='prefix', help="S3 prefix to index")
+
+    args = parser.parse_args()
+
+    if args.prefix.startswith("/"):
+        args.prefix = args.prefix[1:]
+
+    if not args.prefix.endswith("/"):
+        args.prefix += "/"
+
+    parent_dir_str = "Parent Directory"
+
+    folders = dict()
+
+    s3 = boto3.client('s3')
+    paginator = s3.get_paginator('list_objects_v2')
+    objs = []
+    for page in paginator.paginate(Bucket=args.fqdn, Prefix=args.prefix):
+        if 'Contents' in page:
+            objs.extend(page['Contents'])
+
+    for o in objs:
+        key = o['Key']
+        if key.startswith(args.prefix):
+            key = key[len(args.prefix):]
+        folder_list_add(folders, key, o)
+
+    for folder in folders:
+        subs, files = folders[folder]
+        folders[folder] = (subs, files, 1 + max(
+            [len(parent_dir_str)] +
+            [len(s)+1 for s in subs] +
+            [len(f) for f in files]
+        ))
+
+    for folder in folders:
+        print(folder)
+        subs, files, maxlen = folders[folder]
+        indexdata = list()
+        indexdata.append(textwrap.dedent(
+            f"""\
+            <!DOCTYPE html>
+            <html lang="en">
+            <head>
+                <meta charset="UTF-8">
+                <title>Index of {folder}</title>
+            </head>
+            <body>
+            <h1>Index of {folder}</h1>
+            <pre>
+            <b>{"Name":{maxlen}}   {"Last Modified":20}   {"Size":20}</b>
+            """))
+        if folder != "":
+            parent_folder = folderjoin(folder.split("/")[:-1], slashes=True)
+            indexdata.append(f'<a href="{parent_folder}">{parent_dir_str}</a>' +
+                             f'{" ":{maxlen-len(parent_dir_str)}}   {"-":20}   {"-":20}\n')
+        # Apply natural sorting (descending) for bin-repo architecture folders
+        # to show newest versions first (e.g., v25.3 before v24.8 before v23.8)
+        if is_bin_repo_arch_folder(folder):
+            sorted_subs = list(reversed(natsorted(subs)))
+        else:
+            sorted_subs = sorted(subs)
+        for sub in sorted_subs:
+            sub_path = folderjoin([folder, sub], slashes=True)
+            indexdata.append(f'<a href="{sub_path}">{sub}/</a>{" ":{maxlen-len(sub)-1}}' +
+                             f'   {"-":20}   {"-":20}\n')
+        for file in files:
+            if file != "index.html":
+                file_path = folderjoin([folder, file])
+                mtime = files[file]['LastModified']
+                size = human_readable_size(files[file]['Size'])
+                indexdata.append(f'<a href="/{file_path}">{file}</a>{" ":{maxlen-len(file)}}' +
+                                 f'   {mtime:%Y-%m-%d %H:%M:%S}    {size:20}\n')
+        indexdata.append("</pre>\n</body>\n</html>\n")
+        s3.put_object(
+            Bucket=args.fqdn,
+            Key=folderjoin([args.prefix, folder, "index.html"]),
+            ContentType="text/html",
+            Body="".join(indexdata)
+        )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/release/packaging/static/bootstrap.bundle.min.js b/tests/ci/release/packaging/static/bootstrap.bundle.min.js
new file mode 100644
index 000000000000..b65b161a5332
--- /dev/null
+++ b/tests/ci/release/packaging/static/bootstrap.bundle.min.js
@@ -0,0 +1,7 @@
+/*!
+  * Bootstrap v5.1.0 (https://getbootstrap.com/)
+  * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).bootstrap=e()}(this,(function(){"use strict";const t=t=>{let e=t.getAttribute("data-bs-target");if(!e||"#"===e){let i=t.getAttribute("href");if(!i||!i.includes("#")&&!i.startsWith("."))return null;i.includes("#")&&!i.startsWith("#")&&(i="#"+i.split("#")[1]),e=i&&"#"!==i?i.trim():null}return e},e=e=>{const i=t(e);return i&&document.querySelector(i)?i:null},i=e=>{const i=t(e);return i?document.querySelector(i):null},n=t=>{t.dispatchEvent(new Event("transitionend"))},s=t=>!(!t||"object"!=typeof t)&&(void 0!==t.jquery&&(t=t[0]),void 0!==t.nodeType),o=t=>s(t)?t.jquery?t[0]:t:"string"==typeof t&&t.length>0?document.querySelector(t):null,r=(t,e,i)=>{Object.keys(i).forEach(n=>{const o=i[n],r=e[n],a=r&&s(r)?"element":null==(l=r)?""+l:{}.toString.call(l).match(/\s([a-z]+)/i)[1].toLowerCase();var l;if(!new RegExp(o).test(a))throw new TypeError(`${t.toUpperCase()}: Option "${n}" provided type "${a}" but expected type "${o}".`)})},a=t=>!(!s(t)||0===t.getClientRects().length)&&"visible"===getComputedStyle(t).getPropertyValue("visibility"),l=t=>!t||t.nodeType!==Node.ELEMENT_NODE||!!t.classList.contains("disabled")||(void 0!==t.disabled?t.disabled:t.hasAttribute("disabled")&&"false"!==t.getAttribute("disabled")),c=t=>{if(!document.documentElement.attachShadow)return null;if("function"==typeof t.getRootNode){const e=t.getRootNode();return e instanceof ShadowRoot?e:null}return t instanceof ShadowRoot?t:t.parentNode?c(t.parentNode):null},h=()=>{},d=t=>{t.offsetHeight},u=()=>{const{jQuery:t}=window;return t&&!document.body.hasAttribute("data-bs-no-jquery")?t:null},f=[],p=()=>"rtl"===document.documentElement.dir,m=t=>{var e;e=()=>{const e=u();if(e){const i=t.NAME,n=e.fn[i];e.fn[i]=t.jQueryInterface,e.fn[i].Constructor=t,e.fn[i].noConflict=()=>(e.fn[i]=n,t.jQueryInterface)}},"loading"===document.readyState?(f.length||document.addEventListener("DOMContentLoaded",()=>{f.forEach(t=>t())}),f.push(e)):e()},g=t=>{"function"==typeof t&&t()},_=(t,e,i=!0)=>{if(!i)return void g(t);const s=(t=>{if(!t)return 0;let{transitionDuration:e,transitionDelay:i}=window.getComputedStyle(t);const n=Number.parseFloat(e),s=Number.parseFloat(i);return n||s?(e=e.split(",")[0],i=i.split(",")[0],1e3*(Number.parseFloat(e)+Number.parseFloat(i))):0})(e)+5;let o=!1;const r=({target:i})=>{i===e&&(o=!0,e.removeEventListener("transitionend",r),g(t))};e.addEventListener("transitionend",r),setTimeout(()=>{o||n(e)},s)},b=(t,e,i,n)=>{let s=t.indexOf(e);if(-1===s)return t[!i&&n?t.length-1:0];const o=t.length;return s+=i?1:-1,n&&(s=(s+o)%o),t[Math.max(0,Math.min(s,o-1))]},v=/[^.]*(?=\..*)\.|.*/,y=/\..*/,w=/::\d+$/,E={};let A=1;const T={mouseenter:"mouseover",mouseleave:"mouseout"},O=/^(mouseenter|mouseleave)/i,C=new Set(["click","dblclick","mouseup","mousedown","contextmenu","mousewheel","DOMMouseScroll","mouseover","mouseout","mousemove","selectstart","selectend","keydown","keypress","keyup","orientationchange","touchstart","touchmove","touchend","touchcancel","pointerdown","pointermove","pointerup","pointerleave","pointercancel","gesturestart","gesturechange","gestureend","focus","blur","change","reset","select","submit","focusin","focusout","load","unload","beforeunload","resize","move","DOMContentLoaded","readystatechange","error","abort","scroll"]);function k(t,e){return e&&`${e}::${A++}`||t.uidEvent||A++}function L(t){const e=k(t);return t.uidEvent=e,E[e]=E[e]||{},E[e]}function x(t,e,i=null){const n=Object.keys(t);for(let s=0,o=n.length;s<o;s++){const o=t[n[s]];if(o.originalHandler===e&&o.delegationSelector===i)return o}return null}function D(t,e,i){const n="string"==typeof e,s=n?i:e;let o=I(t);return C.has(o)||(o=t),[n,s,o]}function S(t,e,i,n,s){if("string"!=typeof e||!t)return;if(i||(i=n,n=null),O.test(e)){const t=t=>function(e){if(!e.relatedTarget||e.relatedTarget!==e.delegateTarget&&!e.delegateTarget.contains(e.relatedTarget))return t.call(this,e)};n?n=t(n):i=t(i)}const[o,r,a]=D(e,i,n),l=L(t),c=l[a]||(l[a]={}),h=x(c,r,o?i:null);if(h)return void(h.oneOff=h.oneOff&&s);const d=k(r,e.replace(v,"")),u=o?function(t,e,i){return function n(s){const o=t.querySelectorAll(e);for(let{target:r}=s;r&&r!==this;r=r.parentNode)for(let a=o.length;a--;)if(o[a]===r)return s.delegateTarget=r,n.oneOff&&P.off(t,s.type,e,i),i.apply(r,[s]);return null}}(t,i,n):function(t,e){return function i(n){return n.delegateTarget=t,i.oneOff&&P.off(t,n.type,e),e.apply(t,[n])}}(t,i);u.delegationSelector=o?i:null,u.originalHandler=r,u.oneOff=s,u.uidEvent=d,c[d]=u,t.addEventListener(a,u,o)}function N(t,e,i,n,s){const o=x(e[i],n,s);o&&(t.removeEventListener(i,o,Boolean(s)),delete e[i][o.uidEvent])}function I(t){return t=t.replace(y,""),T[t]||t}const P={on(t,e,i,n){S(t,e,i,n,!1)},one(t,e,i,n){S(t,e,i,n,!0)},off(t,e,i,n){if("string"!=typeof e||!t)return;const[s,o,r]=D(e,i,n),a=r!==e,l=L(t),c=e.startsWith(".");if(void 0!==o){if(!l||!l[r])return;return void N(t,l,r,o,s?i:null)}c&&Object.keys(l).forEach(i=>{!function(t,e,i,n){const s=e[i]||{};Object.keys(s).forEach(o=>{if(o.includes(n)){const n=s[o];N(t,e,i,n.originalHandler,n.delegationSelector)}})}(t,l,i,e.slice(1))});const h=l[r]||{};Object.keys(h).forEach(i=>{const n=i.replace(w,"");if(!a||e.includes(n)){const e=h[i];N(t,l,r,e.originalHandler,e.delegationSelector)}})},trigger(t,e,i){if("string"!=typeof e||!t)return null;const n=u(),s=I(e),o=e!==s,r=C.has(s);let a,l=!0,c=!0,h=!1,d=null;return o&&n&&(a=n.Event(e,i),n(t).trigger(a),l=!a.isPropagationStopped(),c=!a.isImmediatePropagationStopped(),h=a.isDefaultPrevented()),r?(d=document.createEvent("HTMLEvents"),d.initEvent(s,l,!0)):d=new CustomEvent(e,{bubbles:l,cancelable:!0}),void 0!==i&&Object.keys(i).forEach(t=>{Object.defineProperty(d,t,{get:()=>i[t]})}),h&&d.preventDefault(),c&&t.dispatchEvent(d),d.defaultPrevented&&void 0!==a&&a.preventDefault(),d}},j=new Map;var M={set(t,e,i){j.has(t)||j.set(t,new Map);const n=j.get(t);n.has(e)||0===n.size?n.set(e,i):console.error(`Bootstrap doesn't allow more than one instance per element. Bound instance: ${Array.from(n.keys())[0]}.`)},get:(t,e)=>j.has(t)&&j.get(t).get(e)||null,remove(t,e){if(!j.has(t))return;const i=j.get(t);i.delete(e),0===i.size&&j.delete(t)}};class H{constructor(t){(t=o(t))&&(this._element=t,M.set(this._element,this.constructor.DATA_KEY,this))}dispose(){M.remove(this._element,this.constructor.DATA_KEY),P.off(this._element,this.constructor.EVENT_KEY),Object.getOwnPropertyNames(this).forEach(t=>{this[t]=null})}_queueCallback(t,e,i=!0){_(t,e,i)}static getInstance(t){return M.get(o(t),this.DATA_KEY)}static getOrCreateInstance(t,e={}){return this.getInstance(t)||new this(t,"object"==typeof e?e:null)}static get VERSION(){return"5.1.0"}static get NAME(){throw new Error('You have to implement the static method "NAME", for each component!')}static get DATA_KEY(){return"bs."+this.NAME}static get EVENT_KEY(){return"."+this.DATA_KEY}}const B=(t,e="hide")=>{const n="click.dismiss"+t.EVENT_KEY,s=t.NAME;P.on(document,n,`[data-bs-dismiss="${s}"]`,(function(n){if(["A","AREA"].includes(this.tagName)&&n.preventDefault(),l(this))return;const o=i(this)||this.closest("."+s);t.getOrCreateInstance(o)[e]()}))};class R extends H{static get NAME(){return"alert"}close(){if(P.trigger(this._element,"close.bs.alert").defaultPrevented)return;this._element.classList.remove("show");const t=this._element.classList.contains("fade");this._queueCallback(()=>this._destroyElement(),this._element,t)}_destroyElement(){this._element.remove(),P.trigger(this._element,"closed.bs.alert"),this.dispose()}static jQueryInterface(t){return this.each((function(){const e=R.getOrCreateInstance(this);if("string"==typeof t){if(void 0===e[t]||t.startsWith("_")||"constructor"===t)throw new TypeError(`No method named "${t}"`);e[t](this)}}))}}B(R,"close"),m(R);class W extends H{static get NAME(){return"button"}toggle(){this._element.setAttribute("aria-pressed",this._element.classList.toggle("active"))}static jQueryInterface(t){return this.each((function(){const e=W.getOrCreateInstance(this);"toggle"===t&&e[t]()}))}}function z(t){return"true"===t||"false"!==t&&(t===Number(t).toString()?Number(t):""===t||"null"===t?null:t)}function q(t){return t.replace(/[A-Z]/g,t=>"-"+t.toLowerCase())}P.on(document,"click.bs.button.data-api",'[data-bs-toggle="button"]',t=>{t.preventDefault();const e=t.target.closest('[data-bs-toggle="button"]');W.getOrCreateInstance(e).toggle()}),m(W);const F={setDataAttribute(t,e,i){t.setAttribute("data-bs-"+q(e),i)},removeDataAttribute(t,e){t.removeAttribute("data-bs-"+q(e))},getDataAttributes(t){if(!t)return{};const e={};return Object.keys(t.dataset).filter(t=>t.startsWith("bs")).forEach(i=>{let n=i.replace(/^bs/,"");n=n.charAt(0).toLowerCase()+n.slice(1,n.length),e[n]=z(t.dataset[i])}),e},getDataAttribute:(t,e)=>z(t.getAttribute("data-bs-"+q(e))),offset(t){const e=t.getBoundingClientRect();return{top:e.top+window.pageYOffset,left:e.left+window.pageXOffset}},position:t=>({top:t.offsetTop,left:t.offsetLeft})},U={find:(t,e=document.documentElement)=>[].concat(...Element.prototype.querySelectorAll.call(e,t)),findOne:(t,e=document.documentElement)=>Element.prototype.querySelector.call(e,t),children:(t,e)=>[].concat(...t.children).filter(t=>t.matches(e)),parents(t,e){const i=[];let n=t.parentNode;for(;n&&n.nodeType===Node.ELEMENT_NODE&&3!==n.nodeType;)n.matches(e)&&i.push(n),n=n.parentNode;return i},prev(t,e){let i=t.previousElementSibling;for(;i;){if(i.matches(e))return[i];i=i.previousElementSibling}return[]},next(t,e){let i=t.nextElementSibling;for(;i;){if(i.matches(e))return[i];i=i.nextElementSibling}return[]},focusableChildren(t){const e=["a","button","input","textarea","select","details","[tabindex]",'[contenteditable="true"]'].map(t=>t+':not([tabindex^="-"])').join(", ");return this.find(e,t).filter(t=>!l(t)&&a(t))}},$={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0,touch:!0},V={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean",touch:"boolean"},K="next",X="prev",Y="left",Q="right",G={ArrowLeft:Q,ArrowRight:Y};class Z extends H{constructor(t,e){super(t),this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this.touchStartX=0,this.touchDeltaX=0,this._config=this._getConfig(e),this._indicatorsElement=U.findOne(".carousel-indicators",this._element),this._touchSupported="ontouchstart"in document.documentElement||navigator.maxTouchPoints>0,this._pointerEvent=Boolean(window.PointerEvent),this._addEventListeners()}static get Default(){return $}static get NAME(){return"carousel"}next(){this._slide(K)}nextWhenVisible(){!document.hidden&&a(this._element)&&this.next()}prev(){this._slide(X)}pause(t){t||(this._isPaused=!0),U.findOne(".carousel-item-next, .carousel-item-prev",this._element)&&(n(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null}cycle(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config&&this._config.interval&&!this._isPaused&&(this._updateInterval(),this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))}to(t){this._activeElement=U.findOne(".active.carousel-item",this._element);const e=this._getItemIndex(this._activeElement);if(t>this._items.length-1||t<0)return;if(this._isSliding)return void P.one(this._element,"slid.bs.carousel",()=>this.to(t));if(e===t)return this.pause(),void this.cycle();const i=t>e?K:X;this._slide(i,this._items[t])}_getConfig(t){return t={...$,...F.getDataAttributes(this._element),..."object"==typeof t?t:{}},r("carousel",t,V),t}_handleSwipe(){const t=Math.abs(this.touchDeltaX);if(t<=40)return;const e=t/this.touchDeltaX;this.touchDeltaX=0,e&&this._slide(e>0?Q:Y)}_addEventListeners(){this._config.keyboard&&P.on(this._element,"keydown.bs.carousel",t=>this._keydown(t)),"hover"===this._config.pause&&(P.on(this._element,"mouseenter.bs.carousel",t=>this.pause(t)),P.on(this._element,"mouseleave.bs.carousel",t=>this.cycle(t))),this._config.touch&&this._touchSupported&&this._addTouchEventListeners()}_addTouchEventListeners(){const t=t=>{!this._pointerEvent||"pen"!==t.pointerType&&"touch"!==t.pointerType?this._pointerEvent||(this.touchStartX=t.touches[0].clientX):this.touchStartX=t.clientX},e=t=>{this.touchDeltaX=t.touches&&t.touches.length>1?0:t.touches[0].clientX-this.touchStartX},i=t=>{!this._pointerEvent||"pen"!==t.pointerType&&"touch"!==t.pointerType||(this.touchDeltaX=t.clientX-this.touchStartX),this._handleSwipe(),"hover"===this._config.pause&&(this.pause(),this.touchTimeout&&clearTimeout(this.touchTimeout),this.touchTimeout=setTimeout(t=>this.cycle(t),500+this._config.interval))};U.find(".carousel-item img",this._element).forEach(t=>{P.on(t,"dragstart.bs.carousel",t=>t.preventDefault())}),this._pointerEvent?(P.on(this._element,"pointerdown.bs.carousel",e=>t(e)),P.on(this._element,"pointerup.bs.carousel",t=>i(t)),this._element.classList.add("pointer-event")):(P.on(this._element,"touchstart.bs.carousel",e=>t(e)),P.on(this._element,"touchmove.bs.carousel",t=>e(t)),P.on(this._element,"touchend.bs.carousel",t=>i(t)))}_keydown(t){if(/input|textarea/i.test(t.target.tagName))return;const e=G[t.key];e&&(t.preventDefault(),this._slide(e))}_getItemIndex(t){return this._items=t&&t.parentNode?U.find(".carousel-item",t.parentNode):[],this._items.indexOf(t)}_getItemByOrder(t,e){const i=t===K;return b(this._items,e,i,this._config.wrap)}_triggerSlideEvent(t,e){const i=this._getItemIndex(t),n=this._getItemIndex(U.findOne(".active.carousel-item",this._element));return P.trigger(this._element,"slide.bs.carousel",{relatedTarget:t,direction:e,from:n,to:i})}_setActiveIndicatorElement(t){if(this._indicatorsElement){const e=U.findOne(".active",this._indicatorsElement);e.classList.remove("active"),e.removeAttribute("aria-current");const i=U.find("[data-bs-target]",this._indicatorsElement);for(let e=0;e<i.length;e++)if(Number.parseInt(i[e].getAttribute("data-bs-slide-to"),10)===this._getItemIndex(t)){i[e].classList.add("active"),i[e].setAttribute("aria-current","true");break}}}_updateInterval(){const t=this._activeElement||U.findOne(".active.carousel-item",this._element);if(!t)return;const e=Number.parseInt(t.getAttribute("data-bs-interval"),10);e?(this._config.defaultInterval=this._config.defaultInterval||this._config.interval,this._config.interval=e):this._config.interval=this._config.defaultInterval||this._config.interval}_slide(t,e){const i=this._directionToOrder(t),n=U.findOne(".active.carousel-item",this._element),s=this._getItemIndex(n),o=e||this._getItemByOrder(i,n),r=this._getItemIndex(o),a=Boolean(this._interval),l=i===K,c=l?"carousel-item-start":"carousel-item-end",h=l?"carousel-item-next":"carousel-item-prev",u=this._orderToDirection(i);if(o&&o.classList.contains("active"))return void(this._isSliding=!1);if(this._isSliding)return;if(this._triggerSlideEvent(o,u).defaultPrevented)return;if(!n||!o)return;this._isSliding=!0,a&&this.pause(),this._setActiveIndicatorElement(o),this._activeElement=o;const f=()=>{P.trigger(this._element,"slid.bs.carousel",{relatedTarget:o,direction:u,from:s,to:r})};if(this._element.classList.contains("slide")){o.classList.add(h),d(o),n.classList.add(c),o.classList.add(c);const t=()=>{o.classList.remove(c,h),o.classList.add("active"),n.classList.remove("active",h,c),this._isSliding=!1,setTimeout(f,0)};this._queueCallback(t,n,!0)}else n.classList.remove("active"),o.classList.add("active"),this._isSliding=!1,f();a&&this.cycle()}_directionToOrder(t){return[Q,Y].includes(t)?p()?t===Y?X:K:t===Y?K:X:t}_orderToDirection(t){return[K,X].includes(t)?p()?t===X?Y:Q:t===X?Q:Y:t}static carouselInterface(t,e){const i=Z.getOrCreateInstance(t,e);let{_config:n}=i;"object"==typeof e&&(n={...n,...e});const s="string"==typeof e?e:n.slide;if("number"==typeof e)i.to(e);else if("string"==typeof s){if(void 0===i[s])throw new TypeError(`No method named "${s}"`);i[s]()}else n.interval&&n.ride&&(i.pause(),i.cycle())}static jQueryInterface(t){return this.each((function(){Z.carouselInterface(this,t)}))}static dataApiClickHandler(t){const e=i(this);if(!e||!e.classList.contains("carousel"))return;const n={...F.getDataAttributes(e),...F.getDataAttributes(this)},s=this.getAttribute("data-bs-slide-to");s&&(n.interval=!1),Z.carouselInterface(e,n),s&&Z.getInstance(e).to(s),t.preventDefault()}}P.on(document,"click.bs.carousel.data-api","[data-bs-slide], [data-bs-slide-to]",Z.dataApiClickHandler),P.on(window,"load.bs.carousel.data-api",()=>{const t=U.find('[data-bs-ride="carousel"]');for(let e=0,i=t.length;e<i;e++)Z.carouselInterface(t[e],Z.getInstance(t[e]))}),m(Z);const J={toggle:!0,parent:null},tt={toggle:"boolean",parent:"(null|element)"};class et extends H{constructor(t,i){super(t),this._isTransitioning=!1,this._config=this._getConfig(i),this._triggerArray=[];const n=U.find('[data-bs-toggle="collapse"]');for(let t=0,i=n.length;t<i;t++){const i=n[t],s=e(i),o=U.find(s).filter(t=>t===this._element);null!==s&&o.length&&(this._selector=s,this._triggerArray.push(i))}this._initializeChildren(),this._config.parent||this._addAriaAndCollapsedClass(this._triggerArray,this._isShown()),this._config.toggle&&this.toggle()}static get Default(){return J}static get NAME(){return"collapse"}toggle(){this._isShown()?this.hide():this.show()}show(){if(this._isTransitioning||this._isShown())return;let t,e=[];if(this._config.parent){const t=U.find(".collapse .collapse",this._config.parent);e=U.find(".show, .collapsing",this._config.parent).filter(e=>!t.includes(e))}const i=U.findOne(this._selector);if(e.length){const n=e.find(t=>i!==t);if(t=n?et.getInstance(n):null,t&&t._isTransitioning)return}if(P.trigger(this._element,"show.bs.collapse").defaultPrevented)return;e.forEach(e=>{i!==e&&et.getOrCreateInstance(e,{toggle:!1}).hide(),t||M.set(e,"bs.collapse",null)});const n=this._getDimension();this._element.classList.remove("collapse"),this._element.classList.add("collapsing"),this._element.style[n]=0,this._addAriaAndCollapsedClass(this._triggerArray,!0),this._isTransitioning=!0;const s="scroll"+(n[0].toUpperCase()+n.slice(1));this._queueCallback(()=>{this._isTransitioning=!1,this._element.classList.remove("collapsing"),this._element.classList.add("collapse","show"),this._element.style[n]="",P.trigger(this._element,"shown.bs.collapse")},this._element,!0),this._element.style[n]=this._element[s]+"px"}hide(){if(this._isTransitioning||!this._isShown())return;if(P.trigger(this._element,"hide.bs.collapse").defaultPrevented)return;const t=this._getDimension();this._element.style[t]=this._element.getBoundingClientRect()[t]+"px",d(this._element),this._element.classList.add("collapsing"),this._element.classList.remove("collapse","show");const e=this._triggerArray.length;for(let t=0;t<e;t++){const e=this._triggerArray[t],n=i(e);n&&!this._isShown(n)&&this._addAriaAndCollapsedClass([e],!1)}this._isTransitioning=!0,this._element.style[t]="",this._queueCallback(()=>{this._isTransitioning=!1,this._element.classList.remove("collapsing"),this._element.classList.add("collapse"),P.trigger(this._element,"hidden.bs.collapse")},this._element,!0)}_isShown(t=this._element){return t.classList.contains("show")}_getConfig(t){return(t={...J,...F.getDataAttributes(this._element),...t}).toggle=Boolean(t.toggle),t.parent=o(t.parent),r("collapse",t,tt),t}_getDimension(){return this._element.classList.contains("collapse-horizontal")?"width":"height"}_initializeChildren(){if(!this._config.parent)return;const t=U.find(".collapse .collapse",this._config.parent);U.find('[data-bs-toggle="collapse"]',this._config.parent).filter(e=>!t.includes(e)).forEach(t=>{const e=i(t);e&&this._addAriaAndCollapsedClass([t],this._isShown(e))})}_addAriaAndCollapsedClass(t,e){t.length&&t.forEach(t=>{e?t.classList.remove("collapsed"):t.classList.add("collapsed"),t.setAttribute("aria-expanded",e)})}static jQueryInterface(t){return this.each((function(){const e={};"string"==typeof t&&/show|hide/.test(t)&&(e.toggle=!1);const i=et.getOrCreateInstance(this,e);if("string"==typeof t){if(void 0===i[t])throw new TypeError(`No method named "${t}"`);i[t]()}}))}}P.on(document,"click.bs.collapse.data-api",'[data-bs-toggle="collapse"]',(function(t){("A"===t.target.tagName||t.delegateTarget&&"A"===t.delegateTarget.tagName)&&t.preventDefault();const i=e(this);U.find(i).forEach(t=>{et.getOrCreateInstance(t,{toggle:!1}).toggle()})})),m(et);var it="top",nt="bottom",st="right",ot="left",rt=[it,nt,st,ot],at=rt.reduce((function(t,e){return t.concat([e+"-start",e+"-end"])}),[]),lt=[].concat(rt,["auto"]).reduce((function(t,e){return t.concat([e,e+"-start",e+"-end"])}),[]),ct=["beforeRead","read","afterRead","beforeMain","main","afterMain","beforeWrite","write","afterWrite"];function ht(t){return t?(t.nodeName||"").toLowerCase():null}function dt(t){if(null==t)return window;if("[object Window]"!==t.toString()){var e=t.ownerDocument;return e&&e.defaultView||window}return t}function ut(t){return t instanceof dt(t).Element||t instanceof Element}function ft(t){return t instanceof dt(t).HTMLElement||t instanceof HTMLElement}function pt(t){return"undefined"!=typeof ShadowRoot&&(t instanceof dt(t).ShadowRoot||t instanceof ShadowRoot)}var mt={name:"applyStyles",enabled:!0,phase:"write",fn:function(t){var e=t.state;Object.keys(e.elements).forEach((function(t){var i=e.styles[t]||{},n=e.attributes[t]||{},s=e.elements[t];ft(s)&&ht(s)&&(Object.assign(s.style,i),Object.keys(n).forEach((function(t){var e=n[t];!1===e?s.removeAttribute(t):s.setAttribute(t,!0===e?"":e)})))}))},effect:function(t){var e=t.state,i={popper:{position:e.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}};return Object.assign(e.elements.popper.style,i.popper),e.styles=i,e.elements.arrow&&Object.assign(e.elements.arrow.style,i.arrow),function(){Object.keys(e.elements).forEach((function(t){var n=e.elements[t],s=e.attributes[t]||{},o=Object.keys(e.styles.hasOwnProperty(t)?e.styles[t]:i[t]).reduce((function(t,e){return t[e]="",t}),{});ft(n)&&ht(n)&&(Object.assign(n.style,o),Object.keys(s).forEach((function(t){n.removeAttribute(t)})))}))}},requires:["computeStyles"]};function gt(t){return t.split("-")[0]}var _t=Math.round;function bt(t,e){void 0===e&&(e=!1);var i=t.getBoundingClientRect(),n=1,s=1;return ft(t)&&e&&(n=i.width/t.offsetWidth||1,s=i.height/t.offsetHeight||1),{width:_t(i.width/n),height:_t(i.height/s),top:_t(i.top/s),right:_t(i.right/n),bottom:_t(i.bottom/s),left:_t(i.left/n),x:_t(i.left/n),y:_t(i.top/s)}}function vt(t){var e=bt(t),i=t.offsetWidth,n=t.offsetHeight;return Math.abs(e.width-i)<=1&&(i=e.width),Math.abs(e.height-n)<=1&&(n=e.height),{x:t.offsetLeft,y:t.offsetTop,width:i,height:n}}function yt(t,e){var i=e.getRootNode&&e.getRootNode();if(t.contains(e))return!0;if(i&&pt(i)){var n=e;do{if(n&&t.isSameNode(n))return!0;n=n.parentNode||n.host}while(n)}return!1}function wt(t){return dt(t).getComputedStyle(t)}function Et(t){return["table","td","th"].indexOf(ht(t))>=0}function At(t){return((ut(t)?t.ownerDocument:t.document)||window.document).documentElement}function Tt(t){return"html"===ht(t)?t:t.assignedSlot||t.parentNode||(pt(t)?t.host:null)||At(t)}function Ot(t){return ft(t)&&"fixed"!==wt(t).position?t.offsetParent:null}function Ct(t){for(var e=dt(t),i=Ot(t);i&&Et(i)&&"static"===wt(i).position;)i=Ot(i);return i&&("html"===ht(i)||"body"===ht(i)&&"static"===wt(i).position)?e:i||function(t){var e=-1!==navigator.userAgent.toLowerCase().indexOf("firefox");if(-1!==navigator.userAgent.indexOf("Trident")&&ft(t)&&"fixed"===wt(t).position)return null;for(var i=Tt(t);ft(i)&&["html","body"].indexOf(ht(i))<0;){var n=wt(i);if("none"!==n.transform||"none"!==n.perspective||"paint"===n.contain||-1!==["transform","perspective"].indexOf(n.willChange)||e&&"filter"===n.willChange||e&&n.filter&&"none"!==n.filter)return i;i=i.parentNode}return null}(t)||e}function kt(t){return["top","bottom"].indexOf(t)>=0?"x":"y"}var Lt=Math.max,xt=Math.min,Dt=Math.round;function St(t,e,i){return Lt(t,xt(e,i))}function Nt(t){return Object.assign({},{top:0,right:0,bottom:0,left:0},t)}function It(t,e){return e.reduce((function(e,i){return e[i]=t,e}),{})}var Pt={name:"arrow",enabled:!0,phase:"main",fn:function(t){var e,i=t.state,n=t.name,s=t.options,o=i.elements.arrow,r=i.modifiersData.popperOffsets,a=gt(i.placement),l=kt(a),c=[ot,st].indexOf(a)>=0?"height":"width";if(o&&r){var h=function(t,e){return Nt("number"!=typeof(t="function"==typeof t?t(Object.assign({},e.rects,{placement:e.placement})):t)?t:It(t,rt))}(s.padding,i),d=vt(o),u="y"===l?it:ot,f="y"===l?nt:st,p=i.rects.reference[c]+i.rects.reference[l]-r[l]-i.rects.popper[c],m=r[l]-i.rects.reference[l],g=Ct(o),_=g?"y"===l?g.clientHeight||0:g.clientWidth||0:0,b=p/2-m/2,v=h[u],y=_-d[c]-h[f],w=_/2-d[c]/2+b,E=St(v,w,y),A=l;i.modifiersData[n]=((e={})[A]=E,e.centerOffset=E-w,e)}},effect:function(t){var e=t.state,i=t.options.element,n=void 0===i?"[data-popper-arrow]":i;null!=n&&("string"!=typeof n||(n=e.elements.popper.querySelector(n)))&&yt(e.elements.popper,n)&&(e.elements.arrow=n)},requires:["popperOffsets"],requiresIfExists:["preventOverflow"]},jt={top:"auto",right:"auto",bottom:"auto",left:"auto"};function Mt(t){var e,i=t.popper,n=t.popperRect,s=t.placement,o=t.offsets,r=t.position,a=t.gpuAcceleration,l=t.adaptive,c=t.roundOffsets,h=!0===c?function(t){var e=t.x,i=t.y,n=window.devicePixelRatio||1;return{x:Dt(Dt(e*n)/n)||0,y:Dt(Dt(i*n)/n)||0}}(o):"function"==typeof c?c(o):o,d=h.x,u=void 0===d?0:d,f=h.y,p=void 0===f?0:f,m=o.hasOwnProperty("x"),g=o.hasOwnProperty("y"),_=ot,b=it,v=window;if(l){var y=Ct(i),w="clientHeight",E="clientWidth";y===dt(i)&&"static"!==wt(y=At(i)).position&&(w="scrollHeight",E="scrollWidth"),y=y,s===it&&(b=nt,p-=y[w]-n.height,p*=a?1:-1),s===ot&&(_=st,u-=y[E]-n.width,u*=a?1:-1)}var A,T=Object.assign({position:r},l&&jt);return a?Object.assign({},T,((A={})[b]=g?"0":"",A[_]=m?"0":"",A.transform=(v.devicePixelRatio||1)<2?"translate("+u+"px, "+p+"px)":"translate3d("+u+"px, "+p+"px, 0)",A)):Object.assign({},T,((e={})[b]=g?p+"px":"",e[_]=m?u+"px":"",e.transform="",e))}var Ht={name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:function(t){var e=t.state,i=t.options,n=i.gpuAcceleration,s=void 0===n||n,o=i.adaptive,r=void 0===o||o,a=i.roundOffsets,l=void 0===a||a,c={placement:gt(e.placement),popper:e.elements.popper,popperRect:e.rects.popper,gpuAcceleration:s};null!=e.modifiersData.popperOffsets&&(e.styles.popper=Object.assign({},e.styles.popper,Mt(Object.assign({},c,{offsets:e.modifiersData.popperOffsets,position:e.options.strategy,adaptive:r,roundOffsets:l})))),null!=e.modifiersData.arrow&&(e.styles.arrow=Object.assign({},e.styles.arrow,Mt(Object.assign({},c,{offsets:e.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:l})))),e.attributes.popper=Object.assign({},e.attributes.popper,{"data-popper-placement":e.placement})},data:{}},Bt={passive:!0},Rt={name:"eventListeners",enabled:!0,phase:"write",fn:function(){},effect:function(t){var e=t.state,i=t.instance,n=t.options,s=n.scroll,o=void 0===s||s,r=n.resize,a=void 0===r||r,l=dt(e.elements.popper),c=[].concat(e.scrollParents.reference,e.scrollParents.popper);return o&&c.forEach((function(t){t.addEventListener("scroll",i.update,Bt)})),a&&l.addEventListener("resize",i.update,Bt),function(){o&&c.forEach((function(t){t.removeEventListener("scroll",i.update,Bt)})),a&&l.removeEventListener("resize",i.update,Bt)}},data:{}},Wt={left:"right",right:"left",bottom:"top",top:"bottom"};function zt(t){return t.replace(/left|right|bottom|top/g,(function(t){return Wt[t]}))}var qt={start:"end",end:"start"};function Ft(t){return t.replace(/start|end/g,(function(t){return qt[t]}))}function Ut(t){var e=dt(t);return{scrollLeft:e.pageXOffset,scrollTop:e.pageYOffset}}function $t(t){return bt(At(t)).left+Ut(t).scrollLeft}function Vt(t){var e=wt(t),i=e.overflow,n=e.overflowX,s=e.overflowY;return/auto|scroll|overlay|hidden/.test(i+s+n)}function Kt(t,e){var i;void 0===e&&(e=[]);var n=function t(e){return["html","body","#document"].indexOf(ht(e))>=0?e.ownerDocument.body:ft(e)&&Vt(e)?e:t(Tt(e))}(t),s=n===(null==(i=t.ownerDocument)?void 0:i.body),o=dt(n),r=s?[o].concat(o.visualViewport||[],Vt(n)?n:[]):n,a=e.concat(r);return s?a:a.concat(Kt(Tt(r)))}function Xt(t){return Object.assign({},t,{left:t.x,top:t.y,right:t.x+t.width,bottom:t.y+t.height})}function Yt(t,e){return"viewport"===e?Xt(function(t){var e=dt(t),i=At(t),n=e.visualViewport,s=i.clientWidth,o=i.clientHeight,r=0,a=0;return n&&(s=n.width,o=n.height,/^((?!chrome|android).)*safari/i.test(navigator.userAgent)||(r=n.offsetLeft,a=n.offsetTop)),{width:s,height:o,x:r+$t(t),y:a}}(t)):ft(e)?function(t){var e=bt(t);return e.top=e.top+t.clientTop,e.left=e.left+t.clientLeft,e.bottom=e.top+t.clientHeight,e.right=e.left+t.clientWidth,e.width=t.clientWidth,e.height=t.clientHeight,e.x=e.left,e.y=e.top,e}(e):Xt(function(t){var e,i=At(t),n=Ut(t),s=null==(e=t.ownerDocument)?void 0:e.body,o=Lt(i.scrollWidth,i.clientWidth,s?s.scrollWidth:0,s?s.clientWidth:0),r=Lt(i.scrollHeight,i.clientHeight,s?s.scrollHeight:0,s?s.clientHeight:0),a=-n.scrollLeft+$t(t),l=-n.scrollTop;return"rtl"===wt(s||i).direction&&(a+=Lt(i.clientWidth,s?s.clientWidth:0)-o),{width:o,height:r,x:a,y:l}}(At(t)))}function Qt(t){return t.split("-")[1]}function Gt(t){var e,i=t.reference,n=t.element,s=t.placement,o=s?gt(s):null,r=s?Qt(s):null,a=i.x+i.width/2-n.width/2,l=i.y+i.height/2-n.height/2;switch(o){case it:e={x:a,y:i.y-n.height};break;case nt:e={x:a,y:i.y+i.height};break;case st:e={x:i.x+i.width,y:l};break;case ot:e={x:i.x-n.width,y:l};break;default:e={x:i.x,y:i.y}}var c=o?kt(o):null;if(null!=c){var h="y"===c?"height":"width";switch(r){case"start":e[c]=e[c]-(i[h]/2-n[h]/2);break;case"end":e[c]=e[c]+(i[h]/2-n[h]/2)}}return e}function Zt(t,e){void 0===e&&(e={});var i=e,n=i.placement,s=void 0===n?t.placement:n,o=i.boundary,r=void 0===o?"clippingParents":o,a=i.rootBoundary,l=void 0===a?"viewport":a,c=i.elementContext,h=void 0===c?"popper":c,d=i.altBoundary,u=void 0!==d&&d,f=i.padding,p=void 0===f?0:f,m=Nt("number"!=typeof p?p:It(p,rt)),g="popper"===h?"reference":"popper",_=t.elements.reference,b=t.rects.popper,v=t.elements[u?g:h],y=function(t,e,i){var n="clippingParents"===e?function(t){var e=Kt(Tt(t)),i=["absolute","fixed"].indexOf(wt(t).position)>=0&&ft(t)?Ct(t):t;return ut(i)?e.filter((function(t){return ut(t)&&yt(t,i)&&"body"!==ht(t)})):[]}(t):[].concat(e),s=[].concat(n,[i]),o=s[0],r=s.reduce((function(e,i){var n=Yt(t,i);return e.top=Lt(n.top,e.top),e.right=xt(n.right,e.right),e.bottom=xt(n.bottom,e.bottom),e.left=Lt(n.left,e.left),e}),Yt(t,o));return r.width=r.right-r.left,r.height=r.bottom-r.top,r.x=r.left,r.y=r.top,r}(ut(v)?v:v.contextElement||At(t.elements.popper),r,l),w=bt(_),E=Gt({reference:w,element:b,strategy:"absolute",placement:s}),A=Xt(Object.assign({},b,E)),T="popper"===h?A:w,O={top:y.top-T.top+m.top,bottom:T.bottom-y.bottom+m.bottom,left:y.left-T.left+m.left,right:T.right-y.right+m.right},C=t.modifiersData.offset;if("popper"===h&&C){var k=C[s];Object.keys(O).forEach((function(t){var e=[st,nt].indexOf(t)>=0?1:-1,i=[it,nt].indexOf(t)>=0?"y":"x";O[t]+=k[i]*e}))}return O}function Jt(t,e){void 0===e&&(e={});var i=e,n=i.placement,s=i.boundary,o=i.rootBoundary,r=i.padding,a=i.flipVariations,l=i.allowedAutoPlacements,c=void 0===l?lt:l,h=Qt(n),d=h?a?at:at.filter((function(t){return Qt(t)===h})):rt,u=d.filter((function(t){return c.indexOf(t)>=0}));0===u.length&&(u=d);var f=u.reduce((function(e,i){return e[i]=Zt(t,{placement:i,boundary:s,rootBoundary:o,padding:r})[gt(i)],e}),{});return Object.keys(f).sort((function(t,e){return f[t]-f[e]}))}var te={name:"flip",enabled:!0,phase:"main",fn:function(t){var e=t.state,i=t.options,n=t.name;if(!e.modifiersData[n]._skip){for(var s=i.mainAxis,o=void 0===s||s,r=i.altAxis,a=void 0===r||r,l=i.fallbackPlacements,c=i.padding,h=i.boundary,d=i.rootBoundary,u=i.altBoundary,f=i.flipVariations,p=void 0===f||f,m=i.allowedAutoPlacements,g=e.options.placement,_=gt(g),b=l||(_!==g&&p?function(t){if("auto"===gt(t))return[];var e=zt(t);return[Ft(t),e,Ft(e)]}(g):[zt(g)]),v=[g].concat(b).reduce((function(t,i){return t.concat("auto"===gt(i)?Jt(e,{placement:i,boundary:h,rootBoundary:d,padding:c,flipVariations:p,allowedAutoPlacements:m}):i)}),[]),y=e.rects.reference,w=e.rects.popper,E=new Map,A=!0,T=v[0],O=0;O<v.length;O++){var C=v[O],k=gt(C),L="start"===Qt(C),x=[it,nt].indexOf(k)>=0,D=x?"width":"height",S=Zt(e,{placement:C,boundary:h,rootBoundary:d,altBoundary:u,padding:c}),N=x?L?st:ot:L?nt:it;y[D]>w[D]&&(N=zt(N));var I=zt(N),P=[];if(o&&P.push(S[k]<=0),a&&P.push(S[N]<=0,S[I]<=0),P.every((function(t){return t}))){T=C,A=!1;break}E.set(C,P)}if(A)for(var j=function(t){var e=v.find((function(e){var i=E.get(e);if(i)return i.slice(0,t).every((function(t){return t}))}));if(e)return T=e,"break"},M=p?3:1;M>0&&"break"!==j(M);M--);e.placement!==T&&(e.modifiersData[n]._skip=!0,e.placement=T,e.reset=!0)}},requiresIfExists:["offset"],data:{_skip:!1}};function ee(t,e,i){return void 0===i&&(i={x:0,y:0}),{top:t.top-e.height-i.y,right:t.right-e.width+i.x,bottom:t.bottom-e.height+i.y,left:t.left-e.width-i.x}}function ie(t){return[it,st,nt,ot].some((function(e){return t[e]>=0}))}var ne={name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:function(t){var e=t.state,i=t.name,n=e.rects.reference,s=e.rects.popper,o=e.modifiersData.preventOverflow,r=Zt(e,{elementContext:"reference"}),a=Zt(e,{altBoundary:!0}),l=ee(r,n),c=ee(a,s,o),h=ie(l),d=ie(c);e.modifiersData[i]={referenceClippingOffsets:l,popperEscapeOffsets:c,isReferenceHidden:h,hasPopperEscaped:d},e.attributes.popper=Object.assign({},e.attributes.popper,{"data-popper-reference-hidden":h,"data-popper-escaped":d})}},se={name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:function(t){var e=t.state,i=t.options,n=t.name,s=i.offset,o=void 0===s?[0,0]:s,r=lt.reduce((function(t,i){return t[i]=function(t,e,i){var n=gt(t),s=[ot,it].indexOf(n)>=0?-1:1,o="function"==typeof i?i(Object.assign({},e,{placement:t})):i,r=o[0],a=o[1];return r=r||0,a=(a||0)*s,[ot,st].indexOf(n)>=0?{x:a,y:r}:{x:r,y:a}}(i,e.rects,o),t}),{}),a=r[e.placement],l=a.x,c=a.y;null!=e.modifiersData.popperOffsets&&(e.modifiersData.popperOffsets.x+=l,e.modifiersData.popperOffsets.y+=c),e.modifiersData[n]=r}},oe={name:"popperOffsets",enabled:!0,phase:"read",fn:function(t){var e=t.state,i=t.name;e.modifiersData[i]=Gt({reference:e.rects.reference,element:e.rects.popper,strategy:"absolute",placement:e.placement})},data:{}},re={name:"preventOverflow",enabled:!0,phase:"main",fn:function(t){var e=t.state,i=t.options,n=t.name,s=i.mainAxis,o=void 0===s||s,r=i.altAxis,a=void 0!==r&&r,l=i.boundary,c=i.rootBoundary,h=i.altBoundary,d=i.padding,u=i.tether,f=void 0===u||u,p=i.tetherOffset,m=void 0===p?0:p,g=Zt(e,{boundary:l,rootBoundary:c,padding:d,altBoundary:h}),_=gt(e.placement),b=Qt(e.placement),v=!b,y=kt(_),w="x"===y?"y":"x",E=e.modifiersData.popperOffsets,A=e.rects.reference,T=e.rects.popper,O="function"==typeof m?m(Object.assign({},e.rects,{placement:e.placement})):m,C={x:0,y:0};if(E){if(o||a){var k="y"===y?it:ot,L="y"===y?nt:st,x="y"===y?"height":"width",D=E[y],S=E[y]+g[k],N=E[y]-g[L],I=f?-T[x]/2:0,P="start"===b?A[x]:T[x],j="start"===b?-T[x]:-A[x],M=e.elements.arrow,H=f&&M?vt(M):{width:0,height:0},B=e.modifiersData["arrow#persistent"]?e.modifiersData["arrow#persistent"].padding:{top:0,right:0,bottom:0,left:0},R=B[k],W=B[L],z=St(0,A[x],H[x]),q=v?A[x]/2-I-z-R-O:P-z-R-O,F=v?-A[x]/2+I+z+W+O:j+z+W+O,U=e.elements.arrow&&Ct(e.elements.arrow),$=U?"y"===y?U.clientTop||0:U.clientLeft||0:0,V=e.modifiersData.offset?e.modifiersData.offset[e.placement][y]:0,K=E[y]+q-V-$,X=E[y]+F-V;if(o){var Y=St(f?xt(S,K):S,D,f?Lt(N,X):N);E[y]=Y,C[y]=Y-D}if(a){var Q="x"===y?it:ot,G="x"===y?nt:st,Z=E[w],J=Z+g[Q],tt=Z-g[G],et=St(f?xt(J,K):J,Z,f?Lt(tt,X):tt);E[w]=et,C[w]=et-Z}}e.modifiersData[n]=C}},requiresIfExists:["offset"]};function ae(t,e,i){void 0===i&&(i=!1);var n,s,o=ft(e),r=ft(e)&&function(t){var e=t.getBoundingClientRect(),i=e.width/t.offsetWidth||1,n=e.height/t.offsetHeight||1;return 1!==i||1!==n}(e),a=At(e),l=bt(t,r),c={scrollLeft:0,scrollTop:0},h={x:0,y:0};return(o||!o&&!i)&&(("body"!==ht(e)||Vt(a))&&(c=(n=e)!==dt(n)&&ft(n)?{scrollLeft:(s=n).scrollLeft,scrollTop:s.scrollTop}:Ut(n)),ft(e)?((h=bt(e,!0)).x+=e.clientLeft,h.y+=e.clientTop):a&&(h.x=$t(a))),{x:l.left+c.scrollLeft-h.x,y:l.top+c.scrollTop-h.y,width:l.width,height:l.height}}var le={placement:"bottom",modifiers:[],strategy:"absolute"};function ce(){for(var t=arguments.length,e=new Array(t),i=0;i<t;i++)e[i]=arguments[i];return!e.some((function(t){return!(t&&"function"==typeof t.getBoundingClientRect)}))}function he(t){void 0===t&&(t={});var e=t,i=e.defaultModifiers,n=void 0===i?[]:i,s=e.defaultOptions,o=void 0===s?le:s;return function(t,e,i){void 0===i&&(i=o);var s,r,a={placement:"bottom",orderedModifiers:[],options:Object.assign({},le,o),modifiersData:{},elements:{reference:t,popper:e},attributes:{},styles:{}},l=[],c=!1,h={state:a,setOptions:function(i){d(),a.options=Object.assign({},o,a.options,i),a.scrollParents={reference:ut(t)?Kt(t):t.contextElement?Kt(t.contextElement):[],popper:Kt(e)};var s,r,c=function(t){var e=function(t){var e=new Map,i=new Set,n=[];return t.forEach((function(t){e.set(t.name,t)})),t.forEach((function(t){i.has(t.name)||function t(s){i.add(s.name),[].concat(s.requires||[],s.requiresIfExists||[]).forEach((function(n){if(!i.has(n)){var s=e.get(n);s&&t(s)}})),n.push(s)}(t)})),n}(t);return ct.reduce((function(t,i){return t.concat(e.filter((function(t){return t.phase===i})))}),[])}((s=[].concat(n,a.options.modifiers),r=s.reduce((function(t,e){var i=t[e.name];return t[e.name]=i?Object.assign({},i,e,{options:Object.assign({},i.options,e.options),data:Object.assign({},i.data,e.data)}):e,t}),{}),Object.keys(r).map((function(t){return r[t]}))));return a.orderedModifiers=c.filter((function(t){return t.enabled})),a.orderedModifiers.forEach((function(t){var e=t.name,i=t.options,n=void 0===i?{}:i,s=t.effect;if("function"==typeof s){var o=s({state:a,name:e,instance:h,options:n});l.push(o||function(){})}})),h.update()},forceUpdate:function(){if(!c){var t=a.elements,e=t.reference,i=t.popper;if(ce(e,i)){a.rects={reference:ae(e,Ct(i),"fixed"===a.options.strategy),popper:vt(i)},a.reset=!1,a.placement=a.options.placement,a.orderedModifiers.forEach((function(t){return a.modifiersData[t.name]=Object.assign({},t.data)}));for(var n=0;n<a.orderedModifiers.length;n++)if(!0!==a.reset){var s=a.orderedModifiers[n],o=s.fn,r=s.options,l=void 0===r?{}:r,d=s.name;"function"==typeof o&&(a=o({state:a,options:l,name:d,instance:h})||a)}else a.reset=!1,n=-1}}},update:(s=function(){return new Promise((function(t){h.forceUpdate(),t(a)}))},function(){return r||(r=new Promise((function(t){Promise.resolve().then((function(){r=void 0,t(s())}))}))),r}),destroy:function(){d(),c=!0}};if(!ce(t,e))return h;function d(){l.forEach((function(t){return t()})),l=[]}return h.setOptions(i).then((function(t){!c&&i.onFirstUpdate&&i.onFirstUpdate(t)})),h}}var de=he(),ue=he({defaultModifiers:[Rt,oe,Ht,mt]}),fe=he({defaultModifiers:[Rt,oe,Ht,mt,se,te,re,Pt,ne]}),pe=Object.freeze({__proto__:null,popperGenerator:he,detectOverflow:Zt,createPopperBase:de,createPopper:fe,createPopperLite:ue,top:it,bottom:nt,right:st,left:ot,auto:"auto",basePlacements:rt,start:"start",end:"end",clippingParents:"clippingParents",viewport:"viewport",popper:"popper",reference:"reference",variationPlacements:at,placements:lt,beforeRead:"beforeRead",read:"read",afterRead:"afterRead",beforeMain:"beforeMain",main:"main",afterMain:"afterMain",beforeWrite:"beforeWrite",write:"write",afterWrite:"afterWrite",modifierPhases:ct,applyStyles:mt,arrow:Pt,computeStyles:Ht,eventListeners:Rt,flip:te,hide:ne,offset:se,popperOffsets:oe,preventOverflow:re});const me=new RegExp("ArrowUp|ArrowDown|Escape"),ge=p()?"top-end":"top-start",_e=p()?"top-start":"top-end",be=p()?"bottom-end":"bottom-start",ve=p()?"bottom-start":"bottom-end",ye=p()?"left-start":"right-start",we=p()?"right-start":"left-start",Ee={offset:[0,2],boundary:"clippingParents",reference:"toggle",display:"dynamic",popperConfig:null,autoClose:!0},Ae={offset:"(array|string|function)",boundary:"(string|element)",reference:"(string|element|object)",display:"string",popperConfig:"(null|object|function)",autoClose:"(boolean|string)"};class Te extends H{constructor(t,e){super(t),this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar()}static get Default(){return Ee}static get DefaultType(){return Ae}static get NAME(){return"dropdown"}toggle(){return this._isShown()?this.hide():this.show()}show(){if(l(this._element)||this._isShown(this._menu))return;const t={relatedTarget:this._element};if(P.trigger(this._element,"show.bs.dropdown",t).defaultPrevented)return;const e=Te.getParentFromElement(this._element);this._inNavbar?F.setDataAttribute(this._menu,"popper","none"):this._createPopper(e),"ontouchstart"in document.documentElement&&!e.closest(".navbar-nav")&&[].concat(...document.body.children).forEach(t=>P.on(t,"mouseover",h)),this._element.focus(),this._element.setAttribute("aria-expanded",!0),this._menu.classList.add("show"),this._element.classList.add("show"),P.trigger(this._element,"shown.bs.dropdown",t)}hide(){if(l(this._element)||!this._isShown(this._menu))return;const t={relatedTarget:this._element};this._completeHide(t)}dispose(){this._popper&&this._popper.destroy(),super.dispose()}update(){this._inNavbar=this._detectNavbar(),this._popper&&this._popper.update()}_completeHide(t){P.trigger(this._element,"hide.bs.dropdown",t).defaultPrevented||("ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(t=>P.off(t,"mouseover",h)),this._popper&&this._popper.destroy(),this._menu.classList.remove("show"),this._element.classList.remove("show"),this._element.setAttribute("aria-expanded","false"),F.removeDataAttribute(this._menu,"popper"),P.trigger(this._element,"hidden.bs.dropdown",t))}_getConfig(t){if(t={...this.constructor.Default,...F.getDataAttributes(this._element),...t},r("dropdown",t,this.constructor.DefaultType),"object"==typeof t.reference&&!s(t.reference)&&"function"!=typeof t.reference.getBoundingClientRect)throw new TypeError("dropdown".toUpperCase()+': Option "reference" provided type "object" without a required "getBoundingClientRect" method.');return t}_createPopper(t){if(void 0===pe)throw new TypeError("Bootstrap's dropdowns require Popper (https://popper.js.org)");let e=this._element;"parent"===this._config.reference?e=t:s(this._config.reference)?e=o(this._config.reference):"object"==typeof this._config.reference&&(e=this._config.reference);const i=this._getPopperConfig(),n=i.modifiers.find(t=>"applyStyles"===t.name&&!1===t.enabled);this._popper=fe(e,this._menu,i),n&&F.setDataAttribute(this._menu,"popper","static")}_isShown(t=this._element){return t.classList.contains("show")}_getMenuElement(){return U.next(this._element,".dropdown-menu")[0]}_getPlacement(){const t=this._element.parentNode;if(t.classList.contains("dropend"))return ye;if(t.classList.contains("dropstart"))return we;const e="end"===getComputedStyle(this._menu).getPropertyValue("--bs-position").trim();return t.classList.contains("dropup")?e?_e:ge:e?ve:be}_detectNavbar(){return null!==this._element.closest(".navbar")}_getOffset(){const{offset:t}=this._config;return"string"==typeof t?t.split(",").map(t=>Number.parseInt(t,10)):"function"==typeof t?e=>t(e,this._element):t}_getPopperConfig(){const t={placement:this._getPlacement(),modifiers:[{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"offset",options:{offset:this._getOffset()}}]};return"static"===this._config.display&&(t.modifiers=[{name:"applyStyles",enabled:!1}]),{...t,..."function"==typeof this._config.popperConfig?this._config.popperConfig(t):this._config.popperConfig}}_selectMenuItem({key:t,target:e}){const i=U.find(".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)",this._menu).filter(a);i.length&&b(i,e,"ArrowDown"===t,!i.includes(e)).focus()}static jQueryInterface(t){return this.each((function(){const e=Te.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===e[t])throw new TypeError(`No method named "${t}"`);e[t]()}}))}static clearMenus(t){if(t&&(2===t.button||"keyup"===t.type&&"Tab"!==t.key))return;const e=U.find('[data-bs-toggle="dropdown"]');for(let i=0,n=e.length;i<n;i++){const n=Te.getInstance(e[i]);if(!n||!1===n._config.autoClose)continue;if(!n._isShown())continue;const s={relatedTarget:n._element};if(t){const e=t.composedPath(),i=e.includes(n._menu);if(e.includes(n._element)||"inside"===n._config.autoClose&&!i||"outside"===n._config.autoClose&&i)continue;if(n._menu.contains(t.target)&&("keyup"===t.type&&"Tab"===t.key||/input|select|option|textarea|form/i.test(t.target.tagName)))continue;"click"===t.type&&(s.clickEvent=t)}n._completeHide(s)}}static getParentFromElement(t){return i(t)||t.parentNode}static dataApiKeydownHandler(t){if(/input|textarea/i.test(t.target.tagName)?"Space"===t.key||"Escape"!==t.key&&("ArrowDown"!==t.key&&"ArrowUp"!==t.key||t.target.closest(".dropdown-menu")):!me.test(t.key))return;const e=this.classList.contains("show");if(!e&&"Escape"===t.key)return;if(t.preventDefault(),t.stopPropagation(),l(this))return;const i=this.matches('[data-bs-toggle="dropdown"]')?this:U.prev(this,'[data-bs-toggle="dropdown"]')[0],n=Te.getOrCreateInstance(i);if("Escape"!==t.key)return"ArrowUp"===t.key||"ArrowDown"===t.key?(e||n.show(),void n._selectMenuItem(t)):void(e&&"Space"!==t.key||Te.clearMenus());n.hide()}}P.on(document,"keydown.bs.dropdown.data-api",'[data-bs-toggle="dropdown"]',Te.dataApiKeydownHandler),P.on(document,"keydown.bs.dropdown.data-api",".dropdown-menu",Te.dataApiKeydownHandler),P.on(document,"click.bs.dropdown.data-api",Te.clearMenus),P.on(document,"keyup.bs.dropdown.data-api",Te.clearMenus),P.on(document,"click.bs.dropdown.data-api",'[data-bs-toggle="dropdown"]',(function(t){t.preventDefault(),Te.getOrCreateInstance(this).toggle()})),m(Te);class Oe{constructor(){this._element=document.body}getWidth(){const t=document.documentElement.clientWidth;return Math.abs(window.innerWidth-t)}hide(){const t=this.getWidth();this._disableOverFlow(),this._setElementAttributes(this._element,"paddingRight",e=>e+t),this._setElementAttributes(".fixed-top, .fixed-bottom, .is-fixed, .sticky-top","paddingRight",e=>e+t),this._setElementAttributes(".sticky-top","marginRight",e=>e-t)}_disableOverFlow(){this._saveInitialAttribute(this._element,"overflow"),this._element.style.overflow="hidden"}_setElementAttributes(t,e,i){const n=this.getWidth();this._applyManipulationCallback(t,t=>{if(t!==this._element&&window.innerWidth>t.clientWidth+n)return;this._saveInitialAttribute(t,e);const s=window.getComputedStyle(t)[e];t.style[e]=i(Number.parseFloat(s))+"px"})}reset(){this._resetElementAttributes(this._element,"overflow"),this._resetElementAttributes(this._element,"paddingRight"),this._resetElementAttributes(".fixed-top, .fixed-bottom, .is-fixed, .sticky-top","paddingRight"),this._resetElementAttributes(".sticky-top","marginRight")}_saveInitialAttribute(t,e){const i=t.style[e];i&&F.setDataAttribute(t,e,i)}_resetElementAttributes(t,e){this._applyManipulationCallback(t,t=>{const i=F.getDataAttribute(t,e);void 0===i?t.style.removeProperty(e):(F.removeDataAttribute(t,e),t.style[e]=i)})}_applyManipulationCallback(t,e){s(t)?e(t):U.find(t,this._element).forEach(e)}isOverflowing(){return this.getWidth()>0}}const Ce={className:"modal-backdrop",isVisible:!0,isAnimated:!1,rootElement:"body",clickCallback:null},ke={className:"string",isVisible:"boolean",isAnimated:"boolean",rootElement:"(element|string)",clickCallback:"(function|null)"};class Le{constructor(t){this._config=this._getConfig(t),this._isAppended=!1,this._element=null}show(t){this._config.isVisible?(this._append(),this._config.isAnimated&&d(this._getElement()),this._getElement().classList.add("show"),this._emulateAnimation(()=>{g(t)})):g(t)}hide(t){this._config.isVisible?(this._getElement().classList.remove("show"),this._emulateAnimation(()=>{this.dispose(),g(t)})):g(t)}_getElement(){if(!this._element){const t=document.createElement("div");t.className=this._config.className,this._config.isAnimated&&t.classList.add("fade"),this._element=t}return this._element}_getConfig(t){return(t={...Ce,..."object"==typeof t?t:{}}).rootElement=o(t.rootElement),r("backdrop",t,ke),t}_append(){this._isAppended||(this._config.rootElement.append(this._getElement()),P.on(this._getElement(),"mousedown.bs.backdrop",()=>{g(this._config.clickCallback)}),this._isAppended=!0)}dispose(){this._isAppended&&(P.off(this._element,"mousedown.bs.backdrop"),this._element.remove(),this._isAppended=!1)}_emulateAnimation(t){_(t,this._getElement(),this._config.isAnimated)}}const xe={trapElement:null,autofocus:!0},De={trapElement:"element",autofocus:"boolean"};class Se{constructor(t){this._config=this._getConfig(t),this._isActive=!1,this._lastTabNavDirection=null}activate(){const{trapElement:t,autofocus:e}=this._config;this._isActive||(e&&t.focus(),P.off(document,".bs.focustrap"),P.on(document,"focusin.bs.focustrap",t=>this._handleFocusin(t)),P.on(document,"keydown.tab.bs.focustrap",t=>this._handleKeydown(t)),this._isActive=!0)}deactivate(){this._isActive&&(this._isActive=!1,P.off(document,".bs.focustrap"))}_handleFocusin(t){const{target:e}=t,{trapElement:i}=this._config;if(e===document||e===i||i.contains(e))return;const n=U.focusableChildren(i);0===n.length?i.focus():"backward"===this._lastTabNavDirection?n[n.length-1].focus():n[0].focus()}_handleKeydown(t){"Tab"===t.key&&(this._lastTabNavDirection=t.shiftKey?"backward":"forward")}_getConfig(t){return t={...xe,..."object"==typeof t?t:{}},r("focustrap",t,De),t}}const Ne={backdrop:!0,keyboard:!0,focus:!0},Ie={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean"};class Pe extends H{constructor(t,e){super(t),this._config=this._getConfig(e),this._dialog=U.findOne(".modal-dialog",this._element),this._backdrop=this._initializeBackDrop(),this._focustrap=this._initializeFocusTrap(),this._isShown=!1,this._ignoreBackdropClick=!1,this._isTransitioning=!1,this._scrollBar=new Oe}static get Default(){return Ne}static get NAME(){return"modal"}toggle(t){return this._isShown?this.hide():this.show(t)}show(t){this._isShown||this._isTransitioning||P.trigger(this._element,"show.bs.modal",{relatedTarget:t}).defaultPrevented||(this._isShown=!0,this._isAnimated()&&(this._isTransitioning=!0),this._scrollBar.hide(),document.body.classList.add("modal-open"),this._adjustDialog(),this._setEscapeEvent(),this._setResizeEvent(),P.on(this._dialog,"mousedown.dismiss.bs.modal",()=>{P.one(this._element,"mouseup.dismiss.bs.modal",t=>{t.target===this._element&&(this._ignoreBackdropClick=!0)})}),this._showBackdrop(()=>this._showElement(t)))}hide(){if(!this._isShown||this._isTransitioning)return;if(P.trigger(this._element,"hide.bs.modal").defaultPrevented)return;this._isShown=!1;const t=this._isAnimated();t&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),this._focustrap.deactivate(),this._element.classList.remove("show"),P.off(this._element,"click.dismiss.bs.modal"),P.off(this._dialog,"mousedown.dismiss.bs.modal"),this._queueCallback(()=>this._hideModal(),this._element,t)}dispose(){[window,this._dialog].forEach(t=>P.off(t,".bs.modal")),this._backdrop.dispose(),this._focustrap.deactivate(),super.dispose()}handleUpdate(){this._adjustDialog()}_initializeBackDrop(){return new Le({isVisible:Boolean(this._config.backdrop),isAnimated:this._isAnimated()})}_initializeFocusTrap(){return new Se({trapElement:this._element})}_getConfig(t){return t={...Ne,...F.getDataAttributes(this._element),..."object"==typeof t?t:{}},r("modal",t,Ie),t}_showElement(t){const e=this._isAnimated(),i=U.findOne(".modal-body",this._dialog);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.append(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.setAttribute("aria-modal",!0),this._element.setAttribute("role","dialog"),this._element.scrollTop=0,i&&(i.scrollTop=0),e&&d(this._element),this._element.classList.add("show"),this._queueCallback(()=>{this._config.focus&&this._focustrap.activate(),this._isTransitioning=!1,P.trigger(this._element,"shown.bs.modal",{relatedTarget:t})},this._dialog,e)}_setEscapeEvent(){this._isShown?P.on(this._element,"keydown.dismiss.bs.modal",t=>{this._config.keyboard&&"Escape"===t.key?(t.preventDefault(),this.hide()):this._config.keyboard||"Escape"!==t.key||this._triggerBackdropTransition()}):P.off(this._element,"keydown.dismiss.bs.modal")}_setResizeEvent(){this._isShown?P.on(window,"resize.bs.modal",()=>this._adjustDialog()):P.off(window,"resize.bs.modal")}_hideModal(){this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._element.removeAttribute("aria-modal"),this._element.removeAttribute("role"),this._isTransitioning=!1,this._backdrop.hide(()=>{document.body.classList.remove("modal-open"),this._resetAdjustments(),this._scrollBar.reset(),P.trigger(this._element,"hidden.bs.modal")})}_showBackdrop(t){P.on(this._element,"click.dismiss.bs.modal",t=>{this._ignoreBackdropClick?this._ignoreBackdropClick=!1:t.target===t.currentTarget&&(!0===this._config.backdrop?this.hide():"static"===this._config.backdrop&&this._triggerBackdropTransition())}),this._backdrop.show(t)}_isAnimated(){return this._element.classList.contains("fade")}_triggerBackdropTransition(){if(P.trigger(this._element,"hidePrevented.bs.modal").defaultPrevented)return;const{classList:t,scrollHeight:e,style:i}=this._element,n=e>document.documentElement.clientHeight;!n&&"hidden"===i.overflowY||t.contains("modal-static")||(n||(i.overflowY="hidden"),t.add("modal-static"),this._queueCallback(()=>{t.remove("modal-static"),n||this._queueCallback(()=>{i.overflowY=""},this._dialog)},this._dialog),this._element.focus())}_adjustDialog(){const t=this._element.scrollHeight>document.documentElement.clientHeight,e=this._scrollBar.getWidth(),i=e>0;(!i&&t&&!p()||i&&!t&&p())&&(this._element.style.paddingLeft=e+"px"),(i&&!t&&!p()||!i&&t&&p())&&(this._element.style.paddingRight=e+"px")}_resetAdjustments(){this._element.style.paddingLeft="",this._element.style.paddingRight=""}static jQueryInterface(t,e){return this.each((function(){const i=Pe.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===i[t])throw new TypeError(`No method named "${t}"`);i[t](e)}}))}}P.on(document,"click.bs.modal.data-api",'[data-bs-toggle="modal"]',(function(t){const e=i(this);["A","AREA"].includes(this.tagName)&&t.preventDefault(),P.one(e,"show.bs.modal",t=>{t.defaultPrevented||P.one(e,"hidden.bs.modal",()=>{a(this)&&this.focus()})}),Pe.getOrCreateInstance(e).toggle(this)})),B(Pe),m(Pe);const je={backdrop:!0,keyboard:!0,scroll:!1},Me={backdrop:"boolean",keyboard:"boolean",scroll:"boolean"};class He extends H{constructor(t,e){super(t),this._config=this._getConfig(e),this._isShown=!1,this._backdrop=this._initializeBackDrop(),this._focustrap=this._initializeFocusTrap(),this._addEventListeners()}static get NAME(){return"offcanvas"}static get Default(){return je}toggle(t){return this._isShown?this.hide():this.show(t)}show(t){this._isShown||P.trigger(this._element,"show.bs.offcanvas",{relatedTarget:t}).defaultPrevented||(this._isShown=!0,this._element.style.visibility="visible",this._backdrop.show(),this._config.scroll||(new Oe).hide(),this._element.removeAttribute("aria-hidden"),this._element.setAttribute("aria-modal",!0),this._element.setAttribute("role","dialog"),this._element.classList.add("show"),this._queueCallback(()=>{this._config.scroll||this._focustrap.activate(),P.trigger(this._element,"shown.bs.offcanvas",{relatedTarget:t})},this._element,!0))}hide(){this._isShown&&(P.trigger(this._element,"hide.bs.offcanvas").defaultPrevented||(this._focustrap.deactivate(),this._element.blur(),this._isShown=!1,this._element.classList.remove("show"),this._backdrop.hide(),this._queueCallback(()=>{this._element.setAttribute("aria-hidden",!0),this._element.removeAttribute("aria-modal"),this._element.removeAttribute("role"),this._element.style.visibility="hidden",this._config.scroll||(new Oe).reset(),P.trigger(this._element,"hidden.bs.offcanvas")},this._element,!0)))}dispose(){this._backdrop.dispose(),this._focustrap.deactivate(),super.dispose()}_getConfig(t){return t={...je,...F.getDataAttributes(this._element),..."object"==typeof t?t:{}},r("offcanvas",t,Me),t}_initializeBackDrop(){return new Le({className:"offcanvas-backdrop",isVisible:this._config.backdrop,isAnimated:!0,rootElement:this._element.parentNode,clickCallback:()=>this.hide()})}_initializeFocusTrap(){return new Se({trapElement:this._element})}_addEventListeners(){P.on(this._element,"keydown.dismiss.bs.offcanvas",t=>{this._config.keyboard&&"Escape"===t.key&&this.hide()})}static jQueryInterface(t){return this.each((function(){const e=He.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===e[t]||t.startsWith("_")||"constructor"===t)throw new TypeError(`No method named "${t}"`);e[t](this)}}))}}P.on(document,"click.bs.offcanvas.data-api",'[data-bs-toggle="offcanvas"]',(function(t){const e=i(this);if(["A","AREA"].includes(this.tagName)&&t.preventDefault(),l(this))return;P.one(e,"hidden.bs.offcanvas",()=>{a(this)&&this.focus()});const n=U.findOne(".offcanvas.show");n&&n!==e&&He.getInstance(n).hide(),He.getOrCreateInstance(e).toggle(this)})),P.on(window,"load.bs.offcanvas.data-api",()=>U.find(".offcanvas.show").forEach(t=>He.getOrCreateInstance(t).show())),B(He),m(He);const Be=new Set(["background","cite","href","itemtype","longdesc","poster","src","xlink:href"]),Re=/^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/i,We=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i,ze=(t,e)=>{const i=t.nodeName.toLowerCase();if(e.includes(i))return!Be.has(i)||Boolean(Re.test(t.nodeValue)||We.test(t.nodeValue));const n=e.filter(t=>t instanceof RegExp);for(let t=0,e=n.length;t<e;t++)if(n[t].test(i))return!0;return!1};function qe(t,e,i){if(!t.length)return t;if(i&&"function"==typeof i)return i(t);const n=(new window.DOMParser).parseFromString(t,"text/html"),s=Object.keys(e),o=[].concat(...n.body.querySelectorAll("*"));for(let t=0,i=o.length;t<i;t++){const i=o[t],n=i.nodeName.toLowerCase();if(!s.includes(n)){i.remove();continue}const r=[].concat(...i.attributes),a=[].concat(e["*"]||[],e[n]||[]);r.forEach(t=>{ze(t,a)||i.removeAttribute(t.nodeName)})}return n.body.innerHTML}const Fe=new Set(["sanitize","allowList","sanitizeFn"]),Ue={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(array|string|function)",container:"(string|element|boolean)",fallbackPlacements:"array",boundary:"(string|element)",customClass:"(string|function)",sanitize:"boolean",sanitizeFn:"(null|function)",allowList:"object",popperConfig:"(null|object|function)"},$e={AUTO:"auto",TOP:"top",RIGHT:p()?"left":"right",BOTTOM:"bottom",LEFT:p()?"right":"left"},Ve={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:[0,0],container:!1,fallbackPlacements:["top","right","bottom","left"],boundary:"clippingParents",customClass:"",sanitize:!0,sanitizeFn:null,allowList:{"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","srcset","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},popperConfig:null},Ke={HIDE:"hide.bs.tooltip",HIDDEN:"hidden.bs.tooltip",SHOW:"show.bs.tooltip",SHOWN:"shown.bs.tooltip",INSERTED:"inserted.bs.tooltip",CLICK:"click.bs.tooltip",FOCUSIN:"focusin.bs.tooltip",FOCUSOUT:"focusout.bs.tooltip",MOUSEENTER:"mouseenter.bs.tooltip",MOUSELEAVE:"mouseleave.bs.tooltip"};class Xe extends H{constructor(t,e){if(void 0===pe)throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");super(t),this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this._config=this._getConfig(e),this.tip=null,this._setListeners()}static get Default(){return Ve}static get NAME(){return"tooltip"}static get Event(){return Ke}static get DefaultType(){return Ue}enable(){this._isEnabled=!0}disable(){this._isEnabled=!1}toggleEnabled(){this._isEnabled=!this._isEnabled}toggle(t){if(this._isEnabled)if(t){const e=this._initializeOnDelegatedTarget(t);e._activeTrigger.click=!e._activeTrigger.click,e._isWithActiveTrigger()?e._enter(null,e):e._leave(null,e)}else{if(this.getTipElement().classList.contains("show"))return void this._leave(null,this);this._enter(null,this)}}dispose(){clearTimeout(this._timeout),P.off(this._element.closest(".modal"),"hide.bs.modal",this._hideModalHandler),this.tip&&this.tip.remove(),this._popper&&this._popper.destroy(),super.dispose()}show(){if("none"===this._element.style.display)throw new Error("Please use show on visible elements");if(!this.isWithContent()||!this._isEnabled)return;const t=P.trigger(this._element,this.constructor.Event.SHOW),e=c(this._element),i=null===e?this._element.ownerDocument.documentElement.contains(this._element):e.contains(this._element);if(t.defaultPrevented||!i)return;const n=this.getTipElement(),s=(t=>{do{t+=Math.floor(1e6*Math.random())}while(document.getElementById(t));return t})(this.constructor.NAME);n.setAttribute("id",s),this._element.setAttribute("aria-describedby",s),this._config.animation&&n.classList.add("fade");const o="function"==typeof this._config.placement?this._config.placement.call(this,n,this._element):this._config.placement,r=this._getAttachment(o);this._addAttachmentClass(r);const{container:a}=this._config;M.set(n,this.constructor.DATA_KEY,this),this._element.ownerDocument.documentElement.contains(this.tip)||(a.append(n),P.trigger(this._element,this.constructor.Event.INSERTED)),this._popper?this._popper.update():this._popper=fe(this._element,n,this._getPopperConfig(r)),n.classList.add("show");const l=this._resolvePossibleFunction(this._config.customClass);l&&n.classList.add(...l.split(" ")),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(t=>{P.on(t,"mouseover",h)});const d=this.tip.classList.contains("fade");this._queueCallback(()=>{const t=this._hoverState;this._hoverState=null,P.trigger(this._element,this.constructor.Event.SHOWN),"out"===t&&this._leave(null,this)},this.tip,d)}hide(){if(!this._popper)return;const t=this.getTipElement();if(P.trigger(this._element,this.constructor.Event.HIDE).defaultPrevented)return;t.classList.remove("show"),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(t=>P.off(t,"mouseover",h)),this._activeTrigger.click=!1,this._activeTrigger.focus=!1,this._activeTrigger.hover=!1;const e=this.tip.classList.contains("fade");this._queueCallback(()=>{this._isWithActiveTrigger()||("show"!==this._hoverState&&t.remove(),this._cleanTipClass(),this._element.removeAttribute("aria-describedby"),P.trigger(this._element,this.constructor.Event.HIDDEN),this._popper&&(this._popper.destroy(),this._popper=null))},this.tip,e),this._hoverState=""}update(){null!==this._popper&&this._popper.update()}isWithContent(){return Boolean(this.getTitle())}getTipElement(){if(this.tip)return this.tip;const t=document.createElement("div");t.innerHTML=this._config.template;const e=t.children[0];return this.setContent(e),e.classList.remove("fade","show"),this.tip=e,this.tip}setContent(t){this._sanitizeAndSetContent(t,this.getTitle(),".tooltip-inner")}_sanitizeAndSetContent(t,e,i){const n=U.findOne(i,t);e||!n?this.setElementContent(n,e):n.remove()}setElementContent(t,e){if(null!==t)return s(e)?(e=o(e),void(this._config.html?e.parentNode!==t&&(t.innerHTML="",t.append(e)):t.textContent=e.textContent)):void(this._config.html?(this._config.sanitize&&(e=qe(e,this._config.allowList,this._config.sanitizeFn)),t.innerHTML=e):t.textContent=e)}getTitle(){const t=this._element.getAttribute("data-bs-original-title")||this._config.title;return this._resolvePossibleFunction(t)}updateAttachment(t){return"right"===t?"end":"left"===t?"start":t}_initializeOnDelegatedTarget(t,e){return e||this.constructor.getOrCreateInstance(t.delegateTarget,this._getDelegateConfig())}_getOffset(){const{offset:t}=this._config;return"string"==typeof t?t.split(",").map(t=>Number.parseInt(t,10)):"function"==typeof t?e=>t(e,this._element):t}_resolvePossibleFunction(t){return"function"==typeof t?t.call(this._element):t}_getPopperConfig(t){const e={placement:t,modifiers:[{name:"flip",options:{fallbackPlacements:this._config.fallbackPlacements}},{name:"offset",options:{offset:this._getOffset()}},{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"arrow",options:{element:`.${this.constructor.NAME}-arrow`}},{name:"onChange",enabled:!0,phase:"afterWrite",fn:t=>this._handlePopperPlacementChange(t)}],onFirstUpdate:t=>{t.options.placement!==t.placement&&this._handlePopperPlacementChange(t)}};return{...e,..."function"==typeof this._config.popperConfig?this._config.popperConfig(e):this._config.popperConfig}}_addAttachmentClass(t){this.getTipElement().classList.add(`${this._getBasicClassPrefix()}-${this.updateAttachment(t)}`)}_getAttachment(t){return $e[t.toUpperCase()]}_setListeners(){this._config.trigger.split(" ").forEach(t=>{if("click"===t)P.on(this._element,this.constructor.Event.CLICK,this._config.selector,t=>this.toggle(t));else if("manual"!==t){const e="hover"===t?this.constructor.Event.MOUSEENTER:this.constructor.Event.FOCUSIN,i="hover"===t?this.constructor.Event.MOUSELEAVE:this.constructor.Event.FOCUSOUT;P.on(this._element,e,this._config.selector,t=>this._enter(t)),P.on(this._element,i,this._config.selector,t=>this._leave(t))}}),this._hideModalHandler=()=>{this._element&&this.hide()},P.on(this._element.closest(".modal"),"hide.bs.modal",this._hideModalHandler),this._config.selector?this._config={...this._config,trigger:"manual",selector:""}:this._fixTitle()}_fixTitle(){const t=this._element.getAttribute("title"),e=typeof this._element.getAttribute("data-bs-original-title");(t||"string"!==e)&&(this._element.setAttribute("data-bs-original-title",t||""),!t||this._element.getAttribute("aria-label")||this._element.textContent||this._element.setAttribute("aria-label",t),this._element.setAttribute("title",""))}_enter(t,e){e=this._initializeOnDelegatedTarget(t,e),t&&(e._activeTrigger["focusin"===t.type?"focus":"hover"]=!0),e.getTipElement().classList.contains("show")||"show"===e._hoverState?e._hoverState="show":(clearTimeout(e._timeout),e._hoverState="show",e._config.delay&&e._config.delay.show?e._timeout=setTimeout(()=>{"show"===e._hoverState&&e.show()},e._config.delay.show):e.show())}_leave(t,e){e=this._initializeOnDelegatedTarget(t,e),t&&(e._activeTrigger["focusout"===t.type?"focus":"hover"]=e._element.contains(t.relatedTarget)),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState="out",e._config.delay&&e._config.delay.hide?e._timeout=setTimeout(()=>{"out"===e._hoverState&&e.hide()},e._config.delay.hide):e.hide())}_isWithActiveTrigger(){for(const t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1}_getConfig(t){const e=F.getDataAttributes(this._element);return Object.keys(e).forEach(t=>{Fe.has(t)&&delete e[t]}),(t={...this.constructor.Default,...e,..."object"==typeof t&&t?t:{}}).container=!1===t.container?document.body:o(t.container),"number"==typeof t.delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),r("tooltip",t,this.constructor.DefaultType),t.sanitize&&(t.template=qe(t.template,t.allowList,t.sanitizeFn)),t}_getDelegateConfig(){const t={};for(const e in this._config)this.constructor.Default[e]!==this._config[e]&&(t[e]=this._config[e]);return t}_cleanTipClass(){const t=this.getTipElement(),e=new RegExp(`(^|\\s)${this._getBasicClassPrefix()}\\S+`,"g"),i=t.getAttribute("class").match(e);null!==i&&i.length>0&&i.map(t=>t.trim()).forEach(e=>t.classList.remove(e))}_getBasicClassPrefix(){return"bs-tooltip"}_handlePopperPlacementChange(t){const{state:e}=t;e&&(this.tip=e.elements.popper,this._cleanTipClass(),this._addAttachmentClass(this._getAttachment(e.placement)))}static jQueryInterface(t){return this.each((function(){const e=Xe.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===e[t])throw new TypeError(`No method named "${t}"`);e[t]()}}))}}m(Xe);const Ye={...Xe.Default,placement:"right",offset:[0,8],trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="popover-arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'},Qe={...Xe.DefaultType,content:"(string|element|function)"},Ge={HIDE:"hide.bs.popover",HIDDEN:"hidden.bs.popover",SHOW:"show.bs.popover",SHOWN:"shown.bs.popover",INSERTED:"inserted.bs.popover",CLICK:"click.bs.popover",FOCUSIN:"focusin.bs.popover",FOCUSOUT:"focusout.bs.popover",MOUSEENTER:"mouseenter.bs.popover",MOUSELEAVE:"mouseleave.bs.popover"};class Ze extends Xe{static get Default(){return Ye}static get NAME(){return"popover"}static get Event(){return Ge}static get DefaultType(){return Qe}isWithContent(){return this.getTitle()||this._getContent()}setContent(t){this._sanitizeAndSetContent(t,this.getTitle(),".popover-header"),this._sanitizeAndSetContent(t,this._getContent(),".popover-body")}_getContent(){return this._resolvePossibleFunction(this._config.content)}_getBasicClassPrefix(){return"bs-popover"}static jQueryInterface(t){return this.each((function(){const e=Ze.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===e[t])throw new TypeError(`No method named "${t}"`);e[t]()}}))}}m(Ze);const Je={offset:10,method:"auto",target:""},ti={offset:"number",method:"string",target:"(string|element)"},ei=".nav-link, .list-group-item, .dropdown-item";class ii extends H{constructor(t,e){super(t),this._scrollElement="BODY"===this._element.tagName?window:this._element,this._config=this._getConfig(e),this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,P.on(this._scrollElement,"scroll.bs.scrollspy",()=>this._process()),this.refresh(),this._process()}static get Default(){return Je}static get NAME(){return"scrollspy"}refresh(){const t=this._scrollElement===this._scrollElement.window?"offset":"position",i="auto"===this._config.method?t:this._config.method,n="position"===i?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),U.find(ei,this._config.target).map(t=>{const s=e(t),o=s?U.findOne(s):null;if(o){const t=o.getBoundingClientRect();if(t.width||t.height)return[F[i](o).top+n,s]}return null}).filter(t=>t).sort((t,e)=>t[0]-e[0]).forEach(t=>{this._offsets.push(t[0]),this._targets.push(t[1])})}dispose(){P.off(this._scrollElement,".bs.scrollspy"),super.dispose()}_getConfig(t){return(t={...Je,...F.getDataAttributes(this._element),..."object"==typeof t&&t?t:{}}).target=o(t.target)||document.documentElement,r("scrollspy",t,ti),t}_getScrollTop(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop}_getScrollHeight(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}_getOffsetHeight(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height}_process(){const t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),i=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),t>=i){const t=this._targets[this._targets.length-1];this._activeTarget!==t&&this._activate(t)}else{if(this._activeTarget&&t<this._offsets[0]&&this._offsets[0]>0)return this._activeTarget=null,void this._clear();for(let e=this._offsets.length;e--;)this._activeTarget!==this._targets[e]&&t>=this._offsets[e]&&(void 0===this._offsets[e+1]||t<this._offsets[e+1])&&this._activate(this._targets[e])}}_activate(t){this._activeTarget=t,this._clear();const e=ei.split(",").map(e=>`${e}[data-bs-target="${t}"],${e}[href="${t}"]`),i=U.findOne(e.join(","),this._config.target);i.classList.add("active"),i.classList.contains("dropdown-item")?U.findOne(".dropdown-toggle",i.closest(".dropdown")).classList.add("active"):U.parents(i,".nav, .list-group").forEach(t=>{U.prev(t,".nav-link, .list-group-item").forEach(t=>t.classList.add("active")),U.prev(t,".nav-item").forEach(t=>{U.children(t,".nav-link").forEach(t=>t.classList.add("active"))})}),P.trigger(this._scrollElement,"activate.bs.scrollspy",{relatedTarget:t})}_clear(){U.find(ei,this._config.target).filter(t=>t.classList.contains("active")).forEach(t=>t.classList.remove("active"))}static jQueryInterface(t){return this.each((function(){const e=ii.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===e[t])throw new TypeError(`No method named "${t}"`);e[t]()}}))}}P.on(window,"load.bs.scrollspy.data-api",()=>{U.find('[data-bs-spy="scroll"]').forEach(t=>new ii(t))}),m(ii);class ni extends H{static get NAME(){return"tab"}show(){if(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&this._element.classList.contains("active"))return;let t;const e=i(this._element),n=this._element.closest(".nav, .list-group");if(n){const e="UL"===n.nodeName||"OL"===n.nodeName?":scope > li > .active":".active";t=U.find(e,n),t=t[t.length-1]}const s=t?P.trigger(t,"hide.bs.tab",{relatedTarget:this._element}):null;if(P.trigger(this._element,"show.bs.tab",{relatedTarget:t}).defaultPrevented||null!==s&&s.defaultPrevented)return;this._activate(this._element,n);const o=()=>{P.trigger(t,"hidden.bs.tab",{relatedTarget:this._element}),P.trigger(this._element,"shown.bs.tab",{relatedTarget:t})};e?this._activate(e,e.parentNode,o):o()}_activate(t,e,i){const n=(!e||"UL"!==e.nodeName&&"OL"!==e.nodeName?U.children(e,".active"):U.find(":scope > li > .active",e))[0],s=i&&n&&n.classList.contains("fade"),o=()=>this._transitionComplete(t,n,i);n&&s?(n.classList.remove("show"),this._queueCallback(o,t,!0)):o()}_transitionComplete(t,e,i){if(e){e.classList.remove("active");const t=U.findOne(":scope > .dropdown-menu .active",e.parentNode);t&&t.classList.remove("active"),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}t.classList.add("active"),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),d(t),t.classList.contains("fade")&&t.classList.add("show");let n=t.parentNode;if(n&&"LI"===n.nodeName&&(n=n.parentNode),n&&n.classList.contains("dropdown-menu")){const e=t.closest(".dropdown");e&&U.find(".dropdown-toggle",e).forEach(t=>t.classList.add("active")),t.setAttribute("aria-expanded",!0)}i&&i()}static jQueryInterface(t){return this.each((function(){const e=ni.getOrCreateInstance(this);if("string"==typeof t){if(void 0===e[t])throw new TypeError(`No method named "${t}"`);e[t]()}}))}}P.on(document,"click.bs.tab.data-api",'[data-bs-toggle="tab"], [data-bs-toggle="pill"], [data-bs-toggle="list"]',(function(t){["A","AREA"].includes(this.tagName)&&t.preventDefault(),l(this)||ni.getOrCreateInstance(this).show()})),m(ni);const si={animation:"boolean",autohide:"boolean",delay:"number"},oi={animation:!0,autohide:!0,delay:5e3};class ri extends H{constructor(t,e){super(t),this._config=this._getConfig(e),this._timeout=null,this._hasMouseInteraction=!1,this._hasKeyboardInteraction=!1,this._setListeners()}static get DefaultType(){return si}static get Default(){return oi}static get NAME(){return"toast"}show(){P.trigger(this._element,"show.bs.toast").defaultPrevented||(this._clearTimeout(),this._config.animation&&this._element.classList.add("fade"),this._element.classList.remove("hide"),d(this._element),this._element.classList.add("show"),this._element.classList.add("showing"),this._queueCallback(()=>{this._element.classList.remove("showing"),P.trigger(this._element,"shown.bs.toast"),this._maybeScheduleHide()},this._element,this._config.animation))}hide(){this._element.classList.contains("show")&&(P.trigger(this._element,"hide.bs.toast").defaultPrevented||(this._element.classList.add("showing"),this._queueCallback(()=>{this._element.classList.add("hide"),this._element.classList.remove("showing"),this._element.classList.remove("show"),P.trigger(this._element,"hidden.bs.toast")},this._element,this._config.animation)))}dispose(){this._clearTimeout(),this._element.classList.contains("show")&&this._element.classList.remove("show"),super.dispose()}_getConfig(t){return t={...oi,...F.getDataAttributes(this._element),..."object"==typeof t&&t?t:{}},r("toast",t,this.constructor.DefaultType),t}_maybeScheduleHide(){this._config.autohide&&(this._hasMouseInteraction||this._hasKeyboardInteraction||(this._timeout=setTimeout(()=>{this.hide()},this._config.delay)))}_onInteraction(t,e){switch(t.type){case"mouseover":case"mouseout":this._hasMouseInteraction=e;break;case"focusin":case"focusout":this._hasKeyboardInteraction=e}if(e)return void this._clearTimeout();const i=t.relatedTarget;this._element===i||this._element.contains(i)||this._maybeScheduleHide()}_setListeners(){P.on(this._element,"mouseover.bs.toast",t=>this._onInteraction(t,!0)),P.on(this._element,"mouseout.bs.toast",t=>this._onInteraction(t,!1)),P.on(this._element,"focusin.bs.toast",t=>this._onInteraction(t,!0)),P.on(this._element,"focusout.bs.toast",t=>this._onInteraction(t,!1))}_clearTimeout(){clearTimeout(this._timeout),this._timeout=null}static jQueryInterface(t){return this.each((function(){const e=ri.getOrCreateInstance(this,t);if("string"==typeof t){if(void 0===e[t])throw new TypeError(`No method named "${t}"`);e[t](this)}}))}}return B(ri),m(ri),{Alert:R,Button:W,Carousel:Z,Collapse:et,Dropdown:Te,Modal:Pe,Offcanvas:He,Popover:Ze,ScrollSpy:ii,Tab:ni,Toast:ri,Tooltip:Xe}}));
+//# sourceMappingURL=bootstrap.bundle.min.js.map
\ No newline at end of file
diff --git a/tests/ci/release/packaging/static/index.html b/tests/ci/release/packaging/static/index.html
new file mode 100644
index 000000000000..79ecd8e8a3d2
--- /dev/null
+++ b/tests/ci/release/packaging/static/index.html
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- Bootstrap CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous">
+    <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=Arimo&display=swap" rel="stylesheet">
+
+    <style type="text/css">
+        body{
+            font-family: 'Arimo', sans-serif;
+            color:  #667373;
+        }
+        .header {
+            max-width: 1280px;
+            margin:  0 auto;
+            font-size: 30px;
+        }
+
+    </style>
+
+    <title>{{ repo_title }}</title>
+</head>
+<body>
+
+    <main role="main" class="container-fluid">
+      <div class="row bg-dark bg-opacity-75 p-3">
+          <h1 class="p-0 text-white header"><a href="https://altinity.com" target="_blank" title="Altinity.com website" ><img src="logo-altinity-white.png" alt="Altinity" style="max-width:150px; vertical-align: -8px;" /></a> {{ repo_subtitle }}</h1>
+      </div>
+      <div class="container p-5" id="altinitystable">
+        <p class="h3" style="color:black;"><a href="https://{{ repo_dns_name }}/#altinitystable" style="color:inherit;text-decoration:none;">Altinity Stable Build</a></p>
+        <div class="container">
+            <p>
+                Production-ready build of ClickHouse® with long-term support. (<a href="https://docs.altinity.com/altinitystablebuilds/">Documentation</a>).
+                <br>
+                <br>
+            </p>
+            <p class="h5">How to download:</p>
+            <p>RHEL, CentOS, Amazon Linux, Fedora:</p>
+            <div class="container">
+                <code>
+                    sudo $(type -p dnf || type -p yum) install curl gnupg2
+                    <br/>
+                    sudo curl https://{{ repo_dns_name }}/yum-repo/{{ repo_name }}.repo -o /etc/yum.repos.d/{{ repo_name }}.repo
+                    <br/>
+                    sudo $(type -p dnf || type -p yum) install {{ repo_install_packages }}
+                </code>
+            </div>
+        </div>
+        <p></p>
+        <div class="container">
+            <p>Ubuntu, Debian:</p>
+            <div class="container">
+                <code>
+                    sudo apt-get update
+                    <br/>
+                    sudo apt-get install curl gnupg2 apt-transport-https ca-certificates dialog
+                    <br/>
+                    sudo sh -c 'mkdir -p /usr/share/keyrings &amp;&amp; curl -s https://{{ repo_dns_name }}/apt-repo/pubkey.gpg | gpg --dearmor &gt; /usr/share/keyrings/{{ repo_name }}-archive-keyring.gpg'
+                    <br/>
+                    sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/{{ repo_name }}-archive-keyring.gpg] https://{{ repo_dns_name }}/apt-repo stable main" &gt; /etc/apt/sources.list.d/{{ repo_name }}.list'
+                    <br/>
+                    sudo apt-get update
+                    <br/>
+                    sudo apt-get install {{ repo_install_packages }}
+                </code>
+            </div>
+        </div>
+        <p></p>
+        <div class="container">
+            <p>Browse repo files:</p>
+            <div class="container">
+                <a href="/yum-repo/">yum-repo/</a>
+                <br>
+                <a href="/apt-repo/">apt-repo/</a>
+                <br>
+                <a href="/tgz-repo/">tgz-repo/</a> 
+                <br>
+                <a href="/bin-repo/">bin-repo/</a>
+            </div>
+        </div>
+      </div>
+      <p></p>
+      <div class="container p-5" id="altinityfips">
+        <p class="h3" style="color:black;"><a href="https://{{ repo_dns_name }}/#altinityfips" style="color:inherit;text-decoration:none;">Altinity Stable FIPS-Compatible Build</a></p>
+        <div class="container">
+            <p>
+                Production-ready build of ClickHouse® with FIPS-compatible BoringSSL crypto libraries. (<a href="https://docs.altinity.com/altinitystablebuilds/fips-compatible-altinity-builds">Documentation</a>)
+                <br/>
+                <br/>
+            </p>
+            <p class="h5">How to download:</p>
+            <p>RHEL, CentOS, Amazon Linux, Fedora:</p>
+            <div class="container">
+                <code>
+                    sudo $(type -p dnf || type -p yum) install curl gnupg2
+                    <br/>
+                    sudo curl https://{{ repo_dns_name }}/fips-yum-repo/{{ repo_name }}.repo -o /etc/yum.repos.d/{{ repo_name }}.repo
+                    <br/>
+                    sudo $(type -p dnf || type -p yum) install {{ repo_install_packages }}
+                </code>
+            </div>
+        </div>
+        <p></p>
+        <div class="container">
+            <p>Ubuntu, Debian:</p>
+            <div class="container">
+                <code>
+                    sudo apt-get update
+                    <br/>
+                    sudo apt-get install curl gnupg2 apt-transport-https ca-certificates dialog
+                    <br/>
+                    sudo sh -c 'mkdir -p /usr/share/keyrings &amp;&amp; curl -s https://{{ repo_dns_name }}/fips-apt-repo/pubkey.gpg | gpg --dearmor &gt; /usr/share/keyrings/{{ repo_name }}-archive-keyring.gpg'
+                    <br/>
+                    sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/{{ repo_name }}-archive-keyring.gpg] https://{{ repo_dns_name }}/fips-apt-repo stable main" &gt; /etc/apt/sources.list.d/{{ repo_name }}.list'
+                    <br/>
+                    sudo apt-get update
+                    <br/>
+                    sudo apt-get install {{ repo_install_packages }}
+                </code>
+            </div>
+        </div>
+        <p></p>
+        <div class="container">
+            <p>Browse repo files: </p>
+            <div class="container">
+                <a href="/fips-yum-repo/">fips-yum-repo/</a>
+                <br>
+                <a href="/fips-apt-repo/">fips-apt-repo/</a>
+                <br>
+                <a href="/fips-tgz-repo/">fips-tgz-repo/</a>
+                <br>
+                <a href="/fips-bin-repo/">fips-bin-repo/</a>
+            </div>
+        </div>
+      </div>
+      <p></p>
+      <div class="container p-5" id="altinityantalya">
+        <p class="h3" style="color:black;"><a href="https://{{ repo_dns_name }}/#altinityantalya" style="color:inherit;text-decoration:none;">Altinity Antalya Build</a></p>
+        <div class="container">
+            <p>
+                Experimental build of ClickHouse® incorporating features and fixes from the future Altinity Stable Build releases. <b>Not for production use.</b>
+                <br/>
+                <br/>
+            </p>
+            <p class="h5">How to download:</p>
+            <p>RHEL, CentOS, Amazon Linux, Fedora:</p>
+            <div class="container">
+                <code>
+                    sudo $(type -p dnf || type -p yum) install curl gnupg2
+                    <br/>
+                    sudo curl https://{{ repo_dns_name }}/antalya-yum-repo/{{ repo_name }}.repo -o /etc/yum.repos.d/{{ repo_name }}.repo
+                    <br/>
+                    sudo $(type -p dnf || type -p yum) install {{ repo_install_packages }}
+                </code>
+            </div>
+        </div>
+        <p></p>
+        <div class="container">
+            <p>Ubuntu, Debian:</p>
+            <div class="container">
+                <code>
+                    sudo apt-get update
+                    <br/>
+                    sudo apt-get install curl gnupg2 apt-transport-https ca-certificates dialog
+                    <br/>
+                    sudo sh -c 'mkdir -p /usr/share/keyrings &amp;&amp; curl -s https://{{ repo_dns_name }}/antalya-apt-repo/pubkey.gpg | gpg --dearmor &gt; /usr/share/keyrings/{{ repo_name }}-archive-keyring.gpg'
+                    <br/>
+                    sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/{{ repo_name }}-archive-keyring.gpg] https://{{ repo_dns_name }}/antalya-apt-repo stable main" &gt; /etc/apt/sources.list.d/{{ repo_name }}.list'
+                    <br/>
+                    sudo apt-get update
+                    <br/>
+                    sudo apt-get install {{ repo_install_packages }}
+                </code>
+            </div>
+        </div>
+        <p></p>
+        <div class="container">
+            <p>Browse repo files: </p>
+            <div class="container">
+                <a href="/antalya-yum-repo/">antalya-yum-repo/</a>
+                <br>
+                <a href="/antalya-apt-repo/">antalya-apt-repo/</a>
+                <br>
+                <a href="/antalya-tgz-repo/">antalya-tgz-repo/</a>
+                <br>
+                <a href="/antalya-bin-repo/">antalya-bin-repo/</a>
+            </div>
+        </div>
+      </div>
+
+    </main><!-- /.container -->
+
+<script src="bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
+
+</body></html>
diff --git a/tests/ci/release/packaging/static/logo-altinity-white.png b/tests/ci/release/packaging/static/logo-altinity-white.png
new file mode 100644
index 000000000000..93cf43c9f2d7
Binary files /dev/null and b/tests/ci/release/packaging/static/logo-altinity-white.png differ
diff --git a/tests/ci/report.py b/tests/ci/report.py
index ba6f22fed0b2..64cc681f62c6 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -603,7 +603,7 @@ def load(cls, build_name: str, pr_number: int, head_ref: str):  # type: ignore
         loads report from a report file matched with given @pr_number and/or a @head_ref
         """
         report_path = Path(REPORT_PATH) / BuildResult.get_report_name(
-            build_name, pr_number or head_ref
+            build_name, pr_number or CI.Utils.normalize_string(head_ref)
         )
         return cls.load_from_file(report_path)
 
@@ -622,12 +622,13 @@ def load_any(cls, build_name: str, pr_number: int, head_ref: str):  # type: igno
         master_report = None
         any_report = None
         Path(REPORT_PATH).mkdir(parents=True, exist_ok=True)
+        normalized_head_ref = CI.Utils.normalize_string(head_ref)
         for file in Path(REPORT_PATH).iterdir():
             if f"{build_name}.json" in file.name:
                 any_report = file
                 if "_master_" in file.name:
                     master_report = file
-                elif f"_{head_ref}_" in file.name:
+                elif f"_{normalized_head_ref}_" in file.name:
                     ref_report = file
                 elif pr_number and f"_{pr_number}_" in file.name:
                     pr_report = file
diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
index d0aa034258a5..66c90a1f1492 100644
--- a/tests/ci/s3_helper.py
+++ b/tests/ci/s3_helper.py
@@ -6,6 +6,7 @@
 from multiprocessing.dummy import Pool
 from pathlib import Path
 from typing import Any, List, Union
+import os
 
 import boto3  # type: ignore
 import botocore  # type: ignore
@@ -20,6 +21,38 @@
     S3_URL,
 )
 
+sensitive_var_pattern = re.compile(r"[A-Z_]*(SECRET|PASSWORD|KEY|TOKEN)[A-Z_]*")
+sensitive_strings = {
+    var: value for var, value in os.environ.items() if sensitive_var_pattern.match(var)
+}
+
+
+def scan_file_for_sensitive_data(file_content, file_name):
+    """
+    Scan the content of a file for sensitive strings.
+    Raises ValueError if any sensitive values are found.
+    """
+
+    def clean_line(line):
+        for name, value in sensitive_strings.items():
+            line = line.replace(value, f"SECRET[{name}]")
+        return line
+
+    matches = []
+    for line_number, line in enumerate(file_content.splitlines(), start=1):
+        for name, value in sensitive_strings.items():
+            if value in line:
+                matches.append((file_name, line_number, clean_line(line)))
+
+    if not matches:
+        return
+
+    logging.error(f"Sensitive values found in {file_name}")
+    for file_name, line_number, match in matches:
+        logging.error(f"{file_name}:{line_number}: {match}")
+
+    raise ValueError(f"Sensitive values found in {file_name}")
+
 
 def _flatten_list(lst):
     result = []
@@ -46,6 +79,14 @@ def __init__(self, client: Any = None, endpoint: str = S3_URL):
     def _upload_file_to_s3(
         self, bucket_name: str, file_path: Path, s3_path: str
     ) -> str:
+        logging.debug("Checking %s for sensitive values", file_path)
+        try:
+            file_content = file_path.read_text(encoding="utf-8")
+        except UnicodeDecodeError:
+            logging.warning("Failed to scan file %s, unknown encoding", file_path)
+        else:
+            scan_file_for_sensitive_data(file_content, file_path.name)
+
         logging.debug(
             "Start uploading %s to bucket=%s path=%s", file_path, bucket_name, s3_path
         )
diff --git a/tests/ci/sign_release.py b/tests/ci/sign_release.py
new file mode 100644
index 000000000000..8a5827097c8b
--- /dev/null
+++ b/tests/ci/sign_release.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+import sys
+import os
+import logging
+from env_helper import TEMP_PATH, REPO_COPY, REPORT_PATH
+from s3_helper import S3Helper
+from pr_info import PRInfo
+from build_download_helper import download_builds_filter
+import hashlib
+from pathlib import Path
+
+GPG_BINARY_SIGNING_KEY = os.getenv("GPG_BINARY_SIGNING_KEY")
+GPG_BINARY_SIGNING_PASSPHRASE = os.getenv("GPG_BINARY_SIGNING_PASSPHRASE")
+
+CHECK_NAME = os.getenv("CHECK_NAME", "Sign release")
+
+def hash_file(file_path):
+    BLOCK_SIZE = 65536 # The size of each read from the file
+
+    file_hash = hashlib.sha256() # Create the hash object, can use something other than `.sha256()` if you wish
+    with open(file_path, 'rb') as f: # Open the file to read it's bytes
+        fb = f.read(BLOCK_SIZE) # Read from the file. Take in the amount declared above
+        while len(fb) > 0: # While there is still data being read from the file
+            file_hash.update(fb) # Update the hash
+            fb = f.read(BLOCK_SIZE) # Read the next block from the file
+
+    hash_file_path = file_path + '.sha256'
+    with open(hash_file_path, 'x') as f:
+        digest = file_hash.hexdigest()
+        f.write(digest)
+        print(f'Hashed {file_path}: {digest}')
+
+    return hash_file_path
+
+def sign_file(file_path):
+    priv_key_file_path = 'priv.key'
+    with open(priv_key_file_path, 'x') as f:
+        f.write(GPG_BINARY_SIGNING_KEY)
+
+    out_file_path = f'{file_path}.gpg'
+
+    os.system(f'echo {GPG_BINARY_SIGNING_PASSPHRASE} | gpg --batch --import {priv_key_file_path}')
+    os.system(f'gpg -o {out_file_path} --pinentry-mode=loopback --batch --yes --passphrase {GPG_BINARY_SIGNING_PASSPHRASE} --sign {file_path}')
+    print(f"Signed {file_path}")
+    os.remove(priv_key_file_path)
+
+    return out_file_path
+
+def main():
+    reports_path = Path(REPORT_PATH)
+
+    if not os.path.exists(TEMP_PATH):
+        os.makedirs(TEMP_PATH)
+
+    pr_info = PRInfo()
+
+    logging.info("Repo copy path %s", REPO_COPY)
+
+    s3_helper = S3Helper()
+
+    s3_path_prefix = Path(f"{pr_info.number}/{pr_info.sha}/" + CHECK_NAME.lower().replace(
+        " ", "_"
+    ).replace("(", "_").replace(")", "_").replace(",", "_"))
+
+    # downloads `package_release` artifacts generated
+    download_builds_filter(CHECK_NAME, reports_path, Path(TEMP_PATH))
+
+    for f in os.listdir(TEMP_PATH):
+        full_path = os.path.join(TEMP_PATH, f)
+        if os.path.isdir(full_path):
+            continue
+        hashed_file_path = hash_file(full_path)
+        signed_file_path = sign_file(hashed_file_path)
+        s3_path = s3_path_prefix / os.path.basename(signed_file_path)
+        s3_helper.upload_build_file_to_s3(Path(signed_file_path), str(s3_path))
+        print(f'Uploaded file {signed_file_path} to {s3_path}')
+
+    # Signed hashes are:
+    # clickhouse-client_22.3.15.2.altinitystable_amd64.deb.sha512.gpg              clickhouse-keeper_22.3.15.2.altinitystable_x86_64.apk.sha512.gpg
+    # clickhouse-client-22.3.15.2.altinitystable-amd64.tgz.sha512.gpg              clickhouse-keeper-22.3.15.2.altinitystable.x86_64.rpm.sha512.gpg
+    # clickhouse-client_22.3.15.2.altinitystable_x86_64.apk.sha512.gpg             clickhouse-keeper-dbg_22.3.15.2.altinitystable_amd64.deb.sha512.gpg
+    # clickhouse-client-22.3.15.2.altinitystable.x86_64.rpm.sha512.gpg             clickhouse-keeper-dbg-22.3.15.2.altinitystable-amd64.tgz.sha512.gpg
+    # clickhouse-common-static_22.3.15.2.altinitystable_amd64.deb.sha512.gpg       clickhouse-keeper-dbg_22.3.15.2.altinitystable_x86_64.apk.sha512.gpg
+    # clickhouse-common-static-22.3.15.2.altinitystable-amd64.tgz.sha512.gpg       clickhouse-keeper-dbg-22.3.15.2.altinitystable.x86_64.rpm.sha512.gpg
+    # clickhouse-common-static_22.3.15.2.altinitystable_x86_64.apk.sha512.gpg      clickhouse-keeper.sha512.gpg
+    # clickhouse-common-static-22.3.15.2.altinitystable.x86_64.rpm.sha512.gpg      clickhouse-library-bridge.sha512.gpg
+    # clickhouse-common-static-dbg_22.3.15.2.altinitystable_amd64.deb.sha512.gpg   clickhouse-odbc-bridge.sha512.gpg
+    # clickhouse-common-static-dbg-22.3.15.2.altinitystable-amd64.tgz.sha512.gpg   clickhouse-server_22.3.15.2.altinitystable_amd64.deb.sha512.gpg
+    # clickhouse-common-static-dbg_22.3.15.2.altinitystable_x86_64.apk.sha512.gpg  clickhouse-server-22.3.15.2.altinitystable-amd64.tgz.sha512.gpg
+    # clickhouse-common-static-dbg-22.3.15.2.altinitystable.x86_64.rpm.sha512.gpg  clickhouse-server_22.3.15.2.altinitystable_x86_64.apk.sha512.gpg
+    # clickhouse-keeper_22.3.15.2.altinitystable_amd64.deb.sha512.gpg              clickhouse-server-22.3.15.2.altinitystable.x86_64.rpm.sha512.gpg
+    # clickhouse-keeper-22.3.15.2.altinitystable-amd64.tgz.sha512.gpg              clickhouse.sha512.gpg
+
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/ci/sqltest.py b/tests/ci/sqltest.py
index b3e4233f6546..92026db4d7b1 100644
--- a/tests/ci/sqltest.py
+++ b/tests/ci/sqltest.py
@@ -14,7 +14,7 @@
 from report import SUCCESS, JobReport, TestResult
 from stopwatch import Stopwatch
 
-IMAGE_NAME = "clickhouse/sqltest"
+IMAGE_NAME = "altinityinfra/sqltest"
 
 
 def get_run_command(pr_number, sha, download_url, workspace_path, image):
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index 73707c488c8b..0bb5b5119de7 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -23,9 +23,17 @@
 class SensitiveFormatter(logging.Formatter):
     @staticmethod
     def _filter(s):
-        return re.sub(
-            r"(.*)(AZURE_CONNECTION_STRING.*\')(.*)", r"\1AZURE_CONNECTION_STRING\3", s
+        s = re.sub(r"(.*)(AZURE_STORAGE_KEY\S*\')(.*)", r"\1AZURE_STORAGE_KEY\3", s)
+        s = re.sub(r"(.*)(AZURE_ACCOUNT_NAME\S*\')(.*)", r"\1AZURE_ACCOUNT_NAME\3", s)
+        s = re.sub(
+            r"(.*)(AZURE_CONTAINER_NAME\S*\')(.*)", r"\1AZURE_CONTAINER_NAME\3", s
         )
+        s = re.sub(
+            r"(.*)(AZURE_STORAGE_ACCOUNT_URL\S*\')(.*)",
+            r"\1AZURE_STORAGE_ACCOUNT_URL\3",
+            s,
+        )
+        return s
 
     def format(self, record):
         original = logging.Formatter.format(self, record)
@@ -34,11 +42,17 @@ def format(self, record):
 
 def get_additional_envs(check_name: str) -> List[str]:
     result = []
-    azure_connection_string = get_parameter_from_ssm("azure_connection_string")
-    result.append(f"AZURE_CONNECTION_STRING='{azure_connection_string}'")
-    # some cloud-specific features require feature flags enabled
-    # so we need this ENV to be able to disable the randomization
-    # of feature flags
+    # Get Azure credentials from environment variables
+    azure_account_name = os.environ.get("AZURE_ACCOUNT_NAME")
+
+    if azure_account_name:
+        result.append(f"AZURE_ACCOUNT_NAME='{azure_account_name}'")
+        result.append(f"AZURE_STORAGE_KEY='{os.environ['AZURE_STORAGE_KEY']}'")
+        result.append(f"AZURE_CONTAINER_NAME='{os.environ['AZURE_CONTAINER_NAME']}'")
+        result.append(
+            f"AZURE_STORAGE_ACCOUNT_URL='{os.environ['AZURE_STORAGE_ACCOUNT_URL']}'"
+        )
+
     result.append("RANDOMIZE_KEEPER_FEATURE_FLAGS=1")
     if "azure" in check_name:
         result.append("USE_AZURE_STORAGE_FOR_MERGE_TREE=1")
@@ -72,7 +86,7 @@ def get_run_command(
         "--privileged "
         # a static link, don't use S3_URL or S3_DOWNLOAD
         "-e S3_URL='https://s3.amazonaws.com/clickhouse-datasets' "
-        "--tmpfs /tmp/clickhouse "
+        "--tmpfs /tmp/clickhouse:mode=1777 "
         f"--volume={build_path}:/package_folder "
         f"--volume={result_path}:/test_output "
         f"--volume={repo_tests_path}/..:/repo "
@@ -163,7 +177,7 @@ def run_stress_test(upgrade_check: bool = False) -> None:
     else:
         download_all_deb_packages(check_name, reports_path, packages_path)
 
-    docker_image = pull_image(get_docker_image("clickhouse/stress-test"))
+    docker_image = pull_image(get_docker_image("altinityinfra/stress-test"))
 
     server_log_path = temp_path / "server_log"
     server_log_path.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/version_helper.py b/tests/ci/version_helper.py
index 0989d12d4439..67774608fba1 100755
--- a/tests/ci/version_helper.py
+++ b/tests/ci/version_helper.py
@@ -4,7 +4,14 @@
 from pathlib import Path
 from typing import Any, Dict, Iterable, List, Literal, Optional, Set, Tuple, Union
 
-from git_helper import TWEAK, Git, get_tags, git_runner, removeprefix
+try:
+    # grype scan needs to know the PR number
+    # But non-grype jobs might be missing dependencies
+    from pr_info import PRInfo
+except ImportError:
+    PRInfo = None
+
+from git_helper import TWEAK, Git, get_tags, git_runner, removeprefix, VersionType
 
 FILE_WITH_VERSION_PATH = "cmake/autogenerated_versions.txt"
 CHANGELOG_IN_PATH = "debian/changelog.in"
@@ -29,6 +36,8 @@
 SET(VERSION_MINOR {minor})
 SET(VERSION_PATCH {patch})
 SET(VERSION_GITHASH {githash})
+SET(VERSION_TWEAK {tweak})
+SET(VERSION_FLAVOUR {flavour})
 SET(VERSION_DESCRIBE {describe})
 SET(VERSION_STRING {string})
 # end of autochange
@@ -48,6 +57,7 @@ def __init__(
         revision: Union[int, str],
         git: Optional[Git],
         tweak: Optional[Union[int, str]] = None,
+        flavour: Optional[str] = None,
     ):
         self._major = int(major)
         self._minor = int(minor)
@@ -61,6 +71,7 @@ def __init__(
             self._tweak = self._git.tweak
         self._describe = ""
         self._description = ""
+        self._flavour = flavour
 
     def update(self, part: PART_TYPE) -> "ClickHouseVersion":
         """If part is valid, returns a new version"""
@@ -86,16 +97,6 @@ def bump(self) -> "ClickHouseVersion":
             self._tweak = 1
         return self
 
-    def bump_patch(self) -> "ClickHouseVersion":
-        self._revision += 1
-        self._patch += 1
-        self._tweak = 1
-        return self
-
-    def reset_tweak(self) -> "ClickHouseVersion":
-        self._tweak = 1
-        return self
-
     def major_update(self) -> "ClickHouseVersion":
         if self._git is not None:
             self._git.update()
@@ -115,6 +116,13 @@ def patch_update(self) -> "ClickHouseVersion":
             self.major, self.minor, self.patch + 1, self.revision, self._git
         )
 
+    def reset_tweak(self) -> "ClickHouseVersion":
+        if self._git is not None:
+            self._git.update()
+        return ClickHouseVersion(
+            self.major, self.minor, self.patch, self.revision, self._git, 1
+        )
+
     @property
     def major(self) -> int:
         return self._major
@@ -154,22 +162,24 @@ def describe(self):
     def description(self) -> str:
         return self._description
 
+    @property
+    def flavour(self) -> str:
+        return self._flavour
+
     @property
     def string(self):
-        return ".".join(
+        version_as_string = ".".join(
             (str(self.major), str(self.minor), str(self.patch), str(self.tweak))
         )
+        if self._flavour:
+            version_as_string = f"{version_as_string}.{self._flavour}"
+        return version_as_string
 
     @property
     def is_lts(self) -> bool:
         """our X.3 and X.8 are LTS"""
         return self.minor % 5 == 3
 
-    @property
-    def is_supported(self) -> bool:
-        "we can support only versions with VersionType STABLE or LTS"
-        return self.description in (VersionType.STABLE, VersionType.LTS)
-
     def get_stable_release_type(self) -> str:
         if self.is_lts:
             return VersionType.LTS
@@ -185,6 +195,7 @@ def as_dict(self) -> VERSIONS:
             "githash": self.githash,
             "describe": self.describe,
             "string": self.string,
+            "flavour": self.flavour
         }
 
     def as_tuple(self) -> Tuple[int, int, int, int]:
@@ -194,7 +205,10 @@ def with_description(self, version_type):
         if version_type not in VersionType.VALID:
             raise ValueError(f"version type {version_type} not in {VersionType.VALID}")
         self._description = version_type
-        self._describe = f"v{self.string}-{version_type}"
+        if version_type == self._flavour:
+            self._describe = f"v{self.string}"
+        else:
+            self._describe = f"v{self.string}-{version_type}"
         return self
 
     def copy(self) -> "ClickHouseVersion":
@@ -228,7 +242,7 @@ def __lt__(self, other: Any) -> bool:
         for part in ("major", "minor", "patch", "tweak"):
             if getattr(self, part) < getattr(other, part):
                 return True
-            if getattr(self, part) > getattr(other, part):
+            elif getattr(self, part) > getattr(other, part):
                 return False
 
         return False
@@ -251,21 +265,12 @@ def __repr__(self):
 
 ClickHouseVersions = List[ClickHouseVersion]
 
-
-class VersionType:
-    LTS = "lts"
-    NEW = "new"
-    PRESTABLE = "prestable"
-    STABLE = "stable"
-    TESTING = "testing"
-    VALID = (NEW, TESTING, PRESTABLE, STABLE, LTS)
-
-
 def validate_version(version: str) -> None:
+    # NOTE(vnemkov): minor but important fixes, so versions with 'flavour' are threated as valid (e.g. 22.8.8.4.altinitystable)
     parts = version.split(".")
-    if len(parts) != 4:
+    if len(parts) < 4:
         raise ValueError(f"{version} does not contain 4 parts")
-    for part in parts:
+    for part in parts[:4]:
         int(part)
 
 
@@ -306,18 +311,11 @@ def get_version_from_repo(
         versions["patch"],
         versions["revision"],
         git,
+        # Explicitly use tweak value from version file
+        tweak=versions.get("tweak", versions["revision"]),
+        flavour=versions.get("flavour", None)
     )
-    # Since 24.5 we have tags like v24.6.1.1-new, and we must check if the release
-    # branch already has it's own commit. It's necessary for a proper tweak version
-    if git is not None and git.latest_tag:
-        version_from_tag = get_version_from_tag(git.latest_tag)
-        if (
-            version_from_tag.description == VersionType.NEW
-            and cmake_version < version_from_tag
-        ):
-            # We are in a new release branch without existing release.
-            # We should change the tweak version to a `tweak_to_new`
-            cmake_version.tweak = git.tweak_to_new
+
     return cmake_version
 
 
@@ -325,15 +323,31 @@ def get_version_from_string(
     version: str, git: Optional[Git] = None
 ) -> ClickHouseVersion:
     validate_version(version)
-    parts = version.split(".")
-    return ClickHouseVersion(parts[0], parts[1], parts[2], -1, git, parts[3])
+    # dict for simple handling of missing parts with parts.get(index, default)
+    parts = dict(enumerate(version.split(".")))
+    return ClickHouseVersion(
+        parts[0],
+        parts[1],
+        parts[2],
+        -1,
+        git,
+        parts.get(3, None),
+        parts.get(4, None)
+    )
 
 
 def get_version_from_tag(tag: str) -> ClickHouseVersion:
     Git.check_tag(tag)
-    tag, description = tag[1:].split("-", 1)
-    version = get_version_from_string(tag)
-    version.with_description(description)
+    tag = tag[1:] # strip initial 'v'
+    if '-' in tag:
+        # Upstream tags with dash
+        tag, description = tag.split("-", 1)
+        version = get_version_from_string(tag)
+        version.with_description(description)
+    else:
+        # Altinity's tags, with dots as separators between parts (handled properly down the road)
+        version = get_version_from_string(tag)
+
     return version
 
 
@@ -371,7 +385,7 @@ def get_supported_versions(
         versions = list(versions)
     else:
         # checks that repo is not shallow in background
-        versions = [v for v in get_tagged_versions() if v.is_supported]
+        versions = get_tagged_versions()
     versions.sort()
     versions.reverse()
     for version in versions:
@@ -438,7 +452,7 @@ def update_contributors(
     get_abs_path(relative_contributors_path).write_text(content, encoding="utf-8")
 
 
-def update_version_local(version, version_type="testing"):
+def update_version_local(version : ClickHouseVersion, version_type="testing"):
     update_contributors()
     version.with_description(version_type)
     update_cmake_version(version)
@@ -505,6 +519,13 @@ def main():
     if args.update_part or args.update_cmake:
         update_cmake_version(version)
 
+    # grype scan needs to know the PR number
+    if PRInfo:
+        pr_info = PRInfo()
+        print(f"PR_NUMBER={pr_info.number}")
+        if args.export:
+            print(f"export PR_NUMBER")
+
     for k, v in version.as_dict().items():
         name = f"CLICKHOUSE_VERSION_{k.upper()}"
         print(f"{name}='{v}'")
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index d1dc6245b707..5b1d66d16a4f 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -11,6 +11,10 @@ import copy
 import enum
 import glob
 
+# For processing the broken tests rules
+from functools import lru_cache
+import yaml
+
 # Not requests, to avoid requiring extra dependency.
 import http.client
 import io
@@ -83,6 +87,112 @@ VERSION_PATTERN = r"^((\d+\.)?(\d+\.)?(\d+\.)?\d+)$"
 TEST_MAX_RUN_TIME_IN_SECONDS = 180
 
 
+@lru_cache(maxsize=1)
+def get_broken_tests_rules(broken_tests_file_path: str) -> dict:
+    if (
+        not os.path.isfile(broken_tests_file_path)
+        or os.path.getsize(broken_tests_file_path) == 0
+    ):
+        raise ValueError(
+            "There is something wrong with getting broken tests rules: "
+            f"file '{broken_tests_file_path}' is empty or does not exist."
+        )
+
+    with open(broken_tests_file_path, "r", encoding="utf-8") as broken_tests_file:
+        broken_tests = yaml.safe_load(broken_tests_file)
+
+    compiled_rules = {"exact": {}, "pattern": {}}
+
+    for test in broken_tests:
+        regex = test.get("regex") is True
+        rule = {
+            "reason": test["reason"],
+        }
+
+        if test.get("message"):
+            rule["message"] = re.compile(test["message"]) if regex else test["message"]
+
+        if test.get("not_message"):
+            rule["not_message"] = (
+                re.compile(test["not_message"]) if regex else test["not_message"]
+            )
+        if test.get("check_types"):
+            rule["check_types"] = test["check_types"]
+
+        if regex:
+            rule["regex"] = True
+            compiled_rules["pattern"][re.compile(test["name"])] = rule
+        else:
+            compiled_rules["exact"][test["name"]] = rule
+
+    return compiled_rules
+
+
+def test_is_known_fail(test_name, test_logs, build_flags, broken_tests_file_path):
+    matching_rules = []
+
+    def matches_substring(substring, log, is_regex):
+        if log is None:
+            return False
+        if is_regex:
+            return bool(substring.search(log))
+        return substring in log
+
+    broken_tests_log = "ci/tmp/broken_tests_handler.log"
+
+    with open(broken_tests_log, "a") as log_file:
+        try:
+            known_broken_tests = get_broken_tests_rules(broken_tests_file_path)
+        except Exception as e:
+            log_file.write(f"Error getting broken tests rules: {e}\n")
+            return False
+
+        log_file.write(f"Checking known broken tests for failed test: {test_name}\n")
+        log_file.write("Potential matching rules:\n")
+        exact_rule = known_broken_tests["exact"].get(test_name)
+        if exact_rule:
+            log_file.write(f"{test_name} - {exact_rule}\n")
+            matching_rules.append(exact_rule)
+
+        for name_re, data in known_broken_tests["pattern"].items():
+            if name_re.fullmatch(test_name):
+                log_file.write(f"{name_re} - {data}\n")
+                matching_rules.append(data)
+
+        if not matching_rules:
+            return False
+
+        log_file.write(f"First line of test logs: {test_logs.splitlines()[0]}\n")
+
+        for rule_data in matching_rules:
+            if rule_data.get("check_types") and not any(
+                ct in build_flags for ct in rule_data["check_types"]
+            ):
+                log_file.write(
+                    f"Skip rule: Check types didn't match: '{rule_data['check_types']}' not in '{build_flags}'\n"
+                )
+                continue  # check_types didn't match → skip rule
+
+            is_regex = rule_data.get("regex", False)
+            not_message = rule_data.get("not_message")
+            if not_message and matches_substring(not_message, test_logs, is_regex):
+                log_file.write(
+                    f"Skip rule: Not message matched: '{rule_data['not_message']}'\n"
+                )
+                continue  # not_message matched → skip rule
+            message = rule_data.get("message")
+            if message and not matches_substring(message, test_logs, is_regex):
+                log_file.write(
+                    f"Skip rule: Message didn't match: '{rule_data['message']}'\n"
+                )
+                continue
+
+            log_file.write(f"Matched rule: {rule_data}\n")
+            return rule_data["reason"]
+
+        return False
+
+
 class SharedEngineReplacer:
     SPECIALIZED_ENGINES = "Collapsing|VersionedCollapsing|Summing|Replacing|Aggregating"
     ENGINES_NON_REPLICATED_REGEXP = (
@@ -918,6 +1028,7 @@ class TestStatus(enum.Enum):
     OK = "OK"
     SKIPPED = "SKIPPED"
     NOT_FAILED = "NOT_FAILED"
+    BROKEN = "BROKEN"
 
 
 class FailureReason(enum.Enum):
@@ -1146,6 +1257,8 @@ class SettingsRandomizer:
         "use_query_condition_cache": lambda: random.randint(0, 1),
         "secondary_indices_enable_bulk_filtering": lambda: random.randint(0, 1),
         "use_skip_indexes_if_final": lambda: random.randint(0, 1),
+        # Use the new reader most of the time.
+        "input_format_parquet_use_native_reader_v3": lambda: min(1, random.randint(0, 5)),
         **randomize_external_sort_group_by(),
     }
 
@@ -1594,6 +1707,10 @@ class TestCase:
         if tags and ("no-replicated-database" in tags) and args.replicated_database:
             return FailureReason.REPLICATED_DB
 
+        # RocksDB tests cannot be used with replicated database as, in our CI, the databases share the same user_files
+        if tags and ("use-rocksdb" in tags) and args.replicated_database:
+            return FailureReason.REPLICATED_DB
+
         if tags and ("no-distributed-cache" in tags) and args.distributed_cache:
             return FailureReason.DISTRIBUTED_CACHE
 
@@ -1826,7 +1943,6 @@ class TestCase:
                     self.stdout_file,
                 ],
                 stdout=PIPE,
-                universal_newlines=True,
             ) as diff_proc:
                 if self.show_whitespaces_in_diff:
                     with Popen(
@@ -1834,11 +1950,10 @@ class TestCase:
                         stdin=diff_proc.stdout,
                         stdout=PIPE,
                     ) as sed_proc:
-                        diff = sed_proc.communicate()[0].decode(
-                            "utf-8", errors="ignore"
-                        )
+                        diff = sed_proc.communicate()[0]
                 else:
                     diff = diff_proc.communicate()[0]
+            diff = diff.decode("utf-8", errors="ignore")
 
             if diff.startswith("Binary files "):
                 diff += "Content of stdout:\n===================\n"
@@ -2216,6 +2331,22 @@ class TestCase:
             if result.status == TestStatus.FAIL:
                 result.description = self.add_info_about_settings(result.description)
 
+                if args.known_fails_file_path:
+                    # Check if the test is known to fail
+                    known_fail_reason = test_is_known_fail(
+                        self.name,
+                        f"Reason: {result.reason.value} {result.description}",
+                        args.build_flags,
+                        args.known_fails_file_path,
+                    )
+                    if known_fail_reason:
+                        result.status = TestStatus.BROKEN
+
+                        # Place the message on the second line
+                        result.description = result.description.replace(
+                            "\n", f"\nMarked as broken: {known_fail_reason}\n", 1
+                        )
+
             if self.name in suite.blacklist_check:
                 if result.status == TestStatus.OK:
                     result.status = TestStatus.NOT_FAILED
@@ -2720,6 +2851,11 @@ def run_tests_array(
         + colored(" NOT_FAILED ", args, "red", attrs=["bold"])
         + CL_SQUARE_BRACKET
     )
+    MSG_BROKEN = (
+        OP_SQUARE_BRACKET
+        + colored(" BROKEN ", args, "cyan", attrs=["bold"])
+        + CL_SQUARE_BRACKET
+    )
 
     MESSAGES = {
         TestStatus.FAIL: MSG_FAIL,
@@ -2727,12 +2863,14 @@ def run_tests_array(
         TestStatus.OK: MSG_OK,
         TestStatus.SKIPPED: MSG_SKIPPED,
         TestStatus.NOT_FAILED: MSG_NOT_FAILED,
+        TestStatus.BROKEN: MSG_BROKEN,
     }
 
     passed_total = 0
     skipped_total = 0
     failures_total = 0
     failures_chain = 0
+    broken_total = 0
     start_time = datetime.now()
 
     client_options = get_additional_client_options(args)
@@ -2827,6 +2965,8 @@ def run_tests_array(
                     raise ServerDied("Server died")
             elif test_result.status == TestStatus.SKIPPED:
                 skipped_total += 1
+            elif test_result.status == TestStatus.BROKEN:
+                broken_total += 1
 
         except KeyboardInterrupt as e:
             print(colored("Break tests execution", args, "red"))
@@ -2842,6 +2982,7 @@ def run_tests_array(
             colored(
                 f"\nHaving {failures_total} errors! {passed_total} tests passed."
                 f" {skipped_total} tests skipped."
+                f" {broken_total} broken tests."
                 f" {(datetime.now() - start_time).total_seconds():.2f} s elapsed"
                 f" ({multiprocessing.current_process().name}).",
                 args,
@@ -3695,6 +3836,8 @@ def parse_args():
     parser.add_argument("-q", "--queries", help="Path to queries dir")
     parser.add_argument("--tmp", help="Path to tmp dir")
 
+    parser.add_argument("--known-fails-file-path", help="Path to known fails file")
+
     parser.add_argument(
         "-b",
         "--binary",
diff --git a/tests/config/config.d/azure_storage_conf.xml b/tests/config/config.d/azure_storage_conf.xml
index 1117ef459003..eb7c4d154d34 100644
--- a/tests/config/config.d/azure_storage_conf.xml
+++ b/tests/config/config.d/azure_storage_conf.xml
@@ -6,15 +6,17 @@
                 <object_storage_type>azure</object_storage_type>
                 <skip_access_check>false</skip_access_check>
                 <max_single_part_upload_size>33554432</max_single_part_upload_size>
-                <container_name>openbucketforpublicci</container_name>
-                <connection_string from_env="AZURE_CONNECTION_STRING"/>
+                <storage_account_url from_env="AZURE_STORAGE_ACCOUNT_URL"/>
+                <container_name from_env="AZURE_CONTAINER_NAME"/>
+                <account_name from_env="AZURE_ACCOUNT_NAME"/>
+                <account_key from_env="AZURE_STORAGE_KEY"/>
             </azure>
             <cached_azure>
                 <type>cache</type>
                 <disk>azure</disk>
                 <path>azure_cache/</path>
                 <cache_policy>LRU</cache_policy>
-                <max_size>100000000000</max_size>
+                <max_size>100000000</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
             </cached_azure>
             <cached_azure_encrypted>
diff --git a/tests/config/config.d/clusters.xml b/tests/config/config.d/clusters.xml
index 0ee6ce774e43..e08b0fe17fa7 100644
--- a/tests/config/config.d/clusters.xml
+++ b/tests/config/config.d/clusters.xml
@@ -258,6 +258,188 @@
                  </replica>
              </shard>
         </test_cluster_two_shards_localhost>
+        <test_cluster_thirty_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_thirty_shards_localhost>
         <test_cluster_two_shards_internal_replication>
             <shard>
                 <internal_replication>true</internal_replication>
@@ -325,5 +507,19 @@
                 </replica>
             </shard>
         </test_shard_bind_host_fail>
+        <test_cluster_multiple_nodes_all_unavailable>
+            <node>
+                <host>127.0.0.1</host>
+                <port>1234</port>
+            </node>
+            <node>
+                <host>127.0.0.2</host>
+                <port>1234</port>
+            </node>
+            <node>
+                <host>127.0.0.3</host>
+                <port>1234</port>
+            </node>
+        </test_cluster_multiple_nodes_all_unavailable>
     </remote_servers>
 </clickhouse>
diff --git a/tests/config/config.d/enable_experimental_export_merge_tree_partition.xml b/tests/config/config.d/enable_experimental_export_merge_tree_partition.xml
new file mode 100644
index 000000000000..72014c9de4db
--- /dev/null
+++ b/tests/config/config.d/enable_experimental_export_merge_tree_partition.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <enable_experimental_export_merge_tree_partition_feature>1</enable_experimental_export_merge_tree_partition_feature>
+</clickhouse>
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index 41fb46434319..ab0ddf34f418 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -42,6 +42,24 @@
                 <background_download_queue_size_limit>0</background_download_queue_size_limit>
                 <load_metadata_asynchronously>0</load_metadata_asynchronously>
             </s3_cache_02933>
+            <s3_plain_rewritable>
+                <type>object_storage</type>
+                <object_storage_type>s3</object_storage_type>
+                <metadata_type>plain_rewritable</metadata_type>
+                <endpoint>http://localhost:11111/test/s3_plain_rewritable/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_plain_rewritable>
+            <s3_plain_rewritable_cache>
+                <type>cache</type>
+                <disk>s3_plain_rewritable</disk>
+                <path>s3_plain_rewritable_cache/</path>
+                <max_size>128Mi</max_size>
+                <cache_on_write_operations>1</cache_on_write_operations>
+                <background_download_threads>0</background_download_threads>
+                <background_download_queue_size_limit>0</background_download_queue_size_limit>
+                <load_metadata_asynchronously>0</load_metadata_asynchronously>
+            </s3_plain_rewritable_cache>
             <!-- local disks -->
             <local_disk>
                 <type>object_storage</type>
@@ -79,6 +97,12 @@
                 <max_size>22548578304</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
             </local_cache_3>
+            <local_plain_rewritable>
+                <type>object_storage</type>
+                <object_storage_type>local</object_storage_type>
+                <path>disks/test/local_plain_rewritable/</path>
+                <metadata_type>plain_rewritable</metadata_type>
+            </local_plain_rewritable>
             <!-- multi layer cache -->
             <s3_cache_multi>
                 <type>cache</type>
@@ -99,6 +123,23 @@
                 <secret_access_key>clickhouse</secret_access_key>
                 <s3_check_objects_after_upload>0</s3_check_objects_after_upload>
             </s3_no_cache>
+            <s3_plain_rewritable_cache_multi>
+                <type>cache</type>
+                <disk>s3_plain_rewritable_cache</disk>
+                <path>s3_plain_rewritable_cache_multi/</path>
+                <max_size>22548578304</max_size>
+            </s3_plain_rewritable_cache_multi>
+            <local_cache_multi>
+                <type>cache</type>
+                <disk>local_cache</disk>
+                <path>local_cache_multi/</path>
+                <max_size>22548578304</max_size>
+            </local_cache_multi>
+            <encrypted_s3_plain_rewritable_cache>
+                <type>encrypted</type>
+                <disk>s3_plain_rewritable_cache</disk>
+                <key>1234567812345678</key>
+            </encrypted_s3_plain_rewritable_cache>
         </disks>
         <policies>
             <local_remote>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index b8874097c940..90b70f3ce5cc 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -85,6 +85,7 @@ ln -sf $SRC_PATH/config.d/blob_storage_log.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/custom_settings_prefixes.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_catalog_drop_table_concurrency.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/enable_access_control_improvements.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/enable_experimental_export_merge_tree_partition.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/macros.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/secure_ports.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/clusters.xml $DEST_SERVER_PATH/config.d/
diff --git a/tests/integration/compose/docker_compose_arrowflight.yml b/tests/integration/compose/docker_compose_arrowflight.yml
index be847c5fa5f5..f6d6652ecf58 100644
--- a/tests/integration/compose/docker_compose_arrowflight.yml
+++ b/tests/integration/compose/docker_compose_arrowflight.yml
@@ -1,6 +1,6 @@
 services:
   arrowflight1:
-    image: clickhouse/arrowflight-server-test:${DOCKER_ARROWFLIGHT_SERVER_TAG:-latest}
+    image: altinityinfra/arrowflight-server-test:${DOCKER_ARROWFLIGHT_SERVER_TAG:-latest}
     ports:
       - "5005:5005"
     command: ["python", "flight_server.py"]
diff --git a/tests/integration/compose/docker_compose_azurite.yml b/tests/integration/compose/docker_compose_azurite.yml
index 926bef575fcf..5d1864b04a52 100644
--- a/tests/integration/compose/docker_compose_azurite.yml
+++ b/tests/integration/compose/docker_compose_azurite.yml
@@ -1,6 +1,6 @@
 services:
   azurite1:
-    image: mcr.microsoft.com/azure-storage/azurite
+    image: altinityinfra/azurite:3.35.0 # NOTE(strtgbb): Use mirror to avoid access denied error from mcr.microsoft.com
     ports:
       - "${AZURITE_PORT}:${AZURITE_PORT}"
     volumes:
diff --git a/tests/integration/compose/docker_compose_clickhouse.yml b/tests/integration/compose/docker_compose_clickhouse.yml
index e913766fc9c6..b162c059b9fd 100644
--- a/tests/integration/compose/docker_compose_clickhouse.yml
+++ b/tests/integration/compose/docker_compose_clickhouse.yml
@@ -1,5 +1,5 @@
 # Used to pre-pull images with docker compose
 services:
   clickhouse1:
-    image: clickhouse/integration-test
+    image: altinityinfra/integration-test
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_dotnet_client.yml b/tests/integration/compose/docker_compose_dotnet_client.yml
index dd1f6a5555e3..314039d7a2bc 100644
--- a/tests/integration/compose/docker_compose_dotnet_client.yml
+++ b/tests/integration/compose/docker_compose_dotnet_client.yml
@@ -1,6 +1,6 @@
 services:
   dotnet1:
-    image: clickhouse/dotnet-client:${DOCKER_DOTNET_CLIENT_TAG:-latest}
+    image: altinityinfra/dotnet-client:${DOCKER_DOTNET_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_glue_catalog.yml b/tests/integration/compose/docker_compose_glue_catalog.yml
index f97f8aa27550..32b3bbda245a 100644
--- a/tests/integration/compose/docker_compose_glue_catalog.yml
+++ b/tests/integration/compose/docker_compose_glue_catalog.yml
@@ -44,6 +44,5 @@ services:
       until (/usr/bin/mc config host add minio http://minio:9000 minio ClickHouse_Minio_P@ssw0rd) do echo '...waiting...' && sleep 1; done;
       /usr/bin/mc rm -r --force minio/warehouse-glue;
       /usr/bin/mc mb minio/warehouse-glue --ignore-existing;
-      /usr/bin/mc policy set public minio/warehouse-glue;
       tail -f /dev/null
       "
diff --git a/tests/integration/compose/docker_compose_iceberg_hms_catalog.yml b/tests/integration/compose/docker_compose_iceberg_hms_catalog.yml
index 56c1cd9941d9..073e69a3cedb 100644
--- a/tests/integration/compose/docker_compose_iceberg_hms_catalog.yml
+++ b/tests/integration/compose/docker_compose_iceberg_hms_catalog.yml
@@ -17,7 +17,7 @@ services:
       - 10001:10001
     stop_grace_period: 5s
   hive:
-    image: clickhouse/integration-test-with-hms
+    image: altinityinfra/integration-test-with-hms
     restart: unless-stopped
     depends_on:
       minio:
diff --git a/tests/integration/compose/docker_compose_iceberg_lakekeeper_catalog.yml b/tests/integration/compose/docker_compose_iceberg_lakekeeper_catalog.yml
index 4f6a997a0d42..bfec55f58867 100644
--- a/tests/integration/compose/docker_compose_iceberg_lakekeeper_catalog.yml
+++ b/tests/integration/compose/docker_compose_iceberg_lakekeeper_catalog.yml
@@ -7,6 +7,8 @@ services:
       - LAKEKEEPER__PG_DATABASE_URL_WRITE=postgresql://postgres:postgres@db:5432/postgres
       - RUST_LOG=info
     command: ["serve"]
+    ports:
+      - 8181:8181
     healthcheck:
       test: ["CMD", "/home/nonroot/lakekeeper", "healthcheck"]
       interval: 1s
@@ -14,15 +16,12 @@ services:
       retries: 10
       start_period: 30s
     depends_on:
+      mc:
+        condition: service_completed_successfully
       migrate:
         condition: service_completed_successfully
       db:
         condition: service_healthy
-      minio:
-        condition: service_healthy
-    ports:
-      - 8181:8181
-
 
   migrate:
     image: vakamo/lakekeeper:v0.9.4
@@ -37,7 +36,6 @@ services:
       db:
         condition: service_healthy
 
-
   bootstrap:
     image: curlimages/curl
     depends_on:
@@ -45,7 +43,7 @@ services:
         condition: service_healthy
     restart: "no"
     command:
-      - -w
+      - "-w"
       - "%{http_code}"
       - "-X"
       - "POST"
@@ -58,47 +56,45 @@ services:
       - "-o"
       - "/dev/null"
 
-
-
-
-
-
   db:
-    image: bitnami/postgresql:16.3.0
+    image: postgres:16
     environment:
-      - POSTGRESQL_USERNAME=postgres
-      - POSTGRESQL_PASSWORD=postgres
-      - POSTGRESQL_DATABASE=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -p 5432 -d postgres"]
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
       interval: 2s
       timeout: 10s
       retries: 5
       start_period: 10s
 
-  # TODO: can we simply use with_minio=True instead?
   minio:
-    image: bitnami/minio:2025.4.22
+    image: minio/minio:RELEASE.2024-07-31T05-46-26Z
     environment:
       - MINIO_ROOT_USER=minio
       - MINIO_ROOT_PASSWORD=ClickHouse_Minio_P@ssw0rd
-      - MINIO_API_PORT_NUMBER=9000
-      - MINIO_CONSOLE_PORT_NUMBER=9001
       - MINIO_SCHEME=http
       - MINIO_DEFAULT_BUCKETS=warehouse-rest
-    networks: 
+    networks:
       default:
         aliases:
           - warehouse-rest.minio
-    ports:
-      - "9002:9000"
-      - "9003:9001"
-    healthcheck:
-      test: ["CMD", "mc", "ls", "local", "|", "grep", "warehouse-rest"]
-      interval: 2s
-      timeout: 10s
-      retries: 3
-      start_period: 15s
-
-
+    command: ["server", "/data", "--console-address", ":9001"]
 
+  mc:
+    depends_on:
+      - minio
+    image: minio/mc:RELEASE.2025-04-16T18-13-26Z
+    environment:
+      - AWS_ACCESS_KEY_ID=minio
+      - AWS_SECRET_ACCESS_KEY=ClickHouse_Minio_P@ssw0rd
+      - AWS_REGION=us-east-1
+    restart: "no"
+    entrypoint: >
+      /bin/sh -c "
+      until (/usr/bin/mc config host add minio http://minio:9000 minio ClickHouse_Minio_P@ssw0rd) do echo '...waiting...' && sleep 1; done;
+      /usr/bin/mc rm -r --force minio/warehouse-rest;
+      /usr/bin/mc mb minio/warehouse-rest --ignore-existing;
+      /usr/bin/mc policy set public minio/warehouse-rest;
+      " # FIX 3: Removed 'tail -f /dev/null' to make this a one-shot setup task.
diff --git a/tests/integration/compose/docker_compose_iceberg_nessie_catalog.yml b/tests/integration/compose/docker_compose_iceberg_nessie_catalog.yml
new file mode 100644
index 000000000000..b0394323f657
--- /dev/null
+++ b/tests/integration/compose/docker_compose_iceberg_nessie_catalog.yml
@@ -0,0 +1,62 @@
+services:
+  nessie:
+    image: ghcr.io/projectnessie/nessie:latest
+    depends_on:
+      minio:
+        condition: service_started
+    ports:
+      - "19120:19120"
+    environment:
+      - nessie.version.store.type=IN_MEMORY
+      - nessie.catalog.default-warehouse=warehouse
+      - nessie.catalog.warehouses.warehouse.location=s3://warehouse-rest/
+      - nessie.catalog.service.s3.default-options.endpoint=http://minio:9000/
+      - nessie.catalog.service.s3.default-options.external-endpoint=http://127.0.0.1:9002/
+      - nessie.catalog.service.s3.default-options.access-key=urn:nessie-secret:quarkus:nessie.catalog.secrets.access-key
+      - nessie.catalog.service.s3.default-options.path-style-access=true
+      - nessie.catalog.service.s3.default-options.auth-type=STATIC
+      - nessie.catalog.secrets.access-key.name=minio
+      - nessie.catalog.secrets.access-key.secret=ClickHouse_Minio_P@ssw0rd
+      - nessie.catalog.service.s3.default-options.region=us-east-1
+      - nessie.server.authentication.enabled=false
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:19120/api/v2/config"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 60s
+
+  # TODO: can we simply use with_minio=True instead?
+  minio:
+    image: minio/minio:RELEASE.2024-07-31T05-46-26Z
+    environment:
+      - MINIO_ROOT_USER=minio
+      - MINIO_ROOT_PASSWORD=ClickHouse_Minio_P@ssw0rd
+      - MINIO_DOMAIN=minio
+    networks:
+      default:
+        aliases:
+          - warehouse-rest.minio
+    ports:
+      - "9001:9001"
+      - "9002:9000"
+    command: ["server", "/data", "--console-address", ":9001"]
+
+  # TODO: move this code to cluster.py
+  mc:
+    depends_on:
+      - minio
+    # Stick to version with "mc config"
+    image: minio/mc:RELEASE.2025-04-16T18-13-26Z
+    environment:
+      - AWS_ACCESS_KEY_ID=minio
+      - AWS_SECRET_ACCESS_KEY=ClickHouse_Minio_P@ssw0rd
+      - AWS_REGION=us-east-1
+    entrypoint: >
+      /bin/sh -c "
+      until (/usr/bin/mc config host add minio http://minio:9000 minio ClickHouse_Minio_P@ssw0rd) do echo '...waiting...' && sleep 1; done;
+      /usr/bin/mc rm -r --force minio/warehouse-rest;
+      /usr/bin/mc mb minio/warehouse-rest --ignore-existing;
+      /usr/bin/mc policy set public minio/warehouse-rest;
+      tail -f /dev/null
+      "
\ No newline at end of file
diff --git a/tests/integration/compose/docker_compose_jdbc_bridge.yml b/tests/integration/compose/docker_compose_jdbc_bridge.yml
index 631d88a36672..caa0e0232bb1 100644
--- a/tests/integration/compose/docker_compose_jdbc_bridge.yml
+++ b/tests/integration/compose/docker_compose_jdbc_bridge.yml
@@ -1,5 +1,6 @@
 services:
   bridge1:
+    # NOTE(vnemkov): not produced by CI/CD, so must not be replaced with altinityinfra/jdbc-bridge
     image: clickhouse/jdbc-bridge
     command: |
       /bin/bash -c 'cat << EOF > config/datasources/self.json
diff --git a/tests/integration/compose/docker_compose_keeper.yml b/tests/integration/compose/docker_compose_keeper.yml
index c569b1878c51..a22cf2d960d9 100644
--- a/tests/integration/compose/docker_compose_keeper.yml
+++ b/tests/integration/compose/docker_compose_keeper.yml
@@ -1,6 +1,6 @@
 services:
     zoo1:
-        image: ${image:-clickhouse/integration-test}
+        image: ${image:-altinityinfra/integration-test}
         stop_grace_period: 5s
         restart: always
         user: ${user:-}
@@ -38,7 +38,7 @@ services:
             - inet6
             - rotate
     zoo2:
-        image: ${image:-clickhouse/integration-test}
+        image: ${image:-altinityinfra/integration-test}
         stop_grace_period: 5s
         restart: always
         user: ${user:-}
@@ -76,7 +76,7 @@ services:
             - inet6
             - rotate
     zoo3:
-        image: ${image:-clickhouse/integration-test}
+        image: ${image:-altinityinfra/integration-test}
         stop_grace_period: 5s
         restart: always
         user: ${user:-}
diff --git a/tests/integration/compose/docker_compose_kerberized_kafka.yml b/tests/integration/compose/docker_compose_kerberized_kafka.yml
index 4f21f2138109..33136def6016 100644
--- a/tests/integration/compose/docker_compose_kerberized_kafka.yml
+++ b/tests/integration/compose/docker_compose_kerberized_kafka.yml
@@ -50,7 +50,7 @@ services:
       net.ipv4.ip_local_port_range: '55000 65535'
     stop_grace_period: 5s
   kafka_kerberos:
-    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: altinityinfra/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: kafka_kerberos
     volumes:
       - ${KERBERIZED_KAFKA_DIR}/secrets:/tmp/keytab
diff --git a/tests/integration/compose/docker_compose_kerberos_kdc.yml b/tests/integration/compose/docker_compose_kerberos_kdc.yml
index 1a23854ac9a6..d0a115beef49 100644
--- a/tests/integration/compose/docker_compose_kerberos_kdc.yml
+++ b/tests/integration/compose/docker_compose_kerberos_kdc.yml
@@ -1,6 +1,6 @@
 services:
   kerberoskdc:
-    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: altinityinfra/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: kerberoskdc
     volumes:
       - ${KERBEROS_KDC_DIR}/secrets:/tmp/keytab
diff --git a/tests/integration/compose/docker_compose_ldap.yml b/tests/integration/compose/docker_compose_ldap.yml
index 70b38ed9e824..0f7620d60236 100644
--- a/tests/integration/compose/docker_compose_ldap.yml
+++ b/tests/integration/compose/docker_compose_ldap.yml
@@ -1,6 +1,6 @@
 services:
     openldap:
-        image: bitnami/openldap:2.6.8
+        image: bitnamilegacy/openldap:2.6.8
         stop_grace_period: 5s
         restart: always
         environment:
diff --git a/tests/integration/compose/docker_compose_minio.yml b/tests/integration/compose/docker_compose_minio.yml
index 6592a49262dc..7b40682e6822 100644
--- a/tests/integration/compose/docker_compose_minio.yml
+++ b/tests/integration/compose/docker_compose_minio.yml
@@ -22,7 +22,7 @@ services:
   # HTTP proxies for Minio.
   proxy1:
     stop_grace_period: 5s
-    image: clickhouse/s3-proxy
+    image: altinityinfra/s3-proxy
     expose:
       - "8080" # Redirect proxy port
       - "80"   # Reverse proxy port
@@ -30,7 +30,7 @@ services:
 
   proxy2:
     stop_grace_period: 5s
-    image: clickhouse/s3-proxy
+    image: altinityinfra/s3-proxy
     expose:
       - "8080"
       - "80"
@@ -39,7 +39,7 @@ services:
   # Empty container to run proxy resolver.
   resolver:
     stop_grace_period: 5s
-    image: clickhouse/python-bottle:${DOCKER_PYTHON_BOTTLE_TAG:-latest}
+    image: altinityinfra/python-bottle:${DOCKER_PYTHON_BOTTLE_TAG:-latest}
     expose:
       - "8080"
     tty: true
diff --git a/tests/integration/compose/docker_compose_mysql_dotnet_client.yml b/tests/integration/compose/docker_compose_mysql_dotnet_client.yml
index af1a87a236c3..6b2db35b9dcc 100644
--- a/tests/integration/compose/docker_compose_mysql_dotnet_client.yml
+++ b/tests/integration/compose/docker_compose_mysql_dotnet_client.yml
@@ -1,6 +1,6 @@
 services:
   dotnet:
-    image: clickhouse/mysql_dotnet_client:${mysql:-latest}
+    image: altinityinfra/mysql_dotnet_client:${mysql:-latest}
     # to keep container running
     command: sleep infinity
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_mysql_golang_client.yml b/tests/integration/compose/docker_compose_mysql_golang_client.yml
index 6986b91604ca..d0b8be858fce 100644
--- a/tests/integration/compose/docker_compose_mysql_golang_client.yml
+++ b/tests/integration/compose/docker_compose_mysql_golang_client.yml
@@ -1,6 +1,6 @@
 services:
   golang1:
-    image: clickhouse/mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
+    image: altinityinfra/mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_mysql_java_client.yml b/tests/integration/compose/docker_compose_mysql_java_client.yml
index 176c07ced324..b638b1d09a5f 100644
--- a/tests/integration/compose/docker_compose_mysql_java_client.yml
+++ b/tests/integration/compose/docker_compose_mysql_java_client.yml
@@ -1,6 +1,6 @@
 services:
   java1:
-    image: clickhouse/mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
+    image: altinityinfra/mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep 1d
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_mysql_js_client.yml b/tests/integration/compose/docker_compose_mysql_js_client.yml
index 0a4d7f2b1d54..5ba1fb9e1d0c 100644
--- a/tests/integration/compose/docker_compose_mysql_js_client.yml
+++ b/tests/integration/compose/docker_compose_mysql_js_client.yml
@@ -1,6 +1,6 @@
 services:
   mysqljs1:
-    image: clickhouse/mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
+    image: altinityinfra/mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_mysql_php_client.yml b/tests/integration/compose/docker_compose_mysql_php_client.yml
index b9c51088f9b7..059d4fcd66df 100644
--- a/tests/integration/compose/docker_compose_mysql_php_client.yml
+++ b/tests/integration/compose/docker_compose_mysql_php_client.yml
@@ -1,6 +1,6 @@
 services:
   php1:
-    image: clickhouse/mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
+    image: altinityinfra/mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
     stop_grace_period: 5s
diff --git a/tests/integration/compose/docker_compose_nginx.yml b/tests/integration/compose/docker_compose_nginx.yml
index fc46b03d2d47..6f69d0b77d3b 100644
--- a/tests/integration/compose/docker_compose_nginx.yml
+++ b/tests/integration/compose/docker_compose_nginx.yml
@@ -4,7 +4,7 @@ services:
     # Files will be put into /usr/share/nginx/files.
 
     nginx:
-        image: clickhouse/nginx-dav:${DOCKER_NGINX_DAV_TAG:-latest}
+        image: altinityinfra/nginx-dav:${DOCKER_NGINX_DAV_TAG:-latest}
         stop_grace_period: 5s
         restart: always
         ports:
diff --git a/tests/integration/compose/docker_compose_postgresql_java_client.yml b/tests/integration/compose/docker_compose_postgresql_java_client.yml
index 2c2ee4c537f8..053511b85467 100644
--- a/tests/integration/compose/docker_compose_postgresql_java_client.yml
+++ b/tests/integration/compose/docker_compose_postgresql_java_client.yml
@@ -1,6 +1,6 @@
 services:
   java:
-    image: clickhouse/postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
+    image: altinityinfra/postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
     stop_grace_period: 5s
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index e6923d13b9df..d4245a1934f0 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -181,9 +181,9 @@ def __init__(
         self, command, stdin=None, timeout=None, ignore_error=False, parse=False, stdout_file_path=None, stderr_file_path=None, env = {}
     ):
         # Write data to tmp file to avoid PIPEs and execution blocking
-        stdin_file = tempfile.TemporaryFile(mode="w+")
-        stdin_file.write(stdin)
-        stdin_file.seek(0)
+        self.stdin_file = tempfile.TemporaryFile(mode="w+")
+        self.stdin_file.write(stdin)
+        self.stdin_file.seek(0)
         self.stdout_file = tempfile.TemporaryFile() if stdout_file_path is None else stdout_file_path
         self.stderr_file = tempfile.TemporaryFile() if stderr_file_path is None else stderr_file_path
         self.ignore_error = ignore_error
@@ -196,7 +196,7 @@ def __init__(
         env["TSAN_OPTIONS"] = "use_sigaltstack=0 verbosity=0"
         self.process = sp.Popen(
             command,
-            stdin=stdin_file,
+            stdin=self.stdin_file,
             stdout=self.stdout_file,
             stderr=self.stderr_file,
             env=env,
@@ -225,13 +225,24 @@ def remove_trash_from_stderr(self, stderr):
         ]
         return "\n".join(lines)
 
-    def get_answer(self):
-        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
-        self.stdout_file.seek(0)
-        self.stderr_file.seek(0)
+    def wait_and_read_output(self):
+        try:
+            self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
+            self.stdout_file.seek(0)
+            self.stderr_file.seek(0)
+
+            stdout = self.stdout_file.read().decode("utf-8", errors="replace")
+            stderr = self.stderr_file.read().decode("utf-8", errors="replace")
 
-        stdout = self.stdout_file.read().decode("utf-8", errors="replace")
-        stderr = self.stderr_file.read().decode("utf-8", errors="replace")
+            return stdout, stderr
+
+        finally:
+            self.stdin_file.close()
+            self.stdout_file.close()
+            self.stderr_file.close()
+
+    def get_answer(self):
+        stdout, stderr = self.wait_and_read_output()
 
         if (
             self.timer is not None
@@ -264,12 +275,7 @@ def get_answer(self):
         return stdout
 
     def get_error(self):
-        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
-        self.stdout_file.seek(0)
-        self.stderr_file.seek(0)
-
-        stdout = self.stdout_file.read().decode("utf-8", errors="replace")
-        stderr = self.stderr_file.read().decode("utf-8", errors="replace")
+        stdout, stderr = self.wait_and_read_output()
 
         if (
             self.timer is not None
@@ -288,12 +294,7 @@ def get_error(self):
         return stderr
 
     def get_answer_and_error(self):
-        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
-        self.stdout_file.seek(0)
-        self.stderr_file.seek(0)
-
-        stdout = self.stdout_file.read().decode("utf-8", errors="replace")
-        stderr = self.stderr_file.read().decode("utf-8", errors="replace")
+        stdout, stderr = self.wait_and_read_output()
 
         if (
             self.timer is not None
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index b422a7924c07..3be607ac2c87 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -120,7 +120,8 @@ def find_default_config_path():
 # Minimum version we use in integration tests to check compatibility with old releases
 # Keep in mind that we only support upgrading between releases that are at most 1 year different.
 # This means that this minimum need to be, at least, 1 year older than the current release
-CLICKHOUSE_CI_MIN_TESTED_VERSION = "23.3"
+# NOTE(vnemkov): this is a docker tag, make sure it doesn't include initial 'v'
+CLICKHOUSE_CI_MIN_TESTED_VERSION = "23.3.19.33.altinitystable"
 
 ZOOKEEPER_CONTAINERS = ("zoo1", "zoo2", "zoo3")
 
@@ -1176,7 +1177,7 @@ def setup_keeper_cmd(self, instance, env_variables, docker_compose_yml_dir):
 
         env_variables["keeper_binary"] = binary_path
         env_variables["keeper_cmd_prefix"] = keeper_cmd_prefix
-        env_variables["image"] = "clickhouse/integration-test:" + DOCKER_BASE_TAG
+        env_variables["image"] = "altinityinfra/integration-test:" + DOCKER_BASE_TAG
         env_variables["user"] = str(os.getuid())
         env_variables["keeper_fs"] = "bind"
         for i in range(1, 4):
@@ -1838,7 +1839,7 @@ def add_instance(
         hostname=None,
         env_variables=None,
         instance_env_variables=False,
-        image="clickhouse/integration-test",
+        image="altinityinfra/integration-test",
         tag=None,
         # keep the docker container running when clickhouse server is stopped
         stay_alive=False,
@@ -1856,6 +1857,7 @@ def add_instance(
         keeper_required_feature_flags=[],
         main_config_name="config.xml",
         users_config_name="users.xml",
+        metrika_xml=None,
         copy_common_configs=True,
         config_root_name="clickhouse",
         extra_configs=[],
@@ -1976,6 +1978,7 @@ def add_instance(
             clickhouse_start_extra_args=extra_args,
             main_config_name=main_config_name,
             users_config_name=users_config_name,
+            metrika_xml=metrika_xml,
             copy_common_configs=copy_common_configs,
             hostname=hostname,
             env_variables=env_variables,
@@ -3897,6 +3900,7 @@ def query_all_nodes(self, sql, *args, **kwargs):
             - /etc/passwd:/etc/passwd:ro
             - {HELPERS_DIR}/../integration-tests-entrypoint.sh:/integration-tests-entrypoint.sh
             - /debug:/debug:ro
+            {metrika_xml}
             {binary_volume}
             {external_dirs_volumes}
             {odbc_ini_path}
@@ -3988,11 +3992,12 @@ def __init__(
         clickhouse_start_extra_args="",
         main_config_name="config.xml",
         users_config_name="users.xml",
+        metrika_xml=None,
         copy_common_configs=True,
         hostname=None,
         env_variables=None,
         instance_env_variables=False,
-        image="clickhouse/integration-test",
+        image="altinityinfra/integration-test",
         tag="latest",
         stay_alive=False,
         ipv4_address=None,
@@ -4089,6 +4094,10 @@ def __init__(
 
         self.main_config_name = main_config_name
         self.users_config_name = users_config_name
+        if metrika_xml:
+            self.metrika_xml = p.abspath(p.join(base_path, metrika_xml))
+        else:
+            self.metrika_xml = None
         self.copy_common_configs = copy_common_configs
 
         clickhouse_start_command_with_conf = clickhouse_start_command.replace(
@@ -5251,7 +5260,7 @@ def write_embedded_config(name, dest_dir, fix_log_level=False):
 
         if (
             self.randomize_settings
-            and self.image == "clickhouse/integration-test"
+            and self.image == "altinityinfra/integration-test"
             and self.tag == DOCKER_BASE_TAG
             and self.base_config_dir == DEFAULT_BASE_CONFIG_DIR
         ):
@@ -5310,6 +5319,12 @@ def write_embedded_config(name, dest_dir, fix_log_level=False):
                 self.coredns_config_dir, p.abspath(p.join(self.path, "coredns_config"))
             )
 
+        metrika_xml = ""
+        if self.metrika_xml:
+            metrika_xml_path = p.join(instance_config_dir, "metrika.xml")
+            shutil.copy(self.metrika_xml, metrika_xml_path)
+            metrika_xml = f"- {metrika_xml_path}:/etc/metrika.xml:ro"
+
         # Copy config.d configs
         logging.debug(
             f"Copy custom test config files {self.custom_main_config_paths} to {self.config_d_dir}"
@@ -5475,6 +5490,7 @@ def write_embedded_config(name, dest_dir, fix_log_level=False):
                     config_d_dir=self.config_d_dir,
                     db_dir=db_dir,
                     external_dirs_volumes=external_dirs_volumes,
+                    metrika_xml=metrika_xml,
                     tmpfs=str(self.tmpfs),
                     mem_limit=self.mem_limit,
                     logs_dir=logs_dir,
diff --git a/tests/integration/helpers/iceberg_utils.py b/tests/integration/helpers/iceberg_utils.py
index 54d1f20c6e58..c10cce320927 100644
--- a/tests/integration/helpers/iceberg_utils.py
+++ b/tests/integration/helpers/iceberg_utils.py
@@ -4,6 +4,7 @@
 
 import pyspark
 import pytest
+import pandas as pd
 
 from pyspark.sql.functions import (
     monotonically_increasing_id,
@@ -152,10 +153,14 @@ def write_iceberg_from_df(
         if partition_by is None:
             df.writeTo(table_name).tableProperty(
                 "format-version", format_version
+            ).tableProperty(
+                "write.parquet.row-group-size-bytes", "104850"  # 1MB
             ).using("iceberg").create()
         else:
             df.writeTo(table_name).tableProperty(
                 "format-version", format_version
+            ).tableProperty(
+                "write.parquet.row-group-size-bytes", "104850"  # 1MB
             ).partitionedBy(partition_by).using("iceberg").create()
     else:
         df.writeTo(table_name).append()
@@ -191,18 +196,27 @@ def get_creation_expression(
     allow_dynamic_metadata_for_data_lakes=True,
     use_version_hint=False,
     run_on_cluster=False,
+    object_storage_cluster=False,
     explicit_metadata_path="",
+    storage_type_as_arg=False,
+    storage_type_in_named_collection=False,
+    cluster_name_as_literal=True,
+    additional_settings = [],
     **kwargs,
 ):
-    settings_array = []
+    settings_array = list(additional_settings)
     settings_array.append(f"allow_dynamic_metadata_for_data_lakes = {1 if allow_dynamic_metadata_for_data_lakes else 0}")
 
+
     if explicit_metadata_path:
         settings_array.append(f"iceberg_metadata_file_path = '{explicit_metadata_path}'")
 
     if use_version_hint:
         settings_array.append("iceberg_use_version_hint = true")
 
+    if object_storage_cluster:
+        settings_array.append(f"object_storage_cluster = '{object_storage_cluster}'")
+
     if partition_by:
         partition_by = "PARTITION BY " + partition_by
     settings_array.append(f"iceberg_format_version = {format_version}")
@@ -215,9 +229,27 @@ def get_creation_expression(
     else:
         settings_expression = ""
 
+    cluster_name = "'cluster_simple'" if cluster_name_as_literal else "cluster_simple"
+
+    storage_arg = storage_type
+    engine_part = ""
+    if (storage_type_in_named_collection):
+        storage_arg += "_with_type"
+    elif (storage_type_as_arg):
+        storage_arg += f", storage_type='{storage_type}'"
+    else:
+        if (storage_type == "s3"):
+            engine_part = "S3"
+        elif (storage_type == "azure"):
+            engine_part = "Azure"
+        elif (storage_type == "hdfs"):
+            engine_part = "HDFS"
+        elif (storage_type == "local"):
+            engine_part = "Local"
+
     if_not_exists_prefix = ""
     if if_not_exists:
-        if_not_exists_prefix = "IF NOT EXISTS"        
+        if_not_exists_prefix = "IF NOT EXISTS"
 
     if storage_type == "s3":
         if "bucket" in kwargs:
@@ -227,16 +259,16 @@ def get_creation_expression(
 
         if run_on_cluster:
             assert table_function
-            return f"icebergS3Cluster('cluster_simple', s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"
+            return f"iceberg{engine_part}Cluster({cluster_name}, {storage_arg}, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"
         else:
             if table_function:
-                return f"icebergS3(s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"
+                return f"iceberg{engine_part}({storage_arg}, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"
             else:
                 return (
                     f"""
                     DROP TABLE IF EXISTS {table_name};
                     CREATE TABLE {if_not_exists_prefix} {table_name} {schema}
-                    ENGINE=IcebergS3(s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')
+                    ENGINE=Iceberg{engine_part}({storage_arg}, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')
                     {partition_by}
                     {settings_expression}
                     """
@@ -246,63 +278,108 @@ def get_creation_expression(
         if run_on_cluster:
             assert table_function
             return f"""
-                icebergAzureCluster('cluster_simple', azure, container = '{cluster.azure_container_name}', storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
+                iceberg{engine_part}Cluster({cluster_name}, {storage_arg}, container = '{cluster.azure_container_name}', storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
             """
         else:
             if table_function:
                 return f"""
-                    icebergAzure(azure, container = '{cluster.azure_container_name}', storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
+                    iceberg{engine_part}({storage_arg}, container = '{cluster.azure_container_name}', storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
                 """
             else:
                 return (
                     f"""
                     DROP TABLE IF EXISTS {table_name};
                     CREATE TABLE {if_not_exists_prefix} {table_name} {schema}
-                    ENGINE=IcebergAzure(azure, container = {cluster.azure_container_name}, storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
+                    ENGINE=Iceberg{engine_part}({storage_arg}, container = {cluster.azure_container_name}, storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
                     {partition_by}
                     {settings_expression}
                     """
                 )
 
     elif storage_type == "local":
-        assert not run_on_cluster
-
-        if table_function:
+        if run_on_cluster:
+            assert table_function
             return f"""
-                icebergLocal(local, path = '/iceberg_data/default/{table_name}/', format={format})
+                iceberg{engine_part}Cluster({cluster_name}, {storage_arg}, path = '/iceberg_data/default/{table_name}/', format={format})
             """
         else:
-            return (
-                f"""
-                DROP TABLE IF EXISTS {table_name};
-                CREATE TABLE {if_not_exists_prefix} {table_name} {schema}
-                ENGINE=IcebergLocal(local, path = '/iceberg_data/default/{table_name}/', format={format})
-                {partition_by}
-                {settings_expression}
+            if table_function:
+                return f"""
+                    iceberg{engine_part}({storage_arg}, path = '/iceberg_data/default/{table_name}/', format={format})
                 """
-            )
+            else:
+                return (
+                    f"""
+                    DROP TABLE IF EXISTS {table_name};
+                    CREATE TABLE {if_not_exists_prefix} {table_name} {schema}
+                    ENGINE=Iceberg{engine_part}({storage_arg}, path = '/iceberg_data/default/{table_name}/', format={format})
+                    {partition_by}
+                    {settings_expression}
+                    """
+                )
 
     else:
         raise Exception(f"Unknown iceberg storage type: {storage_type}")
 
 
-def check_schema_and_data(instance, table_expression, expected_schema, expected_data, timestamp_ms=None):
+def get_raw_schema_and_data(instance, table_expression, timestamp_ms=None):
     if timestamp_ms:
         schema = instance.query(f"DESC {table_expression} SETTINGS iceberg_timestamp_ms = {timestamp_ms}")
         data = instance.query(f"SELECT * FROM {table_expression} ORDER BY ALL SETTINGS iceberg_timestamp_ms = {timestamp_ms}")
     else:
         schema = instance.query(f"DESC {table_expression}")
         data = instance.query(f"SELECT * FROM {table_expression} ORDER BY ALL")
+    return schema, data
+
+
+clickhouse_to_pandas_types = {
+    "Int32": "int32",
+}
+
+def convert_schema_and_data_to_pandas_df(schema_raw, data_raw):
+    # Extract column names from schema
+    schema_rows = list(
+        map(
+            lambda x: x.split("\t")[:2],
+            filter(lambda x: len(x) > 0, schema_raw.strip().split("\n")),
+        )
+    )
+    column_names = [x[0] for x in schema_rows]
+    types = [x[1] for x in schema_rows]
+    pandas_types = [clickhouse_to_pandas_types[t]for t in types]
+
+    schema_df = pd.DataFrame([types], columns=column_names)
+
+    # Convert data to DataFrame
+    data_rows = list(
+        map(
+            lambda x: x.split("\t"),
+            filter(lambda x: len(x) > 0, data_raw.strip().split("\n")),
+        )
+    )
+
+    if data_rows:
+        data_df = pd.DataFrame(data_rows, columns=column_names, dtype='object')
+    else:
+        # Create empty DataFrame with correct columns
+        data_df = pd.DataFrame(columns=column_names, dtype='object')
+
+    data_df = data_df.astype(dict(zip(column_names, pandas_types)))
+    return schema_df, data_df
+
+def check_schema_and_data(instance, table_expression, expected_schema, expected_data, timestamp_ms=None):
+    raw_schema, raw_data = get_raw_schema_and_data(instance, table_expression, timestamp_ms)
+
     schema = list(
         map(
             lambda x: x.split("\t")[:2],
-            filter(lambda x: len(x) > 0, schema.strip().split("\n")),
+            filter(lambda x: len(x) > 0, raw_schema.strip().split("\n")),
         )
     )
     data = list(
         map(
             lambda x: x.split("\t"),
-            filter(lambda x: len(x) > 0, data.strip().split("\n")),
+            filter(lambda x: len(x) > 0, raw_data.strip().split("\n")),
         )
     )
     assert expected_schema == schema
@@ -323,16 +400,39 @@ def create_iceberg_table(
     if_not_exists=False,
     compression_method=None,
     format="Parquet",
+    object_storage_cluster=False,
     **kwargs,
 ):
     if 'output_format_parquet_use_custom_encoder' in kwargs:
         node.query(
-            get_creation_expression(storage_type, table_name, cluster, schema, format_version, partition_by, if_not_exists, compression_method, format, **kwargs),
+            get_creation_expression(
+                storage_type,
+                table_name,
+                cluster,
+                schema,
+                format_version,
+                partition_by,
+                if_not_exists,
+                compression_method,
+                format,
+                object_storage_cluster=object_storage_cluster,
+                **kwargs),
             settings={"output_format_parquet_use_custom_encoder" : 0, "output_format_parquet_parallel_encoding" : 0}
         )
     else:
         node.query(
-            get_creation_expression(storage_type, table_name, cluster, schema, format_version, partition_by, if_not_exists, compression_method, format, **kwargs),
+            get_creation_expression(
+                storage_type,
+                table_name,
+                cluster,
+                schema,
+                format_version,
+                partition_by,
+                if_not_exists,
+                compression_method,
+                format,
+                object_storage_cluster=object_storage_cluster,
+                **kwargs),
         )
 
 
@@ -386,6 +486,17 @@ def default_upload_directory(
         raise Exception(f"Unknown iceberg storage type: {storage_type}")
 
 
+def additional_upload_directory(
+    started_cluster, node, storage_type, local_path, remote_path, **kwargs
+):
+    if storage_type == "local":
+        return LocalUploader(started_cluster.instances[node]).upload_directory(
+            local_path, remote_path, **kwargs
+        )
+    else:
+        raise Exception(f"Unknown iceberg storage type for additional uploading: {storage_type}")
+
+
 def default_download_directory(
     started_cluster, storage_type, remote_path, local_path, **kwargs
 ):
@@ -396,9 +507,9 @@ def default_download_directory(
     else:
         raise Exception(f"Unknown iceberg storage type for downloading: {storage_type}")
 
-        
+
 def execute_spark_query_general(
-    spark, started_cluster, storage_type: str, table_name: str, query: str
+    spark, started_cluster, storage_type: str, table_name: str, query: str, additional_nodes=None
 ):
     spark.sql(query)
     default_upload_directory(
@@ -407,8 +518,18 @@ def execute_spark_query_general(
         f"/iceberg_data/default/{table_name}/",
         f"/iceberg_data/default/{table_name}/",
     )
+    additional_nodes = additional_nodes or []
+    for node in additional_nodes:
+        additional_upload_directory(
+            started_cluster,
+            node,
+            storage_type,
+            f"/iceberg_data/default/{table_name}/",
+            f"/iceberg_data/default/{table_name}/",
+        )
     return
 
+
 def get_last_snapshot(path_to_table):
     import json
     import os
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index 153d4c2860cb..6a6ca8bdc46b 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -360,7 +360,7 @@ def __init__(
 
     def _ensure_container(self):
         if self._container is None or self._container_expire_time <= time.time():
-            image_name = "clickhouse/integration-helper:" + os.getenv(
+            image_name = "altinityinfra/integration-helper:" + os.getenv(
                 "DOCKER_HELPER_TAG", "latest"
             )
             for i in range(5):
diff --git a/tests/integration/helpers/s3_mocks/broken_s3.py b/tests/integration/helpers/s3_mocks/broken_s3.py
index db7ea074cc60..c9f613aa2bc6 100644
--- a/tests/integration/helpers/s3_mocks/broken_s3.py
+++ b/tests/integration/helpers/s3_mocks/broken_s3.py
@@ -68,6 +68,9 @@ def setup_at_object_upload(self, **kwargs):
     def setup_at_part_upload(self, **kwargs):
         self.setup_action("at_part_upload", **kwargs)
 
+    def setup_at_listing(self, **kwargs):
+        self.setup_action("at_listing", **kwargs)
+
     def setup_at_create_multi_part_upload(self, **kwargs):
         self.setup_action("at_create_multi_part_upload", **kwargs)
 
@@ -314,6 +317,28 @@ def inject_error(self, request_handler):
             )
             request_handler.connection.close()
 
+    class TimeoutAction:
+        def inject_error(self, request_handler):
+            request_handler.log_message("timeout action: read all input and send 200")
+
+            request_handler.read_all_input()
+
+            request_handler.send_response(200)
+            request_handler.send_header("Content-Type", "text/xml")
+            request_handler.end_headers()
+
+            request_handler.log_message("timeout action: write partial data")
+            request_handler.wfile.write(b'<?xml version="1.0" encoding="UTF-8"?> <')
+            request_handler.wfile.flush()
+
+            request_handler.log_message("timeout action: sleep")
+            time.sleep(10)
+            request_handler.log_message("timeout action: close connection")
+            request_handler.connection.setsockopt(
+                socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)
+            )
+            request_handler.connection.close()
+
     class ConnectionRefusedAction(RedirectAction):
         pass
 
@@ -352,6 +377,8 @@ def __init__(
                 self.error_handler = _ServerRuntime.ThrottleToBpsAction(
                     *self.action_args
                 )
+            elif self.action == "timeout":
+                self.error_handler = _ServerRuntime.TimeoutAction()
             else:
                 self.error_handler = _ServerRuntime.Expected500ErrorAction()
 
@@ -372,10 +399,9 @@ def has_effect(self):
             with self.lock:
                 if self.after:
                     self.after -= 1
-                if self.after == 0:
-                    if self.count:
-                        self.count -= 1
-                        return True
+                elif self.count:
+                    self.count -= 1
+                    return True
                 return False
 
         def inject_error(self, request_handler):
@@ -410,6 +436,7 @@ def reset(self):
             self.slow_put = None
             self.fake_multipart_upload = None
             self.at_create_multi_part_upload = None
+            self.at_listing = None
 
 
 _runtime = _ServerRuntime()
@@ -587,6 +614,14 @@ def _mock_settings(self):
             )
             return self._ok()
 
+        if path[1] == "at_listing":
+            params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+            _runtime.at_listing = _ServerRuntime.CountAfter.from_cgi_params(
+                _runtime.lock, params
+            )
+            self.log_message("set at_listing %s", _runtime.at_listing)
+            return self._ok()
+
         if path[1] == "reset":
             _runtime.reset()
             self.log_message("reset")
@@ -601,6 +636,14 @@ def do_GET(self):
         if self.path.startswith("/mock_settings"):
             return self._mock_settings()
 
+        parts = urllib.parse.urlsplit(self.path)
+        params = urllib.parse.parse_qs(parts.query, keep_blank_values=False)
+        is_listing = params.get("list-type", [None])[0] is not None
+
+        if is_listing and _runtime.at_listing is not None:
+            if _runtime.at_listing.has_effect():
+                return _runtime.at_listing.inject_error(self)
+
         self.log_message("get redirect")
         return self.redirect()
 
diff --git a/tests/integration/helpers/s3_queue_common.py b/tests/integration/helpers/s3_queue_common.py
index bd2381305829..5571e2ea9e3c 100644
--- a/tests/integration/helpers/s3_queue_common.py
+++ b/tests/integration/helpers/s3_queue_common.py
@@ -122,6 +122,7 @@ def create_table(
     }
     if version is None:
         settings["enable_hash_ring_filtering"] = 1
+        settings["use_persistent_processing_nodes"] = random.choice([True, False])
 
     settings.update(additional_settings)
 
diff --git a/tests/integration/integration_test_images.py b/tests/integration/integration_test_images.py
index f7548545f6db..db5fba0bb3b7 100644
--- a/tests/integration/integration_test_images.py
+++ b/tests/integration/integration_test_images.py
@@ -1,22 +1,22 @@
 #!/usr/bin/env python3
 
 IMAGES_ENV = {
-    "clickhouse/dotnet-client": "DOCKER_DOTNET_CLIENT_TAG",
-    "clickhouse/integration-helper": "DOCKER_HELPER_TAG",
-    "clickhouse/integration-test": "DOCKER_BASE_TAG",
-    "clickhouse/integration-tests-runner": "",
-    "clickhouse/kerberos-kdc": "DOCKER_KERBEROS_KDC_TAG",
-    "clickhouse/mysql-golang-client": "DOCKER_MYSQL_GOLANG_CLIENT_TAG",
-    "clickhouse/mysql-java-client": "DOCKER_MYSQL_JAVA_CLIENT_TAG",
-    "clickhouse/mysql-js-client": "DOCKER_MYSQL_JS_CLIENT_TAG",
-    "clickhouse/arrowflight-server-test": "DOCKER_ARROWFLIGHT_SERVER_TAG",
-    "clickhouse/mysql-php-client": "DOCKER_MYSQL_PHP_CLIENT_TAG",
-    "clickhouse/nginx-dav": "DOCKER_NGINX_DAV_TAG",
-    "clickhouse/postgresql-java-client": "DOCKER_POSTGRESQL_JAVA_CLIENT_TAG",
-    "clickhouse/python-bottle": "DOCKER_PYTHON_BOTTLE_TAG",
-    "clickhouse/integration-test-with-unity-catalog": "DOCKER_BASE_WITH_UNITY_CATALOG_TAG",
-    "clickhouse/integration-test-with-hms": "DOCKER_BASE_WITH_HMS_TAG",
-    "clickhouse/mysql_dotnet_client": "DOCKER_MYSQL_DOTNET_CLIENT_TAG",
+    "altinityinfra/dotnet-client": "DOCKER_DOTNET_CLIENT_TAG",
+    "altinityinfra/integration-helper": "DOCKER_HELPER_TAG",
+    "altinityinfra/integration-test": "DOCKER_BASE_TAG",
+    "altinityinfra/integration-tests-runner": "",
+    "altinityinfra/kerberos-kdc": "DOCKER_KERBEROS_KDC_TAG",
+    "altinityinfra/mysql-golang-client": "DOCKER_MYSQL_GOLANG_CLIENT_TAG",
+    "altinityinfra/mysql-java-client": "DOCKER_MYSQL_JAVA_CLIENT_TAG",
+    "altinityinfra/mysql-js-client": "DOCKER_MYSQL_JS_CLIENT_TAG",
+    "altinityinfra/arrowflight-server-test": "DOCKER_ARROWFLIGHT_SERVER_TAG",
+    "altinityinfra/mysql-php-client": "DOCKER_MYSQL_PHP_CLIENT_TAG",
+    "altinityinfra/nginx-dav": "DOCKER_NGINX_DAV_TAG",
+    "altinityinfra/postgresql-java-client": "DOCKER_POSTGRESQL_JAVA_CLIENT_TAG",
+    "altinityinfra/python-bottle": "DOCKER_PYTHON_BOTTLE_TAG",
+    "altinityinfra/integration-test-with-unity-catalog": "DOCKER_BASE_WITH_UNITY_CATALOG_TAG",
+    "altinityinfra/integration-test-with-hms": "DOCKER_BASE_WITH_HMS_TAG",
+    "altinityinfra/mysql_dotnet_client": "DOCKER_MYSQL_DOTNET_CLIENT_TAG",
 }
 
 IMAGES = list(IMAGES_ENV.keys())
diff --git a/tests/integration/runner b/tests/integration/runner
index 6881f6e71bcd..4398ddeba660 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -31,7 +31,7 @@ CONFIG_DIR_IN_REPO = "programs/server"
 INTEGRATION_DIR_IN_REPO = "tests/integration"
 UTILS_DIR_IN_REPO = "utils"
 
-DIND_INTEGRATION_TESTS_IMAGE_NAME = "clickhouse/integration-tests-runner"
+DIND_INTEGRATION_TESTS_IMAGE_NAME = "altinityinfra/integration-tests-runner"
 
 
 def physical_memory() -> int:
diff --git a/tests/integration/test_MemoryTracking/configs/no_system_log.xml b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
index 739734bd3df6..8edad13b0502 100644
--- a/tests/integration/test_MemoryTracking/configs/no_system_log.xml
+++ b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
@@ -14,6 +14,7 @@
     <part_log remove="remove" />
     <crash_log remove="remove" />
     <opentelemetry_span_log remove="remove" />
+    <iceberg_metadata_log remove="remove" />
     <!-- just in case it will be enabled by default -->
     <zookeeper_log remove="remove" />
     <transactions_info_log remove="remove" />
diff --git a/tests/integration/test_attach_partition_using_copy/test.py b/tests/integration/test_attach_partition_using_copy/test.py
index 99fb2ff01530..206d339f333c 100644
--- a/tests/integration/test_attach_partition_using_copy/test.py
+++ b/tests/integration/test_attach_partition_using_copy/test.py
@@ -61,7 +61,9 @@ def create_source_table(node, table_name, replicated):
         SETTINGS disk = disk(type = web, endpoint = 'https://raw.githubusercontent.com/ClickHouse/web-tables-demo/main/web/')
         """.format(
             table_name=table_name, engine=engine
-        )
+        ),
+        timeout=60,
+        retry_count=3,
     )
 
 
diff --git a/tests/integration/test_azure_blob_storage_native_copy/test.py b/tests/integration/test_azure_blob_storage_native_copy/test.py
index f5d24485b9e3..9e4c70da7c98 100644
--- a/tests/integration/test_azure_blob_storage_native_copy/test.py
+++ b/tests/integration/test_azure_blob_storage_native_copy/test.py
@@ -55,17 +55,16 @@ def generate_config(port):
                         <max_size>1000000000</max_size>
                         <cache_on_write_operations>1</cache_on_write_operations>
                     </disk_azure_cache>
-                    <disk_azure_different_auth>
+                    <disk_azure_small_native_copy>
                         <metadata_type>local</metadata_type>
                         <type>object_storage</type>
                         <object_storage_type>azure_blob_storage</object_storage_type>
-                        <use_native_copy>true</use_native_copy>
-                        <storage_account_url>http://azurite1:{port}/devstoreaccount1/</storage_account_url>
-                        <container_name>othercontainer</container_name>
+                        <connection_string>DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:{port}/devstoreaccount1;</connection_string>
+                        <container_name>cont</container_name>
                         <skip_access_check>false</skip_access_check>
-                        <account_name>devstoreaccount1</account_name>
-                        <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
-                    </disk_azure_different_auth>
+                        <use_native_copy>true</use_native_copy>
+                        <max_single_part_copy_size>4</max_single_part_copy_size>
+                    </disk_azure_small_native_copy>
                 </disks>
                 <policies>
                     <policy_azure>
@@ -89,20 +88,12 @@ def generate_config(port):
                             </main>
                         </volumes>
                     </policy_azure_cache>
-                    <policy_azure_different_auth>
-                        <volumes>
-                            <main>
-                                <disk>disk_azure_different_auth</disk>
-                            </main>
-                        </volumes>
-                    </policy_azure_different_auth>
                 </policies>
             </storage_configuration>
             <backups>
                 <allowed_disk>disk_azure</allowed_disk>
                 <allowed_disk>disk_azure_cache</allowed_disk>
                 <allowed_disk>disk_azure_other_bucket</allowed_disk>
-                <allowed_disk>disk_azure_different_auth</allowed_disk>
             </backups>
         </clickhouse>
         """
@@ -295,21 +286,43 @@ def test_backup_restore_native_copy_disabled_in_query(cluster):
 
     assert not node4.contains_in_log("using native copy")
 
-def test_backup_restore_native_copy_disabled_due_to_different_auth(cluster):
+
+def test_clickhouse_disks_azure(cluster):
     node4 = cluster.instances["node4"]
-    azure_query(
-        node4,
-        f"CREATE TABLE test_simple_merge_tree_native_copy_disabled_due_to_different_auth(key UInt64, data String) Engine = MergeTree() ORDER BY tuple() SETTINGS storage_policy='policy_azure_different_auth'",
+    disk = "disk_azure_small_native_copy"
+    node4.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"echo 'meow' | /usr/bin/clickhouse disks --disk {disk} --query 'write im_a_file.txt'",
+        ]
     )
-    azure_query(
-        node4, f"INSERT INTO test_simple_merge_tree_native_copy_disabled_due_to_different_auth VALUES (1, 'a')"
+    out = node4.exec_in_container(
+        [
+            "/usr/bin/clickhouse",
+            "disks",
+            "--disk",
+            disk,
+            "--query",
+            "read im_a_file.txt",
+        ]
     )
-
-    backup_destination = f"AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_merge_tree_native_copy_disabled_due_to_different_auth_backup')"
-    print("BACKUP DEST", backup_destination)
-    azure_query(
-        node4,
-        f"BACKUP TABLE test_simple_merge_tree_native_copy_disabled_due_to_different_auth TO {backup_destination}",
+    assert out == "meow\n\n"
+    node4.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"/usr/bin/clickhouse disks --disk {disk} --log-level trace --query 'copy im_a_file.txt another_file.txt'",
+        ]
     )
-
-    assert not node4.contains_in_log("using native copy")
\ No newline at end of file
+    out = node4.exec_in_container(
+        [
+            "/usr/bin/clickhouse",
+            "disks",
+            "--disk",
+            disk,
+            "--query",
+            "read another_file.txt",
+        ]
+    )
+    assert out == "meow\n\n"
diff --git a/tests/integration/test_azure_blob_storage_plain_rewritable/test.py b/tests/integration/test_azure_blob_storage_plain_rewritable/test.py
index 796a7b80793b..4af2d84c5c13 100644
--- a/tests/integration/test_azure_blob_storage_plain_rewritable/test.py
+++ b/tests/integration/test_azure_blob_storage_plain_rewritable/test.py
@@ -30,7 +30,6 @@ def generate_cluster_def(port, node_name):
                 <metadata_type>plain_rewritable</metadata_type>
                 <endpoint>http://azurite1:{port}/devstoreaccount1/cont</endpoint>
                 <endpoint_subpath>{node_name}</endpoint_subpath>
-                <skip_access_check>true</skip_access_check>
                 <account_name>devstoreaccount1</account_name>
                 <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
                 <max_single_part_upload_size>100000</max_single_part_upload_size>
@@ -38,6 +37,19 @@ def generate_cluster_def(port, node_name):
                 <max_single_download_retries>10</max_single_download_retries>
                 <max_single_read_retries>10</max_single_read_retries>
             </blob_storage_disk>
+            <blob_storage_cache_disk>
+                <type>cache</type>
+                <disk>blob_storage_disk</disk>
+                <path>disks/blob_storage_cache/</path>
+                <max_size>1000000000</max_size>
+                <cache_on_write_operations>1</cache_on_write_operations>
+            </blob_storage_cache_disk>
+            <blob_storage_encrypted_disk>
+                <type>encrypted</type>
+                <disk>blob_storage_cache_disk</disk>
+                <key>1234567812345678</key>
+                <path></path>
+            </blob_storage_encrypted_disk>
         </disks>
         <policies>
             <blob_storage_policy>
@@ -47,6 +59,20 @@ def generate_cluster_def(port, node_name):
                     </main>
                 </volumes>
             </blob_storage_policy>
+            <blob_storage_cache_policy>
+                <volumes>
+                    <main>
+                        <disk>blob_storage_cache_disk</disk>
+                    </main>
+                </volumes>
+            </blob_storage_cache_policy>
+            <blob_storage_encrypted_policy>
+                <volumes>
+                    <main>
+                        <disk>blob_storage_encrypted_disk</disk>
+                    </main>
+                </volumes>
+            </blob_storage_encrypted_policy>
         </policies>
     </storage_configuration>
 </clickhouse>
@@ -93,26 +119,30 @@ def cluster():
 
 
 @pytest.mark.parametrize(
-    "min_bytes_for_wide_part", [pytest.param(0), pytest.param(1 << 20)]
+    "storage_policy,min_bytes_for_wide_part",
+    [
+        pytest.param("blob_storage_policy", 0),
+        pytest.param("blob_storage_cache_policy", 0),
+        pytest.param("blob_storage_encrypted_policy", 0),
+        pytest.param("blob_storage_policy", 1 << 20),
+    ],
 )
-def test_insert_select(cluster, min_bytes_for_wide_part):
+def test_insert_select(cluster, storage_policy, min_bytes_for_wide_part):
     node = cluster.instances[NODE_NAME]
 
     for index, value in enumerate(insert_values):
         azure_query(
             node,
-            """
-            CREATE TABLE test_{} (
+            f"""
+            CREATE TABLE test_{index} (
                 id Int64,
                 data String,
                 empty String
             ) ENGINE=MergeTree()
             ORDER BY id
-            SETTINGS storage_policy='blob_storage_policy',
-            min_bytes_for_wide_part = {}
-            """.format(
-                index, min_bytes_for_wide_part
-            ),
+            SETTINGS storage_policy = '{storage_policy}',
+            min_bytes_for_wide_part = {min_bytes_for_wide_part}
+            """,
         )
 
         azure_query(
diff --git a/tests/integration/test_backup_restore_azure_blob_storage/test.py b/tests/integration/test_backup_restore_azure_blob_storage/test.py
index 407fc2d4a7bd..de88fc85b46c 100644
--- a/tests/integration/test_backup_restore_azure_blob_storage/test.py
+++ b/tests/integration/test_backup_restore_azure_blob_storage/test.py
@@ -1,22 +1,13 @@
 #!/usr/bin/env python3
 
-import gzip
 import io
-import json
-import logging
 import os
-import random
-import threading
 import time
 
 import pytest
 from azure.storage.blob import BlobServiceClient
 
-import helpers.client
-from helpers.cluster import ClickHouseCluster, ClickHouseInstance
-from helpers.mock_servers import start_mock_servers
-from helpers.network import PartitionManager
-from helpers.test_tools import exec_query_with_retry
+from helpers.cluster import ClickHouseCluster
 
 
 def generate_cluster_def(port):
@@ -98,6 +89,15 @@ def cluster():
         cluster.shutdown()
 
 
+backup_id_counter = 0
+
+
+def new_backup_name():
+    global backup_id_counter
+    backup_id_counter += 1
+    return f"backup{backup_id_counter}"
+
+
 def azure_query(
     node, query, expect_error=False, try_num=10, settings={}, query_on_retry=None
 ):
@@ -278,6 +278,98 @@ def test_backup_restore_with_named_collection_azure_conf2(cluster):
     )
 
 
+def test_backup_restore_with_sql_named_collection_azure(cluster):
+    """Test backup using a named collection created via SQL (not XML config)."""
+    node = cluster.instances["node"]
+    port = cluster.env_variables["AZURITE_PORT"]
+
+    # Create a named collection via SQL
+    azure_query(
+        node,
+        f"""
+        CREATE NAMED COLLECTION IF NOT EXISTS sql_azure_backup_collection AS
+            connection_string = '{cluster.env_variables['AZURITE_CONNECTION_STRING']}',
+            container = 'cont'
+        """,
+    )
+
+    try:
+        azure_query(node, "DROP TABLE IF EXISTS test_sql_nc_backup")
+        azure_query(
+            node,
+            f"CREATE TABLE test_sql_nc_backup (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_sql_nc_backup.csv', 'CSV')",
+        )
+        azure_query(
+            node,
+            "INSERT INTO test_sql_nc_backup SETTINGS azure_truncate_on_insert = 1 VALUES (1, 'a')",
+        )
+
+        backup_name = new_backup_name()
+        backup_destination = f"AzureBlobStorage(sql_azure_backup_collection, '{backup_name}')"
+        azure_query(
+            node,
+            f"BACKUP TABLE test_sql_nc_backup TO {backup_destination}",
+        )
+        print(get_azure_file_content(f"{backup_name}/.backup", port))
+        azure_query(node, "DROP TABLE IF EXISTS test_sql_nc_backup_restored")
+        azure_query(
+            node,
+            f"RESTORE TABLE test_sql_nc_backup AS test_sql_nc_backup_restored FROM {backup_destination};",
+        )
+        assert (
+            azure_query(node, "SELECT * from test_sql_nc_backup_restored") == "1\ta\n"
+        )
+    finally:
+        azure_query(node, "DROP NAMED COLLECTION IF EXISTS sql_azure_backup_collection")
+
+
+def test_backup_restore_with_sql_named_collection_azure_with_overrides(cluster):
+    """Test backup using a SQL named collection with key-value overrides."""
+    node = cluster.instances["node"]
+    port = cluster.env_variables["AZURITE_PORT"]
+
+    # Create a named collection via SQL with placeholder blob_path
+    azure_query(
+        node,
+        f"""
+        CREATE NAMED COLLECTION IF NOT EXISTS sql_azure_backup_override AS
+            connection_string = '{cluster.env_variables['AZURITE_CONNECTION_STRING']}',
+            container = 'cont',
+            blob_path = 'placeholder'
+        """,
+    )
+
+    try:
+        azure_query(node, "DROP TABLE IF EXISTS test_sql_nc_override_backup")
+        azure_query(
+            node,
+            f"CREATE TABLE test_sql_nc_override_backup (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_sql_nc_override.csv', 'CSV')",
+        )
+        azure_query(
+            node,
+            "INSERT INTO test_sql_nc_override_backup SETTINGS azure_truncate_on_insert = 1 VALUES (2, 'b')",
+        )
+
+        backup_name = new_backup_name()
+        # Override the blob_path via key-value argument
+        backup_destination = f"AzureBlobStorage(sql_azure_backup_override, blob_path='{backup_name}')"
+        azure_query(
+            node,
+            f"BACKUP TABLE test_sql_nc_override_backup TO {backup_destination}",
+        )
+        print(get_azure_file_content(f"{backup_name}/.backup", port))
+        azure_query(node, "DROP TABLE IF EXISTS test_sql_nc_override_restored")
+        azure_query(
+            node,
+            f"RESTORE TABLE test_sql_nc_override_backup AS test_sql_nc_override_restored FROM {backup_destination};",
+        )
+        assert (
+            azure_query(node, "SELECT * from test_sql_nc_override_restored") == "2\tb\n"
+        )
+    finally:
+        azure_query(node, "DROP NAMED COLLECTION IF EXISTS sql_azure_backup_override")
+
+
 def test_backup_restore_on_merge_tree(cluster):
     node = cluster.instances["node"]
     azure_query(
diff --git a/tests/integration/test_backup_restore_on_cluster/concurrency_helper.py b/tests/integration/test_backup_restore_on_cluster/concurrency_helper.py
new file mode 100644
index 000000000000..522e75b53b81
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/concurrency_helper.py
@@ -0,0 +1,66 @@
+from pathlib import Path
+from typing import List
+
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance
+
+
+def generate_cluster_def(file: str, num_nodes: int) -> str:
+    # For multiple workers, it has race and sometimes errors out,
+    # so we generate it once and reuse
+    path = (
+        Path(__file__).parent / f"_gen/cluster_{Path(file).stem}_{num_nodes}_nodes.xml"
+    )
+    replicas = "\n".join(
+        f"""                <replica>
+                    <host>node{i}</host>
+                    <port>9000</port>
+                </replica>"""
+        for i in range(num_nodes)
+    )
+    config = f"""<clickhouse>
+    <remote_servers>
+        <cluster>
+            <shard>
+{replicas}
+            </shard>
+        </cluster>
+    </remote_servers>
+</clickhouse>"""
+    if path.is_file():
+        existing = path.read_text(encoding="utf-8")
+        if existing == config:
+            return str(path.absolute())
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(
+        encoding="utf-8",
+        data=config,
+    )
+    return str(path.absolute())
+
+
+def add_nodes_to_cluster(
+    cluster: ClickHouseCluster,
+    num_nodes: int,
+    main_configs: List[str],
+    user_configs: List[str],
+) -> List[ClickHouseInstance]:
+    nodes = [
+        cluster.add_instance(
+            f"node{i}",
+            main_configs=main_configs,
+            user_configs=user_configs,
+            external_dirs=["/backups/"],
+            macros={"replica": f"node{i}", "shard": "shard1"},
+            with_zookeeper=True,
+        )
+        for i in range(num_nodes)
+    ]
+    return nodes
+
+
+def create_test_table(node: ClickHouseInstance) -> None:
+    node.query(
+        """CREATE TABLE tbl ON CLUSTER 'cluster' ( x UInt64 )
+ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')
+ORDER BY tuple()"""
+    )
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 304ae4af752d..e9354a27fdd2 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
@@ -1,50 +1,32 @@
 import concurrent
-import os.path
 import time
 from random import randint, random
+from typing import List
 
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance
 from helpers.test_tools import TSV, assert_eq_with_retry
 
+from .concurrency_helper import (
+    add_nodes_to_cluster,
+    create_test_table,
+    generate_cluster_def,
+)
+
 cluster = ClickHouseCluster(__file__)
 
 num_nodes = 10
 
 
-def generate_cluster_def():
-    path = os.path.join(
-        os.path.dirname(os.path.realpath(__file__)),
-        "./_gen/cluster_for_concurrency_test.xml",
-    )
-    os.makedirs(os.path.dirname(path), exist_ok=True)
-    with open(path, "w") as f:
-        f.write("<clickhouse>\n\t<remote_servers>\n\t\t<cluster>\n\t\t\t<shard>\n")
-        for i in range(num_nodes):
-            f.write(
-                f"\t\t\t\t<replica>\n\t\t\t\t\t<host>node{i}</host>\n\t\t\t\t\t<port>9000</port>\n\t\t\t\t</replica>\n"
-            )
-        f.write("\t\t\t</shard>\n\t\t</cluster>\n\t</remote_servers>\n</clickhouse>")
-    return path
-
-
-main_configs = ["configs/backups_disk.xml", generate_cluster_def()]
+main_configs = [
+    "configs/backups_disk.xml",
+    generate_cluster_def(__file__, num_nodes),
+]
 # No [Zoo]Keeper retries for tests with concurrency
 user_configs = ["configs/allow_database_types.xml"]
 
-nodes = []
-for i in range(num_nodes):
-    nodes.append(
-        cluster.add_instance(
-            f"node{i}",
-            main_configs=main_configs,
-            user_configs=user_configs,
-            external_dirs=["/backups/"],
-            macros={"replica": f"node{i}", "shard": "shard1"},
-            with_zookeeper=True,
-        )
-    )
+nodes = add_nodes_to_cluster(cluster, num_nodes, main_configs, user_configs)
 
 node0 = nodes[0]
 
@@ -70,23 +52,18 @@ def drop_after_test():
 backup_id_counter = 0
 
 
+def create_and_fill_table() -> None:
+    create_test_table(node0)
+    for i, node in enumerate(nodes):
+        node.query(f"INSERT INTO tbl VALUES ({i})")
+
+
 def new_backup_name():
     global backup_id_counter
     backup_id_counter += 1
     return f"Disk('backups', '{backup_id_counter}')"
 
 
-def create_and_fill_table():
-    node0.query(
-        "CREATE TABLE tbl ON CLUSTER 'cluster' ("
-        "x Int32"
-        ") ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')"
-        "ORDER BY tuple()"
-    )
-    for i in range(num_nodes):
-        nodes[i].query(f"INSERT INTO tbl VALUES ({i})")
-
-
 expected_sum = num_nodes * (num_nodes - 1) // 2
 
 
diff --git a/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py b/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
index 3dea986e3d97..5892c6173ad7 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
@@ -1,72 +1,27 @@
-import concurrent
-import os.path
-import re
-import time
-from random import randint
-
 import pytest
 
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV, assert_eq_with_retry
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance
+from helpers.test_tools import assert_eq_with_retry
+
+from .concurrency_helper import (
+    add_nodes_to_cluster,
+    create_test_table,
+    generate_cluster_def,
+)
 
 cluster = ClickHouseCluster(__file__)
 
 num_nodes = 2
 
 
-def generate_cluster_def():
-    path = os.path.join(
-        os.path.dirname(os.path.realpath(__file__)),
-        "./_gen/cluster_for_test_disallow_concurrency.xml",
-    )
-    os.makedirs(os.path.dirname(path), exist_ok=True)
-    with open(path, "w") as f:
-        f.write(
-            """
-        <clickhouse>
-            <remote_servers>
-                <cluster>
-                    <shard>
-        """
-        )
-        for i in range(num_nodes):
-            f.write(
-                """
-                        <replica>
-                            <host>node"""
-                + str(i)
-                + """</host>
-                            <port>9000</port>
-                        </replica>
-            """
-            )
-        f.write(
-            """
-                    </shard>
-                </cluster>
-            </remote_servers>
-        </clickhouse>
-        """
-        )
-    return path
-
-
-main_configs = ["configs/disallow_concurrency.xml", generate_cluster_def()]
+main_configs = [
+    "configs/disallow_concurrency.xml",
+    generate_cluster_def(__file__, num_nodes),
+]
 # No [Zoo]Keeper retries for tests with concurrency
 user_configs = ["configs/allow_database_types.xml"]
 
-nodes = []
-for i in range(num_nodes):
-    nodes.append(
-        cluster.add_instance(
-            f"node{i}",
-            main_configs=main_configs,
-            user_configs=user_configs,
-            external_dirs=["/backups/"],
-            macros={"replica": f"node{i}", "shard": "shard1"},
-            with_zookeeper=True,
-        )
-    )
+nodes = add_nodes_to_cluster(cluster, num_nodes, main_configs, user_configs)
 
 node0 = nodes[0]
 
@@ -96,23 +51,18 @@ def drop_after_test():
 backup_id_counter = 0
 
 
+def create_and_fill_table() -> None:
+    create_test_table(node0)
+    for node in nodes:
+        node.query("INSERT INTO tbl SELECT number FROM numbers(40000000)")
+
+
 def new_backup_name():
     global backup_id_counter
     backup_id_counter += 1
     return f"Disk('backups', '{backup_id_counter}')"
 
 
-def create_and_fill_table():
-    node0.query(
-        "CREATE TABLE tbl ON CLUSTER 'cluster' ("
-        "x UInt64"
-        ") ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')"
-        "ORDER BY x"
-    )
-    for i in range(num_nodes):
-        nodes[i].query(f"INSERT INTO tbl SELECT number FROM numbers(40000000)")
-
-
 def get_status_and_error(node, backup_or_restore_id):
     return (
         node.query(
diff --git a/tests/integration/test_backup_restore_on_cluster/test_huge_concurrent_restore.py b/tests/integration/test_backup_restore_on_cluster/test_huge_concurrent_restore.py
new file mode 100644
index 000000000000..a6474c7a93d7
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/test_huge_concurrent_restore.py
@@ -0,0 +1,78 @@
+from typing import List
+
+import pytest
+
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance
+from helpers.test_tools import TSV
+
+from .concurrency_helper import (
+    add_nodes_to_cluster,
+    create_test_table,
+    generate_cluster_def,
+)
+
+cluster = ClickHouseCluster(__file__)
+
+# Testing backups.max_attempts_after_bad_version is dynamic, and depends on num_nodes
+num_nodes = 20
+
+main_configs = [
+    "configs/backups_disk.xml",
+    generate_cluster_def(__file__, num_nodes),
+]
+# No [Zoo]Keeper retries for tests with concurrency
+user_configs = ["configs/allow_database_types.xml"]
+
+nodes = add_nodes_to_cluster(cluster, num_nodes, main_configs, user_configs)
+
+node0 = nodes[0]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def drop_after_test():
+    try:
+        yield
+    finally:
+        node0.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' SYNC")
+        node0.query("DROP DATABASE IF EXISTS mydb ON CLUSTER 'cluster' SYNC")
+
+
+backup_id_counter = 0
+
+
+def new_backup_name():
+    global backup_id_counter
+    backup_id_counter += 1
+    return f"Disk('backups', '{backup_id_counter}')"
+
+
+def create_and_fill_table() -> None:
+    create_test_table(node0)
+    for i, node in enumerate(nodes):
+        node.query(f"INSERT INTO tbl VALUES ({i})")
+
+
+expected_sum = num_nodes * (num_nodes - 1) // 2
+
+
+def test_backup_restore_huge_cluster():
+    create_and_fill_table()
+
+    backup_name = new_backup_name()
+    node0.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
+
+    node0.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
+    node0.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
+    node0.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' tbl")
+
+    for i in range(num_nodes):
+        assert nodes[i].query("SELECT sum(x) FROM tbl") == TSV([expected_sum])
diff --git a/tests/integration/test_backup_restore_s3/test.py b/tests/integration/test_backup_restore_s3/test.py
index f12d7ebcba06..37d397cdc813 100644
--- a/tests/integration/test_backup_restore_s3/test.py
+++ b/tests/integration/test_backup_restore_s3/test.py
@@ -4,6 +4,7 @@
 
 import pytest
 
+from ast import literal_eval
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
 from helpers.config_cluster import minio_secret_key
@@ -373,6 +374,55 @@ def test_backup_to_s3_named_collection():
     check_backup_and_restore(cluster, storage_policy, backup_destination)
 
 
+def test_backup_to_s3_named_collection_sql():
+    """Test backup using a named collection created via SQL (not XML config)."""
+    node = cluster.instances["node"]
+    storage_policy = "default"
+    backup_name = new_backup_name()
+
+    # Create a named collection via SQL
+    node.query(
+        f"""
+        CREATE NAMED COLLECTION IF NOT EXISTS sql_named_collection_s3_backup AS
+            url = 'http://minio1:9001/root/data/backups',
+            access_key_id = 'minio',
+            secret_access_key = '{minio_secret_key}'
+        """
+    )
+
+    try:
+        backup_destination = f"S3(sql_named_collection_s3_backup, '{backup_name}')"
+        check_backup_and_restore(cluster, storage_policy, backup_destination)
+    finally:
+        node.query("DROP NAMED COLLECTION IF EXISTS sql_named_collection_s3_backup")
+
+
+def test_backup_to_s3_named_collection_sql_with_overrides():
+    """Test backup using a SQL named collection with key-value overrides."""
+    node = cluster.instances["node"]
+    storage_policy = "default"
+    backup_name = new_backup_name()
+
+    # Create a named collection via SQL with a placeholder URL
+    node.query(
+        f"""
+        CREATE NAMED COLLECTION IF NOT EXISTS sql_named_collection_s3_backup_override AS
+            url = 'http://minio1:9001/root/data/placeholder',
+            access_key_id = 'minio',
+            secret_access_key = '{minio_secret_key}'
+        """
+    )
+
+    try:
+        # Override the URL via key-value argument
+        backup_destination = f"S3(sql_named_collection_s3_backup_override, url='http://minio1:9001/root/data/backups/{backup_name}')"
+        check_backup_and_restore(cluster, storage_policy, backup_destination)
+    finally:
+        node.query(
+            "DROP NAMED COLLECTION IF EXISTS sql_named_collection_s3_backup_override"
+        )
+
+
 def test_backup_to_s3_multipart():
     storage_policy = "default"
     backup_name = new_backup_name()
@@ -384,8 +434,16 @@ def test_backup_to_s3_multipart():
         size=1000000,
     )
     node = cluster.instances["node"]
-    assert node.contains_in_log(
-        f"copyDataToS3File: Multipart upload has completed. Bucket: root, Key: data/backups/multipart/{backup_name}"
+
+    node.query("SYSTEM FLUSH LOGS")
+    pattern = f"Multipart upload has completed. Bucket: root, Key: data/backups/multipart/{backup_name}"
+    assert (
+        int(
+            node.query(
+                f"SELECT count() FROM system.text_log WHERE logger_name='copyDataToS3File' AND message like '{pattern}%'",
+            )
+        )
+        > 0
     )
 
     backup_query_id = backup_events["query_id"]
@@ -465,9 +523,56 @@ def test_backup_to_s3_native_copy(storage_policy):
     # single part upload
     assert backup_events["S3CopyObject"] > 0
     assert restore_events["S3CopyObject"] > 0
+
+    node.query("SYSTEM FLUSH LOGS")
+    pattern = f"Single operation copy has completed. Bucket: root, Key: data/backups/{backup_name}"
+    assert (
+        int(
+            node.query(
+                f"SELECT count() FROM system.text_log WHERE logger_name='copyS3File' AND message like '{pattern}%'",
+            )
+        )
+        > 0
+    )
+
+
+@pytest.mark.parametrize(
+    "storage_policy",
+    [
+        "policy_s3",
+        "policy_s3_other_bucket",
+        "policy_s3_plain_rewritable",
+    ],
+)
+def test_backup_to_s3_native_copy_slow_down_all_threads(storage_policy):
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', '{minio_secret_key}')"
+    (backup_events, restore_events) = check_backup_and_restore(
+        cluster,
+        storage_policy,
+        backup_destination,
+        backup_settings={"backup_slow_all_threads_after_retryable_s3_error": True},
+    )
+    # single part upload
+    assert backup_events["S3CopyObject"] > 0
+    assert restore_events["S3CopyObject"] > 0
     node = cluster.instances["node"]
-    assert node.contains_in_log(
-        f"copyS3File: Single operation copy has completed. Bucket: root, Key: data/backups/{backup_name}"
+
+    disks = literal_eval(
+        node.query(
+            f"SELECT disks FROM system.storage_policies WHERE policy_name='{storage_policy}'"
+        )
+    )
+    assert len(disks) == 1
+    node.query("SYSTEM FLUSH LOGS")
+    pattern = f"S3 client for disk \\'{disks[0]}\\': slowing down threads on retryable errors is enabled"
+    assert (
+        int(
+            node.query(
+                f"SELECT count() FROM system.text_log WHERE logger_name='S3Client' AND message LIKE '%{pattern}%'",
+            )
+        )
+        > 0
     )
 
 
@@ -481,11 +586,62 @@ def test_backup_to_s3_native_copy_multipart():
     # multi part upload
     assert backup_events["S3CreateMultipartUpload"] > 0
     assert restore_events["S3CreateMultipartUpload"] > 0
+
+    node = cluster.instances["node"]
+    pattern = f"Multipart upload has completed. Bucket: root, Key: data/backups/multipart/{backup_name}/"
+    assert (
+        int(
+            node.query(
+                f"SELECT count() FROM system.text_log WHERE logger_name='copyS3File' AND message like '{pattern}%'",
+            )
+        )
+        > 0
+    )
+
+
+@pytest.fixture(scope="module")
+def init_broken_s3():
+    yield start_s3_mock(cluster, "broken_s3", "8083")
+
+
+@pytest.fixture(scope="function")
+def broken_s3(init_broken_s3):
+    init_broken_s3.reset()
+    yield init_broken_s3
+
+
+def test_backup_to_s3_copy_multipart_check_error_message(broken_s3):
+    storage_policy = "policy_s3"
+    size = 10000000
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://resolver:8083/root/data/backups/multipart/{backup_name}', 'minio', '{minio_secret_key}')"
     node = cluster.instances["node"]
-    assert node.contains_in_log(
-        f"copyS3File: Multipart upload has completed. Bucket: root, Key: data/backups/multipart/{backup_name}/"
+
+    node.query(
+        f"""
+    DROP TABLE IF EXISTS data SYNC;
+    CREATE TABLE data (key Int, value String, array Array(String)) Engine=MergeTree() ORDER BY tuple() SETTINGS storage_policy='{storage_policy}';
+    INSERT INTO data SELECT * FROM generateRandom('key Int, value String, array Array(String)') LIMIT {size} {format_settings(None)};
+    OPTIMIZE TABLE data FINAL;
+    """
     )
 
+    try:
+        backup_query_id = uuid.uuid4().hex
+        broken_s3.setup_at_part_upload(after=20, count=1)
+        error = node.query_and_get_error(
+            f"BACKUP TABLE data TO {backup_destination} {format_settings(None)}",
+            query_id=backup_query_id,
+        )
+
+        assert "mock s3 injected unretryable error" in error, error
+    finally:
+        node.query(
+            """
+            DROP TABLE data SYNC;
+            """
+        )
+
 
 def test_incremental_backup_append_table_def():
     backup_name = f"S3('http://minio1:9001/root/data/backups/{new_backup_name()}', 'minio', '{minio_secret_key}')"
@@ -918,21 +1074,28 @@ def test_backup_restore_s3_plain():
     instance.query("DROP TABLE sample_restored SYNC")
 
 
-@pytest.fixture(scope="module")
-def init_broken_s3():
-    yield start_s3_mock(cluster, "broken_s3", "8083")
-
-
-@pytest.fixture(scope="function")
-def broken_s3(init_broken_s3):
-    init_broken_s3.reset()
-    yield init_broken_s3
-
-
-def test_backup_restore_with_s3_throttle(broken_s3):
+@pytest.mark.parametrize(
+    "to_disk",
+    [
+        pytest.param(
+            None,
+            id="to_s3",
+        ),
+        pytest.param(
+            "disk_s3",
+            id="to_disk_s3",
+        ),
+    ],
+)
+def test_backup_restore_with_s3_throttle(broken_s3, to_disk):
     storage_policy = "default"
     backup_name = new_backup_name()
-    backup_destination = f"S3('http://resolver:8083/root/data/backups/multipart/{backup_name}', 'minio', '{minio_secret_key}')"
+
+    backup_destination = (
+        f"Disk('{to_disk}', '{backup_name}')"
+        if to_disk
+        else f"S3('http://resolver:8083/root/data/backups/multipart/{backup_name}', 'minio', '{minio_secret_key}')"
+    )
     node = cluster.instances["node"]
     backup_settings = {
         "backup_restore_s3_retry_attempts": "10",
diff --git a/tests/integration/test_backward_compatibility/test.py b/tests/integration/test_backward_compatibility/test.py
index 0f9a57c7bbca..321dd9eab1ba 100644
--- a/tests/integration/test_backward_compatibility/test.py
+++ b/tests/integration/test_backward_compatibility/test.py
@@ -6,7 +6,7 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py b/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
index e4433fac30f2..0a2c787f86b9 100644
--- a/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
+++ b/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
@@ -6,7 +6,7 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
 )
diff --git a/tests/integration/test_backward_compatibility/test_aggregate_function_state.py b/tests/integration/test_backward_compatibility/test_aggregate_function_state.py
index bb18244308b5..183596fe6b5e 100644
--- a/tests/integration/test_backward_compatibility/test_aggregate_function_state.py
+++ b/tests/integration/test_backward_compatibility/test_aggregate_function_state.py
@@ -6,7 +6,7 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
@@ -14,7 +14,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_convert_ordinary.py b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
index 0a29f4433621..37dc3193fff5 100644
--- a/tests/integration/test_backward_compatibility/test_convert_ordinary.py
+++ b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
@@ -5,7 +5,7 @@
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_zookeeper=True,
diff --git a/tests/integration/test_backward_compatibility/test_cte_distributed.py b/tests/integration/test_backward_compatibility/test_cte_distributed.py
index 3fb0d3cc4289..e482b884acf1 100644
--- a/tests/integration/test_backward_compatibility/test_cte_distributed.py
+++ b/tests/integration/test_backward_compatibility/test_cte_distributed.py
@@ -7,7 +7,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_functions.py b/tests/integration/test_backward_compatibility/test_functions.py
index 751e52d1ffce..2a772280db35 100644
--- a/tests/integration/test_backward_compatibility/test_functions.py
+++ b/tests/integration/test_backward_compatibility/test_functions.py
@@ -14,7 +14,7 @@
 upstream = cluster.add_instance("upstream", use_old_analyzer=True)
 backward = cluster.add_instance(
     "backward",
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
 )
diff --git a/tests/integration/test_backward_compatibility/test_insert_profile_events.py b/tests/integration/test_backward_compatibility/test_insert_profile_events.py
index dd1459a29371..cfa6ffe7c980 100644
--- a/tests/integration/test_backward_compatibility/test_insert_profile_events.py
+++ b/tests/integration/test_backward_compatibility/test_insert_profile_events.py
@@ -10,7 +10,7 @@
 upstream_node = cluster.add_instance("upstream_node", use_old_analyzer=True)
 old_node = cluster.add_instance(
     "old_node",
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
 )
diff --git a/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py b/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
index 8631bcc3f093..2d64129f7699 100644
--- a/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
+++ b/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
@@ -6,7 +6,7 @@
 # Version 21.6.3.14 has incompatible partition id for tables with UUID in partition key.
 node = cluster.add_instance(
     "node",
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py b/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
index 7b9f87d269d4..7876644a3538 100644
--- a/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
+++ b/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
@@ -6,7 +6,7 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
@@ -14,7 +14,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py b/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
index 5255f3c4265e..812e2d3ca280 100644
--- a/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
+++ b/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
@@ -7,7 +7,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_rocksdb_upgrade.py b/tests/integration/test_backward_compatibility/test_rocksdb_upgrade.py
new file mode 100644
index 000000000000..43b48c698cae
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/test_rocksdb_upgrade.py
@@ -0,0 +1,51 @@
+import pytest
+
+from helpers.cluster import CLICKHOUSE_CI_MIN_TESTED_VERSION, ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    with_zookeeper=False,
+    image="altinity/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
+    stay_alive=True,
+    with_installed_binary=True,
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def cleanup():
+    yield
+    node.restart_with_original_version(clear_data_dir=True)
+
+
+def test_rocksdb_upgrade(start_cluster):
+    node.query(
+        """
+               CREATE TABLE vt
+               (
+                   `sha256` FixedString(64),
+                   `amount` Nullable(Int8)
+               )
+               ENGINE = EmbeddedRocksDB
+               PRIMARY KEY sha256
+               """
+    )
+
+    assert node.query("SELECT count() FROM vt") == "0\n"
+
+    node.restart_with_latest_version()
+
+    assert node.query("SELECT count() FROM vt") == "0\n"
+
+    node.query("""DROP TABLE vt""")
diff --git a/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py b/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
index b900d97a7930..b0c463e55825 100644
--- a/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
+++ b/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
@@ -7,7 +7,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py b/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
index 3a1ffaf7b486..befaafc5bd0a 100644
--- a/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
+++ b/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
@@ -7,16 +7,20 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
-    tag="24.1" if is_arm() else CLICKHOUSE_CI_MIN_TESTED_VERSION,
+    image="altinity/clickhouse-server",
+    tag=(
+        "24.3.18.10426.altinitystable" if is_arm() else CLICKHOUSE_CI_MIN_TESTED_VERSION
+    ),
     stay_alive=True,
     with_installed_binary=True,
 )
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="clickhouse/clickhouse-server",
-    tag="24.1" if is_arm() else CLICKHOUSE_CI_MIN_TESTED_VERSION,
+    image="altinity/clickhouse-server",
+    tag=(
+        "24.3.18.10426.altinitystable" if is_arm() else CLICKHOUSE_CI_MIN_TESTED_VERSION
+    ),
     stay_alive=True,
     with_installed_binary=True,
 )
diff --git a/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py b/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
index c6fddbc7763c..d9ed663fb9ef 100644
--- a/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
+++ b/tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
@@ -6,7 +6,7 @@
 
 node_old = cluster.add_instance(
     "node1",
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_checking_s3_blobs_paranoid/test.py b/tests/integration/test_checking_s3_blobs_paranoid/test.py
index 257953445965..423ea81ff013 100644
--- a/tests/integration/test_checking_s3_blobs_paranoid/test.py
+++ b/tests/integration/test_checking_s3_blobs_paranoid/test.py
@@ -465,9 +465,8 @@ def test_when_s3_connection_reset_by_peer_at_upload_is_retried(
 
     assert "Code: 1000" in error, error
     assert (
-        "DB::Exception: Connection reset by peer." in error
-        or "DB::Exception: Poco::Exception. Code: 1000, e.code() = 104, Connection reset by peer"
-        in error
+        "Connection reset by peer." in error
+        or "Code: 1000, e.code() = 104, Connection reset by peer" in error
     ), error
 
 
@@ -548,12 +547,82 @@ def test_when_s3_connection_reset_by_peer_at_create_mpu_retried(
 
     assert "Code: 1000" in error, error
     assert (
-        "DB::Exception: Connection reset by peer." in error
-        or "DB::Exception: Poco::Exception. Code: 1000, e.code() = 104, Connection reset by peer"
+        "Connection reset by peer." in error
+        or "Code: 1000, e.code() = 104, Connection reset by peer"
         in error
     ), error
 
 
+def test_when_s3_timeout_at_listing(
+    cluster, broken_s3
+):
+    node = cluster.instances["node_with_inf_s3_retries"]
+
+    insert_query_id = randomize_query_id(
+        f"TEST_WHEN_S3_TIMEOUT_AT_LISTING_INSERT"
+    )
+    node.query(
+        f"""
+        INSERT INTO
+            TABLE FUNCTION s3(
+                'http://resolver:8083/root/data/test_when_s3_timeout_at_listing/{{_partition_id}}/file',
+                'minio', '{minio_secret_key}',
+                'CSV', auto, 'none'
+            )
+            PARTITION BY number
+        SELECT
+            *
+        FROM system.numbers
+        LIMIT 2000
+        SETTINGS
+            s3_check_objects_after_upload=0,
+            s3_truncate_on_insert=1
+        """,
+        query_id=insert_query_id,
+    )
+
+    broken_s3.setup_at_listing(
+        count=1,
+        after=1,
+        action="timeout"
+    )
+
+    select_query_id = randomize_query_id(
+        f"TEST_WHEN_S3_TIMEOUT_AT_LISTING_SELECT"
+    )
+    result = node.query(
+        f"""
+        SELECT * FROM
+            s3(
+                'http://resolver:8083/root/data/test_when_s3_timeout_at_listing/*/file',
+                'minio', '{minio_secret_key}',
+                'CSV', auto, 'none'
+            )
+        ORDER BY ALL
+        """,
+        query_id=select_query_id,
+    )
+    result = result.strip().split("\n")
+    assert len(result) == 2000
+    assert result == [str(i) for i in range(2000)]
+
+    node.query("SYSTEM FLUSH LOGS")
+    read_count, errors, retryable = node.query(
+        f"""
+            SELECT
+                ProfileEvents['S3ReadRequestsCount'],
+                ProfileEvents['S3ReadRequestsErrors'],
+                ProfileEvents['S3ReadRequestRetryableErrors'],
+            FROM system.query_log
+            WHERE query_id='{select_query_id}'
+                AND type='QueryFinish'
+            """).strip().split("\t")
+
+    assert int(read_count) > 10 # at least 10 files are read from s3
+    assert int(errors) >= 1
+    assert int(retryable) >= 1
+
+
 def test_query_is_canceled_with_inf_retries(cluster, broken_s3):
     node = cluster.instances["node_with_inf_s3_retries"]
 
@@ -729,7 +798,7 @@ def test_no_key_found_disk(cluster, broken_s3):
     error = node.query_and_get_error("SELECT * FROM no_key_found_disk").strip()
 
     assert (
-        "DB::Exception: The specified key does not exist. This error happened for S3 disk"
+        "The specified key does not exist. This error happened for S3 disk"
         in error
     )
 
diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml
index ffa8eeb077e7..e90883ae4b09 100644
--- a/tests/integration/test_config_xml_full/configs/config.xml
+++ b/tests/integration/test_config_xml_full/configs/config.xml
@@ -786,6 +786,11 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </opentelemetry_span_log>
 
+    <iceberg_metadata_log>
+        <database>system</database>
+        <table>iceberg_metadata_log</table>
+        <flush_interval_milliseconds>2000</flush_interval_milliseconds>
+    </iceberg_metadata_log>
 
     <!-- Crash log. Stores stack traces for fatal errors.
          This table is normally empty. -->
diff --git a/tests/integration/test_config_xml_main/configs/config.xml b/tests/integration/test_config_xml_main/configs/config.xml
index 7f951e449028..4144c51ced53 100644
--- a/tests/integration/test_config_xml_main/configs/config.xml
+++ b/tests/integration/test_config_xml_main/configs/config.xml
@@ -140,6 +140,12 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </opentelemetry_span_log>
 
+    <iceberg_metadata_log>
+        <database>system</database>
+        <table>iceberg_metadata_log</table>
+        <flush_interval_milliseconds>2000</flush_interval_milliseconds>
+    </iceberg_metadata_log>
+
     <crash_log>
         <database>system</database>
         <table>crash_log</table>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
index f1e5137ac001..ded0edf22390 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
@@ -140,6 +140,12 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </opentelemetry_span_log>
 
+    <iceberg_metadata_log>
+        <database>system</database>
+        <table>iceberg_metadata_log</table>
+        <flush_interval_milliseconds>2000</flush_interval_milliseconds>
+    </iceberg_metadata_log>
+
     <crash_log>
         <database>system</database>
         <table>crash_log</table>
diff --git a/tests/integration/test_config_yaml_full/configs/config.yaml b/tests/integration/test_config_yaml_full/configs/config.yaml
index 894f1a374676..baf2bc930823 100644
--- a/tests/integration/test_config_yaml_full/configs/config.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.yaml
@@ -89,6 +89,10 @@ asynchronous_metric_log:
   database: system
   table: asynchronous_metric_log
   flush_interval_milliseconds: 60000
+iceberg_metadata_log:
+  database: system
+  table: iceberg_metadata_log
+  flush_interval_milliseconds: 2000
 opentelemetry_span_log:
   engine: |-
     engine MergeTree
diff --git a/tests/integration/test_config_yaml_main/configs/config.yaml b/tests/integration/test_config_yaml_main/configs/config.yaml
index e8483f95bb0e..0ce6b1425e99 100644
--- a/tests/integration/test_config_yaml_main/configs/config.yaml
+++ b/tests/integration/test_config_yaml_main/configs/config.yaml
@@ -89,6 +89,10 @@ asynchronous_metric_log:
   database: system
   table: asynchronous_metric_log
   flush_interval_milliseconds: 60000
+iceberg_metadata_log:
+  database: system
+  table: iceberg_metadata_log
+  flush_interval_milliseconds: 2000
 opentelemetry_span_log:
   engine: |-
     engine MergeTree
diff --git a/tests/integration/test_cow_policy/test.py b/tests/integration/test_cow_policy/test.py
index 0d14eacbcb2b..db34c157f0ab 100644
--- a/tests/integration/test_cow_policy/test.py
+++ b/tests/integration/test_cow_policy/test.py
@@ -43,7 +43,9 @@ def test_cow_policy(start_cluster, storage_policy):
             ENGINE = MergeTree
             ORDER BY (postcode1, postcode2, addr1, addr2)
             SETTINGS storage_policy = '{storage_policy}'
-            """
+            """,
+            timeout=60,
+            retry_count=3,
         )
         prev_count = int(node.query("SELECT count() FROM uk_price_paid"))
         assert prev_count > 0
diff --git a/tests/integration/test_crash_log/test.py b/tests/integration/test_crash_log/test.py
index ce1264856706..43acd5469707 100644
--- a/tests/integration/test_crash_log/test.py
+++ b/tests/integration/test_crash_log/test.py
@@ -31,7 +31,7 @@ def send_signal(started_node, signal):
 
 def wait_for_clickhouse_stop(started_node):
     result = None
-    for attempt in range(120):
+    for attempt in range(180):
         time.sleep(1)
         pid = started_node.get_process_pid("clickhouse")
         if pid is None:
@@ -40,7 +40,7 @@ def wait_for_clickhouse_stop(started_node):
     assert result == "OK", "ClickHouse process is still running"
 
 
-def test_pkill(started_node):
+def test_crash_log_synchronous(started_node):
     if (
         started_node.is_built_with_thread_sanitizer()
         or started_node.is_built_with_address_sanitizer()
@@ -50,6 +50,7 @@ def test_pkill(started_node):
 
     crashes_count = 0
     for signal in ["SEGV", "4"]:
+        started_node.query("SYSTEM ENABLE FAILPOINT sleep_in_logs_flush")
         send_signal(started_node, signal)
         wait_for_clickhouse_stop(started_node)
         started_node.restart_clickhouse()
diff --git a/tests/integration/test_database_delta/test.py b/tests/integration/test_database_delta/test.py
index e91c6e652136..fe4dc4d55a95 100644
--- a/tests/integration/test_database_delta/test.py
+++ b/tests/integration/test_database_delta/test.py
@@ -36,7 +36,7 @@ def started_cluster():
             "node1",
             main_configs=[],
             user_configs=[],
-            image="clickhouse/integration-test-with-unity-catalog",
+            image="altinityinfra/integration-test-with-unity-catalog",
             with_installed_binary=False,
             tag=os.environ.get("DOCKER_BASE_WITH_UNITY_CATALOG_TAG", "latest"),
         )
diff --git a/tests/integration/test_database_glue/s3_mocks/mock_sts.py b/tests/integration/test_database_glue/s3_mocks/mock_sts.py
new file mode 100644
index 000000000000..df1ab486d4fd
--- /dev/null
+++ b/tests/integration/test_database_glue/s3_mocks/mock_sts.py
@@ -0,0 +1,42 @@
+import sys
+from datetime import datetime, timedelta, timezone
+
+from bottle import request, response, route, run
+
+if len(sys.argv) >= 3:
+    expected_role = sys.argv[2]
+else:
+    expected_role = 'miniorole'
+
+@route("/")
+def ping():
+    response.content_type = "text/plain"
+    response.set_header("Content-Length", 2)
+    return "OK"
+
+
+@route("/", method="POST")
+def sts():
+    access_key = "minio"
+    secret_access_key = "wrong_key"
+
+    if f"RoleSessionName={expected_role}" in str(request.url):
+        secret_access_key = "ClickHouse_Minio_P@ssw0rd"
+
+    expiration = datetime.now(timezone.utc) + timedelta(hours=1)
+    expiration_str = expiration.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    response.content_type = "text/xml"
+    return f"""
+        <AssumeRoleResponse xmlns="https://sts.amazonaws.com/doc/2011-06-15/">
+            <AssumeRoleResult>
+                <Credentials>
+                    <AccessKeyId>{access_key}</AccessKeyId>
+                    <SecretAccessKey>{secret_access_key}</SecretAccessKey>
+                    <Expiration>{expiration_str}</Expiration>
+                </Credentials>
+            </AssumeRoleResult>
+        </AssumeRoleResponse>
+    """
+
+run(host="0.0.0.0", port=int(sys.argv[1]))
diff --git a/tests/integration/test_database_glue/test.py b/tests/integration/test_database_glue/test.py
index 70db874cd3c8..30a105536758 100644
--- a/tests/integration/test_database_glue/test.py
+++ b/tests/integration/test_database_glue/test.py
@@ -29,9 +29,20 @@
 )
 
 from helpers.cluster import ClickHouseCluster, ClickHouseInstance, is_arm
+from helpers.mock_servers import start_mock_servers
 
 import boto3
 
+
+def run_s3_mocks(started_cluster):
+    script_dir = os.path.join(os.path.dirname(__file__), "s3_mocks")
+    start_mock_servers(
+        started_cluster,
+        script_dir,
+        [("mock_sts.py", "sts.us-east-1.amazonaws.com", "80")],
+    )
+
+
 CATALOG_NAME = "test"
 
 BASE_URL = "http://glue:3000"
@@ -182,7 +193,7 @@ def generate_arrow_data(num_rows=5):
     return table
 
 def create_clickhouse_glue_database(
-    started_cluster, node, name, additional_settings={}
+    started_cluster, node, name, additional_settings={}, with_credentials=True
 ):
     settings = {
         "catalog_type": "glue",
@@ -193,12 +204,14 @@ def create_clickhouse_glue_database(
 
     settings.update(additional_settings)
 
+    credential_args = f",'{minio_access_key}', '{minio_secret_key}'" if with_credentials else ""
+
     node.query(
         f"""
 DROP DATABASE IF EXISTS {name};
 SET allow_database_glue_catalog=true;
 SET write_full_path_in_iceberg_metadata=true;
-CREATE DATABASE {name} ENGINE = DataLakeCatalog('{BASE_URL}', '{minio_access_key}', '{minio_secret_key}')
+CREATE DATABASE {name} ENGINE = DataLakeCatalog('{BASE_URL}'{credential_args})
 SETTINGS {",".join((k+"="+repr(v) for k, v in settings.items()))}
     """
     )
@@ -251,8 +264,20 @@ def started_cluster():
             with_glue_catalog=True,
         )
 
+        sts = cluster.add_instance(
+            name="sts.us-east-1.amazonaws.com",
+            hostname="sts.us-east-1.amazonaws.com",
+            image="clickhouse/python-bottle",
+            tag="latest",
+            stay_alive=True,
+        )
+        sts.stop_clickhouse(kill=True)
+
         logging.info("Starting cluster...")
         cluster.start()
+        logging.info("Cluster started")
+
+        run_s3_mocks(cluster)
 
         yield cluster
 
@@ -295,14 +320,14 @@ def test_list_tables(started_cluster):
     assert (
         tables_list
         == node.query(
-            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name"
+            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name SETTINGS show_data_lake_catalogs_in_system_tables = true"
         ).strip()
     )
     node.restart_clickhouse()
     assert (
         tables_list
         == node.query(
-            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name"
+            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name SETTINGS show_data_lake_catalogs_in_system_tables = true"
         ).strip()
     )
 
@@ -354,7 +379,7 @@ def test_select(started_cluster):
         )
 
     assert int(node.query(f"SELECT count() FROM system.iceberg_history WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 4
-    assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 4
+    assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 4
     assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = false").strip()) == 0
 
 
@@ -384,7 +409,6 @@ def test_hide_sensitive_info(started_cluster):
     assert "SECRET_2" not in node.query(f"SHOW CREATE DATABASE {CATALOG_NAME}")
 
 
-
 def test_select_after_rename(started_cluster):
     node = started_cluster.instances["node1"]
 
@@ -578,3 +602,139 @@ def test_drop_table(started_cluster):
 
     drop_clickhouse_glue_table(node, root_namespace, table_name)
     assert len(catalog.list_tables(root_namespace)) == 0
+
+
+def test_system_tables(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_system_tables_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    root_namespace = f"{test_ref}_namespace"
+
+    namespaces_to_create = [
+        root_namespace,
+        f"{root_namespace}_A",
+        f"{root_namespace}_B",
+        f"{root_namespace}_C",
+    ]
+
+    catalog = load_catalog_impl(started_cluster)
+
+    for namespace in namespaces_to_create:
+        catalog.create_namespace(namespace)
+        assert len(catalog.list_tables(namespace)) == 0
+
+    for namespace in namespaces_to_create:
+        table = create_table(catalog, namespace, table_name)
+
+        num_rows = 10
+        df = generate_arrow_data(num_rows)
+        table.append(df)
+
+        create_clickhouse_glue_database(started_cluster, node, CATALOG_NAME)
+
+        expected = DEFAULT_CREATE_TABLE.format(CATALOG_NAME, namespace, table_name)
+        assert expected == node.query(
+            f"SHOW CREATE TABLE {CATALOG_NAME}.`{namespace}.{table_name}`"
+        )
+
+        assert num_rows == int(
+            node.query(f"SELECT count() FROM {CATALOG_NAME}.`{namespace}.{table_name}`")
+        )
+
+    assert CATALOG_NAME in node.query("SHOW DATABASES")
+    assert table_name in node.query(f"SHOW TABLES FROM {CATALOG_NAME}")
+    # system.tables
+    assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 4
+    assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 4
+    assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = false").strip()) == 0
+
+    # system.iceberg_history - always displays irrespective of show_data_lake_catalogs_in_system_tables
+    assert int(node.query(f"SELECT count() FROM system.iceberg_history WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 4
+    assert int(node.query(f"SELECT count() FROM system.iceberg_history WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = false").strip()) == 4
+
+    # system.databases
+    assert int(node.query(f"SELECT count() FROM system.databases WHERE name = '{CATALOG_NAME}' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 1
+    assert int(node.query(f"SELECT count() FROM system.databases WHERE name = '{CATALOG_NAME}'").strip()) == 1
+    assert int(node.query(f"SELECT count() FROM system.databases WHERE name = '{CATALOG_NAME}' SETTINGS show_data_lake_catalogs_in_system_tables = false").strip()) == 0
+
+    # system.columns
+    assert int(node.query(f"SELECT count() FROM system.columns WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 24
+    assert int(node.query(f"SELECT count() FROM system.columns WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 24
+    assert int(node.query(f"SELECT count() FROM system.columns WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = false").strip()) == 0
+
+    # system.completions
+    assert int(node.query(f"SELECT count() FROM system.completions WHERE startsWith(word, '{test_ref}') SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) != 0
+    assert int(node.query(f"SELECT count() FROM system.completions WHERE startsWith(word, '{test_ref}')").strip()) != 0
+    assert int(node.query(f"SELECT count() FROM system.completions WHERE startsWith(word, '{test_ref}') SETTINGS show_data_lake_catalogs_in_system_tables = false").strip()) == 0
+
+def test_sts_smoke(started_cluster):
+    """Test that STS authentication works with Glue catalog using role_arn and role_session_name"""
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_sts_smoke_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    root_namespace = f"{test_ref}_namespace"
+
+    catalog = load_catalog_impl(started_cluster)
+    catalog.create_namespace(root_namespace)
+
+    schema = Schema(
+        NestedField(field_id=1, name="id", field_type=StringType(), required=False),
+        NestedField(field_id=2, name="value", field_type=DoubleType(), required=False),
+    )
+    table = create_table(catalog, root_namespace, table_name, schema, PartitionSpec(), DEFAULT_SORT_ORDER, dir=table_name)
+
+    data = [
+        {"id": "row1", "value": 10.0},
+        {"id": "row2", "value": 20.0},
+        {"id": "row3", "value": 30.0},
+    ]
+    df = pa.Table.from_pylist(data)
+    table.append(df)
+
+    # Test with wrong role_session_name - should fail
+    db_name_fail = f"db_fail_{test_ref.replace('-', '_')}"
+    create_clickhouse_glue_database(
+        started_cluster,
+        node,
+        db_name_fail,
+        additional_settings={
+            "aws_role_arn": "arn::role",
+            "aws_role_session_name": "wrongsession",
+        },
+        with_credentials=False,
+    )
+
+    # Query should fail with wrong session name
+    try:
+        result = node.query(
+            f"SELECT sum(value) FROM {db_name_fail}.`{root_namespace}.{table_name}` "
+            f"SETTINGS s3_max_single_read_retries = 1, s3_retry_attempts = 1, s3_request_timeout_ms = 1000"
+        )
+        assert False, f"Expected query to fail with wrong session name but got result: {result}"
+    except Exception as e:
+        error_str = str(e)
+        assert "403" in error_str or "Failed to get object info" in error_str or "HTTP response code: 403" in error_str, \
+            f"Expected 403 error but got: {error_str}"
+
+    # Test with correct role_session_name - should succeed
+    db_name_success = f"db_success_{test_ref.replace('-', '_')}"
+    create_clickhouse_glue_database(
+        started_cluster,
+        node,
+        db_name_success,
+        additional_settings={
+            "aws_role_arn": "arn::role",
+            "aws_role_session_name": "miniorole",
+        },
+        with_credentials=False,
+    )
+
+    # Query should succeed with correct session name
+    result = node.query(f"SELECT sum(value) FROM {db_name_success}.`{root_namespace}.{table_name}`")
+    assert result.strip() == "60", f"Expected sum to be 60 but got: {result}"
+
+    # Cleanup
+    node.query(f"DROP DATABASE IF EXISTS {db_name_fail} SYNC")
+    node.query(f"DROP DATABASE IF EXISTS {db_name_success} SYNC")
diff --git a/tests/integration/test_database_iceberg/configs/cluster.xml b/tests/integration/test_database_iceberg/configs/cluster.xml
new file mode 100644
index 000000000000..08d810dbb0bf
--- /dev/null
+++ b/tests/integration/test_database_iceberg/configs/cluster.xml
@@ -0,0 +1,26 @@
+<clickhouse>
+    <remote_servers>
+        <cluster_simple>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_simple>
+    </remote_servers>
+    <query_log>
+        <database>system</database>
+        <table>query_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_database_iceberg/test.py b/tests/integration/test_database_iceberg/test.py
index 662b51e0f687..7e35f46e9a4f 100644
--- a/tests/integration/test_database_iceberg/test.py
+++ b/tests/integration/test_database_iceberg/test.py
@@ -14,12 +14,13 @@
 import pytz
 from minio import Minio
 from pyiceberg.catalog import load_catalog
-from pyiceberg.partitioning import PartitionField, PartitionSpec
+from pyiceberg.partitioning import PartitionField, PartitionSpec, UNPARTITIONED_PARTITION_SPEC
 from pyiceberg.schema import Schema
 from pyiceberg.table.sorting import SortField, SortOrder
 from pyiceberg.transforms import DayTransform, IdentityTransform
 from pyiceberg.types import (
     DoubleType,
+    LongType,
     FloatType,
     NestedField,
     StringType,
@@ -27,6 +28,7 @@
     TimestampType,
     TimestamptzType
 )
+from pyiceberg.table.sorting import UNSORTED_SORT_ORDER
 
 from helpers.cluster import ClickHouseCluster, ClickHouseInstance, is_arm
 from helpers.config_cluster import minio_secret_key, minio_access_key
@@ -72,6 +74,8 @@
 
 DEFAULT_SORT_ORDER = SortOrder(SortField(source_id=2, transform=IdentityTransform()))
 
+AVAILABLE_ENGINES = ["DataLakeCatalog", "Iceberg"]
+
 
 def list_namespaces():
     response = requests.get(f"{BASE_URL_LOCAL}/namespaces")
@@ -122,7 +126,7 @@ def generate_record():
 
 
 def create_clickhouse_iceberg_database(
-    started_cluster, node, name, additional_settings={}
+    started_cluster, node, name, additional_settings={}, engine='DataLakeCatalog'
 ):
     settings = {
         "catalog_type": "rest",
@@ -137,7 +141,7 @@ def create_clickhouse_iceberg_database(
 DROP DATABASE IF EXISTS {name};
 SET allow_database_iceberg=true;
 SET write_full_path_in_iceberg_metadata=1;
-CREATE DATABASE {name} ENGINE = DataLakeCatalog('{BASE_URL}', 'minio', '{minio_secret_key}')
+CREATE DATABASE {name} ENGINE = {engine}('{BASE_URL}', 'minio', '{minio_secret_key}')
 SETTINGS {",".join((k+"="+repr(v) for k, v in settings.items()))}
     """
     )
@@ -184,12 +188,21 @@ def started_cluster():
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance(
             "node1",
-            main_configs=["configs/backups.xml"],
+            main_configs=["configs/backups.xml", "configs/cluster.xml"],
             user_configs=[],
             stay_alive=True,
             with_iceberg_catalog=True,
         )
 
+        cluster.add_instance(
+            "node2",
+            main_configs=["configs/backups.xml", "configs/cluster.xml"],
+            user_configs=[],
+            stay_alive=True,
+            with_iceberg_catalog=True,
+            with_zookeeper=True,
+        )
+
         logging.info("Starting cluster...")
         cluster.start()
 
@@ -202,7 +215,8 @@ def started_cluster():
         cluster.shutdown()
 
 
-def test_list_tables(started_cluster):
+@pytest.mark.parametrize("engine", AVAILABLE_ENGINES)
+def test_list_tables(started_cluster, engine):
     node = started_cluster.instances["node1"]
 
     root_namespace = f"clickhouse_{uuid.uuid4()}"
@@ -233,7 +247,7 @@ def test_list_tables(started_cluster):
     for namespace in [namespace_1, namespace_2]:
         assert len(catalog.list_tables(namespace)) == 0
 
-    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME, engine=engine)
 
     tables_list = ""
     for table in namespace_1_tables:
@@ -251,14 +265,14 @@ def test_list_tables(started_cluster):
     assert (
         tables_list
         == node.query(
-            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name"
+            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name SETTINGS show_data_lake_catalogs_in_system_tables = true"
         ).strip()
     )
     node.restart_clickhouse()
     assert (
         tables_list
         == node.query(
-            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name"
+            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{root_namespace}%' ORDER BY name SETTINGS show_data_lake_catalogs_in_system_tables = true"
         ).strip()
     )
 
@@ -268,7 +282,8 @@ def test_list_tables(started_cluster):
     )
 
 
-def test_many_namespaces(started_cluster):
+@pytest.mark.parametrize("engine", AVAILABLE_ENGINES)
+def test_many_namespaces(started_cluster, engine):
     node = started_cluster.instances["node1"]
     root_namespace_1 = f"A_{uuid.uuid4()}"
     root_namespace_2 = f"B_{uuid.uuid4()}"
@@ -289,19 +304,20 @@ def test_many_namespaces(started_cluster):
         for table in tables:
             create_table(catalog, namespace, table)
 
-    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME, engine=engine)
 
     for namespace in namespaces:
         for table in tables:
             table_name = f"{namespace}.{table}"
             assert int(
                 node.query(
-                    f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and name = '{table_name}'"
+                    f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and name = '{table_name}' SETTINGS show_data_lake_catalogs_in_system_tables = true"
                 )
             )
 
 
-def test_select(started_cluster):
+@pytest.mark.parametrize("engine", AVAILABLE_ENGINES)
+def test_select(started_cluster, engine):
     node = started_cluster.instances["node1"]
 
     test_ref = f"test_list_tables_{uuid.uuid4()}"
@@ -329,7 +345,7 @@ def test_select(started_cluster):
     df = pa.Table.from_pylist(data)
     table.append(df)
 
-    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME, engine=engine)
 
     expected = DEFAULT_CREATE_TABLE.format(CATALOG_NAME, namespace, table_name)
     assert expected == node.query(
@@ -343,7 +359,8 @@ def test_select(started_cluster):
     assert int(node.query(f"SELECT count() FROM system.iceberg_history WHERE table = '{namespace}.{table_name}' and database = '{CATALOG_NAME}'").strip()) == 1
 
 
-def test_hide_sensitive_info(started_cluster):
+@pytest.mark.parametrize("engine", AVAILABLE_ENGINES)
+def test_hide_sensitive_info(started_cluster, engine):
     node = started_cluster.instances["node1"]
 
     test_ref = f"test_hide_sensitive_info_{uuid.uuid4()}"
@@ -361,6 +378,7 @@ def test_hide_sensitive_info(started_cluster):
         node,
         CATALOG_NAME,
         additional_settings={"catalog_credential": "SECRET_1"},
+        engine=engine,
     )
     assert "SECRET_1" not in node.query(f"SHOW CREATE DATABASE {CATALOG_NAME}")
 
@@ -369,11 +387,13 @@ def test_hide_sensitive_info(started_cluster):
         node,
         CATALOG_NAME,
         additional_settings={"auth_header": "SECRET_2"},
+        engine=engine,
     )
     assert "SECRET_2" not in node.query(f"SHOW CREATE DATABASE {CATALOG_NAME}")
 
 
-def test_tables_with_same_location(started_cluster):
+@pytest.mark.parametrize("engine", AVAILABLE_ENGINES)
+def test_tables_with_same_location(started_cluster, engine):
     node = started_cluster.instances["node1"]
 
     test_ref = f"test_tables_with_same_location_{uuid.uuid4()}"
@@ -404,7 +424,7 @@ def record(key):
     df = pa.Table.from_pylist(data)
     table_2.append(df)
 
-    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME, engine=engine)
 
     assert 'aaa\naaa\naaa' == node.query(f"SELECT symbol FROM {CATALOG_NAME}.`{namespace}.{table_name}`").strip()
     assert 'bbb\nbbb\nbbb' == node.query(f"SELECT symbol FROM {CATALOG_NAME}.`{namespace}.{table_name_2}`").strip()
@@ -526,6 +546,52 @@ def test_timestamps(started_cluster):
     assert node.query(f"SHOW CREATE TABLE {CATALOG_NAME}.`{root_namespace}.{table_name}`") == f"CREATE TABLE {CATALOG_NAME}.`{root_namespace}.{table_name}`\\n(\\n    `timestamp` Nullable(DateTime64(6)),\\n    `timestamptz` Nullable(DateTime64(6, \\'UTC\\'))\\n)\\nENGINE = Iceberg(\\'http://minio:9000/warehouse-rest/data/\\', \\'minio\\', \\'[HIDDEN]\\')\n"
     assert node.query(f"SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`") == "2024-01-01 12:00:00.000000\t2024-01-01 12:00:00.000000\n"
 
+    # Berlin - UTC+1 at winter
+    # Istanbul - UTC+3 at winter
+
+    # 'UTC' is default value, responce is equal to query above
+    assert node.query(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS iceberg_timezone_for_timestamptz='UTC'
+                      """) == "2024-01-01 12:00:00.000000\t2024-01-01 12:00:00.000000\n"
+    # Timezone from setting
+    assert node.query(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS iceberg_timezone_for_timestamptz='Europe/Berlin'
+                      """) == "2024-01-01 12:00:00.000000\t2024-01-01 13:00:00.000000\n"
+    # Empty value means session timezone, by default it is 'UTC' too
+    assert node.query(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS iceberg_timezone_for_timestamptz=''
+                      """) == "2024-01-01 12:00:00.000000\t2024-01-01 12:00:00.000000\n"
+    # If session timezone is used, `timestamptz` does not changed, 'UTC' by default
+    assert node.query(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS session_timezone='Asia/Istanbul'
+                      """) == "2024-01-01 15:00:00.000000\t2024-01-01 12:00:00.000000\n"
+    # Setiing `iceberg_timezone_for_timestamptz` does not affect `timestamp` column
+    assert node.query(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS session_timezone='Asia/Istanbul', iceberg_timezone_for_timestamptz='Europe/Berlin'
+                      """) == "2024-01-01 15:00:00.000000\t2024-01-01 13:00:00.000000\n"
+    # Empty value, used non-default session timezone
+    assert node.query(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS session_timezone='Asia/Istanbul', iceberg_timezone_for_timestamptz=''
+                      """) == "2024-01-01 15:00:00.000000\t2024-01-01 15:00:00.000000\n"
+    # Invalid timezone
+    assert "Invalid time zone: Foo/Bar" in node.query_and_get_error(f"""
+                      SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+                      SETTINGS iceberg_timezone_for_timestamptz='Foo/Bar'
+                      """)
+
+    assert node.query(f"SHOW CREATE TABLE {CATALOG_NAME}.`{root_namespace}.{table_name}` SETTINGS iceberg_timezone_for_timestamptz='UTC'") == f"CREATE TABLE {CATALOG_NAME}.`{root_namespace}.{table_name}`\\n(\\n    `timestamp` Nullable(DateTime64(6)),\\n    `timestamptz` Nullable(DateTime64(6, \\'UTC\\'))\\n)\\nENGINE = Iceberg(\\'http://minio:9000/warehouse-rest/data/\\', \\'minio\\', \\'[HIDDEN]\\')\n"
+    assert node.query(f"SHOW CREATE TABLE {CATALOG_NAME}.`{root_namespace}.{table_name}` SETTINGS iceberg_timezone_for_timestamptz='Europe/Berlin'") == f"CREATE TABLE {CATALOG_NAME}.`{root_namespace}.{table_name}`\\n(\\n    `timestamp` Nullable(DateTime64(6)),\\n    `timestamptz` Nullable(DateTime64(6, \\'Europe/Berlin\\'))\\n)\\nENGINE = Iceberg(\\'http://minio:9000/warehouse-rest/data/\\', \\'minio\\', \\'[HIDDEN]\\')\n"
+
+    assert node.query(f"SELECT timezoneOf(timestamptz) FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` LIMIT 1") == "UTC\n"
+    assert node.query(f"SELECT timezoneOf(timestamptz) FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` LIMIT 1 SETTINGS iceberg_timezone_for_timestamptz='UTC'") == "UTC\n"
+    assert node.query(f"SELECT timezoneOf(timestamptz) FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` LIMIT 1 SETTINGS iceberg_timezone_for_timestamptz='Europe/Berlin'") == "Europe/Berlin\n"
+
 
 def test_insert(started_cluster):
     node = started_cluster.instances["node1"]
@@ -560,6 +626,7 @@ def test_create(started_cluster):
     node.query(f"INSERT INTO {CATALOG_NAME}.`{root_namespace}.{table_name}` VALUES ('AAPL');", settings={"allow_experimental_insert_into_iceberg": 1, 'write_full_path_in_iceberg_metadata': 1})
     assert node.query(f"SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`") == "AAPL\n"
 
+
 def test_drop_table(started_cluster):
     node = started_cluster.instances["node1"]
 
@@ -575,3 +642,279 @@ def test_drop_table(started_cluster):
 
     drop_clickhouse_iceberg_table(node, root_namespace, table_name)
     assert len(catalog.list_tables(root_namespace)) == 0
+
+
+def test_table_with_slash(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    # pyiceberg at current moment (version 0.9.1) has a bug with table names with slashes
+    # see https://github.com/apache/iceberg-python/issues/2462
+    # so we need to encode it manually
+    table_raw_suffix = "table/foo"
+    table_encoded_suffix = "table%2Ffoo"
+
+    test_ref = f"test_list_tables_{uuid.uuid4()}"
+    table_name = f"{test_ref}_{table_raw_suffix}"
+    table_encoded_name = f"{test_ref}_{table_encoded_suffix}"
+    root_namespace = f"{test_ref}_namespace"
+
+    catalog = load_catalog_impl(started_cluster)
+    catalog.create_namespace(root_namespace)
+
+    create_table(catalog, root_namespace, table_name, DEFAULT_SCHEMA, PartitionSpec(), DEFAULT_SORT_ORDER)
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+    node.query(f"INSERT INTO {CATALOG_NAME}.`{root_namespace}.{table_encoded_name}` VALUES (NULL, 'AAPL', 193.24, 193.31, tuple('bot'));", settings={"allow_experimental_insert_into_iceberg": 1, 'write_full_path_in_iceberg_metadata': 1})
+    assert node.query(f"SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_encoded_name}`") == "\\N\tAAPL\t193.24\t193.31\t('bot')\n"
+
+
+def test_partition_value_with_slash(started_cluster):
+    """Partition value containing '/' produces object keys with %2F; reading must preserve encoding."""
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_partition_slash_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    root_namespace = f"{test_ref}_namespace"
+
+    # Partition by symbol (string) so partition value "us/west" becomes path segment symbol=us%2Fwest
+    partition_spec = PartitionSpec(
+        PartitionField(
+            source_id=2, field_id=1000, transform=IdentityTransform(), name="symbol"
+        )
+    )
+    schema = DEFAULT_SCHEMA
+
+    catalog = load_catalog_impl(started_cluster)
+    catalog.create_namespace(root_namespace)
+
+    table = create_table(
+        catalog,
+        root_namespace,
+        table_name,
+        schema,
+        partition_spec=partition_spec,
+        sort_order=DEFAULT_SORT_ORDER,
+    )
+
+    # Write a row with partition value containing slash (path will have %2F in S3 key)
+    data = [
+        {
+            "datetime": datetime.now(),
+            "symbol": "us/west",
+            "bid": 100.0,
+            "ask": 101.0,
+            "details": {"created_by": "test"},
+        }
+    ]
+    df = pa.Table.from_pylist(data)
+    table.append(df)
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+    assert 1 == int(node.query(f"SELECT count() FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`"))
+    assert "us/west" in node.query(f"SELECT symbol FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`")
+
+
+def test_cluster_joins(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_join_tables_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    table_name_2 = f"{test_ref}_table_2"
+    table_name_local = f"{test_ref}_table_local"
+
+    root_namespace = f"{test_ref}_namespace"
+
+    catalog = load_catalog_impl(started_cluster)
+    catalog.create_namespace(root_namespace)
+
+    schema = Schema(
+        NestedField(
+            field_id=1,
+            name="tag",
+            field_type=LongType(),
+            required=False
+        ),
+        NestedField(
+            field_id=2,
+            name="name",
+            field_type=StringType(),
+            required=False,
+        ),
+    )
+    table = create_table(catalog, root_namespace, table_name, schema,
+                         partition_spec=UNPARTITIONED_PARTITION_SPEC, sort_order=UNSORTED_SORT_ORDER)
+    data = [{"tag": 1, "name": "John"}, {"tag": 2, "name": "Jack"}]
+    df = pa.Table.from_pylist(data)
+    table.append(df)
+
+    schema2 = Schema(
+        NestedField(
+            field_id=1,
+            name="id",
+            field_type=LongType(),
+            required=False
+        ),
+        NestedField(
+            field_id=2,
+            name="second_name",
+            field_type=StringType(),
+            required=False,
+        ),
+    )
+    table2 = create_table(catalog, root_namespace, table_name_2, schema2,
+                          partition_spec=UNPARTITIONED_PARTITION_SPEC, sort_order=UNSORTED_SORT_ORDER)
+    data = [{"id": 1, "second_name": "Dow"}, {"id": 2, "second_name": "Sparrow"}]
+    df = pa.Table.from_pylist(data)
+    table2.append(df)
+
+    node.query(f"CREATE TABLE `{table_name_local}` (id Int64, second_name String) ENGINE = Memory()")
+    node.query(f"INSERT INTO `{table_name_local}` VALUES (1, 'Silver'), (2, 'Black')")
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    res = node.query(
+        f"""
+            SELECT t1.name,t2.second_name
+            FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` AS t1
+                JOIN {CATALOG_NAME}.`{root_namespace}.{table_name_2}` AS t2
+                ON t1.tag=t2.id
+            WHERE t1.tag < 10 AND t2.id < 20
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "Jack\tSparrow\nJohn\tDow\n"
+
+    res = node.query(
+        f"""
+            SELECT name
+            FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+            WHERE tag in (
+                SELECT id
+                FROM {CATALOG_NAME}.`{root_namespace}.{table_name_2}`
+            )
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "Jack\nJohn\n"
+
+    res = node.query(
+        f"""
+            SELECT t1.name,t2.second_name
+            FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` AS t1
+                JOIN `{table_name_local}` AS t2
+                ON t1.tag=t2.id
+            WHERE t1.tag < 10 AND t2.id < 20
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "Jack\tBlack\nJohn\tSilver\n"
+
+    res = node.query(
+        f"""
+            SELECT name
+            FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
+            WHERE tag in (
+                SELECT id
+                FROM `{table_name_local}`
+            )
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "Jack\nJohn\n"
+
+    res = node.query(
+        f"""
+            SELECT t1.name,t2.second_name
+            FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` AS t1
+                CROSS JOIN `{table_name_local}` AS t2
+            WHERE t1.tag < 10 AND t2.id < 20
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "Jack\tBlack\nJack\tSilver\nJohn\tBlack\nJohn\tSilver\n"
+
+def test_gcs(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    node.query("SYSTEM ENABLE FAILPOINT database_iceberg_gcs")
+    node.query(
+        f"""
+        DROP DATABASE IF EXISTS {CATALOG_NAME};
+        SET allow_database_iceberg = 1;
+        """
+    )
+
+    with pytest.raises(Exception) as err:
+        node.query(
+            f"""
+            CREATE DATABASE {CATALOG_NAME}
+            ENGINE = DataLakeCatalog('http://rest:8181/v1', 'gcs', 'dummy')
+            SETTINGS
+                catalog_type = 'rest',
+                warehouse = 'demo',
+            """
+        )
+        assert "Google cloud storage converts to S3" in str(err.value)
+
+
+def test_cluster_select(started_cluster):
+    node1 = started_cluster.instances["node1"]
+    node2 = started_cluster.instances["node2"]
+
+    test_ref = f"test_list_tables_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    root_namespace = f"{test_ref}_namespace"
+
+    catalog = load_catalog_impl(started_cluster)
+    create_clickhouse_iceberg_database(started_cluster, node1, CATALOG_NAME)
+    create_clickhouse_iceberg_database(started_cluster, node2, CATALOG_NAME)
+    create_clickhouse_iceberg_table(started_cluster, node1, root_namespace, table_name, "(x String)")
+    node1.query(f"INSERT INTO {CATALOG_NAME}.`{root_namespace}.{table_name}` VALUES ('pablo');", settings={"allow_experimental_insert_into_iceberg": 1, 'write_full_path_in_iceberg_metadata': 1})
+
+    query_id = uuid.uuid4().hex
+    assert node1.query(f"SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` SETTINGS parallel_replicas_for_cluster_engines=1, enable_parallel_replicas=2, cluster_for_parallel_replicas='cluster_simple'", query_id=query_id) == 'pablo\n'
+
+    node1.query("SYSTEM FLUSH LOGS system.query_log")
+    node2.query("SYSTEM FLUSH LOGS system.query_log")
+
+    assert node1.query(f"SELECT Settings['parallel_replicas_for_cluster_engines'] AS parallel_replicas_for_cluster_engines FROM system.query_log WHERE query_id = '{query_id}' LIMIT 1;") == '1\n'
+
+    for replica in [node1, node2]:
+        cluster_secondary_queries = (
+            replica.query(
+                f"""
+                SELECT query, type, is_initial_query, read_rows, read_bytes FROM system.query_log
+                WHERE
+                    type = 'QueryStart' AND
+                    positionCaseInsensitive(query, 's3Cluster') != 0 AND
+                    position(query, 'system.query_log') = 0 AND
+                    NOT is_initial_query AND
+                    initial_query_id = '{query_id}'
+            """
+            )
+            .strip()
+            .split("\n")
+        )
+        assert len(cluster_secondary_queries) == 1
+
+    assert node2.query(f"SELECT * FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`", settings={"parallel_replicas_for_cluster_engines":1, 'enable_parallel_replicas': 2, 'cluster_for_parallel_replicas': 'cluster_simple', 'parallel_replicas_for_cluster_engines' : 1}) == 'pablo\n'
diff --git a/tests/integration/test_database_iceberg_lakekeeper_catalog/test.py b/tests/integration/test_database_iceberg_lakekeeper_catalog/test.py
index 9488f39473f3..d670b4997cde 100644
--- a/tests/integration/test_database_iceberg_lakekeeper_catalog/test.py
+++ b/tests/integration/test_database_iceberg_lakekeeper_catalog/test.py
@@ -168,7 +168,7 @@ def test_list_tables(started_cluster):
     assert (
         tables_list
         == node.query(
-            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{namespace_prefix}%' ORDER BY name"
+            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{namespace_prefix}%' ORDER BY name SETTINGS show_data_lake_catalogs_in_system_tables = true"
         ).strip()
     )
 
diff --git a/tests/integration/test_database_iceberg_nessie_catalog/__init__.py b/tests/integration/test_database_iceberg_nessie_catalog/__init__.py
new file mode 100644
index 000000000000..e5a0d9b4834e
--- /dev/null
+++ b/tests/integration/test_database_iceberg_nessie_catalog/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_database_iceberg_nessie_catalog/configs/backups.xml b/tests/integration/test_database_iceberg_nessie_catalog/configs/backups.xml
new file mode 100644
index 000000000000..5e2e3ee9d716
--- /dev/null
+++ b/tests/integration/test_database_iceberg_nessie_catalog/configs/backups.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <backups>
+        <allowed_path>/backups</allowed_path>
+    </backups>
+</clickhouse>
diff --git a/tests/integration/test_database_iceberg_nessie_catalog/test.py b/tests/integration/test_database_iceberg_nessie_catalog/test.py
new file mode 100644
index 000000000000..fe595233a851
--- /dev/null
+++ b/tests/integration/test_database_iceberg_nessie_catalog/test.py
@@ -0,0 +1,504 @@
+import json
+import random
+import requests
+import time
+import uuid
+from datetime import datetime
+
+import pandas as pd
+import pyarrow as pa
+import pytest
+from pyiceberg.catalog.rest import RestCatalog
+from pyiceberg.partitioning import PartitionField, PartitionSpec
+from pyiceberg.schema import Schema
+from pyiceberg.table.sorting import SortField, SortOrder
+from pyiceberg.transforms import DayTransform, IdentityTransform
+from pyiceberg.types import (
+    DoubleType,
+    NestedField,
+    StringType,
+    TimestampType,
+)
+
+from helpers.cluster import ClickHouseCluster
+from helpers.config_cluster import minio_secret_key, minio_access_key
+from helpers.test_tools import TSV, csv_compare
+
+BASE_URL_LOCAL = "http://localhost:19120/iceberg/"
+BASE_URL = "http://nessie:19120/iceberg/"
+CATALOG_NAME = "demo"
+WAREHOUSE_NAME = "warehouse"
+
+DEFAULT_SCHEMA = Schema(
+    NestedField(
+        field_id=1, name="datetime", field_type=TimestampType(), required=False
+    ),
+    NestedField(field_id=2, name="symbol", field_type=StringType(), required=False),
+    NestedField(field_id=3, name="bid", field_type=DoubleType(), required=False),
+    NestedField(field_id=4, name="ask", field_type=DoubleType(), required=False),
+    NestedField(
+        field_id=5,
+        name="details",
+        field_type=StringType(),  # Simplified from struct for compatibility
+        required=False,
+    ),
+)
+
+DEFAULT_PARTITION_SPEC = PartitionSpec(
+    PartitionField(
+        source_id=1, field_id=1000, transform=DayTransform(), name="datetime_day"
+    )
+)
+
+DEFAULT_SORT_ORDER = SortOrder(SortField(source_id=2, transform=IdentityTransform()))
+
+
+def create_table(
+    catalog,
+    namespace,
+    table,
+    schema=DEFAULT_SCHEMA,
+    partition_spec=DEFAULT_PARTITION_SPEC,
+    sort_order=DEFAULT_SORT_ORDER,
+):
+    return catalog.create_table(
+        identifier=f"{namespace}.{table}",
+        schema=schema,
+        partition_spec=partition_spec,
+        sort_order=sort_order,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+
+def create_clickhouse_iceberg_database(
+    started_cluster, node, name, additional_settings={}
+):
+    settings = {
+        "catalog_type": "rest",
+        "warehouse": "warehouse", 
+        "storage_endpoint": "http://minio:9000/warehouse-rest",
+    }
+
+    settings.update(additional_settings)
+
+    node.query(
+        f"""
+DROP DATABASE IF EXISTS {name};
+SET allow_experimental_database_iceberg=true;
+CREATE DATABASE {name} ENGINE = DataLakeCatalog('{BASE_URL}', 'minio', '{minio_secret_key}')
+SETTINGS {",".join((k+"="+repr(v) for k, v in settings.items()))}
+    """
+    )
+    show_result = node.query(f"SHOW DATABASE {name}")
+    assert minio_secret_key not in show_result
+    assert "HIDDEN" in show_result
+
+
+def load_catalog_impl(started_cluster):
+    minio_ip = started_cluster.get_instance_ip('minio')
+    s3_endpoint = f"http://{minio_ip}:9002"
+
+    return RestCatalog(
+        name="my_catalog",
+        warehouse=WAREHOUSE_NAME,
+        uri=BASE_URL_LOCAL,
+        token="dummy",
+        **{
+            "s3.endpoint": s3_endpoint,
+            "s3.access-key-id": minio_access_key,
+            "s3.secret-access-key": minio_secret_key,
+            "s3.region": "us-east-1",
+            "s3.path-style-access": "true",
+        },
+    )
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance(
+            "node1",
+            main_configs=["configs/backups.xml"],
+            user_configs=[],
+            stay_alive=True,
+            with_iceberg_catalog=True,
+            extra_parameters={
+                "docker_compose_file_name": "docker_compose_iceberg_nessie_catalog.yml"
+            },
+        )
+
+        cluster.start()
+
+        time.sleep(15)
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def test_list_tables(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    namespace_prefix = f"clickhouse_{uuid.uuid4().hex[:8]}"
+    namespace_1 = f"{namespace_prefix}_testA"
+    namespace_2 = f"{namespace_prefix}_testB"
+    namespace_1_tables = ["tableA", "tableB"]
+    namespace_2_tables = ["tableC", "tableD"]
+
+    catalog = load_catalog_impl(started_cluster)
+
+    for namespace in [namespace_1, namespace_2]:
+        catalog.create_namespace((namespace,))
+
+    for namespace in [namespace_1, namespace_2]:
+        assert len(catalog.list_tables((namespace,))) == 0
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    tables_list = []
+    schema = Schema(
+        NestedField(field_id=1, name="id", field_type=DoubleType(), required=False),
+        NestedField(field_id=2, name="data", field_type=StringType(), required=False),
+    )
+
+    for table in namespace_1_tables:
+        catalog.create_table(
+            (namespace_1, table),
+            schema=schema,
+            properties={"write.metadata.compression-codec": "none"},
+        )
+        tables_list.append(f"{namespace_1}.{table}")
+
+    for table in namespace_2_tables:
+        catalog.create_table(
+            (namespace_2, table),
+            schema=schema,
+            properties={"write.metadata.compression-codec": "none"},
+        )
+        tables_list.append(f"{namespace_2}.{table}")
+
+    # Verify tables were created via PyIceberg
+    assert len(catalog.list_tables((namespace_1,))) == 2
+    assert len(catalog.list_tables((namespace_2,))) == 2
+
+    assert (
+        "\n".join(sorted(tables_list))
+        == node.query(
+            f"SELECT name FROM system.tables WHERE database = '{CATALOG_NAME}' and name ILIKE '{namespace_prefix}%' ORDER BY name SETTINGS show_data_lake_catalogs_in_system_tables = true"
+        ).strip()
+    )
+
+
+def test_select(started_cluster):
+    """Test select operations with Nessie catalog"""
+
+    node = started_cluster.instances["node1"]
+
+    catalog = load_catalog_impl(started_cluster)
+
+    test_ref = f"test_select_{uuid.uuid4().hex[:8]}"
+    test_namespace = (f"{test_ref}_namespace",)
+    
+    catalog.create_namespace(test_namespace)
+
+    test_table_name = f"{test_ref}_table"
+    test_table_identifier = (test_namespace[0], test_table_name)
+
+    try:
+        existing_tables = catalog.list_tables(namespace=test_namespace)
+
+        if test_table_identifier in existing_tables:
+            catalog.drop_table(test_table_identifier)
+    except Exception as e:
+        pass
+
+    simple_schema = Schema(
+        NestedField(field_id=1, name="id", field_type=DoubleType(), required=False),
+        NestedField(field_id=2, name="data", field_type=StringType(), required=False),
+    )
+
+    table = catalog.create_table(
+        test_table_identifier,
+        schema=simple_schema,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+    df = pd.DataFrame(
+        {
+            "id": [1.0, 2.0, 3.0, 4.0, 5.0],
+            "data": ["hello", "world", "from", "nessie", "test"],
+        }
+    )
+
+    pa_df = pa.Table.from_pandas(df)
+
+    table.append(pa_df)
+
+    scan_result = table.scan().to_pandas()
+
+    assert len(scan_result) == 5
+    assert list(scan_result["id"]) == [1.0, 2.0, 3.0, 4.0, 5.0]
+    assert list(scan_result["data"]) == ["hello", "world", "from", "nessie", "test"]
+
+    namespaces = catalog.list_namespaces()
+
+    tables = catalog.list_tables(namespace=test_namespace)
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    assert int(node.query(f"SELECT count(*) FROM {CATALOG_NAME}.`{test_namespace[0]}.{test_table_name}`")) == len(scan_result)
+
+    result = node.query(f"SELECT id, data FROM {CATALOG_NAME}.`{test_namespace[0]}.{test_table_name}` ORDER BY id FORMAT TSV")
+    expected = TSV("""
+1   hello
+2	world
+3	from
+4	nessie
+5	test
+""")
+    assert csv_compare(result, expected), f"got\n{result}\nwant\n{expected}"
+    
+
+def test_hide_sensitive_info(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_hide_sensitive_info_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    root_namespace = f"{test_ref}_namespace"
+
+    namespace = (root_namespace,)
+    catalog = load_catalog_impl(started_cluster)
+
+    catalog.create_namespace(namespace)
+
+    schema = Schema(
+        NestedField(field_id=1, name="id", field_type=DoubleType(), required=False),
+        NestedField(field_id=2, name="data", field_type=StringType(), required=False),
+    )
+    catalog.create_table(
+        (namespace[0], table_name),
+        schema=schema,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+    create_clickhouse_iceberg_database(
+        started_cluster,
+        node,
+        CATALOG_NAME,
+        additional_settings={"catalog_credential": "SECRET_1"},
+    )
+    show_result = node.query(f"SHOW CREATE DATABASE {CATALOG_NAME}")
+    assert "SECRET_1" not in show_result
+    assert minio_secret_key not in show_result
+
+    create_clickhouse_iceberg_database(
+        started_cluster,
+        node,
+        CATALOG_NAME,
+        additional_settings={"auth_header": "SECRET_2"},
+    )
+    show_result = node.query(f"SHOW CREATE DATABASE {CATALOG_NAME}")
+    assert "SECRET_2" not in show_result
+    assert minio_secret_key not in show_result
+
+def test_tables_with_same_location(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_tables_with_same_location_{uuid.uuid4()}"
+    namespace = f"{test_ref}_namespace"
+    catalog = load_catalog_impl(started_cluster)
+
+    table_name = f"{test_ref}_table"
+    table_name_2 = f"{test_ref}_table_2"
+
+    catalog.create_namespace((namespace,))
+    table = create_table(catalog, namespace, table_name)
+    table_2 = create_table(catalog, namespace, table_name_2)
+
+    def record(key):
+        return {
+            "datetime": datetime.now(),
+            "symbol": str(key),
+            "bid": round(random.uniform(100, 200), 2),
+            "ask": round(random.uniform(200, 300), 2),
+            "details": "created_by Alice Smith",  # Simplified from nested dict
+        }
+
+    data = [record('aaa') for _ in range(3)]
+    df = pa.Table.from_pylist(data)
+    table.append(df)
+
+    data = [record('bbb') for _ in range(3)]
+    df = pa.Table.from_pylist(data)
+    table_2.append(df)
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    assert 'aaa\naaa\naaa' == node.query(f"SELECT symbol FROM {CATALOG_NAME}.`{namespace}.{table_name}`").strip()
+    assert 'bbb\nbbb\nbbb' == node.query(f"SELECT symbol FROM {CATALOG_NAME}.`{namespace}.{table_name_2}`").strip()
+
+def test_backup_database(started_cluster):
+    node = started_cluster.instances["node1"]
+    create_clickhouse_iceberg_database(started_cluster, node, "backup_database")
+
+    backup_id = uuid.uuid4().hex
+    backup_name = f"File('/backups/test_backup_{backup_id}/')"
+
+    node.query(f"BACKUP DATABASE backup_database TO {backup_name}")
+    node.query("DROP DATABASE backup_database SYNC")
+    assert "backup_database" not in node.query("SHOW DATABASES")
+
+    node.query(f"RESTORE DATABASE backup_database FROM {backup_name}", settings={"allow_experimental_database_iceberg": 1})
+    assert (
+        node.query("SHOW CREATE DATABASE backup_database")
+        == "CREATE DATABASE backup_database\\nENGINE = DataLakeCatalog(\\'http://nessie:19120/iceberg/\\', \\'minio\\', \\'[HIDDEN]\\')\\nSETTINGS catalog_type = \\'rest\\', warehouse = \\'warehouse\\', storage_endpoint = \\'http://minio:9000/warehouse-rest\\'\n"
+    )
+
+def test_timestamps(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    test_ref = f"test_list_tables_{uuid.uuid4()}"
+    table_name = f"{test_ref}_table"
+    test_namespace = (f"{test_ref}_namespace",)
+    test_table_identifier = (test_namespace[0], table_name)
+    
+    catalog = load_catalog_impl(started_cluster)
+    catalog.create_namespace(test_namespace)
+
+    simple_schema = Schema(
+        NestedField(
+            field_id=1, name="timestamp", field_type=TimestampType(), required=False
+        ),
+        NestedField(
+            field_id=2, name="timestamptz", field_type=TimestampType(), required=False
+        ),
+    )
+    
+    table = catalog.create_table(
+        test_table_identifier,
+        schema=simple_schema,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    data = [
+        {
+            "timestamp": datetime(2024, 1, 1, hour=12, minute=0, second=0, microsecond=0),
+            "timestamptz": datetime(2024, 1, 1, hour=12, minute=0, second=0, microsecond=0),
+        }
+    ]
+    df = pa.Table.from_pylist(data)
+    table.append(df)
+
+    # Extract the table path from S3 location for ClickHouse Iceberg ENGINE configuration
+    # 
+    # The table metadata contains the full S3 URI which needs to be processed:
+    # table.metadata.location:  s3://warehouse-rest/<test_namespace>/<test_table_uuid>
+    # extracted_table_path: <test_namespace>/<test_table_uuid>
+    
+    table_metadata = table.metadata
+    table_location = table_metadata.location
+    if "warehouse-rest/" in table_location:
+        extracted_table_path = table_location.split("warehouse-rest/")[1]
+
+    result = node.query(f"SHOW CREATE TABLE {CATALOG_NAME}.`{test_namespace[0]}.{table_name}`")
+    assert result == f"CREATE TABLE {CATALOG_NAME}.`{test_namespace[0]}.{table_name}`\\n(\\n    `timestamp` Nullable(DateTime64(6)),\\n    `timestamptz` Nullable(DateTime64(6))\\n)\\nENGINE = Iceberg(\\'http://minio:9000/warehouse-rest/{extracted_table_path}/\\', \\'minio\\', \\'[HIDDEN]\\')\n"
+    assert node.query(f"SELECT * FROM {CATALOG_NAME}.`{test_namespace[0]}.{table_name}`") == "2024-01-01 12:00:00.000000\t2024-01-01 12:00:00.000000\n"
+
+def test_insert(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    catalog = load_catalog_impl(started_cluster)
+
+    test_ref = f"test_insert_{uuid.uuid4().hex[:8]}"
+    test_namespace = (f"{test_ref}_namespace",)
+
+    catalog.create_namespace(test_namespace)
+
+    test_table_name = f"{test_ref}_table"
+    test_table_identifier = (test_namespace[0], test_table_name)
+
+    schema = Schema(
+        NestedField(field_id=1, name="id", field_type=DoubleType(), required=False),
+        NestedField(field_id=2, name="data", field_type=StringType(), required=False),
+    )
+
+    table = catalog.create_table(
+        test_table_identifier,
+        schema=schema,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+    data = [
+    {"id": float(i), "data": f"data_{i}"} for i in range(10)
+    ]
+    df = pa.Table.from_pylist(data)
+    table.append(df)
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    result = node.query(f"SELECT * FROM {CATALOG_NAME}.`{test_namespace[0]}.{test_table_name}` ORDER BY id")
+    expected = "\n".join([f"{i}\tdata_{i}" for i in range(10)])
+    assert result.strip() == expected
+
+def test_create(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    catalog = load_catalog_impl(started_cluster)
+
+    test_ref = f"test_create_{uuid.uuid4().hex[:8]}"
+    test_namespace = (f"{test_ref}_namespace",)
+
+    catalog.create_namespace(test_namespace)
+
+    test_table_name = f"{test_ref}_table"
+    test_table_identifier = (test_namespace[0], test_table_name)
+
+    schema = Schema(
+        NestedField(field_id=1, name="id", field_type=DoubleType(), required=False),
+        NestedField(field_id=2, name="data", field_type=StringType(), required=False),
+    )
+
+    catalog.create_table(
+        test_table_identifier,
+        schema=schema,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    result = node.query(f"SHOW TABLES FROM {CATALOG_NAME}")
+    assert test_table_name in result
+
+def test_drop_table(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    catalog = load_catalog_impl(started_cluster)
+
+    test_ref = f"test_drop_table_{uuid.uuid4().hex[:8]}"
+    test_namespace = (f"{test_ref}_namespace",)
+
+    catalog.create_namespace(test_namespace)
+
+    test_table_name = f"{test_ref}_table"
+    test_table_identifier = (test_namespace[0], test_table_name)
+
+    schema = Schema(
+        NestedField(field_id=1, name="id", field_type=DoubleType(), required=False),
+        NestedField(field_id=2, name="data", field_type=StringType(), required=False),
+    )
+
+    catalog.create_table(
+        test_table_identifier,
+        schema=schema,
+        properties={"write.metadata.compression-codec": "none"},
+    )
+
+    catalog.drop_table(test_table_identifier)
+
+    create_clickhouse_iceberg_database(started_cluster, node, CATALOG_NAME)
+
+    result = node.query(f"SHOW TABLES FROM {CATALOG_NAME}")
+    assert test_table_name not in result
\ No newline at end of file
diff --git a/tests/integration/test_database_replicated_settings/test.py b/tests/integration/test_database_replicated_settings/test.py
index 29c11f7b6c48..0d3095bb3df7 100644
--- a/tests/integration/test_database_replicated_settings/test.py
+++ b/tests/integration/test_database_replicated_settings/test.py
@@ -176,3 +176,13 @@ def add_setting(key, val, default):
     settings_dict_from_logs = get_settings_from_logs(node, db_name)
     assert setting_dict == settings_dict_from_logs
     node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
+
+def test_database_replicated_settings_zero_logs_to_keep(started_cluster):
+    db_name = "test_" + get_random_string()
+
+    assert "A setting's value has to be greater than 0" in node1.query_and_get_error(
+        f"CREATE DATABASE {db_name} ENGINE=Replicated('/test/{db_name}', "
+        + r"'{shard}', '{replica}') "
+        + "SETTINGS logs_to_keep=0"
+    )
diff --git a/contrib/postgres-cmake/utils/errcodes.h b/tests/integration/test_ddl_worker_with_loopback_hosts/__init__.py
similarity index 100%
rename from contrib/postgres-cmake/utils/errcodes.h
rename to tests/integration/test_ddl_worker_with_loopback_hosts/__init__.py
diff --git a/tests/integration/test_ddl_worker_with_loopback_hosts/configs/remote_servers.xml b/tests/integration/test_ddl_worker_with_loopback_hosts/configs/remote_servers.xml
new file mode 100644
index 000000000000..449492e35cc6
--- /dev/null
+++ b/tests/integration/test_ddl_worker_with_loopback_hosts/configs/remote_servers.xml
@@ -0,0 +1,33 @@
+<clickhouse>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+        <test_loopback_cluster1>
+            <shard>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_loopback_cluster1>
+        <test_loopback_cluster2>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_loopback_cluster2>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_ddl_worker_with_loopback_hosts/test.py b/tests/integration/test_ddl_worker_with_loopback_hosts/test.py
new file mode 100644
index 000000000000..d7729b4abb09
--- /dev/null
+++ b/tests/integration/test_ddl_worker_with_loopback_hosts/test.py
@@ -0,0 +1,98 @@
+import time
+
+import pytest
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=[
+        "configs/remote_servers.xml",
+    ],
+    with_zookeeper=True,
+)
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=[
+        "configs/remote_servers.xml",
+    ],
+    with_zookeeper=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def count_table(node, table_name):
+    return int(
+        node.query(
+            f"SELECT count() FROM system.tables WHERE name='{table_name}'"
+        ).strip()
+    )
+
+
+def test_ddl_worker_with_loopback_hosts(
+    started_cluster,
+):
+    node1.query("DROP TABLE IF EXISTS t1 SYNC")
+    node2.query("DROP TABLE IF EXISTS t1 SYNC")
+    node1.query("DROP TABLE IF EXISTS t2 SYNC")
+    node2.query("DROP TABLE IF EXISTS t2 SYNC")
+    node1.query("DROP TABLE IF EXISTS t3 SYNC")
+    node2.query("DROP TABLE IF EXISTS t3 SYNC")
+    node1.query("DROP TABLE IF EXISTS t4 SYNC")
+    node2.query("DROP TABLE IF EXISTS t4 SYNC")
+
+    node1.query(
+        "CREATE TABLE t1 ON CLUSTER 'test_cluster' (x INT) ENGINE=MergeTree() ORDER BY x",
+        settings={
+            "distributed_ddl_task_timeout": 10,
+        },
+    )
+
+    node2.query(
+        "CREATE TABLE t2 ON CLUSTER 'test_cluster' (x INT) ENGINE=MergeTree() ORDER BY x",
+        settings={
+            "distributed_ddl_task_timeout": 10,
+        },
+    )
+
+    assert count_table(node1, "t2") == 1
+    assert count_table(node2, "t1") == 1
+
+    node1.query(
+        "CREATE TABLE t3 ON CLUSTER 'test_loopback_cluster1' (x INT) ENGINE=MergeTree() ORDER BY x",
+        settings={
+            "distributed_ddl_task_timeout": 10,
+        },
+    )
+    # test_loopback_cluster1 has a loopback host, only 1 replica processed the query
+    assert count_table(node1, "t3") == 1 or count_table(node2, "t3") == 1
+
+    node2.query(
+        "CREATE TABLE t4 ON CLUSTER 'test_loopback_cluster2' (x INT) ENGINE=MergeTree() ORDER BY x",
+        settings={
+            "distributed_ddl_task_timeout": 10,
+        },
+    )
+    # test_loopback_cluster2 has a loopback host, only 1 replica processed the query
+    assert count_table(node1, "t4") == 1 or count_table(node2, "t4") == 1
+
+    node1.query("DROP TABLE IF EXISTS t1 SYNC")
+    node2.query("DROP TABLE IF EXISTS t1 SYNC")
+    node1.query("DROP TABLE IF EXISTS t2 SYNC")
+    node2.query("DROP TABLE IF EXISTS t2 SYNC")
+    node1.query("DROP TABLE IF EXISTS t3 SYNC")
+    node2.query("DROP TABLE IF EXISTS t3 SYNC")
+    node1.query("DROP TABLE IF EXISTS t4 SYNC")
+    node2.query("DROP TABLE IF EXISTS t4 SYNC")
diff --git a/tests/queries/0_stateless/03444_case_with_expression_exception.reference b/tests/integration/test_dirty_pages_force_purge/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/03444_case_with_expression_exception.reference
rename to tests/integration/test_dirty_pages_force_purge/__init__.py
diff --git a/tests/integration/test_dirty_pages_force_purge/configs/overrides.yaml b/tests/integration/test_dirty_pages_force_purge/configs/overrides.yaml
new file mode 100644
index 000000000000..195236e51dde
--- /dev/null
+++ b/tests/integration/test_dirty_pages_force_purge/configs/overrides.yaml
@@ -0,0 +1,3 @@
+---
+max_server_memory_usage: 4Gi
+memory_worker_purge_dirty_pages_threshold_ratio: 0.2
diff --git a/tests/integration/test_dirty_pages_force_purge/test.py b/tests/integration/test_dirty_pages_force_purge/test.py
new file mode 100644
index 000000000000..24f5a18fab58
--- /dev/null
+++ b/tests/integration/test_dirty_pages_force_purge/test.py
@@ -0,0 +1,69 @@
+import time
+
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+# Jemalloc configuration used in this test disables automated dirty pages purge,
+# to simplify its accumulation, and verify that they'll be cleaned up by the
+# MemoryWorker
+MALLOC_CONF = "background_thread:false,dirty_decay_ms:-1,muzzy_decay_ms:0,oversize_threshold:0"
+PEAK_MEMORY_UPPER_BOUND = 3 * 1024 * 1024 * 1024
+
+PEAK_MEMORY_COUNTER_PATHS = [
+    "/sys/fs/cgroup/memory/memory.max_usage_in_bytes",  # cgroup v1
+    "/sys/fs/cgroup/memory.peak",                       # cgroup v2
+]
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/overrides.yaml"],
+    env_variables={"MALLOC_CONF": MALLOC_CONF},
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_dirty_pages_force_purge(start_cluster):
+    if node.is_built_with_sanitizer():
+        pytest.skip("Jemalloc disabled in sanitizer builds")
+
+    purges = ""
+    for _ in range(100):
+        node.query("""
+            SELECT arrayMap(x -> randomPrintableASCII(40), range(4096))
+            FROM numbers(2048)
+            FORMAT Null
+        """)
+
+        purges = node.query("SELECT value from system.events where event = 'MemoryAllocatorPurge'")
+        if purges:
+            break
+
+        time.sleep(0.2)
+
+    if not purges:
+        raise TimeoutError("Timed out waiting for MemoryAllocatorPurge event")
+
+    for path in PEAK_MEMORY_COUNTER_PATHS:
+        try:
+            peak_memory = int(node.exec_in_container(["cat", path]))
+            break
+        except Exception as ex:
+            if not str(ex).lower().strip().endswith("no such file or directory"):
+                raise
+    else:
+        raise RuntimeError("Failed to find peak memory counter")
+
+    # Assert peak memory usage is lower than expected peak, which is noticeably lower
+    # than max_server_memory_usage, to guarantee that purge has been cause by dirty pages
+    # volume, not the memory tracker limit
+    assert(peak_memory < PEAK_MEMORY_UPPER_BOUND)
diff --git a/tests/integration/test_disk_configuration/configs/config.d/include_from.xml b/tests/integration/test_disk_configuration/configs/config.d/include_from.xml
index 3f9da4e0a4f0..94865e04af78 100644
--- a/tests/integration/test_disk_configuration/configs/config.d/include_from.xml
+++ b/tests/integration/test_disk_configuration/configs/config.d/include_from.xml
@@ -2,4 +2,7 @@
   <include_endpoint>
     <endpoint>http://minio1:9001/root/data/</endpoint>
   </include_endpoint>
+  <disk_encrypted_keys>
+    <key_hex>00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff</key_hex>
+  </disk_encrypted_keys>
 </clickhouse>
diff --git a/tests/integration/test_disk_configuration/configs/metrika.xml b/tests/integration/test_disk_configuration/configs/metrika.xml
new file mode 100644
index 000000000000..94865e04af78
--- /dev/null
+++ b/tests/integration/test_disk_configuration/configs/metrika.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+  <include_endpoint>
+    <endpoint>http://minio1:9001/root/data/</endpoint>
+  </include_endpoint>
+  <disk_encrypted_keys>
+    <key_hex>00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff</key_hex>
+  </disk_encrypted_keys>
+</clickhouse>
diff --git a/tests/integration/test_disk_configuration/test.py b/tests/integration/test_disk_configuration/test.py
index c2ce54119a20..0a73454a007c 100644
--- a/tests/integration/test_disk_configuration/test.py
+++ b/tests/integration/test_disk_configuration/test.py
@@ -35,10 +35,9 @@ def start_cluster():
             "node2",
             main_configs=[
                 "configs/config.d/storage_configuration.xml",
-                "configs/config.d/include_from_path.xml",
-                "configs/config.d/include_from.xml",
                 "configs/config.d/remote_servers.xml",
             ],
+            metrika_xml="configs/metrika.xml",
             with_zookeeper=True,
             stay_alive=True,
             with_minio=True,
@@ -525,3 +524,53 @@ def test_merge_tree_setting_override(start_cluster):
         len(list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True))) > 0
     )
     node.query(f"DROP TABLE {TABLE_NAME} SYNC")
+
+@pytest.mark.parametrize("use_node", ["node1", "node2"])
+def test_merge_tree_custom_encrypted_disk_include(start_cluster, use_node):
+    """Test that encrypted disk configuration works with include parameter.
+
+    This test creates an encrypted disk using the include parameter to reference
+    encryption keys defined in a separate configuration file. It verifies that:
+    - The include mechanism correctly merges encryption keys into the disk config
+    - Data can be successfully encrypted and decrypted using the included keys
+    """
+    node = cluster.instances[use_node]
+
+    node.query(
+        f"""
+        DROP TABLE IF EXISTS {TABLE_NAME}_encrypted;
+        CREATE TABLE {TABLE_NAME}_encrypted (
+            id Int32,
+            data String
+        ) ENGINE = MergeTree()
+        ORDER BY id
+        SETTINGS
+            disk = disk(
+                type = encrypted,
+                disk = disk(
+                    type = s3,
+                    endpoint = 'http://minio1:9001/root/data/',
+                    access_key_id = 'minio',
+                    secret_access_key = '{minio_secret_key}'
+                ),
+                path = 'encrypted_test/',
+                include = 'disk_encrypted_keys',
+                algorithm = 'AES_256_CTR'
+            );
+        """
+    )
+
+    node.query(f"INSERT INTO {TABLE_NAME}_encrypted VALUES (1, 'test_data'), (2, 'more_data')")
+
+    result = node.query(f"SELECT COUNT(*) FROM {TABLE_NAME}_encrypted")
+    assert int(result.strip()) == 2
+
+    result = node.query(f"SELECT data FROM {TABLE_NAME}_encrypted WHERE id = 1")
+    assert result.strip() == "test_data"
+
+    minio = cluster.minio_client
+    s3_objects = list(minio.list_objects(cluster.minio_bucket, "data/", recursive=True))
+    assert len(s3_objects) > 0, "Data should be written to S3"
+
+    node.query(f"DROP TABLE {TABLE_NAME}_encrypted SYNC")
+    remove_minio_objects(minio, "data/")
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index 2fee0ee8cc78..d0ef55de289c 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -37,7 +37,7 @@ def cluster():
             with_nginx=True,
             stay_alive=True,
             with_installed_binary=True,
-            image="clickhouse/clickhouse-server",
+            image="altinity/clickhouse-server",
             tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
         )
         cluster.add_instance(
diff --git a/tests/integration/test_distributed_insert_backward_compatibility/test.py b/tests/integration/test_distributed_insert_backward_compatibility/test.py
index f02d6fb13b91..9433edd71574 100644
--- a/tests/integration/test_distributed_insert_backward_compatibility/test.py
+++ b/tests/integration/test_distributed_insert_backward_compatibility/test.py
@@ -10,7 +10,7 @@
 node_dist = cluster.add_instance(
     "node2",
     main_configs=["configs/remote_servers.xml"],
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_executable_user_defined_function/functions/test_function_config.xml b/tests/integration/test_executable_user_defined_function/functions/test_function_config.xml
index 620c756ccf7d..91ed52624e0c 100644
--- a/tests/integration/test_executable_user_defined_function/functions/test_function_config.xml
+++ b/tests/integration/test_executable_user_defined_function/functions/test_function_config.xml
@@ -48,11 +48,12 @@
         <name>test_function_send_chunk_header_python</name>
         <return_type>String</return_type>
         <argument>
+            <name>number</name>
             <type>UInt64</type>
         </argument>
-        <format>TabSeparated</format>
+        <format>JSONEachRow</format>
         <send_chunk_header>1</send_chunk_header>
-        <command>input_chunk_header.py</command>
+        <command>input_chunk_header_json.py</command>
     </function>
 
     <function>
@@ -60,11 +61,12 @@
         <name>test_function_send_chunk_header_pool_python</name>
         <return_type>String</return_type>
         <argument>
+            <name>number</name>
             <type>UInt64</type>
         </argument>
-        <format>TabSeparated</format>
+        <format>JSONEachRow</format>
         <send_chunk_header>1</send_chunk_header>
-        <command>input_chunk_header.py</command>
+        <command>input_chunk_header_json.py</command>
     </function>
 
     <function>
diff --git a/tests/integration/test_executable_user_defined_function/test.py b/tests/integration/test_executable_user_defined_function/test.py
index 717c0456c42a..4ab67969ce96 100644
--- a/tests/integration/test_executable_user_defined_function/test.py
+++ b/tests/integration/test_executable_user_defined_function/test.py
@@ -81,19 +81,23 @@ def test_executable_function_python(started_cluster):
 
 def test_executable_function_send_chunk_header_python(started_cluster):
     skip_test_msan(node)
-    assert (
-        node.query("SELECT test_function_send_chunk_header_python(toUInt64(1))")
-        == "Key 1\n"
-    )
-    assert node.query("SELECT test_function_send_chunk_header_python(1)") == "Key 1\n"
 
-    assert (
-        node.query("SELECT test_function_send_chunk_header_pool_python(toUInt64(1))")
-        == "Key 1\n"
-    )
-    assert (
-        node.query("SELECT test_function_send_chunk_header_pool_python(1)") == "Key 1\n"
-    )
+    for function_name in [
+        "test_function_send_chunk_header_python",
+        "test_function_send_chunk_header_pool_python",
+    ]:
+        assert node.query(f"SELECT {function_name}(toUInt64(1))") == "Key 1\n"
+        assert node.query(f"SELECT {function_name}(1)") == "Key 1\n"
+
+        assert node.query(f"SELECT {function_name}(toUInt64(1))") == "Key 1\n"
+        assert node.query(f"SELECT {function_name}(1)") == "Key 1\n"
+
+        # Test specifically HTTP protocol
+        # This ensures that http_write_exception_in_output_format works as expected
+        assert node.http_query(
+            f"SELECT {function_name}(number) FROM numbers(10)",
+            params={"max_block_size": 3, "http_write_exception_in_output_format": True},
+        ) == "".join(f"Key {i}\n" for i in range(10))
 
 
 def test_executable_function_sum_python(started_cluster):
diff --git a/tests/integration/test_executable_user_defined_function/user_scripts/input_chunk_header.py b/tests/integration/test_executable_user_defined_function/user_scripts/input_chunk_header.py
deleted file mode 100755
index 90c8bfd9a2fe..000000000000
--- a/tests/integration/test_executable_user_defined_function/user_scripts/input_chunk_header.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/python3
-
-import sys
-
-if __name__ == "__main__":
-    for chunk_header in sys.stdin:
-        chunk_length = int(chunk_header)
-
-        while chunk_length != 0:
-            line = sys.stdin.readline()
-            chunk_length -= 1
-            print("Key " + line, end="")
-
-        sys.stdout.flush()
diff --git a/tests/integration/test_executable_user_defined_function/user_scripts/input_chunk_header_json.py b/tests/integration/test_executable_user_defined_function/user_scripts/input_chunk_header_json.py
new file mode 100755
index 000000000000..7bb1c173d371
--- /dev/null
+++ b/tests/integration/test_executable_user_defined_function/user_scripts/input_chunk_header_json.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+
+import sys
+import json
+
+if __name__ == "__main__":
+    for chunk_header in sys.stdin:
+        chunk_length = int(chunk_header)
+
+        for _ in range(chunk_length):
+            row = json.loads(sys.stdin.readline().strip())
+            print(f'{{"result": "Key {row["number"]}"}}')
+
+        sys.stdout.flush()
diff --git a/tests/queries/0_stateless/03547_s3_partition_by_require_partition_wildcard.reference b/tests/integration/test_export_merge_tree_part_to_object_storage/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/03547_s3_partition_by_require_partition_wildcard.reference
rename to tests/integration/test_export_merge_tree_part_to_object_storage/__init__.py
diff --git a/tests/integration/test_export_merge_tree_part_to_object_storage/configs/named_collections.xml b/tests/integration/test_export_merge_tree_part_to_object_storage/configs/named_collections.xml
new file mode 100644
index 000000000000..d46920b7ba88
--- /dev/null
+++ b/tests/integration/test_export_merge_tree_part_to_object_storage/configs/named_collections.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <named_collections>
+        <s3_conn>
+            <url>http://minio1:9001/root/data</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>ClickHouse_Minio_P@ssw0rd</secret_access_key>
+        </s3_conn>
+    </named_collections>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_export_merge_tree_part_to_object_storage/test.py b/tests/integration/test_export_merge_tree_part_to_object_storage/test.py
new file mode 100644
index 000000000000..71c9108470a4
--- /dev/null
+++ b/tests/integration/test_export_merge_tree_part_to_object_storage/test.py
@@ -0,0 +1,274 @@
+import logging
+import pytest
+import random
+import string
+import time
+from typing import Optional
+import uuid
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance(
+            "node1", 
+            main_configs=["configs/named_collections.xml"],
+            with_minio=True,
+        )
+        logging.info("Starting cluster...")
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def create_s3_table(node, s3_table):
+    node.query(f"CREATE TABLE {s3_table} (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='{s3_table}', format=Parquet, partition_strategy='hive') PARTITION BY year")
+
+
+def create_tables_and_insert_data(node, mt_table, s3_table):
+    node.query(f"CREATE TABLE {mt_table} (id UInt64, year UInt16) ENGINE = MergeTree() PARTITION BY year ORDER BY tuple() SETTINGS enable_block_number_column = 1, enable_block_offset_column = 1")
+    node.query(f"INSERT INTO {mt_table} VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021)")
+
+    create_s3_table(node, s3_table)
+
+
+def test_drop_column_during_export_snapshot(cluster):
+    node = cluster.instances["node1"]
+
+    mt_table = "mutations_snapshot_mt_table"
+    s3_table = "mutations_snapshot_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    # Block traffic to/from MinIO to force upload errors and retries, following existing S3 tests style
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    # Ensure export sees a consistent snapshot at start time even if we mutate the source later
+    with PartitionManager() as pm:
+                # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        # Block requests to MinIO (destination: MinIO, destination_port: minio_port)
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        # Start export of 2020
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table};"
+        )
+
+        # Drop a column that is required for the export
+        node.query(f"ALTER TABLE {mt_table} DROP COLUMN id")
+
+        time.sleep(3)
+        # assert the mutation has been applied AND the data has not been exported yet
+        assert "Unknown expression identifier `id`" in node.query_and_get_error(f"SELECT id FROM {mt_table}"), "Column id is not removed"
+
+    # Wait for export to finish and then verify destination still reflects the original snapshot (3 rows)
+    time.sleep(5)
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE id >= 0") == '3\n', "Export did not preserve snapshot at start time after source mutation"
+
+
+def test_add_column_during_export(cluster):
+    node = cluster.instances["node1"]
+
+    mt_table = "add_column_during_export_mt_table"
+    s3_table = "add_column_during_export_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    # Block traffic to/from MinIO to force upload errors and retries, following existing S3 tests style
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    # Ensure export sees a consistent snapshot at start time even if we mutate the source later
+    with PartitionManager() as pm:
+                # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        # Block requests to MinIO (destination: MinIO, destination_port: minio_port)
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        # Start export of 2020
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table};"
+        )
+
+        node.query(f"ALTER TABLE {mt_table} ADD COLUMN id2 UInt64")
+
+        time.sleep(3)
+
+        # assert the mutation has been applied AND the data has not been exported yet
+        assert node.query(f"SELECT count(id2) FROM {mt_table}") == '4\n', "Column id2 is not added"
+
+    # Wait for export to finish and then verify destination still reflects the original snapshot (3 rows)
+    time.sleep(5)
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE id >= 0") == '3\n', "Export did not preserve snapshot at start time after source mutation"
+    assert "Unknown expression identifier `id2`" in node.query_and_get_error(f"SELECT id2 FROM {s3_table}"), "Column id2 is present in the exported data"
+
+
+def test_pending_mutations_throw_before_export(cluster):
+    """Test that pending mutations before export throw an error with default settings."""
+    node = cluster.instances["node1"]
+
+    mt_table = "pending_mutations_throw_mt_table"
+    s3_table = "pending_mutations_throw_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 WHERE year = 2020")
+
+    mutations = node.query(f"SELECT count() FROM system.mutations WHERE table = '{mt_table}' AND is_done = 0")
+    assert mutations.strip() != '0', "Mutation should be pending"
+
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table} SETTINGS export_merge_tree_part_throw_on_pending_mutations=true"
+    )
+
+    assert "PENDING_MUTATIONS_NOT_ALLOWED" in error, f"Expected error about pending mutations, got: {error}"
+
+
+def test_pending_mutations_skip_before_export(cluster):
+    """Test that pending mutations before export are skipped with throw_on_pending_mutations=false."""
+    node = cluster.instances["node1"]
+
+    mt_table = "pending_mutations_skip_mt_table"
+    s3_table = "pending_mutations_skip_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 WHERE year = 2020")
+
+    mutations = node.query(f"SELECT count() FROM system.mutations WHERE table = '{mt_table}' AND is_done = 0")
+    assert mutations.strip() != '0', "Mutation should be pending"
+
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=false"
+    )
+
+    time.sleep(5)
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "101" not in result and "102" not in result and "103" not in result, \
+        "Export should contain original data before mutation"
+    assert "1\n2\n3" in result, "Export should contain original data"
+
+
+def test_data_mutations_after_export_started(cluster):
+    """Test that mutations applied after export starts don't affect the exported data."""
+    node = cluster.instances["node1"]
+
+    mt_table = "mutations_after_export_mt_table"
+    s3_table = "mutations_after_export_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    # Block traffic to MinIO to delay export
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table} "
+            f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=true"
+        )
+
+        node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 WHERE year = 2020")
+
+    time.sleep(5)
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "1\n2\n3" in result, "Export should contain original data before mutation"
+    assert "101" not in result, "Export should not contain mutated data"
+
+
+def test_pending_patch_parts_throw_before_export(cluster):
+    """Test that pending patch parts before export throw an error with default settings."""
+    node = cluster.instances["node1"]
+
+    mt_table = "pending_patches_throw_mt_table"
+    s3_table = "pending_patches_throw_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"UPDATE {mt_table} SET id = id + 100 WHERE year = 2020")
+
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table}"
+    )
+
+    node.query(f"DROP TABLE {mt_table}")
+
+    assert "PENDING_MUTATIONS_NOT_ALLOWED" in error or "pending patch parts" in error.lower(), \
+        f"Expected error about pending patch parts, got: {error}"
+
+
+def test_pending_patch_parts_skip_before_export(cluster):
+    """Test that pending patch parts before export are skipped with throw_on_pending_patch_parts=false."""
+    node = cluster.instances["node1"]
+
+    mt_table = "pending_patches_skip_mt_table"
+    s3_table = "pending_patches_skip_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table)
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"UPDATE {mt_table} SET id = id + 100 WHERE year = 2020")
+    
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PART '2020_1_1_0' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_patch_parts=false"
+    )
+
+    time.sleep(5)
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "1\n2\n3" in result, "Export should contain original data before patch"
+
+    node.query(f"DROP TABLE {mt_table}")
diff --git a/tests/integration/test_export_replicated_mt_partition_to_object_storage/__init__.py b/tests/integration/test_export_replicated_mt_partition_to_object_storage/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/allow_experimental_export_partition.xml b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/allow_experimental_export_partition.xml
new file mode 100644
index 000000000000..f8c5fab1a3be
--- /dev/null
+++ b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/allow_experimental_export_partition.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <enable_experimental_export_merge_tree_partition_feature>1</enable_experimental_export_merge_tree_partition_feature>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/disable_experimental_export_partition.xml b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/disable_experimental_export_partition.xml
new file mode 100644
index 000000000000..ba6508ebd660
--- /dev/null
+++ b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/disable_experimental_export_partition.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <enable_experimental_export_merge_tree_partition_feature>0</enable_experimental_export_merge_tree_partition_feature>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/named_collections.xml b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/named_collections.xml
new file mode 100644
index 000000000000..d46920b7ba88
--- /dev/null
+++ b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/named_collections.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <named_collections>
+        <s3_conn>
+            <url>http://minio1:9001/root/data</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>ClickHouse_Minio_P@ssw0rd</secret_access_key>
+        </s3_conn>
+    </named_collections>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/users.d/profile.xml b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/users.d/profile.xml
new file mode 100644
index 000000000000..518f29708929
--- /dev/null
+++ b/tests/integration/test_export_replicated_mt_partition_to_object_storage/configs/users.d/profile.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <s3_retry_attempts>3</s3_retry_attempts>
+        </default>
+    </profiles>
+</clickhouse>
+
diff --git a/tests/integration/test_export_replicated_mt_partition_to_object_storage/test.py b/tests/integration/test_export_replicated_mt_partition_to_object_storage/test.py
new file mode 100644
index 000000000000..e84921b141a2
--- /dev/null
+++ b/tests/integration/test_export_replicated_mt_partition_to_object_storage/test.py
@@ -0,0 +1,1010 @@
+import logging
+import pytest
+import random
+import string
+import time
+from typing import Optional
+import uuid
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+
+def wait_for_export_status(
+    node,
+    mt_table: str,
+    s3_table: str,
+    partition_id: str,
+    expected_status: str = "COMPLETED",
+    timeout: int = 30,
+    poll_interval: float = 0.5,
+):
+    start_time = time.time()
+    while time.time() - start_time < timeout:
+        status = node.query(
+            f"""
+            SELECT status FROM system.replicated_partition_exports
+            WHERE source_table = '{mt_table}'
+                AND destination_table = '{s3_table}'
+                AND partition_id = '{partition_id}'
+            """
+        ).strip()
+
+        if status and status == expected_status:
+            return status
+
+        time.sleep(poll_interval)
+
+    raise TimeoutError(
+        f"Export status did not reach '{expected_status}' within {timeout}s. ")
+
+
+def wait_for_export_to_start(
+    node,
+    mt_table: str,
+    s3_table: str,
+    partition_id: str,
+    timeout: int = 10,
+    poll_interval: float = 0.2,
+):
+    start_time = time.time()
+    while time.time() - start_time < timeout:
+        count = node.query(
+            f"""
+            SELECT count() FROM system.replicated_partition_exports
+            WHERE source_table = '{mt_table}'
+              AND destination_table = '{s3_table}'
+              AND partition_id = '{partition_id}'
+            """
+        ).strip()
+        
+        if count != '0':
+            return True
+        
+        time.sleep(poll_interval)
+    
+    raise TimeoutError(f"Export did not start within {timeout}s. ")
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance(
+            "replica1", 
+            main_configs=["configs/named_collections.xml", "configs/allow_experimental_export_partition.xml"],
+            user_configs=["configs/users.d/profile.xml"],
+            with_minio=True,
+            stay_alive=True,
+            with_zookeeper=True,
+        )
+        cluster.add_instance(
+            "replica2", 
+            main_configs=["configs/named_collections.xml", "configs/allow_experimental_export_partition.xml"],
+            user_configs=["configs/users.d/profile.xml"],
+            with_minio=True,
+            stay_alive=True,
+            with_zookeeper=True,
+        )
+        # node that does not participate in the export, but will have visibility over the s3 table
+        cluster.add_instance(
+            "watcher_node", 
+            main_configs=["configs/named_collections.xml"],
+            user_configs=[],
+            with_minio=True,
+        )
+        cluster.add_instance(
+            "replica_with_export_disabled", 
+            main_configs=["configs/named_collections.xml", "configs/disable_experimental_export_partition.xml"],
+            user_configs=["configs/users.d/profile.xml"],
+            with_minio=True,
+            stay_alive=True,
+            with_zookeeper=True,
+        )
+        logging.info("Starting cluster...")
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def create_s3_table(node, s3_table):
+    node.query(f"CREATE TABLE {s3_table} (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='{s3_table}', format=Parquet, partition_strategy='hive') PARTITION BY year")
+
+
+def create_tables_and_insert_data(node, mt_table, s3_table, replica_name):
+    node.query(f"CREATE TABLE {mt_table} (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{mt_table}', '{replica_name}') PARTITION BY year ORDER BY tuple() SETTINGS enable_block_number_column = 1, enable_block_offset_column = 1")
+    node.query(f"INSERT INTO {mt_table} VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021)")
+
+    create_s3_table(node, s3_table)
+
+
+def test_restart_nodes_during_export(cluster):
+    node = cluster.instances["replica1"]
+    node2 = cluster.instances["replica2"]
+    watcher_node = cluster.instances["watcher_node"]
+
+    mt_table = "disaster_mt_table"
+    s3_table = "disaster_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+    create_tables_and_insert_data(node2, mt_table, s3_table, "replica2")
+    create_s3_table(watcher_node, s3_table)
+
+    # Block S3/MinIO requests to keep exports alive via retry mechanism
+    # This allows ZooKeeper operations to proceed quickly
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses_node1 = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses_node1)
+
+        pm_rule_reject_responses_node2 = {
+            "destination": node2.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses_node2)
+
+        # Block requests to MinIO (destination: MinIO, destination_port: minio_port)
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+        
+        export_queries = f"""
+            ALTER TABLE {mt_table}
+            EXPORT PARTITION ID '2020' TO TABLE {s3_table}
+            SETTINGS export_merge_tree_partition_max_retries = 50;
+            ALTER TABLE {mt_table}
+            EXPORT PARTITION ID '2021' TO TABLE {s3_table}
+            SETTINGS export_merge_tree_partition_max_retries = 50;
+        """
+
+        node.query(export_queries)
+
+        # wait for the exports to start
+        wait_for_export_to_start(node, mt_table, s3_table, "2020")
+        wait_for_export_to_start(node, mt_table, s3_table, "2021")
+
+        node.stop_clickhouse(kill=True)
+        node2.stop_clickhouse(kill=True)
+
+    assert watcher_node.query(f"SELECT count() FROM {s3_table} where year = 2020") == '0\n', "Partition 2020 was written to S3 during network delay crash"
+
+    assert watcher_node.query(f"SELECT count() FROM {s3_table} where year = 2021") == '0\n', "Partition 2021 was written to S3 during network delay crash"
+
+    # start the nodes, they should finish the export
+    node.start_clickhouse()
+    node2.start_clickhouse()
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+    wait_for_export_status(node, mt_table, s3_table, "2021", "COMPLETED")
+
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE year = 2020") != f'0\n', "Export of partition 2020 did not resume after crash"
+
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE year = 2021") != f'0\n', "Export of partition 2021 did not resume after crash"
+
+
+def test_kill_export(cluster):
+    node = cluster.instances["replica1"]
+    node2 = cluster.instances["replica2"]
+    watcher_node = cluster.instances["watcher_node"]
+
+    mt_table = "kill_export_mt_table"
+    s3_table = "kill_export_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+    create_tables_and_insert_data(node2, mt_table, s3_table, "replica2")
+
+    # Block S3/MinIO requests to keep exports alive via retry mechanism
+    # This allows ZooKeeper operations (KILL) to proceed quickly
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        # Block requests to MinIO (destination: MinIO, destination_port: minio_port)
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+        
+        export_queries = f"""
+            ALTER TABLE {mt_table}
+            EXPORT PARTITION ID '2020' TO TABLE {s3_table}
+            SETTINGS export_merge_tree_partition_max_retries = 50;
+            ALTER TABLE {mt_table}
+            EXPORT PARTITION ID '2021' TO TABLE {s3_table}
+            SETTINGS export_merge_tree_partition_max_retries = 50;
+        """
+
+        node.query(export_queries)
+    
+        # Kill only 2020 while S3 is blocked - retry mechanism keeps exports alive
+        # ZooKeeper operations (KILL) proceed quickly since only S3 is blocked
+        node.query(f"KILL EXPORT PARTITION WHERE partition_id = '2020' and source_table = '{mt_table}' and destination_table = '{s3_table}'")
+
+    # wait for 2021 to finish
+    wait_for_export_status(node, mt_table, s3_table, "2021", "COMPLETED")
+
+    # checking for the commit file because maybe the data file was too fast?
+    assert node.query(f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_2020_*', format=LineAsString)") == '0\n', "Partition 2020 was written to S3, it was not killed as expected"
+    assert node.query(f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_2021_*', format=LineAsString)") != f'0\n', "Partition 2021 was not written to S3, but it should have been"
+
+    # check system.replicated_partition_exports for the export, status should be KILLED
+    assert node.query(f"SELECT status FROM system.replicated_partition_exports WHERE partition_id = '2020' and source_table = '{mt_table}' and destination_table = '{s3_table}'") == 'KILLED\n', "Partition 2020 was not killed as expected"
+    assert node.query(f"SELECT status FROM system.replicated_partition_exports WHERE partition_id = '2021' and source_table = '{mt_table}' and destination_table = '{s3_table}'") == 'COMPLETED\n', "Partition 2021 was not completed, this is unexpected"
+
+
+def test_drop_source_table_during_export(cluster):
+    node = cluster.instances["replica1"]
+    # node2 = cluster.instances["replica2"]
+    watcher_node = cluster.instances["watcher_node"]
+
+    mt_table = "drop_source_table_during_export_mt_table"
+    s3_table = "drop_source_table_during_export_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+    # create_tables_and_insert_data(node2, mt_table, s3_table, "replica2")
+    create_s3_table(watcher_node, s3_table)
+
+    # Block S3/MinIO requests to keep exports alive via retry mechanism
+    # This allows ZooKeeper operations (KILL) to proceed quickly
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        # Block requests to MinIO (destination: MinIO, destination_port: minio_port)
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+        
+        export_queries = f"""
+            ALTER TABLE {mt_table}
+            EXPORT PARTITION ID '2020' TO TABLE {s3_table};
+            ALTER TABLE {mt_table}
+            EXPORT PARTITION ID '2021' TO TABLE {s3_table};
+        """
+
+        node.query(export_queries)
+
+        # This should kill the background operations and drop the table
+        node.query(f"DROP TABLE {mt_table}")
+
+    # Sleep some time to let the export finish (assuming it was not properly cancelled)
+    time.sleep(10)
+
+    assert node.query(f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_*', format=LineAsString)") == '0\n', "Background operations completed even with the table dropped"
+
+
+def test_concurrent_exports_to_different_targets(cluster):
+    node = cluster.instances["replica1"]
+
+    mt_table = "concurrent_diff_targets_mt_table"
+    s3_table_a = "concurrent_diff_targets_s3_a"
+    s3_table_b = "concurrent_diff_targets_s3_b"
+
+    create_tables_and_insert_data(node, mt_table, s3_table_a, "replica1")
+    create_s3_table(node, s3_table_b)
+
+    # Launch two exports of the same partition to two different S3 tables concurrently
+    with PartitionManager() as pm:
+        pm.add_network_delay(node, delay_ms=1000)
+
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table_a}"
+        )
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table_b}"
+        )
+
+    wait_for_export_status(node, mt_table, s3_table_a, "2020", "COMPLETED")
+    wait_for_export_status(node, mt_table, s3_table_b, "2020", "COMPLETED")
+
+    # Both targets should receive the same data independently
+    assert node.query(f"SELECT count() FROM {s3_table_a} WHERE year = 2020") == '3\n', "First target did not receive expected rows"
+    assert node.query(f"SELECT count() FROM {s3_table_b} WHERE year = 2020") == '3\n', "Second target did not receive expected rows"
+
+    # And both should have a commit marker
+    assert node.query(
+        f"SELECT count() FROM s3(s3_conn, filename='{s3_table_a}/commit_2020_*', format=LineAsString)"
+    ) != '0\n', "Commit file missing for first target"
+    assert node.query(
+        f"SELECT count() FROM s3(s3_conn, filename='{s3_table_b}/commit_2020_*', format=LineAsString)"
+    ) != '0\n', "Commit file missing for second target"
+
+
+def test_failure_is_logged_in_system_table(cluster):
+    node = cluster.instances["replica1"]
+
+    mt_table = "failure_is_logged_in_system_table_mt_table"
+    s3_table = "failure_is_logged_in_system_table_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # Block traffic to/from MinIO to force upload errors and retries, following existing S3 tests style
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        # Also block requests to MinIO (destination: MinIO, destination_port: 9001) with REJECT to fail fast
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} SETTINGS export_merge_tree_partition_max_retries=1;"
+        )
+
+        # Wait so that the export fails
+        wait_for_export_status(node, mt_table, s3_table, "2020", "FAILED", timeout=10)
+
+    # Network restored; verify the export is marked as FAILED in the system table
+    # Also verify we captured at least one exception and no commit file exists
+    status = node.query(
+        f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+        """
+    )
+
+    assert status.strip() == "FAILED", f"Expected FAILED status, got: {status!r}"
+
+    exception_count = node.query(
+        f"""
+        SELECT any(exception_count) FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+        """
+    )
+    assert int(exception_count.strip()) > 0, "Expected non-zero exception_count in system.replicated_partition_exports"
+
+    # No commit should have been produced for this partition
+    assert node.query(
+        f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_2020_*', format=LineAsString)"
+    ) == '0\n', "Commit file exists despite forced S3 failures"
+
+
+def test_inject_short_living_failures(cluster):
+    node = cluster.instances["replica1"]
+
+    mt_table = "inject_short_living_failures_mt_table"
+    s3_table = "inject_short_living_failures_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # Block traffic to/from MinIO to force upload errors and retries, following existing S3 tests style
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        # Block responses from MinIO (source_port matches MinIO service)
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        # Also block requests to MinIO (destination: MinIO, destination_port: 9001) with REJECT to fail fast
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        # set big max_retries so that the export does not fail completely
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} SETTINGS export_merge_tree_partition_max_retries=100;"
+        )
+
+        # wait only for a second to get at least one failure, but not enough to finish the export
+        time.sleep(5)
+    
+    # wait for the export to finish
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    # Assert the export succeeded
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE year = 2020") == '3\n', "Export did not succeed"
+    assert node.query(f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_2020_*', format=LineAsString)") == '1\n', "Export did not succeed"
+
+    # check system.replicated_partition_exports for the export
+    assert node.query(
+        f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+        """
+    ) == "COMPLETED\n", "Export should be marked as COMPLETED"
+
+    exception_count = node.query(
+        f"""
+        SELECT exception_count FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+        """
+    )
+    assert int(exception_count.strip()) >= 1, "Expected at least one exception"
+
+
+def test_export_ttl(cluster):
+    node = cluster.instances["replica1"]
+
+    mt_table = "export_ttl_mt_table"
+    s3_table = "export_ttl_s3_table"
+
+    expiration_time = 3
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # start export
+    node.query(f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} SETTINGS export_merge_tree_partition_manifest_ttl={expiration_time};")
+
+    # assert that I get an error when trying to export the same partition again, query_and_get_error
+    error = node.query_and_get_error(f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table};")
+    assert "Export with key" in error, "Expected error about expired export"
+
+    # wait for the export to finish and for the manifest to expire
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+    time.sleep(expiration_time * 2)
+
+    # assert that the export succeeded, check the commit file
+    assert node.query(f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_2020_*', format=LineAsString)") == '1\n', "Export did not succeed"
+
+    # start export again
+    node.query(f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}")
+
+    # wait for the export to finish
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    # assert that the export succeeded, check the commit file
+    # there should be two commit files now, one for the first export and one for the second export
+    assert node.query(f"SELECT count() FROM s3(s3_conn, filename='{s3_table}/commit_2020_*', format=LineAsString)") == '2\n', "Export did not succeed"
+
+
+def test_export_partition_file_already_exists_policy(cluster):
+    node = cluster.instances["replica1"]
+
+    mt_table = "export_partition_file_already_exists_policy_mt_table"
+    s3_table = "export_partition_file_already_exists_policy_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # stop merges so part names remain stable. it is important for the test.
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    # Export all parts
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}",
+    )
+
+    # check system.replicated_partition_exports for the export
+    assert node.query(
+        f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+        """
+    ) == "COMPLETED\n", "Export should be marked as COMPLETED"
+
+    # wait for the exports to finish
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    # try to export the partition
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} SETTINGS export_merge_tree_partition_force_export=1"
+    )
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    assert node.query(
+        f"""
+        SELECT count() FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+          AND status = 'COMPLETED'
+        """
+    ) == '1\n', "Expected the export to be marked as COMPLETED"
+
+    # overwrite policy
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} SETTINGS export_merge_tree_partition_force_export=1, export_merge_tree_part_file_already_exists_policy='overwrite'"
+    )
+
+    # wait for the export to finish
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    # check system.replicated_partition_exports for the export
+    # ideally we would make sure the transaction id is different, but I do not have the time to do that now
+    assert node.query(
+        f"""
+        SELECT count() FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+          AND status = 'COMPLETED'
+        """
+    ) == '1\n', "Expected the export to be marked as COMPLETED"
+
+    # last but not least, let's try with the error policy
+    # max retries = 1 so it fails fast
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} SETTINGS export_merge_tree_partition_force_export=1, export_merge_tree_part_file_already_exists_policy='error', export_merge_tree_partition_max_retries=1",
+    )
+
+    # wait for the export to finish
+    wait_for_export_status(node, mt_table, s3_table, "2020", "FAILED")
+
+    # check system.replicated_partition_exports for the export
+    assert node.query(
+        f"""
+        SELECT count() FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+          AND status = 'FAILED'
+        """
+    ) == '1\n', "Expected the export to be marked as FAILED"
+
+
+def test_export_partition_feature_is_disabled(cluster):
+    replica_with_export_disabled = cluster.instances["replica_with_export_disabled"]
+
+    mt_table = "export_partition_feature_is_disabled_mt_table"
+    s3_table = "export_partition_feature_is_disabled_s3_table"
+
+    create_tables_and_insert_data(replica_with_export_disabled, mt_table, s3_table, "replica1")
+
+    error = replica_with_export_disabled.query_and_get_error(f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table};")
+    assert "experimental" in error, "Expected error about disabled feature"
+
+    # make sure kill operation also throws
+    error = replica_with_export_disabled.query_and_get_error(f"KILL EXPORT PARTITION WHERE partition_id = '2020' and source_table = '{mt_table}' and destination_table = '{s3_table}'")
+    assert "experimental" in error, "Expected error about disabled feature"
+
+
+def test_export_partition_permissions(cluster):
+    """Test that export partition validates permissions correctly:
+    - User needs ALTER permission on source table
+    - User needs INSERT permission on destination table
+    """
+    node = cluster.instances["replica1"]
+
+    mt_table = "permissions_mt_table"
+    s3_table = "permissions_s3_table"
+
+    # Create tables as default user
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # Create test users with specific permissions
+    node.query("CREATE USER IF NOT EXISTS user_no_alter IDENTIFIED WITH no_password")
+    node.query("CREATE USER IF NOT EXISTS user_no_insert IDENTIFIED WITH no_password")
+    node.query("CREATE USER IF NOT EXISTS user_with_permissions IDENTIFIED WITH no_password")
+
+    # Grant basic access to all users
+    node.query(f"GRANT SELECT ON {mt_table} TO user_no_alter")
+    node.query(f"GRANT SELECT ON {s3_table} TO user_no_alter")
+    
+    # user_no_insert has ALTER on source but no INSERT on destination
+    node.query(f"GRANT ALTER ON {mt_table} TO user_no_insert")
+    node.query(f"GRANT SELECT ON {s3_table} TO user_no_insert")
+    
+    # user_with_permissions has both ALTER and INSERT
+    node.query(f"GRANT ALTER ON {mt_table} TO user_with_permissions")
+    node.query(f"GRANT INSERT ON {s3_table} TO user_with_permissions")
+
+    # Test 1: User without ALTER permission should fail
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}",
+        user="user_no_alter"
+    )
+    assert "ACCESS_DENIED" in error or "Not enough privileges" in error, \
+        f"Expected ACCESS_DENIED error for user without ALTER, got: {error}"
+
+    # Test 2: User with ALTER but without INSERT permission should fail
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}",
+        user="user_no_insert"
+    )
+    assert "ACCESS_DENIED" in error or "Not enough privileges" in error, \
+        f"Expected ACCESS_DENIED error for user without INSERT, got: {error}"
+
+    # Test 3: User with both ALTER and INSERT should succeed
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}",
+        user="user_with_permissions"
+    )
+
+    # Wait for export to complete
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    # Verify the export succeeded
+    result = node.query(f"SELECT count() FROM {s3_table} WHERE year = 2020")
+    assert result.strip() == "3", f"Expected 3 rows exported, got: {result}"
+
+    # Verify system table shows COMPLETED status
+    status = node.query(
+        f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+            AND destination_table = '{s3_table}'
+            AND partition_id = '2020'
+        """
+    )
+    assert status.strip() == "COMPLETED", f"Expected COMPLETED status, got: {status}"
+
+
+# assert multiple exports within a single query are executed. They all share the same query id
+# and previously the transaction id was the query id, which would cause problems
+def test_multiple_exports_within_a_single_query(cluster):
+    node = cluster.instances["replica1"]
+
+    mt_table = "multiple_exports_within_a_single_query_mt_table"
+    s3_table = "multiple_exports_within_a_single_query_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    node.query(f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}, EXPORT PARTITION ID '2021' TO TABLE {s3_table};")
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+    wait_for_export_status(node, mt_table, s3_table, "2021", "COMPLETED")
+
+    # assert the exports have been executed
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE year = 2020") == '3\n', "Export did not succeed"
+    assert node.query(f"SELECT count() FROM {s3_table} WHERE year = 2021") == '1\n', "Export did not succeed"
+
+    # check system.replicated_partition_exports for the exports
+    assert node.query(
+        f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2020'
+        """
+    ) == "COMPLETED\n", "Export should be marked as COMPLETED"
+
+    assert node.query(
+        f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+          AND destination_table = '{s3_table}'
+          AND partition_id = '2021'
+        """
+    ) == "COMPLETED\n", "Export should be marked as COMPLETED"
+
+
+def test_pending_mutations_throw_before_export_partition(cluster):
+    """Test that pending mutations before export partition throw an error."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "pending_mutations_throw_partition_mt_table"
+    s3_table = "pending_mutations_throw_partition_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 WHERE year = 2020")
+
+    mutations = node.query(f"SELECT count() FROM system.mutations WHERE table = '{mt_table}' AND is_done = 0")
+    assert mutations.strip() != '0', "Mutation should be pending"
+
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=true"
+    )
+
+    assert "PENDING_MUTATIONS_NOT_ALLOWED" in error, f"Expected error about pending mutations, got: {error}"
+
+
+def test_pending_mutations_skip_before_export_partition(cluster):
+    """Test that pending mutations before export partition are skipped with throw_on_pending_mutations=false."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "pending_mutations_skip_partition_mt_table"
+    s3_table = "pending_mutations_skip_partition_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 WHERE year = 2020")
+
+    mutations = node.query(f"SELECT count() FROM system.mutations WHERE table = '{mt_table}' AND is_done = 0")
+    assert mutations.strip() != '0', "Mutation should be pending"
+
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=false"
+    )
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "101" not in result and "102" not in result and "103" not in result, \
+        "Export should contain original data before mutation"
+    assert "1\n2\n3" in result, "Export should contain original data"
+
+
+def test_pending_patch_parts_throw_before_export_partition(cluster):
+    """Test that pending patch parts before export partition throw an error with default settings."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "pending_patches_throw_partition_mt_table"
+    s3_table = "pending_patches_throw_partition_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"UPDATE {mt_table} SET id = id + 100 WHERE year = 2020")
+
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}"
+    )
+
+    node.query(f"DROP TABLE {mt_table}")
+
+    assert "PENDING_MUTATIONS_NOT_ALLOWED" in error or "pending patch parts" in error.lower(), \
+        f"Expected error about pending patch parts, got: {error}"
+
+
+def test_pending_patch_parts_skip_before_export_partition(cluster):
+    """Test that pending patch parts before export partition are skipped with throw_on_pending_patch_parts=false."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "pending_patches_skip_partition_mt_table"
+    s3_table = "pending_patches_skip_partition_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    node.query(f"UPDATE {mt_table} SET id = id + 100 WHERE year = 2020")
+
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_patch_parts=false"
+    )
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "1\n2\n3" in result, "Export should contain original data before patch"
+
+    node.query(f"DROP TABLE {mt_table}")
+
+
+def test_mutations_after_export_partition_started(cluster):
+    """Test that mutations applied after export partition starts don't affect the exported data."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "mutations_after_export_partition_mt_table"
+    s3_table = "mutations_after_export_partition_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # Block traffic to MinIO to delay export
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} "
+            f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=true"
+        )
+
+        # Wait for export to start
+        wait_for_export_to_start(node, mt_table, s3_table, "2020")
+
+        node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 WHERE year = 2020")
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "1\n2\n3" in result, "Export should contain original data before mutation"
+    assert "101" not in result, "Export should not contain mutated data"
+
+
+def test_patch_parts_after_export_partition_started(cluster):
+    """Test that patch parts created after export partition starts don't affect the exported data."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "patches_after_export_partition_mt_table"
+    s3_table = "patches_after_export_partition_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    # Block traffic to MinIO to delay export
+    minio_ip = cluster.minio_ip
+    minio_port = cluster.minio_port
+
+    with PartitionManager() as pm:
+        pm_rule_reject_responses = {
+            "destination": node.ip_address,
+            "source_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_responses)
+
+        pm_rule_reject_requests = {
+            "destination": minio_ip,
+            "destination_port": minio_port,
+            "action": "REJECT --reject-with tcp-reset",
+        }
+        pm._add_rule(pm_rule_reject_requests)
+
+        node.query(
+            f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table}"
+        )
+
+        # Wait for export to start
+        wait_for_export_to_start(node, mt_table, s3_table, "2020")
+
+        node.query(f"UPDATE {mt_table} SET id = id + 100 WHERE year = 2020")
+
+    wait_for_export_status(node, mt_table, s3_table, "2020", "COMPLETED")
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2020 ORDER BY id")
+    assert "1\n2\n3" in result, "Export should contain original data before patch"
+    assert "101" not in result, "Export should not contain patched data"
+
+    node.query(f"DROP TABLE {mt_table}")
+
+
+def test_mutation_in_partition_clause(cluster):
+    """Test that mutations limited to specific partitions using IN PARTITION clause
+    allow exports of unaffected partitions to succeed."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "mutation_in_partition_clause_mt_table"
+    s3_table = "mutation_in_partition_clause_s3_table"
+
+    create_tables_and_insert_data(node, mt_table, s3_table, "replica1")
+
+    node.query(f"SYSTEM STOP MERGES {mt_table}")
+
+    # Issue a mutation that uses IN PARTITION to limit it to partition 2020
+    node.query(f"ALTER TABLE {mt_table} UPDATE id = id + 100 IN PARTITION '2020' WHERE year = 2020")
+
+    # Verify mutation is pending for 2020
+    mutations = node.query(
+        f"SELECT count() FROM system.mutations WHERE table = '{mt_table}' AND is_done = 0"
+    )
+    assert mutations.strip() != '0', "Mutation should be pending"
+
+    # Export of 2020 should fail (it has pending mutations)
+    error = node.query_and_get_error(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2020' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=true"
+    )
+    assert "PENDING_MUTATIONS_NOT_ALLOWED" in error, f"Expected error about pending mutations for partition 2020, got: {error}"
+
+    # Export of 2021 should succeed (no mutations affecting it)
+    node.query(
+        f"ALTER TABLE {mt_table} EXPORT PARTITION ID '2021' TO TABLE {s3_table} "
+        f"SETTINGS export_merge_tree_part_throw_on_pending_mutations=true"
+    )
+
+    wait_for_export_status(node, mt_table, s3_table, "2021", "COMPLETED")
+
+    result = node.query(f"SELECT id FROM {s3_table} WHERE year = 2021 ORDER BY id")
+    assert "4" in result, "Export of partition 2021 should contain original data"
+
+
+def test_export_partition_with_mixed_computed_columns(cluster):
+    """Test export partition with ALIAS, MATERIALIZED, and EPHEMERAL columns."""
+    node = cluster.instances["replica1"]
+
+    mt_table = "mixed_computed_mt_table"
+    s3_table = "mixed_computed_s3_table"
+
+    node.query(f"""
+        CREATE TABLE {mt_table} (
+            id UInt32,
+            value UInt32,
+            tag_input String EPHEMERAL,
+            doubled UInt64 ALIAS value * 2,
+            tripled UInt64 MATERIALIZED value * 3,
+            tag String DEFAULT upper(tag_input)
+        ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{mt_table}', 'replica1')
+        PARTITION BY id
+        ORDER BY id
+        SETTINGS index_granularity = 1
+    """)
+
+    # Create S3 destination table with regular columns (no EPHEMERAL)
+    node.query(f"""
+        CREATE TABLE {s3_table} (
+            id UInt32,
+            value UInt32,
+            doubled UInt64,
+            tripled UInt64,
+            tag String
+        ) ENGINE = S3(s3_conn, filename='{s3_table}', format=Parquet, partition_strategy='hive')
+        PARTITION BY id
+    """)
+
+    node.query(f"INSERT INTO {mt_table} (id, value, tag_input) VALUES (1, 5, 'test'), (1, 10, 'prod')")
+
+    node.query(f"ALTER TABLE {mt_table} EXPORT PARTITION ID '1' TO TABLE {s3_table}")
+
+    wait_for_export_status(node, mt_table, s3_table, "1", "COMPLETED")
+
+    # Verify source data (ALIAS computed, EPHEMERAL not stored)
+    source_result = node.query(f"SELECT id, value, doubled, tripled, tag FROM {mt_table} ORDER BY value")
+    expected = "1\t5\t10\t15\tTEST\n1\t10\t20\t30\tPROD\n"
+    assert source_result == expected, f"Source table data mismatch. Expected:\n{expected}\nGot:\n{source_result}"
+
+    dest_result = node.query(f"SELECT id, value, doubled, tripled, tag FROM {s3_table} ORDER BY value")
+    assert dest_result == expected, f"Exported data mismatch. Expected:\n{expected}\nGot:\n{dest_result}"
+
+    status = node.query(f"""
+        SELECT status FROM system.replicated_partition_exports
+        WHERE source_table = '{mt_table}'
+            AND destination_table = '{s3_table}'
+            AND partition_id = '1'
+    """)
+    assert status.strip() == "COMPLETED", f"Expected COMPLETED status, got: {status}"
diff --git a/tests/integration/test_filesystem_cache/config.d/filesystem_caches.xml b/tests/integration/test_filesystem_cache/config.d/filesystem_caches.xml
new file mode 100644
index 000000000000..faf4d4f40517
--- /dev/null
+++ b/tests/integration/test_filesystem_cache/config.d/filesystem_caches.xml
@@ -0,0 +1,20 @@
+<clickhouse>
+    <filesystem_caches>
+        <cache1>
+            <type>cache</type>
+            <disk>hdd_blob</disk>
+            <path>/cache1/</path>
+            <max_size>1234</max_size>
+            <cache_policy>SLRU</cache_policy>
+            <cache_on_write_operations>1</cache_on_write_operations>
+        </cache1>
+        <cache2>
+            <type>cache</type>
+            <disk>hdd_blob</disk>
+            <path>/cache1/</path>
+            <max_size>1234</max_size>
+            <cache_policy>SLRU</cache_policy>
+            <cache_on_write_operations>1</cache_on_write_operations>
+        </cache2>
+    </filesystem_caches>
+</clickhouse>
diff --git a/tests/integration/test_filesystem_cache/test_size_limit_metric.py b/tests/integration/test_filesystem_cache/test_size_limit_metric.py
new file mode 100644
index 000000000000..e4babdefbb8a
--- /dev/null
+++ b/tests/integration/test_filesystem_cache/test_size_limit_metric.py
@@ -0,0 +1,47 @@
+import logging
+import os
+import random
+import time
+import uuid
+
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+from helpers.mock_servers import start_mock_servers, start_s3_mock
+from helpers.utility import SafeThread, generate_values, replace_config
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance(
+            "node_test_size_limit_metric",
+            main_configs=[
+                "config.d/filesystem_caches_path.xml",
+                "config.d/filesystem_caches.xml",
+            ],
+            user_configs=[
+                "users.d/cache_on_write_operations.xml",
+            ],
+            stay_alive=True,
+        )
+
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_cache_size_limit_metric(cluster):
+    node = cluster.instances["node_test_size_limit_metric"]
+    assert 1234 == int(
+        node.query(
+            "SELECT value FROM system.metrics WHERE name = 'FilesystemCacheSizeLimit'"
+        )
+    )
diff --git a/tests/integration/test_graphite_merge_tree/test.py b/tests/integration/test_graphite_merge_tree/test.py
index 1a55ee28aa15..5e74bea6e9d3 100644
--- a/tests/integration/test_graphite_merge_tree/test.py
+++ b/tests/integration/test_graphite_merge_tree/test.py
@@ -254,6 +254,8 @@ def test_paths_not_matching_any_pattern(graphite_table):
 
 
 def test_system_graphite_retentions(graphite_table):
+    # Avoid flakiness caused by concurrent test runs
+    q("DROP TABLE IF EXISTS test.graphite2")
     expected = """
 graphite_rollup	all	\\\\.count$	sum	0	0	1	0	['test']	['graphite']
 graphite_rollup	all	\\\\.max$	max	0	0	2	0	['test']	['graphite']
@@ -512,3 +514,24 @@ def test_wrong_rollup_config(graphite_table):
     assert "Age and precision should only grow up: " in str(exc.value)
     assert "36000:600" in str(exc.value)
     assert "72000:300" in str(exc.value)
+
+
+def test_ttl_version(graphite_table):
+    q(
+        """
+DROP TABLE IF EXISTS test.graphite;
+CREATE TABLE test.graphite
+    (
+        metric String, value Float64, timestamp UInt32, date Date,
+        updated UInt32 TTL date + INTERVAL 1 DAY)
+    ENGINE = GraphiteMergeTree('graphite_rollup')
+    PARTITION BY toYYYYMM(date)
+    ORDER BY (metric, timestamp)
+    SETTINGS index_granularity=8192;
+"""
+    )
+
+    to_insert = "one_min.x1	100	1000000000	2001-09-09	1"
+    q("INSERT INTO test.graphite FORMAT TSV", to_insert)
+    q("OPTIMIZE TABLE test.graphite PARTITION 200109 FINAL")
+    q("OPTIMIZE TABLE test.graphite PARTITION 200109 FINAL")
diff --git a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
index 76ecddfe5d91..69456ca080a0 100644
--- a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
+++ b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
@@ -16,6 +16,8 @@
     <crash_log remove="remove" />
     <opentelemetry_span_log remove="remove" />
     <processors_profile_log remove="remove" />
+    <iceberg_metadata_log remove="remove" />
+
     <!-- just in case it will be enabled by default -->
     <zookeeper_log remove="remove" />
 </clickhouse>
diff --git a/tests/integration/test_jwt_auth/__init__.py b/tests/integration/test_jwt_auth/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_jwt_auth/configs/users.xml b/tests/integration/test_jwt_auth/configs/users.xml
new file mode 100644
index 000000000000..b3d3372ebaa9
--- /dev/null
+++ b/tests/integration/test_jwt_auth/configs/users.xml
@@ -0,0 +1,15 @@
+<clickhouse>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+    <users>
+        <jwt_user>
+            <jwt>
+<!--                <claims>{"resource_access": "view-profile"}</claims>-->
+            </jwt>
+            <profile>default</profile>
+            <quota>default</quota>
+        </jwt_user>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_jwt_auth/configs/validators.xml b/tests/integration/test_jwt_auth/configs/validators.xml
new file mode 100644
index 000000000000..e6bb8a1d265e
--- /dev/null
+++ b/tests/integration/test_jwt_auth/configs/validators.xml
@@ -0,0 +1,26 @@
+<clickhouse>
+    <token_processors>
+
+        <single_key_processor>
+            <type>jwt_static_key</type>
+            <algo>HS256</algo>
+            <static_key>my_secret</static_key>
+            <static_key_in_base64>false</static_key_in_base64>
+            <allow_no_expiration>true</allow_no_expiration>
+        </single_key_processor>
+
+        <another_single_key_processor>
+            <type>jwt_static_key</type>
+            <algo>hs256</algo>
+            <static_key>other_secret</static_key>
+            <static_key_in_base64>false</static_key_in_base64>
+            <allow_no_expiration>true</allow_no_expiration>
+        </another_single_key_processor>
+
+        <remote_jwks_processor>
+            <type>jwt_dynamic_jwks</type>
+            <jwks_uri>http://resolver:8080/.well-known/jwks.json</jwks_uri>
+            <allow_no_expiration>true</allow_no_expiration>
+        </remote_jwks_processor>
+    </token_processors>
+</clickhouse>
diff --git a/tests/integration/test_jwt_auth/helpers/generate_private_key.py b/tests/integration/test_jwt_auth/helpers/generate_private_key.py
new file mode 100644
index 000000000000..7b54fa63368b
--- /dev/null
+++ b/tests/integration/test_jwt_auth/helpers/generate_private_key.py
@@ -0,0 +1,21 @@
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.backends import default_backend
+
+# Generate RSA private key
+private_key = rsa.generate_private_key(
+    public_exponent=65537,
+    key_size=2048,  # Key size of 2048 bits
+    backend=default_backend()
+)
+
+# Save the private key to a PEM file
+pem_private_key = private_key.private_bytes(
+    encoding=serialization.Encoding.PEM,
+    format=serialization.PrivateFormat.TraditionalOpenSSL,
+    encryption_algorithm=serialization.NoEncryption()  # You can add encryption if needed
+)
+
+# Write the private key to a file
+with open("new_private_key", "wb") as pem_file:
+    pem_file.write(pem_private_key)
diff --git a/tests/integration/test_jwt_auth/helpers/jwt_jwk.py b/tests/integration/test_jwt_auth/helpers/jwt_jwk.py
new file mode 100644
index 000000000000..265882efce76
--- /dev/null
+++ b/tests/integration/test_jwt_auth/helpers/jwt_jwk.py
@@ -0,0 +1,113 @@
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization
+
+import base64
+import json
+import jwt
+
+
+"""
+Only RS* family algorithms are supported!!!
+"""
+with open("./private_key_2", "rb") as key_file:
+    private_key = serialization.load_pem_private_key(
+        key_file.read(),
+        password=None,
+    )
+
+
+public_key = private_key.public_key()
+
+
+def to_base64_url(data):
+    return base64.urlsafe_b64encode(data).decode("utf-8").rstrip("=")
+
+
+def rsa_key_to_jwk(private_key=None, public_key=None):
+    if private_key:
+        # Convert the private key to its components
+        private_numbers = private_key.private_numbers()
+        public_numbers = private_key.public_key().public_numbers()
+
+        jwk = {
+            "kty": "RSA",
+            "alg": "RS512",
+            "kid": "mykid",
+            "n": to_base64_url(
+                public_numbers.n.to_bytes(
+                    (public_numbers.n.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "e": to_base64_url(
+                public_numbers.e.to_bytes(
+                    (public_numbers.e.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "d": to_base64_url(
+                private_numbers.d.to_bytes(
+                    (private_numbers.d.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "p": to_base64_url(
+                private_numbers.p.to_bytes(
+                    (private_numbers.p.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "q": to_base64_url(
+                private_numbers.q.to_bytes(
+                    (private_numbers.q.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "dp": to_base64_url(
+                private_numbers.dmp1.to_bytes(
+                    (private_numbers.dmp1.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "dq": to_base64_url(
+                private_numbers.dmq1.to_bytes(
+                    (private_numbers.dmq1.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "qi": to_base64_url(
+                private_numbers.iqmp.to_bytes(
+                    (private_numbers.iqmp.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+        }
+    elif public_key:
+        # Convert the public key to its components
+        public_numbers = public_key.public_numbers()
+
+        jwk = {
+            "kty": "RSA",
+            "alg": "RS512",
+            "kid": "mykid",
+            "n": to_base64_url(
+                public_numbers.n.to_bytes(
+                    (public_numbers.n.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+            "e": to_base64_url(
+                public_numbers.e.to_bytes(
+                    (public_numbers.e.bit_length() + 7) // 8, byteorder="big"
+                )
+            ),
+        }
+    else:
+        raise ValueError("You must provide either a private or public key.")
+
+    return jwk
+
+
+# Convert to JWK
+jwk_private = rsa_key_to_jwk(private_key=private_key)
+jwk_public = rsa_key_to_jwk(public_key=public_key)
+
+print(f"Private JWK:\n{json.dumps(jwk_private)}\n")
+print(f"Public JWK:\n{json.dumps(jwk_public)}\n")
+
+payload = {"sub": "jwt_user", "iss": "test_iss"}
+
+# Create a JWT
+token = jwt.encode(payload, private_key, headers={"kid": "mykid"}, algorithm="RS512")
+print(f"JWT:\n{token}")
diff --git a/tests/integration/test_jwt_auth/helpers/jwt_static_secret.py b/tests/integration/test_jwt_auth/helpers/jwt_static_secret.py
new file mode 100644
index 000000000000..5f1c7e0340af
--- /dev/null
+++ b/tests/integration/test_jwt_auth/helpers/jwt_static_secret.py
@@ -0,0 +1,43 @@
+import jwt
+import datetime
+
+
+def create_jwt(
+    payload: dict, secret: str, algorithm: str = "HS256", expiration_minutes: int = None
+) -> str:
+    """
+    Create a JWT using a static secret and a specified encryption algorithm.
+
+    :param payload: The payload to include in the JWT (as a dictionary).
+    :param secret: The secret key used to sign the JWT.
+    :param algorithm: The encryption algorithm to use (default is 'HS256').
+    :param expiration_minutes: The time until the token expires (default is 60 minutes).
+    :return: The encoded JWT as a string.
+    """
+    if expiration_minutes:
+        expiration = datetime.datetime.utcnow() + datetime.timedelta(
+            minutes=expiration_minutes
+        )
+        payload["exp"] = expiration
+
+    return jwt.encode(payload, secret, algorithm=algorithm)
+
+
+if __name__ == "__main__":
+    secret = "my_secret"
+    payload = {"sub": "jwt_user"}  # `sub` must contain user name
+
+    """
+    Supported algorithms:
+      | HMSC  | RSA   | ECDSA  | PSS   | EdDSA   |
+      | ----- | ----- | ------ | ----- | ------- |
+      | HS256 | RS256 | ES256  | PS256 | Ed25519 |
+      | HS384 | RS384 | ES384  | PS384 | Ed448   |
+      | HS512 | RS512 | ES512  | PS512 |         |
+      |       |       | ES256K |       |         |
+      And None
+    """
+    algorithm = "HS256"
+
+    token = create_jwt(payload, secret, algorithm)
+    print(f"Generated JWT: {token}")
diff --git a/tests/integration/test_jwt_auth/helpers/private_key_1 b/tests/integration/test_jwt_auth/helpers/private_key_1
new file mode 100644
index 000000000000..a076a86e17a4
--- /dev/null
+++ b/tests/integration/test_jwt_auth/helpers/private_key_1
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAlICGC8S5pObyASih5qfmwuclG0oKsbzY2z9vgwqyhTYQOWcq
+YcTjVV4aQ30qb6E0+5W6rJ+jx9zx6GuAEGMiG/aWJEdbUAMGp+L1kz4lrw5U6Glw
+oZIvk4wqoRwsiyc+mnDMQAmiZLBNyt3wU6YnKgYmb4O1cSzcZ5HMbImJpj4tpYjq
+nIazvYMn/9Pxjkl0ezLCr52av0UkWHro1H4QMVfuEoNmHuWPww9jgHn+I+La0xdO
+hRpAa0XnJi65dXZd4330uWjeJwt413yz881uS4n1OLOGKG8ImDcNlwU/guyvk0n0
+aqT0zkOAPp9/yYo13MPWmiRCfOX8ozdN7VDIJwIDAQABAoIBADZfiLUuZrrWRK3f
+7sfBmmCquY9wYNILT2uXooDcndjgnrgl6gK6UHKlbgBgB/WvlPK5NAyYtyMq5vgu
+xEk7wvVyKC9IYUq+kOVP2JL9IlcibDxcvvypxfnETKeI5VZeHDH4MxEPdgJf+1vY
+P3KhV52vestB8mFqB5l0bOEgyuGvO3/3D1JjOnFLS/K2vOj8D/KDRmwXRCcGHTxj
+dj3wJH4UbCIsLgiaQBPkFmTteJDICb+7//6YQuB0t8sR/DZS9Z0GWcfy04Cp/m/E
+4rRoTNz80MbbU9+k0Ly360SxPizcjpPYSRSD025i8Iqv8jvelq7Nzg69Kubc0KfN
+mMrRdMECgYEAz4b7+OX+aO5o2ZQS+fHc8dyWc5umC+uT5xrUm22wZLYA5O8x0Rgj
+vdO/Ho/XyN/GCyvNNV2rI2+CBTxez6NqesGDEmJ2n7TQ03xXLCVsnwVz694sPSMO
+pzTbU6e42jvDo5DMPDv0Pg1CVQuM9ka6wb4DcolMyDql6QddY3iXHBkCgYEAtzAl
+xEAABqdFAnCs3zRf9EZphGJiJ4gtoWmCxQs+IcrfyBNQCy6GqrzJOZ7fQiEoAeII
+V0JmsNcnx3U1W0lp8N+1QNZoB4fOWXaX08BvOEe7gbJ6Xl5t52j792vQp1txpBhE
+UDhz8m5R9i5qb3BzrYBiSTfak0Pq56Xw3jRDjj8CgYEAqX2QS07kQqT8gz85ZGOR
+1QMY6aCks7WaXTR/kdW7K/Wts0xb/m7dugq3W+mVDh0c7UC/36b5v/4xTb9pm+HW
+dB2ZxCkgwvz1VNSHiamjFhlo/Km+rcv1CsDTpHYmNi57cRowg71flFJV64l8fiN0
+IgnjXOcgC6RCnpiCQFxb5fkCgYB+Zq2YleSuspqOjXrrZPNU1YUXgN9jkbaSqwA9
+wH01ygvRvWm83XS0uSFMLhC1S7WUXwgMVdgP69YZ7glMHQMJ3wLtY0RS9eVvm8I1
+rZHQzsZWPvXqydOiGrHJzs4hvJpUdR4mEF4JCRBrAyoUDQ70yCKJjQ24EeQzxS/H
+015N9wKBgB8DdFPvKXyygTMnBoZdpAhkE/x3TTi7DsLBxj7QxKmSHzlHGz0TubIB
+m5/p9dGawQNzD4JwASuY5r4lKXmvYr+4TQPLq6c7EnoIZSwLdge+6PDhnDWJzvk1
+S/RuHWW4FKGzBStTmstG3m0xzxTMnQkV3kPimMim3I3VsxxeGEdq
+-----END RSA PRIVATE KEY-----
diff --git a/tests/integration/test_jwt_auth/helpers/private_key_2 b/tests/integration/test_jwt_auth/helpers/private_key_2
new file mode 100644
index 000000000000..d0d1576f2017
--- /dev/null
+++ b/tests/integration/test_jwt_auth/helpers/private_key_2
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA0RRsKcZ5j9UckjioG4Phvav3dkg2sXP6tQ7ug0yowAo/u2Hf
+fB+1OjKuhWTpA3E3YkMKj0RrT+tuUpmZEXqCAipEV7XcfCv3o7Poa7HTq1ti/abV
+wT/KyfGjoNBBSJH4LTNAyo2J8ySKSDtpAEU52iL7s40Ra6I0vqp7/aRuPF5M4zcH
+zN3zarG5EfSVSG1+gTkaRv8XJbra0IeIINmKv0F4++ww8ZxXTR6cvI+MsArUiAPw
+zf7s5dMR4DNRG6YNTrPA0pTOqQE9sRPd62XsfU08plYm27naOUZO5avIPl1YO5I6
+Gi4kPdTvv3WFIy+QvoKoPhPCaD6EbdBpe8BbTQIDAQABAoIBABghJsCFfucKHdOE
+RWZziHx22cblW6aML41wzTcLBFixdhx+lafCEwzF551OgZPbn5wwB4p0R3xAPAm9
+X0yEmnd8gEmtG+aavmg+rZ6sNbULhXenpvi4D4PR5uP61OX2rrEsvpgB0L9mYq0m
+ah5VXvFdYzYcHDwTSsoMa+XgcbZ2qCW6Si3jnbBA1TPIJS5GjfPUQlu9g2FKQL5H
+tlJ7L4Wq39zkueS6LH7kEXOoM+jHgA8F4f7MIrajmilYqnuXanVcMV3+K/6FvH2B
+VBiLggG3CerhB3QyEvZBshvEvvcyRff2NK64CGr/xrAElj4cPHk/E499M1uvUXjE
+boCrD+ECgYEA9LvLljf59h8WWF4bKQZGNKprgFdQIZ2iCEf+VGdGWt/mNg+LyXyn
+3gS/vReON1eaMuEGklZM4Guh/ZPhsPaNmlu16PjmeYTIW1vQTHiO3KR7tAmWep70
+w+gVxDDzuRvBkuDF5oQsZnD3Ri9I7r+J5y9OhyZUsDXe/LJARivF3x0CgYEA2rRx
+wl4mfuYmikvcO8I4vuKXcK1UyYmZQLhp6EHKfhSVgrt7XsstZX9AP2OxUUAocRks
+e6vU/sKUSni7TQrZzAZHc8JXonDgmCqoMPBXIuUncvysGR1kmgVIbN8ISPKJuZoV
+8Dbj3fQfHZ0g0R+mUcuZ+xBO5CKcjPWHZXZoxfECgYAQ/5o8bNbnyXD74k1wpAbs
+UYn1+BqQuyot+RIpOqMgXLzYtGu5Kvdd7GaE88XlAiirsAWM1IGydMdjnYnniLh9
+KDGSZPddKWPhNJdbOGRz3tjYwHG7Qp8tnEkmv1+uU8c2NHaKdFPBKceDEHW4X4Vs
+kVSa/oaTVqqOUrM0LIYp4QKBgQCW1aIriiGEnZhxAvbGJCJczAvkAzcZtBOFBmrM
+ayuLnwiqXEEu1HPfr06RKWFuhxAdSF5cgNrqRSpe3jtXXCdvxdjbpmooNy8+4xSS
+g/+kqmR1snvC6nmqnAAiTgP5w4RnBDUjMcggGLCpDOhIMkrT2Na+x7WRM6nCsceK
+m4qREQKBgEWqdb/QkOMvvKAz2DPDeSrwlTyisrZu1G/86uE3ESb97DisPK+TF2Ts
+r4RGUlKL79W3j5xjvIvqGEEDLC+8QKpay9OYXk3lbViPGB8akWMSP6Tw/8AedhVu
+sjFqcBEFGOELwm7VjAcDeP6bXeXibFe+rysBrfFHUGllytCmNoAV
+-----END RSA PRIVATE KEY-----
diff --git a/tests/integration/test_jwt_auth/jwks_server/server.py b/tests/integration/test_jwt_auth/jwks_server/server.py
new file mode 100644
index 000000000000..96e07f02335e
--- /dev/null
+++ b/tests/integration/test_jwt_auth/jwks_server/server.py
@@ -0,0 +1,33 @@
+import sys
+
+from bottle import response, route, run
+
+
+@route("/.well-known/jwks.json")
+def server():
+    result = {
+        "keys": [
+            {
+                "kty": "RSA",
+                "alg": "RS512",
+                "kid": "mykid",
+                "n": "0RRsKcZ5j9UckjioG4Phvav3dkg2sXP6tQ7ug0yowAo_u2HffB-1OjKuhWTpA3E3YkMKj0RrT-tuUpmZEXqCAipEV7XcfCv3o"
+                     "7Poa7HTq1ti_abVwT_KyfGjoNBBSJH4LTNAyo2J8ySKSDtpAEU52iL7s40Ra6I0vqp7_aRuPF5M4zcHzN3zarG5EfSVSG1-gT"
+                     "kaRv8XJbra0IeIINmKv0F4--ww8ZxXTR6cvI-MsArUiAPwzf7s5dMR4DNRG6YNTrPA0pTOqQE9sRPd62XsfU08plYm27naOUZ"
+                     "O5avIPl1YO5I6Gi4kPdTvv3WFIy-QvoKoPhPCaD6EbdBpe8BbTQ",
+                "e": "AQAB"},
+        ]
+    }
+    response.status = 200
+    response.content_type = "application/json"
+    return result
+
+
+@route("/")
+def ping():
+    response.content_type = "text/plain"
+    response.set_header("Content-Length", 2)
+    return "OK"
+
+
+run(host="0.0.0.0", port=int(sys.argv[1]))
diff --git a/tests/integration/test_jwt_auth/test.py b/tests/integration/test_jwt_auth/test.py
new file mode 100644
index 000000000000..14d42ae08bde
--- /dev/null
+++ b/tests/integration/test_jwt_auth/test.py
@@ -0,0 +1,82 @@
+import os
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+from helpers.mock_servers import start_mock_servers
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+cluster = ClickHouseCluster(__file__)
+instance = cluster.add_instance(
+    "instance",
+    main_configs=["configs/validators.xml"],
+    user_configs=["configs/users.xml"],
+    with_minio=True,
+    # We actually don't need minio, but we need to run dummy resolver
+    # (a shortcut not to change cluster.py in a more unclear way, TBC later).
+)
+client = cluster.add_instance(
+    "client",
+)
+
+
+def run_jwks_server():
+    script_dir = os.path.join(os.path.dirname(__file__), "jwks_server")
+    start_mock_servers(
+        cluster,
+        script_dir,
+        [
+            ("server.py", "resolver", "8080"),
+        ],
+    )
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        run_jwks_server()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def curl_with_jwt(token, ip, https=False):
+    http_prefix = "https" if https else "http"
+    curl = f'curl -H "Authorization: Bearer {token}" "{http_prefix}://{ip}:8123/?query=SELECT%20currentUser()"'
+    return curl
+
+
+# See helpers/ directory if you need to re-create tokens (or understand how they are created)
+def test_static_key(started_cluster):
+    res = client.exec_in_container(
+        [
+            "bash",
+            "-c",
+            curl_with_jwt(
+                token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJqd3RfdXNlciJ9."
+                "kfivQ8qD_oY0UvihydeadD7xvuiO3zSmhFOc_SGbEPQ",
+                ip=cluster.get_instance_ip(instance.name),
+            ),
+        ]
+    )
+    assert res == "jwt_user\n"
+
+
+def test_jwks_server(started_cluster):
+    res = client.exec_in_container(
+        [
+            "bash",
+            "-c",
+            curl_with_jwt(
+                token="eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzUxMiIsImtpZCI6Im15a2lkIn0."
+                      "eyJzdWIiOiJqd3RfdXNlciIsImlzcyI6InRlc3RfaXNzIn0.MjegqrrVyrMMpkxIM-J_q-"
+                      "Sw68Vk5xZuFpxecLLMFs5qzvnh0jslWtyRfi-ANJeJTONPZM5m0yP1ITt8BExoHWobkkR11bXz0ylYEIOgwxqw"
+                      "36XhL2GkE17p-wMvfhCPhGOVL3b7msDRUKXNN48aAJA-NxRbQFhMr-eEx3HsrZXy17Qc7z-"
+                      "0dINe355kzAInGp6gMk3uksAlJ3vMODK8jE-WYFqXusr5GFhXubZXdE2mK0mIbMUGisOZhZLc4QVwvUsYDLBCgJ2RHr5vm"
+                      "jp17j_ZArIedUJkjeC4o72ZMC97kLVnVw94QJwNvd4YisxL6A_mWLTRq9FqNLD4HmbcOQ",
+                ip=cluster.get_instance_ip(instance.name),
+            ),
+        ]
+    )
+    assert res == "jwt_user\n"
diff --git a/tests/integration/test_keeper_map/test.py b/tests/integration/test_keeper_map/test.py
index b25f2a8ac9a1..2a41de18c38d 100644
--- a/tests/integration/test_keeper_map/test.py
+++ b/tests/integration/test_keeper_map/test.py
@@ -132,3 +132,22 @@ def test_keeper_map_with_failed_drop(started_cluster):
     run_query(
         "CREATE TABLE test_keeper_map_with_failed_drop_another (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_with_failed_drop') PRIMARY KEY(key);"
     )
+
+def test_keeper_drop_after_update(started_cluster):
+    run_query("DROP TABLE IF EXISTS test_keeper_drop_after_update SYNC")
+    run_query(
+        "CREATE TABLE test_keeper_drop_after_update (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_drop_after_update') PRIMARY KEY(key);"
+    )
+
+    zk_client = get_genuine_zk()
+    assert (
+        zk_client.delete("/test_keeper_map/test_keeper_drop_after_update/metadata/drop_lock_version")
+        is not None
+    )
+
+    run_query("DROP TABLE test_keeper_drop_after_update SYNC")
+
+    assert (
+        zk_client.exists("/test_keeper_map/test_keeper_drop_after_update/data")
+        is None
+    )
diff --git a/tests/integration/test_keeper_memory_soft_limit/test.py b/tests/integration/test_keeper_memory_soft_limit/test.py
index d4de0c721cea..d400ee7a826a 100644
--- a/tests/integration/test_keeper_memory_soft_limit/test.py
+++ b/tests/integration/test_keeper_memory_soft_limit/test.py
@@ -1,7 +1,4 @@
 #!/usr/bin/env python3
-import random
-import string
-
 import pytest
 from kazoo.client import KazooClient
 from helpers.cluster import ClickHouseCluster
@@ -18,10 +15,6 @@
 )
 
 
-def random_string(length):
-    return "".join(random.choices(string.ascii_lowercase + string.digits, k=length))
-
-
 def get_connection_zk(nodename, timeout=30.0):
     # NOTE: here we need KazooClient without implicit retries! (KazooClientWithImplicitRetries)
     _fake_zk_instance = KazooClient(
@@ -64,7 +57,8 @@ def test_soft_limit_create(started_cluster):
 
         txn.create("/test_soft_limit/node_1000001" + str(i), b"abcde")
         txn.commit()
-        assert "0\n"  == node.query("select sum(ProfileEvent_ZooKeeperHardwareExceptions) from system.metric_log")
+        node.query("system flush logs metric_log")
+        assert int(node.query("select sum(ProfileEvent_ZooKeeperHardwareExceptions) from system.metric_log").strip()) > 0
         return
 
     raise Exception("all records are inserted but no error occurs")
diff --git a/tests/integration/test_keeper_remove_acl/__init__.py b/tests/integration/test_keeper_remove_acl/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_keeper_remove_acl/configs/check_node_acl_on_remove.xml b/tests/integration/test_keeper_remove_acl/configs/check_node_acl_on_remove.xml
new file mode 100644
index 000000000000..77b2a0bcf65c
--- /dev/null
+++ b/tests/integration/test_keeper_remove_acl/configs/check_node_acl_on_remove.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <keeper_server>
+        <coordination_settings>
+            <check_node_acl_on_remove>0</check_node_acl_on_remove>
+        </coordination_settings>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_acl/configs/enable_keeper1.xml b/tests/integration/test_keeper_remove_acl/configs/enable_keeper1.xml
new file mode 100644
index 000000000000..873facafb3c8
--- /dev/null
+++ b/tests/integration/test_keeper_remove_acl/configs/enable_keeper1.xml
@@ -0,0 +1,25 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node</hostname>
+                <port>9234</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_acl/test.py b/tests/integration/test_keeper_remove_acl/test.py
new file mode 100644
index 000000000000..24f41c0fb1b1
--- /dev/null
+++ b/tests/integration/test_keeper_remove_acl/test.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+
+import pytest
+import logging
+
+import helpers.keeper_utils as keeper_utils
+from helpers.cluster import ClickHouseCluster
+
+from kazoo.security import make_digest_acl
+from kazoo.exceptions import NoAuthError
+
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/enable_keeper1.xml", "configs/check_node_acl_on_remove.xml"],
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def wait_nodes():
+    keeper_utils.wait_nodes(cluster, [node])
+
+
+def get_fake_zk(nodename, timeout=30.0):
+    return keeper_utils.get_fake_zk(cluster, nodename, timeout=timeout)
+
+
+def stop_zk_connection(zk_conn):
+    zk_conn.stop()
+    zk_conn.close()
+
+
+def test_server_restart(started_cluster):
+    try:
+        wait_nodes()
+
+        node.stop_clickhouse()
+        node.replace_in_config(
+            "/etc/clickhouse-server/config.d/check_node_acl_on_remove.xml", "1", "0"
+        )
+        node.start_clickhouse()
+
+        def create_node_with_acl():
+            node_zk = get_fake_zk("node")
+            node_zk.add_auth("digest", "clickhouse:password")
+
+            if node_zk.exists("/test_acl_node"):
+                node_zk.delete("/test_acl_node")
+
+            acl = make_digest_acl("clickhouse", "password", all=True)
+            node_zk.create("/test_acl_node", b"test_data", acl=[acl])
+            stop_zk_connection(node_zk)
+
+        def delete_node():
+            node_zk = get_fake_zk("node")
+            node_zk.delete("/test_acl_node")
+            stop_zk_connection(node_zk)
+
+        create_node_with_acl()
+        delete_node()
+        node.stop_clickhouse()
+        node.replace_in_config(
+            "/etc/clickhouse-server/config.d/check_node_acl_on_remove.xml", "0", "1"
+        )
+        node.start_clickhouse()
+
+        create_node_with_acl()
+
+        with pytest.raises(NoAuthError):
+            delete_node()
+    finally:
+        try:
+            stop_zk_connection(
+                node_zk,
+            )
+        except:
+            pass
diff --git a/tests/integration/test_lightweight_updates/configs/remote_servers.xml b/tests/integration/test_lightweight_updates/configs/remote_servers.xml
new file mode 100644
index 000000000000..68b420f36b4d
--- /dev/null
+++ b/tests/integration/test_lightweight_updates/configs/remote_servers.xml
@@ -0,0 +1,18 @@
+<clickhouse>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_lightweight_updates/test.py b/tests/integration/test_lightweight_updates/test.py
index 79743714ee0b..44580446799f 100644
--- a/tests/integration/test_lightweight_updates/test.py
+++ b/tests/integration/test_lightweight_updates/test.py
@@ -9,17 +9,19 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
+    main_configs=["configs/remote_servers.xml"],
 )
 
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
+    main_configs=["configs/remote_servers.xml"],
 )
 
 node3 = cluster.add_instance(
     "node3",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
@@ -183,3 +185,45 @@ def test_lwu_upgrade(started_cluster, table_engine):
         )
         == "100000\n"
     )
+
+
+def test_lwu_on_cluster(started_cluster):
+    node1.query("DROP TABLE IF EXISTS t_lwu_on_cluster")
+    node2.query("DROP TABLE IF EXISTS t_lwu_on_cluster")
+
+    create_query = """
+    CREATE TABLE t_lwu_on_cluster
+    (
+        `id` UInt32,
+        `value` String,
+    )
+    ENGINE = MergeTree
+    ORDER BY id
+    SETTINGS enable_block_number_column = 1, enable_block_offset_column = 1
+"""
+
+    node1.query(create_query)
+    node2.query(create_query)
+
+    node1.query(
+        "INSERT INTO t_lwu_on_cluster SELECT number, '' FROM numbers(10000) WHERE number % 4 != 0"
+    )
+    node2.query(
+        "INSERT INTO t_lwu_on_cluster SELECT number, '' FROM numbers(10000) WHERE number % 4 != 1"
+    )
+
+    assert (
+        node1.query(
+            "SELECT count() from remote(test_cluster, currentDatabase(), t_lwu_on_cluster)"
+        )
+        == "15000\n"
+    )
+    node1.query(
+        "UPDATE t_lwu_on_cluster ON CLUSTER test_cluster SET value = 'updated' WHERE id >= 2000 AND id < 3000"
+    )
+    assert (
+        node1.query(
+            "SELECT count() from remote(test_cluster, currentDatabase(), t_lwu_on_cluster) WHERE value = 'updated'"
+        )
+        == "1500\n"
+    )
diff --git a/tests/integration/test_mask_sensitive_info/configs/overrides.xml b/tests/integration/test_mask_sensitive_info/configs/overrides.xml
index 00e2cb229efb..b02424c1713b 100644
--- a/tests/integration/test_mask_sensitive_info/configs/overrides.xml
+++ b/tests/integration/test_mask_sensitive_info/configs/overrides.xml
@@ -27,4 +27,12 @@
         </named_collection_5>
         <named_collection_6/>
     </named_collections>
+
+    <query_masking_rules>
+        <rule>
+            <name>Query masking rule</name>
+            <regexp>sensetive_data</regexp>
+            <replace>replaced_data</replace>
+        </rule>
+    </query_masking_rules>
 </clickhouse>
diff --git a/tests/integration/test_mask_sensitive_info/test.py b/tests/integration/test_mask_sensitive_info/test.py
index 453613060b91..b65fdede5665 100644
--- a/tests/integration/test_mask_sensitive_info/test.py
+++ b/tests/integration/test_mask_sensitive_info/test.py
@@ -6,6 +6,8 @@
 
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
+from helpers.config_cluster import minio_secret_key
+from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
@@ -273,11 +275,13 @@ def test_create_table():
             f"IcebergS3('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
             "DNS_ERROR",
         ),
+        (
+            f"Iceberg(storage_type='s3', 'http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
+            "DNS_ERROR",
+        ),
         f"AzureBlobStorage('{azure_conn_string}', 'cont', 'test_simple.csv', 'CSV')",
         f"AzureBlobStorage('{azure_conn_string}', 'cont', 'test_simple_1.csv', 'CSV', 'none')",
-        f"AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_2.csv', '{azure_account_name}', '{azure_account_key}')",
-        f"AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_3.csv', '{azure_account_name}', '{azure_account_key}', 'CSV')",
-        f"AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_4.csv', '{azure_account_name}', '{azure_account_key}', 'CSV', 'none')",
+
         f"AzureQueue('{azure_conn_string}', 'cont', '*', 'CSV') SETTINGS mode = 'unordered'",
         f"AzureQueue('{azure_conn_string}', 'cont', '*', 'CSV', 'none') SETTINGS mode = 'unordered'",
         f"AzureQueue('{azure_storage_account_url}', 'cont', '*', '{azure_account_name}', '{azure_account_key}', 'CSV') SETTINGS mode = 'unordered'",
@@ -286,9 +290,49 @@ def test_create_table():
             f"AzureBlobStorage('BlobEndpoint=https://my-endpoint/;SharedAccessSignature=sp=r&st=2025-09-29T14:58:11Z&se=2025-09-29T00:00:00Z&spr=https&sv=2022-11-02&sr=c&sig=SECRET%SECRET%SECRET%SECRET', 'exampledatasets', 'example.csv')",
             "STD_EXCEPTION",
         ),
+
+        f"AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_3.csv', '{azure_account_name}', '{azure_account_key}')",
+        f"AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_4.csv', '{azure_account_name}', '{azure_account_key}', 'CSV')",
+        f"AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_5.csv', '{azure_account_name}', '{azure_account_key}', 'CSV', 'none')",
+        f"AzureBlobStorage(named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+        f"AzureBlobStorage(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
+        (
+            f"IcebergAzure('{azure_conn_string}', 'cont', 'test_simple.csv')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"IcebergAzure('{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '{azure_account_key}')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"IcebergAzure(named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"IcebergAzure(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"Iceberg(storage_type='azure', '{azure_conn_string}', 'cont', 'test_simple.csv')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"Iceberg(storage_type='azure', '{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '{azure_account_key}')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"Iceberg(storage_type='azure', named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            "FILE_DOESNT_EXIST",
+        ),
+        (
+            f"Iceberg(storage_type='azure', named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
+            "FILE_DOESNT_EXIST",
+        ),
+
         f"Kafka() SETTINGS kafka_broker_list = '127.0.0.1', kafka_topic_list = 'topic', kafka_group_name = 'group', kafka_format = 'JSONEachRow', kafka_security_protocol = 'sasl_ssl', kafka_sasl_mechanism = 'PLAIN', kafka_sasl_username = 'user', kafka_sasl_password = '{password}', format_avro_schema_registry_url = 'http://schema_user:{password}@'",
         f"Kafka() SETTINGS kafka_broker_list = '127.0.0.1', kafka_topic_list = 'topic', kafka_group_name = 'group', kafka_format = 'JSONEachRow', kafka_security_protocol = 'sasl_ssl', kafka_sasl_mechanism = 'PLAIN', kafka_sasl_username = 'user', kafka_sasl_password = '{password}', format_avro_schema_registry_url = 'http://schema_user:{password}@domain.com'",
         f"S3('http://minio1:9001/root/data/test5.csv.gz', 'CSV', access_key_id = 'minio', secret_access_key = '{password}', compression_method = 'gzip')",
+        f"Redis('localhost', 0, '{password}') PRIMARY KEY x;",
     ]
 
     def make_test_case(i):
@@ -355,19 +399,32 @@ def make_test_case(i):
             "CREATE TABLE table20 (`x` int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'minio', '[HIDDEN]', 'CSV', 'gzip') SETTINGS mode = 'ordered'",
             "CREATE TABLE table21 (`x` int) ENGINE = Iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
             "CREATE TABLE table22 (`x` int) ENGINE = IcebergS3('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
-            f"CREATE TABLE table23 (`x` int) ENGINE = AzureBlobStorage('{masked_azure_conn_string}', 'cont', 'test_simple.csv', 'CSV')",
-            f"CREATE TABLE table24 (`x` int) ENGINE = AzureBlobStorage('{masked_azure_conn_string}', 'cont', 'test_simple_1.csv', 'CSV', 'none')",
-            f"CREATE TABLE table25 (`x` int) ENGINE = AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_2.csv', '{azure_account_name}', '[HIDDEN]')",
-            f"CREATE TABLE table26 (`x` int) ENGINE = AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_3.csv', '{azure_account_name}', '[HIDDEN]', 'CSV')",
-            f"CREATE TABLE table27 (`x` int) ENGINE = AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_4.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none')",
-            f"CREATE TABLE table28 (`x` int) ENGINE = AzureQueue('{masked_azure_conn_string}', 'cont', '*', 'CSV') SETTINGS mode = 'unordered'",
-            f"CREATE TABLE table29 (`x` int) ENGINE = AzureQueue('{masked_azure_conn_string}', 'cont', '*', 'CSV', 'none') SETTINGS mode = 'unordered'",
-            f"CREATE TABLE table30 (`x` int) ENGINE = AzureQueue('{azure_storage_account_url}', 'cont', '*', '{azure_account_name}', '[HIDDEN]', 'CSV') SETTINGS mode = 'unordered'",
-            f"CREATE TABLE table31 (`x` int) ENGINE = AzureQueue('{azure_storage_account_url}', 'cont', '*', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none') SETTINGS mode = 'unordered'",
-            f"CREATE TABLE table32 (`x` int) ENGINE = AzureBlobStorage('{masked_sas_conn_string}', 'exampledatasets', 'example.csv')",
-            "CREATE TABLE table33 (`x` int) ENGINE = Kafka SETTINGS kafka_broker_list = '127.0.0.1', kafka_topic_list = 'topic', kafka_group_name = 'group', kafka_format = 'JSONEachRow', kafka_security_protocol = 'sasl_ssl', kafka_sasl_mechanism = 'PLAIN', kafka_sasl_username = 'user', kafka_sasl_password = '[HIDDEN]', format_avro_schema_registry_url = 'http://schema_user:[HIDDEN]@'",
-            "CREATE TABLE table34 (`x` int) ENGINE = Kafka SETTINGS kafka_broker_list = '127.0.0.1', kafka_topic_list = 'topic', kafka_group_name = 'group', kafka_format = 'JSONEachRow', kafka_security_protocol = 'sasl_ssl', kafka_sasl_mechanism = 'PLAIN', kafka_sasl_username = 'user', kafka_sasl_password = '[HIDDEN]', format_avro_schema_registry_url = 'http://schema_user:[HIDDEN]@domain.com'",
-            "CREATE TABLE table35 (`x` int) ENGINE = S3('http://minio1:9001/root/data/test5.csv.gz', 'CSV', access_key_id = 'minio', secret_access_key = '[HIDDEN]', compression_method = 'gzip')",
+            "CREATE TABLE table23 (`x` int) ENGINE = Iceberg(storage_type = 's3', 'http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
+            f"CREATE TABLE table24 (`x` int) ENGINE = AzureBlobStorage('{masked_azure_conn_string}', 'cont', 'test_simple.csv', 'CSV')",
+            f"CREATE TABLE table25 (`x` int) ENGINE = AzureBlobStorage('{masked_azure_conn_string}', 'cont', 'test_simple_1.csv', 'CSV', 'none')",
+            f"CREATE TABLE table26 (`x` int) ENGINE = AzureQueue('{masked_azure_conn_string}', 'cont', '*', 'CSV') SETTINGS mode = 'unordered'",
+            f"CREATE TABLE table27 (`x` int) ENGINE = AzureQueue('{masked_azure_conn_string}', 'cont', '*', 'CSV', 'none') SETTINGS mode = 'unordered'",
+            f"CREATE TABLE table28 (`x` int) ENGINE = AzureQueue('{azure_storage_account_url}', 'cont', '*', '{azure_account_name}', '[HIDDEN]', 'CSV') SETTINGS mode = 'unordered'",
+            f"CREATE TABLE table29 (`x` int) ENGINE = AzureQueue('{azure_storage_account_url}', 'cont', '*', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none') SETTINGS mode = 'unordered'",
+            f"CREATE TABLE table30 (`x` int) ENGINE = AzureBlobStorage('{masked_sas_conn_string}', 'exampledatasets', 'example.csv')",
+            f"CREATE TABLE table31 (`x` int) ENGINE = AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_3.csv', '{azure_account_name}', '[HIDDEN]')",
+            f"CREATE TABLE table32 (`x` int) ENGINE = AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_4.csv', '{azure_account_name}', '[HIDDEN]', 'CSV')",
+            f"CREATE TABLE table33 (`x` int) ENGINE = AzureBlobStorage('{azure_storage_account_url}', 'cont', 'test_simple_5.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none')",
+            f"CREATE TABLE table34 (`x` int) ENGINE = AzureBlobStorage(named_collection_2, connection_string = '{masked_azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            f"CREATE TABLE table35 (`x` int) ENGINE = AzureBlobStorage(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
+            f"CREATE TABLE table36 (`x` int) ENGINE = IcebergAzure('{masked_azure_conn_string}', 'cont', 'test_simple.csv')",
+            f"CREATE TABLE table37 (`x` int) ENGINE = IcebergAzure('{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '[HIDDEN]')",
+            f"CREATE TABLE table38 (`x` int) ENGINE = IcebergAzure(named_collection_2, connection_string = '{masked_azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            f"CREATE TABLE table39 (`x` int) ENGINE = IcebergAzure(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
+            f"CREATE TABLE table40 (`x` int) ENGINE = Iceberg(storage_type = 'azure', '{masked_azure_conn_string}', 'cont', 'test_simple.csv')",
+            f"CREATE TABLE table41 (`x` int) ENGINE = Iceberg(storage_type = 'azure', '{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '[HIDDEN]')",
+            f"CREATE TABLE table42 (`x` int) ENGINE = Iceberg(storage_type = 'azure', named_collection_2, connection_string = '{masked_azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            f"CREATE TABLE table43 (`x` int) ENGINE = Iceberg(storage_type = 'azure', named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
+
+            "CREATE TABLE table44 (`x` int) ENGINE = Kafka SETTINGS kafka_broker_list = '127.0.0.1', kafka_topic_list = 'topic', kafka_group_name = 'group', kafka_format = 'JSONEachRow', kafka_security_protocol = 'sasl_ssl', kafka_sasl_mechanism = 'PLAIN', kafka_sasl_username = 'user', kafka_sasl_password = '[HIDDEN]', format_avro_schema_registry_url = 'http://schema_user:[HIDDEN]@'",
+            "CREATE TABLE table45 (`x` int) ENGINE = Kafka SETTINGS kafka_broker_list = '127.0.0.1', kafka_topic_list = 'topic', kafka_group_name = 'group', kafka_format = 'JSONEachRow', kafka_security_protocol = 'sasl_ssl', kafka_sasl_mechanism = 'PLAIN', kafka_sasl_username = 'user', kafka_sasl_password = '[HIDDEN]', format_avro_schema_registry_url = 'http://schema_user:[HIDDEN]@domain.com'",
+            "CREATE TABLE table46 (`x` int) ENGINE = S3('http://minio1:9001/root/data/test5.csv.gz', 'CSV', access_key_id = 'minio', secret_access_key = '[HIDDEN]', compression_method = 'gzip')",
+            "CREATE TABLE table47 (`x` int) ENGINE = Redis('localhost', 0, '[HIDDEN]') PRIMARY KEY x",
         ],
         must_not_contain=[password],
     )
@@ -482,11 +539,25 @@ def test_table_functions():
         f"azureBlobStorage(named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
         f"azureBlobStorage(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
         f"iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
-        f"gcs('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
+        f"iceberg(named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '{password}')",
         f"icebergS3('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
+        f"icebergS3(named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '{password}')",
+        f"icebergAzure('{azure_conn_string}', 'cont', 'test_simple.csv')",
+        f"icebergAzure('{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '{azure_account_key}')",
         f"icebergAzure('{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '{azure_account_key}', 'CSV', 'none', 'auto')",
+        f"icebergAzure(named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+        f"icebergAzure(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
+        f"iceberg(storage_type='s3', 'http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
+        f"iceberg(storage_type='s3', named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '{password}')",
+        f"iceberg(storage_type='azure', '{azure_conn_string}', 'cont', 'test_simple.csv')",
+        f"iceberg(storage_type='azure', '{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '{azure_account_key}')",
+        f"iceberg(storage_type='azure', '{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '{azure_account_key}', 'CSV', 'none', 'auto')",
+        f"iceberg(storage_type='azure', named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+        f"iceberg(storage_type='azure', named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
+        f"gcs('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
         f"deltaLakeAzure('{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '{azure_account_key}', 'CSV', 'none', 'auto')",
         f"hudi('http://minio1:9001/root/data/test7.csv', 'minio', '{password}')",
+        f"redis('localhost', 'key', 'key Int64', 0, '{password}')"
     ]
 
     def make_test_case(i):
@@ -567,11 +638,25 @@ def make_test_case(i):
             f"CREATE TABLE tablefunc37 (`x` int) AS azureBlobStorage(named_collection_2, connection_string = '{masked_azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
             f"CREATE TABLE tablefunc38 (`x` int) AS azureBlobStorage(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
             "CREATE TABLE tablefunc39 (`x` int) AS iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
-            "CREATE TABLE tablefunc40 (`x` int) AS gcs('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
+            "CREATE TABLE tablefunc40 (`x` int) AS iceberg(named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '[HIDDEN]')",
             "CREATE TABLE tablefunc41 (`x` int) AS icebergS3('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
-            f"CREATE TABLE tablefunc42 (`x` int) AS icebergAzure('{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none', 'auto')",
-            f"CREATE TABLE tablefunc43 (`x` int) AS deltaLakeAzure('{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none', 'auto')",
-            "CREATE TABLE tablefunc44 (`x` int) AS hudi('http://minio1:9001/root/data/test7.csv', 'minio', '[HIDDEN]')",
+            "CREATE TABLE tablefunc42 (`x` int) AS icebergS3(named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '[HIDDEN]')",
+            f"CREATE TABLE tablefunc43 (`x` int) AS icebergAzure('{masked_azure_conn_string}', 'cont', 'test_simple.csv')",
+            f"CREATE TABLE tablefunc44 (`x` int) AS icebergAzure('{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '[HIDDEN]')",
+            f"CREATE TABLE tablefunc45 (`x` int) AS icebergAzure('{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none', 'auto')",
+            f"CREATE TABLE tablefunc46 (`x` int) AS icebergAzure(named_collection_2, connection_string = '{masked_azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            f"CREATE TABLE tablefunc47 (`x` int) AS icebergAzure(named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
+            "CREATE TABLE tablefunc48 (`x` int) AS iceberg(storage_type = 's3', 'http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
+            "CREATE TABLE tablefunc49 (`x` int) AS iceberg(storage_type = 's3', named_collection_2, url = 'http://minio1:9001/root/data/test4.csv', access_key_id = 'minio', secret_access_key = '[HIDDEN]')",
+            f"CREATE TABLE tablefunc50 (`x` int) AS iceberg(storage_type = 'azure', '{masked_azure_conn_string}', 'cont', 'test_simple.csv')",
+            f"CREATE TABLE tablefunc51 (`x` int) AS iceberg(storage_type = 'azure', '{azure_storage_account_url}', 'cont', 'test_simple.csv', '{azure_account_name}', '[HIDDEN]')",
+            f"CREATE TABLE tablefunc52 (`x` int) AS iceberg(storage_type = 'azure', '{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none', 'auto')",
+            f"CREATE TABLE tablefunc53 (`x` int) AS iceberg(storage_type = 'azure', named_collection_2, connection_string = '{masked_azure_conn_string}', container = 'cont', blob_path = 'test_simple_7.csv', format = 'CSV')",
+            f"CREATE TABLE tablefunc54 (`x` int) AS iceberg(storage_type = 'azure', named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_8.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
+            "CREATE TABLE tablefunc55 (`x` int) AS gcs('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
+            f"CREATE TABLE tablefunc56 (`x` int) AS deltaLakeAzure('{azure_storage_account_url}', 'cont', 'test_simple_6.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none', 'auto')",
+            "CREATE TABLE tablefunc57 (`x` int) AS hudi('http://minio1:9001/root/data/test7.csv', 'minio', '[HIDDEN]')",
+            "CREATE TABLE tablefunc58 (`x` int) AS redis('localhost', 'key', 'key Int64', 0, '[HIDDEN]')",
         ],
         must_not_contain=[password],
     )
@@ -783,6 +868,151 @@ def test_backup_to_s3():
     node.query("DROP TABLE IF EXISTS temptbl2")
 
 
+def test_backup_table_s3_named_collection():
+    """Test that secrets in S3 named collection backups are masked in system.backups and logs."""
+    password = new_password()
+
+    setup_queries = [
+        "CREATE TABLE backup_test_s3_nc (x int) ENGINE = MergeTree ORDER BY x",
+        "INSERT INTO backup_test_s3_nc SELECT * FROM numbers(10)",
+    ]
+
+    for query in setup_queries:
+        node.query_and_get_answer_with_error(query)
+
+    # Create named collection for S3 backup
+    node.query(
+        f"CREATE NAMED COLLECTION IF NOT EXISTS s3_backup_nc AS "
+        f"url = 'http://minio1:9001/root/data/backups/nc_backup_test_base', "
+        f"access_key_id = 'minio', "
+        f"secret_access_key = '{password}'"
+    )
+
+    # Test 1: Using named collection directly
+    base_backup = "S3(s3_backup_nc)"
+    inc_backup = "S3(s3_backup_nc, 'nc_backup_test_incremental')"
+
+    node.query_and_get_answer_with_error(f"BACKUP TABLE backup_test_s3_nc TO {base_backup} ASYNC")[0]
+
+    inc_backup_query_output = node.query_and_get_answer_with_error(
+        f"BACKUP TABLE backup_test_s3_nc TO {inc_backup} SETTINGS async=1, base_backup={base_backup}"
+    )[0]
+    inc_backup_id = TSV.toMat(inc_backup_query_output)[0][0]
+    names_in_system_backups_output, _ = node.query_and_get_answer_with_error(
+        f"SELECT base_backup_name, name FROM system.backups where id = '{inc_backup_id}'"
+    )
+
+    base_backup_name, name = TSV.toMat(names_in_system_backups_output)[0]
+
+    assert password not in base_backup_name
+    assert password not in name
+
+    # Test 2: Using named collection with secret_access_key override
+    password2 = new_password()
+    base_backup2 = f"S3(s3_backup_nc, 'nc_backup_test_base2', secret_access_key = '{password2}')"
+    inc_backup2 = f"S3(s3_backup_nc, 'nc_backup_test_incremental2', secret_access_key = '{password2}')"
+
+    node.query_and_get_answer_with_error(f"BACKUP TABLE backup_test_s3_nc TO {base_backup2} ASYNC")[0]
+
+    inc_backup_query_output2 = node.query_and_get_answer_with_error(
+        f"BACKUP TABLE backup_test_s3_nc TO {inc_backup2} SETTINGS async=1, base_backup={base_backup2}"
+    )[0]
+    inc_backup_id2 = TSV.toMat(inc_backup_query_output2)[0][0]
+    names_in_system_backups_output2, _ = node.query_and_get_answer_with_error(
+        f"SELECT base_backup_name, name FROM system.backups where id = '{inc_backup_id2}'"
+    )
+
+    base_backup_name2, name2 = TSV.toMat(names_in_system_backups_output2)[0]
+
+    assert password2 not in base_backup_name2
+    assert password2 not in name2
+
+    # Check logs don't contain secrets and key-value args are masked
+    check_logs(
+        must_contain=[
+            "BACKUP TABLE backup_test_s3_nc TO S3(s3_backup_nc, 'nc_backup_test_base2', secret_access_key = '[HIDDEN]')",
+        ],
+        must_not_contain=[password, password2],
+    )
+
+    node.query("DROP TABLE IF EXISTS backup_test_s3_nc")
+    node.query("DROP NAMED COLLECTION IF EXISTS s3_backup_nc")
+
+
+def test_backup_table_azure_named_collection():
+    """Test that secrets in Azure named collection backups are masked in system.backups and logs."""
+    azure_storage_account_url = cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]
+    azure_account_name = "devstoreaccount1"
+    azure_account_key = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
+
+    setup_queries = [
+        "CREATE TABLE backup_test_az_nc (x int) ENGINE = MergeTree ORDER BY x",
+        "INSERT INTO backup_test_az_nc SELECT * FROM numbers(10)",
+    ]
+
+    for query in setup_queries:
+        node.query_and_get_answer_with_error(query)
+
+    # Create named collection for Azure backup (using storage_account_url variant)
+    node.query(
+        f"CREATE NAMED COLLECTION IF NOT EXISTS azure_backup_nc AS "
+        f"storage_account_url = '{azure_storage_account_url}', "
+        f"container = 'cont', "
+        f"account_name = '{azure_account_name}', "
+        f"account_key = '{azure_account_key}'"
+    )
+
+    # Test 1: Using named collection directly
+    base_backup = "AzureBlobStorage(azure_backup_nc, 'az_nc_backup_test_base')"
+    inc_backup = "AzureBlobStorage(azure_backup_nc, 'az_nc_backup_test_incremental')"
+
+    node.query_and_get_answer_with_error(f"BACKUP TABLE backup_test_az_nc TO {base_backup} ASYNC")[0]
+
+    inc_backup_query_output = node.query_and_get_answer_with_error(
+        f"BACKUP TABLE backup_test_az_nc TO {inc_backup} SETTINGS async=1, base_backup={base_backup}"
+    )[0]
+    inc_backup_id = TSV.toMat(inc_backup_query_output)[0][0]
+    names_in_system_backups_output, _ = node.query_and_get_answer_with_error(
+        f"SELECT base_backup_name, name FROM system.backups where id = '{inc_backup_id}'"
+    )
+
+    base_backup_name, name = TSV.toMat(names_in_system_backups_output)[0]
+
+    assert azure_account_key not in base_backup_name
+    assert azure_account_key not in name
+
+    # Test 2: Using named collection with account_key override
+    password2 = new_password()
+    base_backup2 = f"AzureBlobStorage(azure_backup_nc, 'az_nc_backup_test_base2', account_key = '{password2}')"
+    inc_backup2 = f"AzureBlobStorage(azure_backup_nc, 'az_nc_backup_test_incremental2', account_key = '{password2}')"
+
+    node.query_and_get_answer_with_error(f"BACKUP TABLE backup_test_az_nc TO {base_backup2} ASYNC")[0]
+
+    inc_backup_query_output2 = node.query_and_get_answer_with_error(
+        f"BACKUP TABLE backup_test_az_nc TO {inc_backup2} SETTINGS async=1, base_backup={base_backup2}"
+    )[0]
+    inc_backup_id2 = TSV.toMat(inc_backup_query_output2)[0][0]
+    names_in_system_backups_output2, _ = node.query_and_get_answer_with_error(
+        f"SELECT base_backup_name, name FROM system.backups where id = '{inc_backup_id2}'"
+    )
+
+    base_backup_name2, name2 = TSV.toMat(names_in_system_backups_output2)[0]
+
+    assert password2 not in base_backup_name2
+    assert password2 not in name2
+
+    # Check logs don't contain secrets and key-value args are masked
+    check_logs(
+        must_contain=[
+            "BACKUP TABLE backup_test_az_nc TO AzureBlobStorage(azure_backup_nc, 'az_nc_backup_test_base2', account_key = '[HIDDEN]')",
+        ],
+        must_not_contain=[azure_account_key, password2],
+    )
+
+    node.query("DROP TABLE IF EXISTS backup_test_az_nc")
+    node.query("DROP NAMED COLLECTION IF EXISTS azure_backup_nc")
+
+
 def test_on_cluster():
     password = new_password()
 
@@ -840,3 +1070,17 @@ def test_iceberg_cluster_function():
         ],
         must_not_contain=[password, azure_account_key],
     )
+
+
+def test_query_masking_rule_with_ddl():
+    table_name = "test_ddl_masking"
+    node.query(f"DROP TABLE IF EXISTS {table_name}")
+    node.query(
+        f"CREATE TABLE {table_name} ON CLUSTER 'test_shard_localhost' (s String, sensetive_data UInt32) ENGINE = MergeTree ORDER BY s"
+    )
+
+    assert_eq_with_retry(node, "SELECT count(*) FROM system.distribution_queue", "0\n")
+    assert "sensetive_data" in node.query(
+        f"SELECT create_table_query FROM system.tables WHERE table='{table_name}' {show_secrets}=1"
+    )
+    node.query("DROP TABLE IF EXISTS test_table")
diff --git a/tests/integration/test_memory_limit/configs/async_metrics_no.xml b/tests/integration/test_memory_limit/configs/async_metrics_no.xml
index 15ebbe9e0bd1..0667494915a5 100644
--- a/tests/integration/test_memory_limit/configs/async_metrics_no.xml
+++ b/tests/integration/test_memory_limit/configs/async_metrics_no.xml
@@ -16,6 +16,7 @@
     <part_log remove="remove" />
     <crash_log remove="remove" />
     <opentelemetry_span_log remove="remove" />
+    <iceberg_metadata_log remove="remove" />
     <!-- just in case it will be enabled by default -->
     <zookeeper_log remove="remove" />
     <transactions_info_log remove="remove" />
diff --git a/tests/integration/test_multiple_disks/test.py b/tests/integration/test_multiple_disks/test.py
index 3dc8c1e5dc4f..4d829e119ad3 100644
--- a/tests/integration/test_multiple_disks/test.py
+++ b/tests/integration/test_multiple_disks/test.py
@@ -93,7 +93,7 @@ def test_system_tables(start_cluster):
             {
                 "name": "disk_db_remote",
                 "path": f"{db_disk_path}",
-                "keep_free_space": "0",
+                "keep_free_space": 0,
             }
         )
 
diff --git a/tests/integration/test_named_collections/configs/config.d/named_collections.xml b/tests/integration/test_named_collections/configs/config.d/named_collections.xml
index d24fb303b377..a837f0041ad0 100644
--- a/tests/integration/test_named_collections/configs/config.d/named_collections.xml
+++ b/tests/integration/test_named_collections/configs/config.d/named_collections.xml
@@ -4,4 +4,5 @@
       <key1>value1</key1>
     </collection1>
   </named_collections>
+  <display_secrets_in_show_and_select>1</display_secrets_in_show_and_select>
 </clickhouse>
diff --git a/tests/integration/test_named_collections/configs/config.d/named_collections_with_zookeeper.xml b/tests/integration/test_named_collections/configs/config.d/named_collections_with_zookeeper.xml
index 43d80ee6f693..2f813ee909df 100644
--- a/tests/integration/test_named_collections/configs/config.d/named_collections_with_zookeeper.xml
+++ b/tests/integration/test_named_collections/configs/config.d/named_collections_with_zookeeper.xml
@@ -10,6 +10,8 @@
     </collection1>
   </named_collections>
 
+  <display_secrets_in_show_and_select>1</display_secrets_in_show_and_select>
+
   <remote_servers>
       <replicated_nc_nodes_cluster>
           <shard>
diff --git a/tests/integration/test_named_collections/configs/users.d/users.xml b/tests/integration/test_named_collections/configs/users.d/users.xml
index 7d4f0543ff1a..f1baf979f7a1 100644
--- a/tests/integration/test_named_collections/configs/users.d/users.xml
+++ b/tests/integration/test_named_collections/configs/users.d/users.xml
@@ -2,6 +2,7 @@
     <profiles>
         <default>
             <ignore_on_cluster_for_replicated_named_collections_queries>0</ignore_on_cluster_for_replicated_named_collections_queries>
+            <format_display_secrets_in_show_and_select>1</format_display_secrets_in_show_and_select>
         </default>
     </profiles>
     <users>
diff --git a/tests/integration/test_named_collections/test.py b/tests/integration/test_named_collections/test.py
index 027c5304f195..9b1244b067ff 100644
--- a/tests/integration/test_named_collections/test.py
+++ b/tests/integration/test_named_collections/test.py
@@ -134,6 +134,36 @@ def test_default_access(cluster):
         ).strip()
         == "value1"
     )
+
+    assert (
+        node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection1'",
+            settings={"format_display_secrets_in_show_and_select": 0}
+        ).strip()
+        == "[HIDDEN]"
+    )
+
+    replace_in_server_config(
+        node, "display_secrets_in_show_and_select>1", "display_secrets_in_show_and_select>0"
+    )
+    assert "display_secrets_in_show_and_select>0" in node.exec_in_container(
+        ["bash", "-c", f"cat /etc/clickhouse-server/config.d/named_collections.xml"]
+    )
+    node.restart_clickhouse()
+    assert (
+        node.query(
+            "select collection['key1'] from system.named_collections where name = 'collection1'"
+        ).strip()
+        == "[HIDDEN]"
+    )
+
+    replace_in_server_config(
+        node, "display_secrets_in_show_and_select>0", "display_secrets_in_show_and_select>1"
+    )
+    assert "display_secrets_in_show_and_select>1" in node.exec_in_container(
+        ["bash", "-c", f"cat /etc/clickhouse-server/config.d/named_collections.xml"]
+    )
+
     replace_in_users_config(
         node, "show_named_collections_secrets>1", "show_named_collections_secrets>0"
     )
diff --git a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml b/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml
index 233e23846cb9..c4bcf60d8bd6 100644
--- a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml
+++ b/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml
@@ -9,4 +9,6 @@
       <key1>value1</key1>
     </collection1>
   </named_collections>
+
+  <display_secrets_in_show_and_select>1</display_secrets_in_show_and_select>
 </clickhouse>
diff --git a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml b/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml
index d1dd5c297878..b8d13cef922e 100644
--- a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml
+++ b/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml
@@ -28,4 +28,6 @@
           <allow_distributed_ddl_queries>true</allow_distributed_ddl_queries>
       </replicated_nc_nodes_cluster>
   </remote_servers>
+
+  <display_secrets_in_show_and_select>1</display_secrets_in_show_and_select>
 </clickhouse>
diff --git a/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml b/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml
index 7d4f0543ff1a..f1baf979f7a1 100644
--- a/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml
+++ b/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml
@@ -2,6 +2,7 @@
     <profiles>
         <default>
             <ignore_on_cluster_for_replicated_named_collections_queries>0</ignore_on_cluster_for_replicated_named_collections_queries>
+            <format_display_secrets_in_show_and_select>1</format_display_secrets_in_show_and_select>
         </default>
     </profiles>
     <users>
diff --git a/tests/integration/test_named_collections_if_exists_on_cluster/configs/config.d/cluster.xml b/tests/integration/test_named_collections_if_exists_on_cluster/configs/config.d/cluster.xml
index 95336350c1e8..1cd6b9f13f14 100644
--- a/tests/integration/test_named_collections_if_exists_on_cluster/configs/config.d/cluster.xml
+++ b/tests/integration/test_named_collections_if_exists_on_cluster/configs/config.d/cluster.xml
@@ -19,4 +19,5 @@
             <allow_distributed_ddl_queries>true</allow_distributed_ddl_queries>
         </cluster>
     </remote_servers>
+    <display_secrets_in_show_and_select>1</display_secrets_in_show_and_select>
 </clickhouse>
diff --git a/tests/integration/test_named_collections_if_exists_on_cluster/configs/users.d/default.xml b/tests/integration/test_named_collections_if_exists_on_cluster/configs/users.d/default.xml
index 15da914f666b..308f3b976a50 100644
--- a/tests/integration/test_named_collections_if_exists_on_cluster/configs/users.d/default.xml
+++ b/tests/integration/test_named_collections_if_exists_on_cluster/configs/users.d/default.xml
@@ -1,4 +1,9 @@
 <clickhouse>
+    <profiles>
+        <default>
+            <format_display_secrets_in_show_and_select>1</format_display_secrets_in_show_and_select>
+        </default>
+    </profiles>
     <users>
         <default>
             <password></password>
diff --git a/tests/integration/test_old_versions/test.py b/tests/integration/test_old_versions/test.py
index e1eb9257280b..0507642118ec 100644
--- a/tests/integration/test_old_versions/test.py
+++ b/tests/integration/test_old_versions/test.py
@@ -6,7 +6,7 @@
 cluster = ClickHouseCluster(__file__)
 node_oldest = cluster.add_instance(
     "node_oldest",
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     main_configs=["configs/config.d/test_cluster.xml"],
diff --git a/tests/integration/test_parallel_replicas_insert_select/test.py b/tests/integration/test_parallel_replicas_insert_select/test.py
index 977abed7dfad..89fa7a292abc 100644
--- a/tests/integration/test_parallel_replicas_insert_select/test.py
+++ b/tests/integration/test_parallel_replicas_insert_select/test.py
@@ -274,3 +274,57 @@ def test_insert_select_with_constant(start_cluster, max_parallel_replicas, paral
         )
         == f"{populate_count}\n"
     )
+
+
+@pytest.mark.parametrize(
+    "max_parallel_replicas",
+    [
+        pytest.param(2),
+        pytest.param(3),
+    ],
+)
+@pytest.mark.parametrize(
+    "parallel_replicas_local_plan",
+    [
+        pytest.param(False),
+        pytest.param(True),
+    ]
+)
+def test_insert_select_where(start_cluster, max_parallel_replicas, parallel_replicas_local_plan):
+    populate_count = 1_000_000
+    count = int(populate_count / 10)
+    cluster_name = "test_1_shard_3_replicas"
+
+    source_table = "t_source"
+    create_tables(source_table, populate_count=populate_count, skip_last_replica=False)
+    target_table = "t_target"
+    create_tables(target_table, populate_count=0, skip_last_replica=False)
+
+    query_id = str(uuid.uuid4())
+    node1.query(
+        f"INSERT INTO {target_table} SELECT * FROM {source_table} WHERE key % 10 = 0",
+        settings={
+            "parallel_distributed_insert_select": 2,
+            "enable_parallel_replicas": 2,
+            "max_parallel_replicas": max_parallel_replicas,
+            "cluster_for_parallel_replicas": cluster_name,
+            "parallel_replicas_local_plan": parallel_replicas_local_plan,
+            "enable_analyzer": 1,
+        },
+        query_id=query_id
+    )
+    node1.query(f"SYSTEM SYNC REPLICA {target_table} LIGHTWEIGHT")
+    assert (
+        node1.query(
+            f"select count() from {target_table}"
+        )
+        == f"{count}\n"
+    )
+
+    # check that query executed in distributed way
+    execute_on_cluster(f"SYSTEM FLUSH LOGS query_log")
+    number_of_queries = node1.query(
+            f"""SELECT count() FROM clusterAllReplicas({cluster_name}, system.query_log) WHERE current_database = currentDatabase() AND initial_query_id = '{query_id}' AND type = 'QueryFinish' AND query_kind = 'Insert'""",
+        settings={"skip_unavailable_shards": 1},
+    )
+    assert (int(number_of_queries) > 1)
diff --git a/tests/integration/test_polymorphic_parts/test.py b/tests/integration/test_polymorphic_parts/test.py
index 49acf287481a..20dc47043145 100644
--- a/tests/integration/test_polymorphic_parts/test.py
+++ b/tests/integration/test_polymorphic_parts/test.py
@@ -365,7 +365,7 @@ def test_different_part_types_on_replicas(start_cluster, table, part_type):
     "node7",
     user_configs=["configs_old/users.d/not_optimize_count.xml"],
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_postgresql_database_engine/test.py b/tests/integration/test_postgresql_database_engine/test.py
index 8e3bfaea9084..042291c5731f 100644
--- a/tests/integration/test_postgresql_database_engine/test.py
+++ b/tests/integration/test_postgresql_database_engine/test.py
@@ -403,6 +403,71 @@ def test_datetime(started_cluster):
     assert "DateTime64(6)" in node1.query("show create table pg.test")
 
 
+def test_numeric_detach_attach(started_cluster):
+    cursor = started_cluster.postgres_conn.cursor()
+    cursor.execute("DROP TABLE IF EXISTS test_table")
+    cursor.execute("""
+        CREATE TABLE test_table (
+            numeric_1 numeric NOT NULL,
+            numeric_2 numeric(10) NOT NULL,
+            numeric_3 numeric(10, 0) NOT NULL,
+            numeric_4 numeric(5, 2) NOT NULL,
+            numeric_5 numeric(10, 5) NOT NULL,
+            numeric_6 numeric(20, 10) NOT NULL,
+            numeric_7 numeric(50, 20) NOT NULL,
+            decimal_1 decimal NOT NULL,
+            decimal_2 decimal(10) NOT NULL,
+            decimal_3 decimal(10, 0) NOT NULL,
+            decimal_4 decimal(5, 2) NOT NULL,
+            decimal_5 decimal(10, 5) NOT NULL,
+            decimal_6 decimal(20, 10) NOT NULL,
+            decimal_7 decimal(50, 20) NOT NULL
+        )
+    """)
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query(
+        "CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1)"
+    )
+
+    expected_clickhouse_column_types = {
+        "numeric_1": "Decimal(38, 19)",
+        "numeric_2": "Decimal(10, 0)",
+        "numeric_3": "Decimal(10, 0)",
+        "numeric_4": "Decimal(5, 2)",
+        "numeric_5": "Decimal(10, 5)",
+        "numeric_6": "Decimal(20, 10)",
+        "numeric_7": "Decimal(50, 20)",
+        "decimal_1": "Decimal(38, 19)",
+        "decimal_2": "Decimal(10, 0)",
+        "decimal_3": "Decimal(10, 0)",
+        "decimal_4": "Decimal(5, 2)",
+        "decimal_5": "Decimal(10, 5)",
+        "decimal_6": "Decimal(20, 10)",
+        "decimal_7": "Decimal(50, 20)",
+    }
+
+    def get_actual_clickhouse_column_types():
+        res = node1.query(
+            "SELECT name, type FROM system.columns WHERE database = 'postgres_database' AND table = 'test_table'"
+        )
+
+        return dict(line.split('\t') for line in res.splitlines())
+
+    assert get_actual_clickhouse_column_types() == expected_clickhouse_column_types
+
+    create_ddl = node1.query("SHOW CREATE TABLE postgres_database.test_table")
+    for column, expected_type in expected_clickhouse_column_types.items():
+        assert f"`{column}` {expected_type}" in create_ddl
+
+    node1.query("DETACH TABLE postgres_database.test_table")
+    node1.query("ATTACH TABLE postgres_database.test_table")
+
+    assert get_actual_clickhouse_column_types() == expected_clickhouse_column_types
+
+    node1.query("DROP DATABASE postgres_database")
+    cursor.execute(f"DROP TABLE test_table")
+
 def test_postgresql_password_leak(started_cluster):
     conn = get_postgres_conn(
         started_cluster.postgres_ip, started_cluster.postgres_port, database=True
diff --git a/tests/integration/test_projection_rebuild_with_required_columns/__init__.py b/tests/integration/test_projection_rebuild_with_required_columns/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_projection_rebuild_with_required_columns/configs/insert_limits.xml b/tests/integration/test_projection_rebuild_with_required_columns/configs/insert_limits.xml
new file mode 100644
index 000000000000..18c9e18d779b
--- /dev/null
+++ b/tests/integration/test_projection_rebuild_with_required_columns/configs/insert_limits.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+  <profiles>
+    <default>
+      <min_insert_block_size_bytes>1048576</min_insert_block_size_bytes>
+      <min_insert_block_size_rows>10000</min_insert_block_size_rows>
+    </default>
+  </profiles>
+</clickhouse>
diff --git a/tests/integration/test_projection_rebuild_with_required_columns/test.py b/tests/integration/test_projection_rebuild_with_required_columns/test.py
new file mode 100644
index 000000000000..d0fdf03e402e
--- /dev/null
+++ b/tests/integration/test_projection_rebuild_with_required_columns/test.py
@@ -0,0 +1,39 @@
+import pytest
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance("node1", user_configs=["configs/insert_limits.xml"])
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_projection_rebuild_uses_only_required_columns(started_cluster):
+    # Here we check that projection rebuild does not create too many temporary parts.
+    # The size of temporary projection part is limited by min_insert_block_size_bytes/min_insert_block_size_rows, so they are changed in the config.
+
+    node1.query("drop table if exists tab")
+    node1.query("create table tab (x UInt64, y UInt64, data String codec(NONE), v UInt8, projection p (select _part_offset order by y)) engine = ReplacingMergeTree(v) order by x settings allow_part_offset_column_in_projections=1, deduplicate_merge_projection_mode='rebuild';")
+    # Here we expect 3 parts to be inserted, contrilled by max_block_size=min_insert_block_size_rows=10000
+    node1.query("insert into tab select number, number, rightPad('', 100, 'a'), 0 from numbers(30000) settings max_block_size=10000;")
+    # Here we merge parts, and projections should be rebuild
+    # Initially we kept `data` column in projection squash, ~10 temporary parts were created by min_insert_block_size_bytes limit
+    node1.query("optimize table tab final settings mutations_sync=2, alter_sync=2;")
+    node1.query("system flush logs;")
+
+    uuid = node1.query("select uuid from system.tables where table = 'tab';").strip()
+    cnt = node1.query("select count() from system.text_log where query_id like '{}::all_%_2' and message like '%Reading%from part p_%from the beginning of the part%'".format(uuid))
+    # One projection part per source part
+    assert (cnt == '3\n')
+    # Here we check that _parent_part_offset is calculated properly. It was fixed in https://github.com/ClickHouse/ClickHouse/pull/93827
+    assert(node1.query("select min(_parent_part_offset), max(_parent_part_offset) from mergeTreeProjection(default, tab, 'p')") == '0\t29999\n')
diff --git a/tests/integration/test_prometheus_protocols/test_write_read.py b/tests/integration/test_prometheus_protocols/test_write_read.py
index e890d0558ab0..a7c198ca16f4 100644
--- a/tests/integration/test_prometheus_protocols/test_write_read.py
+++ b/tests/integration/test_prometheus_protocols/test_write_read.py
@@ -21,9 +21,8 @@
 )
 
 
-# Data are inserted via RemoteWrite protocol to ClickHouse,
-# we need to wait a bit until we get some data.
-def wait_for_data():
+# Waits until Prometheus scrapes some data and sends it to ClickHouse via the RemoteWrite protocol.
+def wait_for_scraped_data():
     start_time = time.monotonic()
     assert_eq_with_retry(
         node, "SELECT count() > 0 FROM timeSeriesData(prometheus)", "1"
@@ -40,6 +39,18 @@ def wait_for_data():
     )
 
 
+# Sends lots of data to ClickHouse via the RemoteWrite protocol.
+def send_big_data(metric_name="big_data", start_time=1724112000, end_time=1724115600, count=75000):
+    time_series = []
+    step = (end_time - start_time) / count
+    for i in range(0, count):
+        timestamp = start_time + i * step
+        value = i
+        time_series.append(({"__name__": metric_name}, {timestamp: value}))
+    protobuf = convert_time_series_to_protobuf(time_series)
+    send_protobuf_to_remote_write(node.ip_address, 9093, "/write", protobuf)
+
+
 # Executes a query in the "prometheus_reader" service. This service uses the RemoteRead protocol to get data from ClickHouse.
 def execute_query_in_prometheus_reader(query, timestamp):
     return execute_query_via_http_api(
@@ -83,13 +94,14 @@ def start_cluster():
     try:
         cluster.start()
         node.query("CREATE TABLE prometheus ENGINE=TimeSeries")
+        wait_for_scraped_data()
+        send_big_data()
         yield cluster
     finally:
         cluster.shutdown()
 
 
 def test_handle_normal_scrape():
-    wait_for_data()
     query = "up"
     evaluation_time = time.time()
     result = execute_query_in_prometheus(query, evaluation_time)
@@ -103,8 +115,6 @@ def test_handle_normal_scrape():
 
 
 def test_remote_read_auth():
-    wait_for_data()
-
     read_request = convert_read_request_to_protobuf(
         "^up$", time.time() - 300, time.time()
     )
@@ -128,3 +138,19 @@ def test_remote_read_auth():
         read_request,
     )
     assert auth_fail_response.status_code == requests.codes.forbidden
+
+
+def test_remote_read_big_data():
+    read_request = convert_read_request_to_protobuf(
+        "^big_data$", 1724112000, 1724115600
+    )
+
+    read_response = receive_protobuf_from_remote_read(
+        node.ip_address,
+        9093,
+        "read_auth_ok",
+        read_request)
+
+    assert len(read_response.results) == 1
+    assert len(read_response.results[0].timeseries) == 1
+    assert len(read_response.results[0].timeseries[0].samples) == 75000
diff --git a/tests/integration/test_race_condition_for_replicated_merge_tree/__init__.py b/tests/integration/test_race_condition_for_replicated_merge_tree/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_race_condition_for_replicated_merge_tree/configs/users.xml b/tests/integration/test_race_condition_for_replicated_merge_tree/configs/users.xml
new file mode 100644
index 000000000000..2daf5e5b0c06
--- /dev/null
+++ b/tests/integration/test_race_condition_for_replicated_merge_tree/configs/users.xml
@@ -0,0 +1,17 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <allow_drop_detached>1</allow_drop_detached>
+            <allow_experimental_alter_materialized_view_structure>1</allow_experimental_alter_materialized_view_structure>
+            <allow_experimental_object_type>0</allow_experimental_object_type>
+            <allow_suspicious_codecs>0</allow_suspicious_codecs>
+            <database_replicated_allow_replicated_engine_arguments>2</database_replicated_allow_replicated_engine_arguments>
+            <database_replicated_allow_explicit_uuid>3</database_replicated_allow_explicit_uuid>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <profile>default</profile>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_race_condition_for_replicated_merge_tree/test.py b/tests/integration/test_race_condition_for_replicated_merge_tree/test.py
new file mode 100644
index 000000000000..171ce6a4d4a9
--- /dev/null
+++ b/tests/integration/test_race_condition_for_replicated_merge_tree/test.py
@@ -0,0 +1,173 @@
+import pytest
+import threading
+import time
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    with_zookeeper=True,
+    user_configs=["configs/users.xml"],
+    stay_alive=True,
+    macros={"shard": "s1", "replica": "r1"},
+)
+node2 = cluster.add_instance(
+    "node2",
+    with_zookeeper=True,
+    user_configs=["configs/users.xml"],
+    stay_alive=True,
+    macros={"shard": "s1", "replica": "r2"},
+)
+node3 = cluster.add_instance(
+    "node3",
+    with_zookeeper=True,
+    user_configs=["configs/users.xml"],
+    stay_alive=True,
+    macros={"shard": "s1", "replica": "r3"},
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def get_last_block_number_for_partition(node, table_uuid, partition):
+    query = f"""
+    SELECT 
+        toInt64(replaceRegexpOne(name, 'block-', '')) as block_number
+    FROM system.zookeeper
+    WHERE path = '/clickhouse/tables/{table_uuid}/s1/block_numbers/{partition}'
+        AND name LIKE 'block-%'
+    ORDER BY block_number DESC
+    LIMIT 1
+    """
+    result = node.query(query).strip()
+    if result == "":
+        return None
+    return int(result)
+
+
+def wait_for_queue_to_process(node, database, table, timeout=60):
+    """Poll until replication queue is empty."""
+    start = time.time()
+    while time.time() - start < timeout:
+        result = node.query(
+            f"""
+            SELECT queue_size, absolute_delay 
+            FROM system.replicas 
+            WHERE database = '{database}' AND table = '{table}'
+        """
+        )
+
+        if result:
+            queue_size, delay = map(int, result.strip().split("\t"))
+            if queue_size == 0 and delay == 0:
+                print(f"Queue processed on {node.name}")
+                return True
+
+        time.sleep(0.5)
+
+    raise TimeoutError(f"Queue not processed within {timeout}s")
+
+
+def test_partition_move_drop_race(started_cluster):
+    for node in [node1, node2, node3]:
+        node.query(f"DROP DATABASE IF EXISTS test_db SYNC")
+
+    node1.query("SYSTEM ENABLE FAILPOINT rmt_delay_execute_drop_range")
+    node1.query("SYSTEM ENABLE FAILPOINT rmt_delay_commit_part")
+
+    for node in [node1, node2, node3]:
+        node.query(
+            """
+            CREATE DATABASE test_db 
+            ENGINE = Replicated('/test/db', '{shard}', '{replica}')
+        """
+        )
+
+    node1.query(
+        f"""
+        CREATE TABLE test_db.tbl (id UInt32, val String)
+        ENGINE = ReplicatedMergeTree
+        PARTITION BY id % 10 ORDER BY id
+        SETTINGS old_parts_lifetime = 1
+    """
+    )
+
+    for node in [node1, node2, node3]:
+        assert node.query_with_retry(
+            "SELECT count() FROM system.tables WHERE database='test_db' AND name='tbl'",
+            check_callback=lambda x: x.strip() == "1",
+        )
+
+    table_uuid = node1.query(
+        "SELECT uuid FROM system.tables WHERE database='test_db' AND name='tbl'"
+    ).strip()
+
+    node2.query(f"SYSTEM STOP FETCHES test_db.tbl")
+    node3.query(f"SYSTEM STOP FETCHES test_db.tbl")
+
+    prev_block_number = get_last_block_number_for_partition(node1, table_uuid, 0)
+
+    exception_holder = [None]
+    def drop_op():
+        try:
+            # Wait until INSERT query allocates the block number
+            timeout = 60  # seconds
+            start_time = time.time()
+
+            while True:
+                current_block_number = get_last_block_number_for_partition(
+                    node1, table_uuid, 0
+                )
+                if current_block_number != prev_block_number:
+                    break
+
+                if time.time() - start_time > timeout:
+                    raise TimeoutError(
+                        f"Timeout waiting for block number to change after {timeout}s. "
+                        f"Previous: {prev_block_number}, Current: {current_block_number}"
+                    )
+                time.sleep(0.5)
+
+            node1.query(f"ALTER TABLE test_db.tbl DROP PARTITION 0")
+        except Exception as e:
+            exception_holder[0] = e
+
+    t = threading.Thread(target=drop_op)
+    t.start()
+
+    node1.query(f"INSERT INTO test_db.tbl VALUES (0, 'a'), (10, 'b'), (20, 'c')")
+    t.join()
+
+    if exception_holder[0]:
+        raise exception_holder[0]
+
+    wait_for_queue_to_process(node1, "test_db", "tbl")
+    node3.query(f"SYSTEM START FETCHES test_db.tbl")
+    wait_for_queue_to_process(node3, "test_db", "tbl")
+
+    errors = []
+    for node in [node1, node2, node3]:
+        lost = int(
+            node.query(
+                "SELECT lost_part_count FROM system.replicas WHERE database = 'test_db' AND table = 'tbl'"
+            ).strip()
+        )
+
+        print(f"{node.name} lost_parts: {lost}")
+
+        if lost > 0:
+            errors.append(f"{node.name} has {lost} lost parts")
+
+    if errors:
+        pytest.fail(f"Race: {'; '.join(errors)}")
+
+    for node in [node1, node2, node3]:
+        node.query(f"DROP DATABASE IF EXISTS test_db SYNC")
diff --git a/tests/integration/test_refreshable_mv_skip_old_temp_table_ddls/test.py b/tests/integration/test_refreshable_mv_skip_old_temp_table_ddls/test.py
index 8bef1de9c826..f0ac9ae8bf7f 100644
--- a/tests/integration/test_refreshable_mv_skip_old_temp_table_ddls/test.py
+++ b/tests/integration/test_refreshable_mv_skip_old_temp_table_ddls/test.py
@@ -80,9 +80,7 @@ def test_refreshable_mv_skip_old_temp_tables_ddls(
     node1.query(f"DROP DATABASE IF EXISTS {db_name} SYNC")
     node2.query(f"DROP DATABASE IF EXISTS {db_name}  SYNC")
     # Make sure that the MV is refreshed on node1
-    node2.query(
-        "SYSTEM ENABLE FAILPOINT refresh_task_delay_update_coordination_state_running"
-    )
+    node2.query("SYSTEM ENABLE FAILPOINT refresh_task_stop_racing_for_running_refresh")
     node2.query("SYSTEM ENABLE FAILPOINT database_replicated_delay_entry_execution")
 
     node1.query(
@@ -98,11 +96,11 @@ def test_refreshable_mv_skip_old_temp_tables_ddls(
             f"CREATE TABLE {db_name}.target (x DateTime) ENGINE ReplicatedMergeTree ORDER BY x"
         )
         node1.query(
-            f"CREATE MATERIALIZED VIEW {db_name}.mv REFRESH EVERY 1 SECOND {append_clause} TO {db_name}.target AS SELECT now() AS x"
+            f"CREATE MATERIALIZED VIEW {db_name}.mv REFRESH EVERY 1 HOUR {append_clause} TO {db_name}.target AS SELECT now() AS x"
         )
     else:
         node1.query(
-            f"CREATE MATERIALIZED VIEW {db_name}.mv REFRESH EVERY 1 SECOND {append_clause} (x DateTime) ENGINE ReplicatedMergeTree ORDER BY x AS SELECT now() AS x"
+            f"CREATE MATERIALIZED VIEW {db_name}.mv REFRESH EVERY 1 HOUR {append_clause} (x DateTime) ENGINE ReplicatedMergeTree ORDER BY x AS SELECT now() AS x"
         )
 
     node2.query(
@@ -122,10 +120,16 @@ def test_refreshable_mv_skip_old_temp_tables_ddls(
 
     last_log_ts = get_last_ddl_worker_log_ts(node2, db_name)
 
-    # Wait for node1 to refresh the view several times
-    time.sleep(5)
-
-    node1.query(f"ALTER TABLE {db_name}.mv MODIFY REFRESH EVERY 1 HOUR {append_clause}")
+    last_refresh_time = node1.query(
+        "SELECT last_refresh_time FROM system.view_refreshes WHERE view='mv'"
+    )
+    for i in range(2):
+        node1.query(f"SYSTEM REFRESH VIEW {db_name}.mv")
+    # Ensure that the mv is refresh
+    node1.query_with_retry(
+        "SELECT last_refresh_time FROM system.view_refreshes WHERE view='mv'",
+        check_callback=lambda x: x != last_refresh_time,
+    )
 
     # Make sure that the view is not refreshing, and it is scheduled to be refreshed in at least 10 minutes
     node1.query_with_retry(
@@ -135,9 +139,7 @@ def test_refreshable_mv_skip_old_temp_tables_ddls(
         > datetime.timedelta(minutes=10),
     )
 
-    node2.query(
-        "SYSTEM DISABLE FAILPOINT refresh_task_delay_update_coordination_state_running"
-    )
+    node2.query("SYSTEM DISABLE FAILPOINT refresh_task_stop_racing_for_running_refresh")
     node2.query("SYSTEM DISABLE FAILPOINT database_replicated_delay_entry_execution")
 
     table_info1 = node1.query(f"SELECT uuid, name FROM system.tables WHERE database='{db_name}'")
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 9f0d63c53f35..1bfc15698353 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -1714,6 +1714,21 @@ def test_lag_after_recovery(started_cluster):
         == "0\n"
     )
 
+
+def test_correct_skip_indexes(started_cluster):
+    competing_node.query("DROP DATABASE IF EXISTS correct_skip_indexes")
+    dummy_node.query("DROP DATABASE IF EXISTS correct_skip_indexes")
+
+    competing_node.query(
+        "CREATE DATABASE correct_skip_indexes ENGINE = Replicated('/clickhouse/databases/correct_skip_indexes', 'shard1', 'replica1');"
+        "CREATE TABLE correct_skip_indexes.test (`id` UInt64, `a` String, `b` String ALIAS a, INDEX bf_a assumeNotNull(b) TYPE bloom_filter(0.01) GRANULARITY 1) ENGINE = ReplicatedMergeTree ORDER BY (id);"
+    )
+    dummy_node.query(
+        "CREATE DATABASE correct_skip_indexes ENGINE = Replicated('/clickhouse/databases/correct_skip_indexes', 'shard1', 'replica2');"
+        "SYSTEM SYNC DATABASE REPLICA correct_skip_indexes;"
+    )
+
+
 def test_implicit_index(started_cluster):
     competing_node.query("DROP DATABASE IF EXISTS implicit_index")
     dummy_node.query("DROP DATABASE IF EXISTS implicit_index")
@@ -1727,3 +1742,35 @@ def test_implicit_index(started_cluster):
         "CREATE DATABASE implicit_index ENGINE = Replicated('/clickhouse/databases/implicit_index', 'shard1', 'replica2');"
         "SYSTEM SYNC DATABASE REPLICA implicit_index;"
     )
+
+
+def test_timeseries(started_cluster):
+    for node in [competing_node, main_node, dummy_node]:
+        node.query("DROP DATABASE IF EXISTS ts_db SYNC")
+
+    competing_node.query(
+        "CREATE DATABASE ts_db ENGINE = Replicated('/clickhouse/databases/ts_db', '{shard}', '{replica}');"
+    )
+
+    main_node.query(
+        """
+        CREATE DATABASE ts_db ENGINE = Replicated('/clickhouse/databases/ts_db', '{shard}', '{replica}');
+        CREATE TABLE ts_db.table ENGINE = TimeSeries SETTINGS store_min_time_and_max_time = false
+        DATA ENGINE = ReplicatedMergeTree ORDER BY (id, timestamp)
+        TAGS ENGINE = ReplicatedAggregatingMergeTree PRIMARY KEY metric_name ORDER BY (metric_name, id)
+        METRICS ENGINE = ReplicatedReplacingMergeTree ORDER BY metric_family_name;
+        """,
+        settings={"allow_experimental_time_series_table": 1}
+    )
+
+    dummy_node.query(
+        "CREATE DATABASE ts_db ENGINE = Replicated('/clickhouse/databases/ts_db', '{shard}', '{replica}');"
+    )
+
+    for node in [competing_node, main_node, dummy_node]:
+        assert node.query(
+            """
+            SYSTEM SYNC DATABASE REPLICA ts_db;
+            SELECT count() FROM system.tables WHERE database='ts_db';
+            """, timeout=10
+        ) == "4\n", f"Node {node.name} failed"
diff --git a/tests/integration/test_replicated_merge_tree_compatibility/test.py b/tests/integration/test_replicated_merge_tree_compatibility/test.py
index 3c1599aeb904..59ee325df237 100644
--- a/tests/integration/test_replicated_merge_tree_compatibility/test.py
+++ b/tests/integration/test_replicated_merge_tree_compatibility/test.py
@@ -6,7 +6,7 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
@@ -14,7 +14,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_replicating_constants/test.py b/tests/integration/test_replicating_constants/test.py
index c895921fc499..f805a068c1b3 100644
--- a/tests/integration/test_replicating_constants/test.py
+++ b/tests/integration/test_replicating_constants/test.py
@@ -8,8 +8,8 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
-    tag="23.3",
+    image="altinity/clickhouse-server",
+    tag="23.3.19.33.altinitystable",
     with_installed_binary=True,
 )
 
diff --git a/tests/integration/test_rocksdb_options/test.py b/tests/integration/test_rocksdb_options/test.py
index a2d40eb6ddb0..8a30cfb58608 100644
--- a/tests/integration/test_rocksdb_options/test.py
+++ b/tests/integration/test_rocksdb_options/test.py
@@ -44,13 +44,13 @@ def test_valid_options(start_cluster):
     )
     node.query(
         """
-    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only') PRIMARY KEY(key);
+    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only_test_valid_options') PRIMARY KEY(key);
     DROP TABLE test;
     """
     )
     node.query(
         """
-    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/store/test_rocksdb_read_only', 1) PRIMARY KEY(key);
+    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/user_files/test_rocksdb_read_only_test_valid_options', 1) PRIMARY KEY(key);
     DROP TABLE test;
     """
     )
diff --git a/tests/integration/test_rocksdb_read_only/test.py b/tests/integration/test_rocksdb_read_only/test.py
index dcbfa417bff3..4eeb16222aee 100644
--- a/tests/integration/test_rocksdb_read_only/test.py
+++ b/tests/integration/test_rocksdb_read_only/test.py
@@ -28,13 +28,13 @@ def test_read_only(start_cluster):
     with pytest.raises(QueryRuntimeException):
         node.query(
             """
-        CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only', 1) PRIMARY KEY(key);
+        CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only', 1) PRIMARY KEY(key);
         """
         )
     # create directory if read_only = false
     node.query(
         """
-    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only') PRIMARY KEY(key);
+    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only') PRIMARY KEY(key);
     INSERT INTO test (key, value) VALUES (0, 'a'), (1, 'b'), (2, 'c');
     """
     )
@@ -42,25 +42,25 @@ def test_read_only(start_cluster):
     with pytest.raises(QueryRuntimeException):
         node.query(
             """
-        CREATE TABLE test_fail (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only') PRIMARY KEY(key);
+        CREATE TABLE test_fail (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only') PRIMARY KEY(key);
         """
         )
     with pytest.raises(QueryRuntimeException):
         node.query(
             """
-        CREATE TABLE test_fail (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/store/test_rocksdb_read_only') PRIMARY KEY(key);
+        CREATE TABLE test_fail (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/user_files/test_rocksdb_read_only') PRIMARY KEY(key);
         """
         )
     # success if create multiple read-only tables on the same directory
     node.query(
         """
-    CREATE TABLE test_1 (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only', 1) PRIMARY KEY(key);
+    CREATE TABLE test_1 (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only', 1) PRIMARY KEY(key);
     DROP TABLE test_1;
     """
     )
     node.query(
         """
-    CREATE TABLE test_2 (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/store/test_rocksdb_read_only', 1) PRIMARY KEY(key);
+    CREATE TABLE test_2 (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/user_files/test_rocksdb_read_only', 1) PRIMARY KEY(key);
     DROP TABLE test_2;
     """
     )
@@ -68,7 +68,7 @@ def test_read_only(start_cluster):
     node.query(
         """
     DROP TABLE test;
-    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/store/test_rocksdb_read_only', 1) PRIMARY KEY(key);
+    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(10, '/var/lib/clickhouse/user_files/test_rocksdb_read_only', 1) PRIMARY KEY(key);
     """
     )
     result = node.query("""SELECT count() FROM test;""")
@@ -90,7 +90,7 @@ def test_dirctory_missing_after_stop(start_cluster):
     # for read_only = false
     node.query(
         """
-    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only_missing') PRIMARY KEY(key);
+    CREATE TABLE test_missing (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only_missing') PRIMARY KEY(key);
     """
     )
     node.stop_clickhouse()
@@ -98,24 +98,24 @@ def test_dirctory_missing_after_stop(start_cluster):
         [
             "bash",
             "-c",
-            "rm -r /var/lib/clickhouse/store/test_rocksdb_read_only_missing",
+            "rm -r /var/lib/clickhouse/user_files/test_rocksdb_read_only_missing",
         ]
     )
     node.start_clickhouse()
     result = node.query(
-        """INSERT INTO test (key, value) VALUES (0, 'a');
-    SELECT * FROM test;
+        """INSERT INTO test_missing (key, value) VALUES (0, 'a');
+    SELECT * FROM test_missing;
     """
     )
     assert result.strip() == "0\ta"
     node.query(
-        """DROP TABLE test;
+        """DROP TABLE test_missing;
     """
     )
     # for read_only = true
     node.query(
         """
-    CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/store/test_rocksdb_read_only_missing', 1) PRIMARY KEY(key);
+    CREATE TABLE test_missing (key UInt64, value String) Engine=EmbeddedRocksDB(0, '/var/lib/clickhouse/user_files/test_rocksdb_read_only_missing', 1) PRIMARY KEY(key);
     """
     )
     node.stop_clickhouse()
@@ -123,15 +123,15 @@ def test_dirctory_missing_after_stop(start_cluster):
         [
             "bash",
             "-c",
-            "rm -r /var/lib/clickhouse/store/test_rocksdb_read_only_missing",
+            "rm -r /var/lib/clickhouse/user_files/test_rocksdb_read_only_missing",
         ]
     )
     node.start_clickhouse()
     with pytest.raises(QueryRuntimeException):
-        node.query("""INSERT INTO test (key, value) VALUES (1, 'b');""")
-    result = node.query("""SELECT * FROM test;""")
+        node.query("""INSERT INTO test_missing (key, value) VALUES (1, 'b');""")
+    result = node.query("""SELECT * FROM test_missing;""")
     assert result.strip() == ""
     node.query(
-        """DROP TABLE test;
+        """DROP TABLE test_missing;
     """
     )
diff --git a/tests/integration/test_s3_cache_locality/__init__.py b/tests/integration/test_s3_cache_locality/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_s3_cache_locality/configs/cluster.xml b/tests/integration/test_s3_cache_locality/configs/cluster.xml
new file mode 100644
index 000000000000..db54c35374b9
--- /dev/null
+++ b/tests/integration/test_s3_cache_locality/configs/cluster.xml
@@ -0,0 +1,126 @@
+
+<clickhouse>
+    <remote_servers>
+
+        <cluster_12345>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse4</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse5</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_12345>
+
+        <cluster_1234>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse4</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_1234>
+
+        <cluster_2345>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse4</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse5</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_2345>
+
+        <cluster_34512>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse4</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse5</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_34512>
+
+        <cluster_4523>
+            <shard>
+                <replica>
+                    <host>clickhouse4</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse5</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_4523>
+
+    </remote_servers>
+
+    <filesystem_caches>
+        <raw_s3_cache>
+            <path>/var/lib/clickhouse/raw_s3_cache</path>
+            <max_size>10Gi</max_size>
+        </raw_s3_cache>
+    </filesystem_caches>
+</clickhouse>
diff --git a/tests/integration/test_s3_cache_locality/configs/named_collections.xml b/tests/integration/test_s3_cache_locality/configs/named_collections.xml
new file mode 100644
index 000000000000..6994aa3f5e77
--- /dev/null
+++ b/tests/integration/test_s3_cache_locality/configs/named_collections.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <named_collections>
+        <test_s3>
+            <url>http://minio1:9001/root/data/*</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>ClickHouse_Minio_P@ssw0rd</secret_access_key>
+            <format>CSV</format>>
+        </test_s3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_s3_cache_locality/configs/users.xml b/tests/integration/test_s3_cache_locality/configs/users.xml
new file mode 100644
index 000000000000..4b6ba057ecb1
--- /dev/null
+++ b/tests/integration/test_s3_cache_locality/configs/users.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_s3_cache_locality/test.py b/tests/integration/test_s3_cache_locality/test.py
new file mode 100644
index 000000000000..68993d85aeed
--- /dev/null
+++ b/tests/integration/test_s3_cache_locality/test.py
@@ -0,0 +1,262 @@
+import csv
+import logging
+import os
+import shutil
+import uuid
+
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+from helpers.config_cluster import minio_secret_key
+
+
+logging.getLogger().setLevel(logging.INFO)
+logging.getLogger().addHandler(logging.StreamHandler())
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+
+def create_buckets_s3(cluster, files=1000):
+    minio = cluster.minio_client
+
+    s3_data = []
+
+    for file_number in range(files):
+        file_name = f"data/generated_{files}/file_{file_number}.csv"
+        os.makedirs(os.path.join(SCRIPT_DIR, f"data/generated_{files}/"), exist_ok=True)
+        s3_data.append(file_name)
+        with open(os.path.join(SCRIPT_DIR, file_name), "w+", encoding="utf-8") as f:
+            # a String, b UInt64
+            data = []
+
+            # Make all files a bit different
+            data.append(
+                ["str_" + str(file_number), file_number]
+            )
+
+            writer = csv.writer(f)
+            writer.writerows(data)
+
+    for file in s3_data:
+        minio.fput_object(
+            bucket_name=cluster.minio_bucket,
+            object_name=file,
+            file_path=os.path.join(SCRIPT_DIR, file),
+        )
+
+    for obj in minio.list_objects(cluster.minio_bucket, recursive=True):
+        print(obj.object_name)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        # clickhouse0 not a member of cluster_XXX
+        for i in range(6):
+            cluster.add_instance(
+                f"clickhouse{i}",
+                main_configs=["configs/cluster.xml", "configs/named_collections.xml"],
+                user_configs=["configs/users.xml"],
+                macros={"replica": f"clickhouse{i}"},
+                with_minio=True,
+                with_zookeeper=True,
+                stay_alive=True,
+            )
+
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        create_buckets_s3(cluster)
+        create_buckets_s3(cluster, files=3)
+
+        yield cluster
+    finally:
+        shutil.rmtree(os.path.join(SCRIPT_DIR, "data/generated_1000/"), ignore_errors=True)
+        shutil.rmtree(os.path.join(SCRIPT_DIR, "data/generated_3/"), ignore_errors=True)
+        cluster.shutdown()
+
+
+def check_s3_gets(cluster, node, expected_result, cluster_first, cluster_second, enable_filesystem_cache,
+                  lock_object_storage_task_distribution_ms, files=1000):
+    for host in list(cluster.instances.values()):
+        host.query("SYSTEM DROP FILESYSTEM CACHE 'raw_s3_cache'", ignore_error=True)
+
+    settings = {
+        "enable_filesystem_cache": enable_filesystem_cache,
+        "filesystem_cache_name": "'raw_s3_cache'",
+        }
+
+    settings["lock_object_storage_task_distribution_ms"] = lock_object_storage_task_distribution_ms
+
+    query_id_first = str(uuid.uuid4())
+    result_first = node.query(
+        f"""
+        SELECT count(*)
+          FROM s3Cluster('{cluster_first}', 'http://minio1:9001/root/data/generated_{files}/*', 'minio', '{minio_secret_key}', 'CSV', 'a String, b UInt64')
+          WHERE b=42
+        SETTINGS {",".join(f"{k}={v}" for k, v in settings.items())}
+        """,
+        query_id=query_id_first,
+    )
+    assert result_first == expected_result
+    query_id_second = str(uuid.uuid4())
+    result_second = node.query(
+        f"""
+        SELECT count(*)
+          FROM s3Cluster('{cluster_second}', 'http://minio1:9001/root/data/generated_{files}/*', 'minio', '{minio_secret_key}', 'CSV', 'a String, b UInt64')
+          WHERE b=42
+        SETTINGS {",".join(f"{k}={v}" for k, v in settings.items())}
+        """,
+        query_id=query_id_second,
+    )
+    assert result_second == expected_result
+
+    node.query(f"SYSTEM FLUSH LOGS ON CLUSTER {cluster_first}")
+    node.query(f"SYSTEM FLUSH LOGS ON CLUSTER {cluster_second}")
+
+    s3_get_first = node.query(
+        f"""
+        SELECT sum(ProfileEvents['S3GetObject'])
+          FROM clusterAllReplicas('{cluster_first}', system.query_log)
+          WHERE type='QueryFinish'
+            AND initial_query_id='{query_id_first}'
+        """,
+    )
+    s3_get_second = node.query(
+        f"""
+        SELECT sum(ProfileEvents['S3GetObject'])
+          FROM clusterAllReplicas('{cluster_second}', system.query_log)
+          WHERE type='QueryFinish'
+            AND initial_query_id='{query_id_second}'
+        """,
+    )
+
+    return int(s3_get_first), int(s3_get_second)
+
+
+def check_s3_gets_by_hosts(cluster, node, expected_result,
+                  lock_object_storage_task_distribution_ms, files=1000):
+    settings = {
+        "enable_filesystem_cache": False,
+        }
+
+    settings["lock_object_storage_task_distribution_ms"] = lock_object_storage_task_distribution_ms
+    query_id = str(uuid.uuid4())
+    result = node.query(
+        f"""
+        SELECT count(*)
+          FROM s3Cluster('{cluster}', 'http://minio1:9001/root/data/generated_{files}/*', 'minio', '{minio_secret_key}', 'CSV', 'a String, b UInt64')
+          WHERE b=42
+        SETTINGS {",".join(f"{k}={v}" for k, v in settings.items())}
+        """,
+        query_id=query_id,
+    )
+    assert result == expected_result
+
+    node.query(f"SYSTEM FLUSH LOGS ON CLUSTER {cluster}")
+
+    s3_get = node.query(
+        f"""
+        SELECT ProfileEvents['S3GetObject']
+          FROM clusterAllReplicas('{cluster}', system.query_log)
+          WHERE type='QueryFinish'
+            AND initial_query_id='{query_id}'
+          ORDER BY hostname
+        """,
+    )
+
+    return [int(events) for events in s3_get.strip().split("\n")]
+
+
+def check_s3_gets_repeat(cluster, node, expected_result, cluster_first, cluster_second, enable_filesystem_cache,
+                         lock_object_storage_task_distribution_ms):
+    # Repeat test several times to get average result
+    iterations = 1 if lock_object_storage_task_distribution_ms > 0 else 10
+    s3_get_first_sum = 0
+    s3_get_second_sum = 0
+    for _ in range(iterations):
+        (s3_get_first, s3_get_second) = check_s3_gets(cluster, node, expected_result, cluster_first, cluster_second, enable_filesystem_cache, lock_object_storage_task_distribution_ms)
+        s3_get_first_sum += s3_get_first
+        s3_get_second_sum += s3_get_second
+    return s3_get_first_sum, s3_get_second_sum
+
+
+@pytest.mark.parametrize("lock_object_storage_task_distribution_ms ", [0, 30000])
+def test_cache_locality(started_cluster, lock_object_storage_task_distribution_ms):
+    node = started_cluster.instances["clickhouse0"]
+
+    expected_result = node.query(
+        f"""
+        SELECT count(*)
+          FROM s3('http://minio1:9001/root/data/generated_1000/*', 'minio', '{minio_secret_key}', 'CSV', 'a String, b UInt64')
+          WHERE b=42
+        """
+    )
+
+    # Algorithm does not give 100% guarantee, so add 10% on dispersion
+    dispersion = 0.0 if lock_object_storage_task_distribution_ms > 0 else 0.1
+
+    # No cache
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_12345', 'cluster_12345', 0, lock_object_storage_task_distribution_ms)
+    assert s3_get_second == s3_get_first
+
+    # With cache
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_12345', 'cluster_12345', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * dispersion
+
+    # Different replicas order
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_12345', 'cluster_34512', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * dispersion
+
+    # No last replica
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_12345', 'cluster_1234', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * (0.179 + dispersion) # actual value - 179 of 1000 files changed replica
+
+    # No first replica
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_12345', 'cluster_2345', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * (0.189 + dispersion) # actual value - 189 of 1000 files changed replica
+
+    # No first replica, different replicas order
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_12345', 'cluster_4523', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * (0.189 + dispersion)
+
+    # Add new replica, different replicas order
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_4523', 'cluster_12345', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * (0.189 + dispersion)
+
+    # New replica and old replica, different replicas order
+    # All files from removed replica changed replica
+    # Some files from existed replicas changed replica on the new replica
+    (s3_get_first, s3_get_second) = check_s3_gets_repeat(started_cluster, node, expected_result, 'cluster_1234', 'cluster_4523', 1, lock_object_storage_task_distribution_ms)
+    assert s3_get_second <= s3_get_first * (0.368 + dispersion) # actual value - 368 of 1000 changed replica
+
+    if (lock_object_storage_task_distribution_ms > 0):
+        s3_get = check_s3_gets_by_hosts('cluster_12345', node, expected_result, lock_object_storage_task_distribution_ms, files=1000)
+        assert s3_get == [189,210,220,202,179]
+        s3_get = check_s3_gets_by_hosts('cluster_1234', node, expected_result, lock_object_storage_task_distribution_ms, files=1000)
+        assert s3_get == [247,243,264,246]
+        s3_get = check_s3_gets_by_hosts('cluster_2345', node, expected_result, lock_object_storage_task_distribution_ms, files=1000)
+        assert s3_get == [251,280,248,221]
+
+
+def test_cache_locality_few_files(started_cluster):
+    node = started_cluster.instances["clickhouse0"]
+
+    expected_result = node.query(
+        f"""
+        SELECT count(*)
+          FROM s3('http://minio1:9001/root/data/generated_3/*', 'minio', '{minio_secret_key}', 'CSV', 'a String, b UInt64')
+          WHERE b=42
+        """
+    )
+
+    # Rendezvous hash makes the next distribution:
+    # file_0 - clickhouse1
+    # file_1 - clickhouse4
+    # file_2 - clickhouse3
+    # The same distribution must be in each query
+    for _ in range(10):
+        s3_get = check_s3_gets_by_hosts('cluster_12345', node, expected_result, lock_object_storage_task_distribution_ms=30000, files=3)
+        assert s3_get == [1,0,1,1,0]
diff --git a/tests/integration/test_s3_cluster/data/graceful/part0.csv b/tests/integration/test_s3_cluster/data/graceful/part0.csv
new file mode 100644
index 000000000000..2a8ceabbea58
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part0.csv
@@ -0,0 +1 @@
+0,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part1.csv b/tests/integration/test_s3_cluster/data/graceful/part1.csv
new file mode 100644
index 000000000000..1950012fffd2
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part1.csv
@@ -0,0 +1 @@
+1,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part2.csv b/tests/integration/test_s3_cluster/data/graceful/part2.csv
new file mode 100644
index 000000000000..dc782d5adf9b
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part2.csv
@@ -0,0 +1 @@
+2,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part3.csv b/tests/integration/test_s3_cluster/data/graceful/part3.csv
new file mode 100644
index 000000000000..6e581549d23c
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part3.csv
@@ -0,0 +1 @@
+3,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part4.csv b/tests/integration/test_s3_cluster/data/graceful/part4.csv
new file mode 100644
index 000000000000..bb5a4d956c51
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part4.csv
@@ -0,0 +1 @@
+4,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part5.csv b/tests/integration/test_s3_cluster/data/graceful/part5.csv
new file mode 100644
index 000000000000..5cb2c6be144b
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part5.csv
@@ -0,0 +1 @@
+5,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part6.csv b/tests/integration/test_s3_cluster/data/graceful/part6.csv
new file mode 100644
index 000000000000..e2e2428d100d
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part6.csv
@@ -0,0 +1 @@
+6,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part7.csv b/tests/integration/test_s3_cluster/data/graceful/part7.csv
new file mode 100644
index 000000000000..3c819a315c20
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part7.csv
@@ -0,0 +1 @@
+7,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part8.csv b/tests/integration/test_s3_cluster/data/graceful/part8.csv
new file mode 100644
index 000000000000..72f39e512be3
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part8.csv
@@ -0,0 +1 @@
+8,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/part9.csv b/tests/integration/test_s3_cluster/data/graceful/part9.csv
new file mode 100644
index 000000000000..f288cb2051dd
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/part9.csv
@@ -0,0 +1 @@
+9,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/partA.csv b/tests/integration/test_s3_cluster/data/graceful/partA.csv
new file mode 100644
index 000000000000..da99f68ba784
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/partA.csv
@@ -0,0 +1 @@
+10,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/partB.csv b/tests/integration/test_s3_cluster/data/graceful/partB.csv
new file mode 100644
index 000000000000..46591e0be815
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/partB.csv
@@ -0,0 +1 @@
+11,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/partC.csv b/tests/integration/test_s3_cluster/data/graceful/partC.csv
new file mode 100644
index 000000000000..24af8010b5c6
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/partC.csv
@@ -0,0 +1 @@
+12,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/partD.csv b/tests/integration/test_s3_cluster/data/graceful/partD.csv
new file mode 100644
index 000000000000..0365a5024871
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/partD.csv
@@ -0,0 +1 @@
+13,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/partE.csv b/tests/integration/test_s3_cluster/data/graceful/partE.csv
new file mode 100644
index 000000000000..3143c0eed915
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/partE.csv
@@ -0,0 +1 @@
+14,"Foo"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/graceful/partF.csv b/tests/integration/test_s3_cluster/data/graceful/partF.csv
new file mode 100644
index 000000000000..d0306b9bb806
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/graceful/partF.csv
@@ -0,0 +1 @@
+15,"Bar"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
index 76b8f0df2881..d607f390ba3c 100644
--- a/tests/integration/test_s3_cluster/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -3,11 +3,18 @@
 import os
 import shutil
 import time
+import uuid
 from email.errors import HeaderParseError
 
+
+import time
+from email.errors import HeaderParseError
+import threading
+
 import pytest
 
 from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
 from helpers.config_cluster import minio_secret_key
 from helpers.mock_servers import start_mock_servers
 from helpers.test_tools import TSV
@@ -21,6 +28,22 @@
     "data/clickhouse/part123.csv",
     "data/database/part2.csv",
     "data/database/partition675.csv",
+    "data/graceful/part0.csv",
+    "data/graceful/part1.csv",
+    "data/graceful/part2.csv",
+    "data/graceful/part3.csv",
+    "data/graceful/part4.csv",
+    "data/graceful/part5.csv",
+    "data/graceful/part6.csv",
+    "data/graceful/part7.csv",
+    "data/graceful/part8.csv",
+    "data/graceful/part9.csv",
+    "data/graceful/partA.csv",
+    "data/graceful/partB.csv",
+    "data/graceful/partC.csv",
+    "data/graceful/partD.csv",
+    "data/graceful/partE.csv",
+    "data/graceful/partF.csv",
 ]
 
 
@@ -76,6 +99,7 @@ def started_cluster():
             macros={"replica": "node1", "shard": "shard1"},
             with_minio=True,
             with_zookeeper=True,
+            stay_alive=True,
         )
         cluster.add_instance(
             "s0_0_1",
@@ -83,6 +107,7 @@ def started_cluster():
             user_configs=["configs/users.xml"],
             macros={"replica": "replica2", "shard": "shard1"},
             with_zookeeper=True,
+            stay_alive=True,
         )
         cluster.add_instance(
             "s0_1_0",
@@ -90,6 +115,7 @@ def started_cluster():
             user_configs=["configs/users.xml"],
             macros={"replica": "replica1", "shard": "shard2"},
             with_zookeeper=True,
+            stay_alive=True,
         )
 
         logging.info("Starting cluster...")
@@ -234,6 +260,21 @@ def test_wrong_cluster(started_cluster):
 
     assert "not found" in error
 
+    error = node.query_and_get_error(
+        f"""
+    SELECT count(*) from s3(
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*',
+        'minio', '{minio_secret_key}', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    UNION ALL
+    SELECT count(*) from s3(
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*',
+        'minio', '{minio_secret_key}', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    SETTINGS object_storage_cluster = 'non_existing_cluster'
+    """
+    )
+
+    assert "not found" in error
+
 
 def test_ambiguous_join(started_cluster):
     node = started_cluster.instances["s0_0_0"]
@@ -252,6 +293,20 @@ def test_ambiguous_join(started_cluster):
     )
     assert "AMBIGUOUS_COLUMN_NAME" not in result
 
+    result = node.query(
+        f"""
+    SELECT l.name, r.value from s3(
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') as l
+    JOIN s3(
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') as r
+    ON l.name = r.name
+    SETTINGS object_storage_cluster = 'cluster_simple'
+    """
+    )
+    assert "AMBIGUOUS_COLUMN_NAME" not in result
+
 
 def test_skip_unavailable_shards(started_cluster):
     node = started_cluster.instances["s0_0_0"]
@@ -267,6 +322,17 @@ def test_skip_unavailable_shards(started_cluster):
 
     assert result == "10\n"
 
+    result = node.query(
+        f"""
+    SELECT count(*) from s3(
+        'http://minio1:9001/root/data/clickhouse/part1.csv',
+        'minio', '{minio_secret_key}', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    SETTINGS skip_unavailable_shards = 1, object_storage_cluster = 'cluster_non_existent_port'
+    """
+    )
+
+    assert result == "10\n"
+
 
 def test_unset_skip_unavailable_shards(started_cluster):
     # Although skip_unavailable_shards is not set, cluster table functions should always skip unavailable shards.
@@ -282,6 +348,17 @@ def test_unset_skip_unavailable_shards(started_cluster):
 
     assert result == "10\n"
 
+    result = node.query(
+        f"""
+    SELECT count(*) from s3(
+        'http://minio1:9001/root/data/clickhouse/part1.csv',
+        'minio', '{minio_secret_key}', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    SETTINGS object_storage_cluster = 'cluster_non_existent_port'
+    """
+    )
+
+    assert result == "10\n"
+
 
 def test_distributed_insert_select_with_replicated(started_cluster):
     first_replica_first_shard = started_cluster.instances["s0_0_0"]
@@ -462,6 +539,18 @@ def test_cluster_format_detection(started_cluster):
 
     assert result == expected_result
 
+    result = node.query(
+        f"SELECT * FROM s3('http://minio1:9001/root/data/generated/*', 'minio', '{minio_secret_key}') order by c1, c2 SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
+    result = node.query(
+        f"SELECT * FROM s3('http://minio1:9001/root/data/generated/*', 'minio', '{minio_secret_key}', auto, 'a String, b UInt64') order by a, b SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
 
 def test_cluster_default_expression(started_cluster):
     node = started_cluster.instances["s0_0_0"]
@@ -509,3 +598,642 @@ def test_cluster_default_expression(started_cluster):
     )
 
     assert result == expected_result
+
+    result = node.query(
+        f"SELECT * FROM s3('http://minio1:9001/root/data/data{{1,2,3}}', 'minio', '{minio_secret_key}', 'JSONEachRow', 'id UInt32, date Date DEFAULT 18262') order by id SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
+    result = node.query(
+        f"SELECT * FROM s3('http://minio1:9001/root/data/data{{1,2,3}}', 'minio', '{minio_secret_key}', 'auto', 'id UInt32, date Date DEFAULT 18262') order by id SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
+    result = node.query(
+        f"SELECT * FROM s3('http://minio1:9001/root/data/data{{1,2,3}}', 'minio', '{minio_secret_key}', 'JSONEachRow', 'id UInt32, date Date DEFAULT 18262', 'auto') order by id SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
+    result = node.query(
+        f"SELECT * FROM s3('http://minio1:9001/root/data/data{{1,2,3}}', 'minio', '{minio_secret_key}', 'auto', 'id UInt32, date Date DEFAULT 18262', 'auto') order by id SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
+    result = node.query(
+        "SELECT * FROM s3(test_s3_with_default) order by id SETTINGS object_storage_cluster = 'cluster_simple'"
+    )
+
+    assert result == expected_result
+
+
+def test_distributed_s3_table_engine(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    resp_def = node.query(
+        f"""
+        SELECT * from s3Cluster(
+            'cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)
+        """
+    )
+
+    node.query("DROP TABLE IF EXISTS single_node");
+    node.query(
+        f"""
+        CREATE TABLE single_node
+            (name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64))))
+            ENGINE=S3('http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV')
+        """
+    )
+    query_id_engine_single_node = str(uuid.uuid4())
+    resp_engine_single_node = node.query(
+        """
+        SELECT * FROM single_node ORDER BY (name, value, polygon)
+        """,
+        query_id = query_id_engine_single_node
+    )
+    assert resp_def == resp_engine_single_node
+
+    node.query("DROP TABLE IF EXISTS distributed");
+    node.query(
+       f"""
+        CREATE TABLE distributed
+            (name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64))))
+            ENGINE=S3('http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV')
+            SETTINGS object_storage_cluster='cluster_simple'
+        """
+    )
+    query_id_engine_distributed = str(uuid.uuid4())
+    resp_engine_distributed = node.query(
+        """
+        SELECT * FROM distributed ORDER BY (name, value, polygon)
+        """,
+        query_id = query_id_engine_distributed
+    )
+    assert resp_def == resp_engine_distributed
+
+    node.query("SYSTEM FLUSH LOGS ON CLUSTER 'cluster_simple'")
+
+    hosts_engine_single_node = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_engine_single_node}'
+        """
+    )
+    assert int(hosts_engine_single_node) == 1
+    hosts_engine_distributed = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_engine_distributed}'
+        """
+    )
+    assert int(hosts_engine_distributed) == 3
+
+
+def test_distributed_s3_table_engine(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    resp_def = node.query(
+        f"""
+        SELECT * from s3Cluster(
+            'cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)
+        """
+    )
+
+    node.query("DROP TABLE IF EXISTS single_node");
+    node.query(
+        f"""
+        CREATE TABLE single_node
+            (name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64))))
+            ENGINE=S3('http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV')
+        """
+    )
+    query_id_engine_single_node = str(uuid.uuid4())
+    resp_engine_single_node = node.query(
+        """
+        SELECT * FROM single_node ORDER BY (name, value, polygon)
+        """,
+        query_id = query_id_engine_single_node
+    )
+    assert resp_def == resp_engine_single_node
+
+    node.query("DROP TABLE IF EXISTS distributed");
+    node.query(
+        f"""
+        CREATE TABLE distributed
+            (name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64))))
+            ENGINE=S3('http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV')
+            SETTINGS object_storage_cluster='cluster_simple'
+        """
+    )
+    query_id_engine_distributed = str(uuid.uuid4())
+    resp_engine_distributed = node.query(
+        """
+        SELECT * FROM distributed ORDER BY (name, value, polygon)
+        """,
+        query_id = query_id_engine_distributed
+    )
+    assert resp_def == resp_engine_distributed
+
+    node.query("SYSTEM FLUSH LOGS ON CLUSTER 'cluster_simple'")
+
+    hosts_engine_single_node = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_engine_single_node}'
+        """
+    )
+    assert int(hosts_engine_single_node) == 1
+    hosts_engine_distributed = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_engine_distributed}'
+        """
+    )
+    assert int(hosts_engine_distributed) == 3
+
+
+def test_cluster_hosts_limit(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    query_id_def = str(uuid.uuid4())
+    resp_def = node.query(
+        f"""
+        SELECT * from s3Cluster(
+            'cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)
+        """,
+        query_id = query_id_def
+    )
+
+    #  object_storage_max_nodes is greater than number of hosts in cluster
+    query_id_4_hosts = str(uuid.uuid4())
+    resp_4_hosts = node.query(
+        f"""
+        SELECT * from s3Cluster(
+            'cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)
+            SETTINGS object_storage_max_nodes=4
+        """,
+        query_id = query_id_4_hosts
+    )
+    assert resp_def == resp_4_hosts
+
+    #  object_storage_max_nodes is equal number of hosts in cluster
+    query_id_3_hosts = str(uuid.uuid4())
+    resp_3_hosts = node.query(
+        f"""
+        SELECT * from s3Cluster(
+            'cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)
+            SETTINGS object_storage_max_nodes=3
+        """,
+        query_id = query_id_3_hosts
+    )
+    assert resp_def == resp_3_hosts
+
+    #  object_storage_max_nodes is less than number of hosts in cluster
+    query_id_2_hosts = str(uuid.uuid4())
+    resp_2_hosts = node.query(
+        f"""
+        SELECT * from s3Cluster(
+            'cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)
+            SETTINGS object_storage_max_nodes=2
+        """,
+        query_id = query_id_2_hosts
+    )
+    assert resp_def == resp_2_hosts
+
+    node.query("SYSTEM FLUSH LOGS ON CLUSTER 'cluster_simple'")
+
+    hosts_def = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_def}' AND query_id!='{query_id_def}'
+        """
+    )
+    assert int(hosts_def) == 3
+
+    hosts_4 = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_4_hosts}' AND query_id!='{query_id_4_hosts}'
+        """
+    )
+    assert int(hosts_4) == 3
+
+    hosts_3 = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_3_hosts}' AND query_id!='{query_id_3_hosts}'
+        """
+    )
+    assert int(hosts_3) == 3
+
+    hosts_2 = node.query(
+        f"""
+        SELECT uniq(hostname)
+            FROM clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_2_hosts}' AND query_id!='{query_id_2_hosts}'
+        """
+    )
+    assert int(hosts_2) == 2
+
+
+def test_remote_hedged(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+    pure_s3 = node.query(
+        f"""
+    SELECT * from s3(
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*',
+        'minio', '{minio_secret_key}', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    ORDER BY (name, value, polygon)
+    LIMIT 1
+        """
+    )
+    s3_distributed = node.query(
+        f"""
+    SELECT * from remote('s0_0_1', s3Cluster(
+        'cluster_simple',
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))'))
+    ORDER BY (name, value, polygon)
+    LIMIT 1
+    SETTINGS use_hedged_requests=True
+        """
+    )
+
+    assert TSV(pure_s3) == TSV(s3_distributed)
+
+
+def test_remote_no_hedged(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+    pure_s3 = node.query(
+        f"""
+    SELECT * from s3(
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*',
+        'minio', '{minio_secret_key}', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    ORDER BY (name, value, polygon)
+    LIMIT 1
+        """
+    )
+    s3_distributed = node.query(
+        f"""
+    SELECT * from remote('s0_0_1', s3Cluster(
+        'cluster_simple',
+        'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))'))
+    ORDER BY (name, value, polygon)
+    LIMIT 1
+    SETTINGS use_hedged_requests=False
+        """
+    )
+
+    assert TSV(pure_s3) == TSV(s3_distributed)
+
+
+@pytest.mark.parametrize("allow_experimental_analyzer", [0, 1])
+def test_hive_partitioning(started_cluster, allow_experimental_analyzer):
+    node = started_cluster.instances["s0_0_0"]
+
+    node.query(f"SET allow_experimental_analyzer = {allow_experimental_analyzer}")
+
+    for i in range(1, 5):
+        exists = node.query(
+            f"""
+            SELECT
+                count()
+                FROM s3('http://minio1:9001/root/data/hive/key={i}/*', 'minio', '{minio_secret_key}', 'Parquet', 'key Int32, value Int32')
+                GROUP BY ALL
+                FORMAT TSV
+            """
+        )
+        if int(exists) == 0:
+            node.query(
+                f"""
+                INSERT
+                    INTO FUNCTION s3('http://minio1:9001/root/data/hive/key={i}/data.parquet', 'minio', '{minio_secret_key}', 'Parquet', 'key Int32, value Int32')
+                    SELECT {i}, {i}
+                    SETTINGS use_hive_partitioning = 0
+                """
+            )
+
+    query_id_full = str(uuid.uuid4())
+    result = node.query(
+        f"""
+        SELECT count()
+            FROM s3('http://minio1:9001/root/data/hive/key=**.parquet', 'minio', '{minio_secret_key}', 'Parquet', 'key Int32, value Int32')
+            WHERE key <= 2
+            FORMAT TSV
+            SETTINGS enable_filesystem_cache = 0, use_query_cache = 0, use_cache_for_count_from_files = 0, use_hive_partitioning = 0
+        """,
+        query_id=query_id_full,
+    )
+    result = int(result)
+    assert result == 2
+
+    query_id_optimized = str(uuid.uuid4())
+    result = node.query(
+        f"""
+        SELECT count()
+            FROM s3('http://minio1:9001/root/data/hive/key=**.parquet', 'minio', '{minio_secret_key}', 'Parquet', 'key Int32, value Int32')
+            WHERE key <= 2
+            FORMAT TSV
+            SETTINGS enable_filesystem_cache = 0, use_query_cache = 0, use_cache_for_count_from_files = 0, use_hive_partitioning = 1
+        """,
+        query_id=query_id_optimized,
+    )
+    result = int(result)
+    assert result == 2
+
+    query_id_cluster_full = str(uuid.uuid4())
+    result = node.query(
+        f"""
+        SELECT count()
+            FROM s3Cluster(cluster_simple, 'http://minio1:9001/root/data/hive/key=**.parquet', 'minio', '{minio_secret_key}', 'Parquet', 'key Int32, value Int32')
+            WHERE key <= 2
+            FORMAT TSV
+            SETTINGS enable_filesystem_cache = 0, use_query_cache = 0, use_cache_for_count_from_files = 0, use_hive_partitioning = 0
+        """,
+        query_id=query_id_cluster_full,
+    )
+    result = int(result)
+    assert result == 2
+
+    query_id_cluster_optimized = str(uuid.uuid4())
+    result = node.query(
+        f"""
+        SELECT count()
+            FROM s3Cluster(cluster_simple, 'http://minio1:9001/root/data/hive/key=**.parquet', 'minio', '{minio_secret_key}', 'Parquet', 'key Int32, value Int32')
+            WHERE key <= 2
+            FORMAT TSV
+            SETTINGS enable_filesystem_cache = 0, use_query_cache = 0, use_cache_for_count_from_files = 0, use_hive_partitioning = 1
+        """,
+        query_id=query_id_cluster_optimized,
+    )
+    result = int(result)
+    assert result == 2
+
+    node.query("SYSTEM FLUSH LOGS ON CLUSTER 'cluster_simple'")
+
+    full_traffic = node.query(
+        f"""
+        SELECT sum(ProfileEvents['ReadBufferFromS3Bytes'])
+            FROM clusterAllReplicas(cluster_simple, system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_full}'
+            FORMAT TSV
+        """
+    )
+    full_traffic = int(full_traffic)
+    assert full_traffic > 0  # 612*4
+
+    optimized_traffic = node.query(
+        f"""
+        SELECT sum(ProfileEvents['ReadBufferFromS3Bytes'])
+            FROM clusterAllReplicas(cluster_simple, system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_optimized}'
+            FORMAT TSV
+        """
+    )
+    optimized_traffic = int(optimized_traffic)
+    assert optimized_traffic > 0  # 612*2
+    assert full_traffic > optimized_traffic
+
+    cluster_full_traffic = node.query(
+        f"""
+        SELECT sum(ProfileEvents['ReadBufferFromS3Bytes'])
+            FROM clusterAllReplicas(cluster_simple, system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_cluster_full}'
+            FORMAT TSV
+        """
+    )
+    cluster_full_traffic = int(cluster_full_traffic)
+    assert cluster_full_traffic == full_traffic
+
+    cluster_optimized_traffic = node.query(
+        f"""
+        SELECT sum(ProfileEvents['ReadBufferFromS3Bytes'])
+            FROM clusterAllReplicas(cluster_simple, system.query_log)
+            WHERE type='QueryFinish' AND initial_query_id='{query_id_cluster_optimized}'
+            FORMAT TSV
+        """
+    )
+    cluster_optimized_traffic = int(cluster_optimized_traffic)
+    assert cluster_optimized_traffic == optimized_traffic
+
+    node.query("SET allow_experimental_analyzer = DEFAULT")
+
+
+def test_joins(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    # Table join_table only exists on the node 's0_0_0'.
+    node.query("DROP TABLE IF EXISTS join_table SYNC")
+    node.query(
+        """
+        CREATE TABLE IF NOT EXISTS join_table (
+            id UInt32,
+            name String
+        ) ENGINE=MergeTree()
+        ORDER BY id;
+        """
+    )
+
+    node.query(
+        f"""
+        INSERT INTO join_table
+        SELECT value, concat(name, '_jt') FROM s3Cluster('cluster_simple',
+            'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))');
+        """
+    )
+
+    result1 = node.query(
+        f"""
+        SELECT t1.name, t2.name FROM
+            s3Cluster('cluster_simple',
+                'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+                'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') AS t1
+        JOIN
+            join_table AS t2
+        ON t1.value = t2.id
+        ORDER BY t1.name
+        SETTINGS object_storage_cluster_join_mode='local';
+        """
+    )
+
+    res = list(map(str.split, result1.splitlines()))
+    assert len(res) == 25
+
+    for line in res:
+        if len(line) == 2:
+            assert line[1] == f"{line[0]}_jt"
+        else:
+            assert line == ["_jt"] # for empty name
+
+    result2 = node.query(
+        f"""
+        SELECT t1.name, t2.name FROM
+            join_table AS t2
+        JOIN
+            s3Cluster('cluster_simple',
+                'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+                'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') AS t1
+        ON t1.value = t2.id
+        ORDER BY t1.name
+        SETTINGS object_storage_cluster_join_mode='local';
+        """
+    )
+
+    assert result1 == result2
+
+    # With WHERE clause with remote column only
+    result3 = node.query(
+        f"""
+        SELECT t1.name, t2.name FROM
+            s3Cluster('cluster_simple',
+                'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+                'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') AS t1
+        JOIN
+            join_table AS t2
+        ON t1.value = t2.id
+        WHERE (t1.value % 2)
+        ORDER BY t1.name
+        SETTINGS object_storage_cluster_join_mode='local';
+        """
+    )
+
+    res = list(map(str.split, result3.splitlines()))
+    assert len(res) == 8
+
+    # With WHERE clause with local column only
+    result4 = node.query(
+        f"""
+        SELECT t1.name, t2.name FROM
+            s3Cluster('cluster_simple',
+                'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+                'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') AS t1
+        JOIN
+            join_table AS t2
+        ON t1.value = t2.id
+        WHERE (t2.id % 2)
+        ORDER BY t1.name
+        SETTINGS object_storage_cluster_join_mode='local';
+        """
+    )
+
+    assert result3 == result4
+
+    # With WHERE clause with local and remote columns
+    result5 = node.query(
+        f"""
+        SELECT t1.name, t2.name FROM
+            s3Cluster('cluster_simple',
+                'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+                'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') AS t1
+        JOIN
+            join_table AS t2
+        ON t1.value = t2.id
+        WHERE (t1.value % 2) AND ((t2.id % 3) == 2)
+        ORDER BY t1.name
+        SETTINGS object_storage_cluster_join_mode='local';
+        """
+    )
+
+    res = list(map(str.split, result5.splitlines()))
+    assert len(res) == 6
+
+    result6 = node.query(
+        f"""
+        SELECT name FROM
+            s3Cluster('cluster_simple',
+                'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
+                'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+        WHERE value IN (SELECT id FROM join_table)
+        ORDER BY name
+        SETTINGS object_storage_cluster_join_mode='local';
+        """
+    )
+    res = list(map(str.split, result6.splitlines()))
+    assert len(res) == 25
+
+
+def test_graceful_shutdown(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+    node_to_shutdown = started_cluster.instances["s0_1_0"]
+
+    expected = TSV("64\tBar\t8\n56\tFoo\t8\n")
+
+    num_lock = threading.Lock()
+    errors = 0
+
+    def query_cycle():
+        nonlocal errors
+        try:
+            i = 0
+            while i < 10:
+                i += 1
+                # Query time 3-4 seconds
+                # Processing single object 1-2 seconds
+                result = node.query(f"""
+                    SELECT sum(value),name,sum(sleep(1)+1) as sleep FROM s3Cluster(
+                        'cluster_simple',
+                        'http://minio1:9001/root/data/graceful/*', 'minio', '{minio_secret_key}', 'CSV',
+                        'value UInt32, name String')
+                    GROUP BY name
+                    ORDER BY name
+                    SETTINGS max_threads=2
+                    """)
+                with num_lock:
+                    if TSV(result) != expected:
+                        errors += 1
+                    if errors >= 1:
+                        break
+        except QueryRuntimeException:
+            with num_lock:
+                errors += 1
+
+    threads = []
+
+    for _ in range(10):
+        thread = threading.Thread(target=query_cycle)
+        thread.start()
+        threads.append(thread)
+        time.sleep(0.2)
+
+    time.sleep(3)
+
+    node_to_shutdown.query("SYSTEM STOP SWARM MODE")
+
+    # enough time to complete processing of objects, started before "SYSTEM STOP SWARM MODE"
+    time.sleep(3)
+
+    node_to_shutdown.stop_clickhouse(kill=True)
+
+    for thread in threads:
+        thread.join()
+
+    node_to_shutdown.start_clickhouse()
+
+    assert errors == 0
diff --git a/tests/integration/test_s3_cluster_insert_select/test.py b/tests/integration/test_s3_cluster_insert_select/test.py
index d35ab6fb0fa7..dd53e93e6f4c 100644
--- a/tests/integration/test_s3_cluster_insert_select/test.py
+++ b/tests/integration/test_s3_cluster_insert_select/test.py
@@ -187,6 +187,50 @@ def test_distributed_insert_select_to_rmt_limit(started_cluster):
     )
 
 
+def test_distributed_insert_select_to_rmt_where(started_cluster):
+    table = "t_rmt_target"
+    cluster_name = "cluster_1_shard_3_replicas"
+
+    node1.query(
+        f"""DROP TABLE IF EXISTS {table} ON CLUSTER '{cluster_name}' SYNC;"""
+    )
+
+    node1.query(
+        f"""
+    CREATE TABLE {table} ON CLUSTER {cluster_name} (a String, b UInt64)
+    ENGINE=ReplicatedMergeTree('/clickhouse/tables/32c614a9-13af-43c5-848c-a3f62a78e390/{table}', '{{replica}}')
+    ORDER BY (a, b);
+        """
+    )
+
+    node1.query(
+        f"""
+    INSERT INTO {table} SELECT * FROM s3Cluster(
+        '{cluster_name}',
+        'http://minio1:9001/root/data/generated/*.csv', 'minio', '{minio_secret_key}', 'CSV','a String, b UInt64'
+    ) WHERE b = 100
+    SETTINGS
+        parallel_distributed_insert_select=2,
+        -- disable deduplication since all rows identical, and if the batch size will be the same size on different nodes it will be deduplicated
+        insert_deduplicate=0;
+        """
+    )
+
+    node1.query(f"SYSTEM SYNC REPLICA {table}")
+
+    assert (
+        int(
+            node1.query(
+                f"SELECT count(*) FROM {table};"
+            ).strip()
+        ) == 99
+    )
+
+    node1.query(
+        f"""DROP TABLE IF EXISTS {table} ON CLUSTER '{cluster_name}' SYNC;"""
+    )
+
+
 def test_distributed_insert_select_to_rmt_cte_const(started_cluster):
     table = "t_rmt_target"
     cluster_name = "cluster_1_shard_3_replicas"
diff --git a/tests/integration/test_scheduler_cpu_preemptive/test.py b/tests/integration/test_scheduler_cpu_preemptive/test.py
index 806787682ced..334af94517a2 100644
--- a/tests/integration/test_scheduler_cpu_preemptive/test.py
+++ b/tests/integration/test_scheduler_cpu_preemptive/test.py
@@ -46,6 +46,32 @@ def clear_workloads_and_resources():
     yield
 
 
+@pytest.fixture(scope="function")
+def with_custom_config(request):
+    for name, server_settings in request.param.items():
+        node = cluster.instances[name]
+        xml = "".join(f"<{k}>{v}</{k}>" for k, v in server_settings.items())
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f"echo '<clickhouse>{xml}</clickhouse>' > /etc/clickhouse-server/config.d/99-custom_config.xml",
+            ]
+        )
+        node.query("system reload config")
+    yield
+    for name, server_settings in request.param.items():
+        node = cluster.instances[name]
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f"rm -f /etc/clickhouse-server/config.d/99-custom_config.xml",
+            ]
+        )
+        node.query("system reload config")
+
+
 def assert_profile_event(node, query_id, profile_event, check):
     assert check(
         int(
@@ -309,3 +335,84 @@ def test_cpu_time_fairness(queries, threads, production_length, development_leng
     )
     production.stop()
     development.stop()
+
+
+class DynamicQueryPool:
+    def __init__(self, workload: str) -> None:
+        self.workload: str = workload
+        self._lock = threading.Lock()
+        self._next_id: int = 1
+        self._threads: dict[int, tuple[threading.Thread, threading.Event]] = {}
+
+    def start(self, billions: int, max_threads: int) -> int:
+        with self._lock:
+            thread_id = self._next_id
+            self._next_id += 1
+
+        stop_event = threading.Event()
+
+        def query_thread(local_stop_event: threading.Event, tid: int) -> None:
+            while not local_stop_event.is_set():
+                mylog(f"Running query in workload {self.workload}, thread_id={tid}")
+                node.query(
+                    f"with (select {billions * 1000000000})::UInt64 as n select count(*) from numbers_mt(n) settings "
+                    f"workload='{self.workload}', max_threads={max_threads}"
+                )
+
+        thread = threading.Thread(target=query_thread, args=(stop_event, thread_id))
+        with self._lock:
+            self._threads[thread_id] = (thread, stop_event)
+        thread.start()
+        return thread_id
+
+    def stop(self, thread_id: int) -> None:
+        with self._lock:
+            pair = self._threads.get(thread_id)
+        if not pair:
+            return
+        thread, stop_event = pair
+        mylog(f"Stopping workload {self.workload}, thread_id={thread_id}")
+        stop_event.set()
+        thread.join()
+        with self._lock:
+            self._threads.pop(thread_id, None)
+        mylog(f"Workload {self.workload} thread_id={thread_id} stopped")
+
+
+@pytest.mark.parametrize(
+    "with_custom_config",
+    [
+        pytest.param(
+            {'node': {"cpu_slot_preemption_timeout_ms": "1"}},
+            id="cpu-slot-preemption-timeout-1ms",
+        )
+    ],
+    indirect=True,
+)
+def test_downscaling(with_custom_config):
+    node.query(
+        f"""
+        create resource cpu (master thread, worker thread);
+        create workload all settings max_concurrent_threads=8;
+        create workload development in all;
+    """
+    )
+
+    development = DynamicQueryPool("development")
+
+    active_ids: list[int] = []
+    try:
+        for _ in range(2):
+            # Gradually increase concurrency to 16
+            for _ in range(16):
+                tid = development.start(billions=1, max_threads=8)
+                active_ids.append(tid)
+                time.sleep(0.05)
+            # Gradually decrease back to 0
+            for tid in reversed(active_ids):
+                development.stop(tid)
+                time.sleep(0.05)
+            active_ids.clear()
+    finally:
+        for tid in active_ids:
+            development.stop(tid)
diff --git a/tests/integration/test_storage_delta/configs/users.d/disable_parquet_metadata_caching.xml b/tests/integration/test_storage_delta/configs/users.d/disable_parquet_metadata_caching.xml
new file mode 100644
index 000000000000..bc34464e30da
--- /dev/null
+++ b/tests/integration/test_storage_delta/configs/users.d/disable_parquet_metadata_caching.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <input_format_parquet_use_metadata_cache>0</input_format_parquet_use_metadata_cache>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_storage_delta/configs/users.d/enable_writes.xml b/tests/integration/test_storage_delta/configs/users.d/enable_writes.xml
new file mode 100644
index 000000000000..fc2a6bd782ce
--- /dev/null
+++ b/tests/integration/test_storage_delta/configs/users.d/enable_writes.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <allow_experimental_delta_lake_writes>1</allow_experimental_delta_lake_writes>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_storage_delta/field_ids_struct_test/data/00000-1-7cad83a6-af90-42a9-8a10-114cbc862a42-0-00001.parquet b/tests/integration/test_storage_delta/field_ids_struct_test/data/00000-1-7cad83a6-af90-42a9-8a10-114cbc862a42-0-00001.parquet
new file mode 100644
index 000000000000..53b79010aa99
Binary files /dev/null and b/tests/integration/test_storage_delta/field_ids_struct_test/data/00000-1-7cad83a6-af90-42a9-8a10-114cbc862a42-0-00001.parquet differ
diff --git a/tests/integration/test_storage_delta/test.py b/tests/integration/test_storage_delta/test.py
index 76f928a82be9..02c860280bff 100644
--- a/tests/integration/test_storage_delta/test.py
+++ b/tests/integration/test_storage_delta/test.py
@@ -62,6 +62,9 @@
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 cluster = ClickHouseCluster(__file__, with_spark=True)
 
+S3_DATA = [
+    "field_ids_struct_test/data/00000-1-7cad83a6-af90-42a9-8a10-114cbc862a42-0-00001.parquet",
+]
 
 def get_spark():
     builder = (
@@ -71,6 +74,8 @@ def get_spark():
             "spark.sql.catalog.spark_catalog",
             "org.apache.spark.sql.delta.catalog.DeltaCatalog",
         )
+        .config("spark.driver.memory", "8g")
+        .config("spark.executor.memory", "8g")
         .master("local")
     )
 
@@ -92,7 +97,11 @@ def started_cluster():
                 "configs/config.d/filesystem_caches.xml",
                 "configs/config.d/remote_servers.xml",
             ],
-            user_configs=["configs/users.d/users.xml"],
+            user_configs=[
+                "configs/users.d/users.xml",
+                "configs/users.d/enable_writes.xml",
+                "configs/users.d/disable_parquet_metadata_caching.xml",
+            ],
             with_minio=True,
             with_azurite=True,
             stay_alive=True,
@@ -105,7 +114,11 @@ def started_cluster():
                 "configs/config.d/named_collections.xml",
                 "configs/config.d/remote_servers.xml",
             ],
-            user_configs=["configs/users.d/users.xml"],
+            user_configs=[
+                "configs/users.d/users.xml",
+                "configs/users.d/enable_writes.xml",
+                "configs/users.d/disable_parquet_metadata_caching.xml",
+            ],
             with_minio=True,
             stay_alive=True,
             with_zookeeper=True,
@@ -151,6 +164,7 @@ def started_cluster():
             user_configs=[
                 "configs/users.d/users.xml",
                 "configs/users.d/disabled_delta_kernel.xml",
+                "configs/users.d/disable_parquet_metadata_caching.xml",
             ],
             with_minio=True,
             with_azurite=True,
@@ -187,6 +201,14 @@ def started_cluster():
 
         cluster.spark_session = get_spark()
 
+        for file in S3_DATA:
+            print(f"Copying object {file}")
+            cluster.minio_client.fput_object(
+                bucket_name=cluster.minio_bucket,
+                object_name=file,
+                file_path=os.path.join(SCRIPT_DIR, file),
+            )
+
         yield cluster
 
     finally:
@@ -199,14 +221,16 @@ def write_delta_from_file(spark, path, result_path, mode="overwrite"):
     ).option("delta.columnMapping.mode", "name").save(result_path)
 
 
-def write_delta_from_df(spark, df, result_path, mode="overwrite", partition_by=None):
+def write_delta_from_df(
+    spark, df, result_path, mode="overwrite", partition_by=None, column_mapping="name"
+):
     if partition_by is None:
-        df.write.mode(mode).option("compression", "none").format("delta").option(
-            "delta.columnMapping.mode", "name"
-        ).save(result_path)
+        df.write.mode(mode).option("compression", "none").option(
+            "delta.columnMapping.mode", column_mapping
+        ).format("delta").save(result_path)
     else:
         df.write.mode(mode).option("compression", "none").format("delta").option(
-            "delta.columnMapping.mode", "name"
+            "delta.columnMapping.mode", column_mapping
         ).partitionBy("a").save(result_path)
 
 
@@ -1352,7 +1376,7 @@ def test_session_token(started_cluster):
     parquet_data_path = create_initial_data_file(
         started_cluster,
         instance,
-        "SELECT toUInt64(number), toString(number) FROM numbers(100)",
+        "SELECT toUInt64(number), toString(number) FROM numbers(100) SETTINGS input_format_parquet_use_metadata_cache=0",
         TABLE_NAME,
         node_name=node_name,
     )
@@ -1365,7 +1389,7 @@ def test_session_token(started_cluster):
             f"""
     SELECT count() FROM deltaLake(
         'http://{started_cluster.minio_host}:{started_cluster.minio_port}/{started_cluster.minio_bucket}/{TABLE_NAME}/',
-        SETTINGS allow_experimental_delta_kernel_rs=1)
+        SETTINGS allow_experimental_delta_kernel_rs=1, input_format_parquet_use_metadata_cache=0)
     """
         )
     )
@@ -2270,21 +2294,23 @@ def test_column_pruning(started_cluster):
     query_id = f"query_{TABLE_NAME}_1"
     sum = int(
         instance.query(
-            f"SELECT sum(id) FROM {table_function} SETTINGS allow_experimental_delta_kernel_rs=0, max_read_buffer_size_remote_fs=100",
+            f"SELECT sum(id) FROM {table_function} SETTINGS allow_experimental_delta_kernel_rs=0, max_read_buffer_size_remote_fs=100, remote_read_min_bytes_for_seek=1, input_format_parquet_use_native_reader_v3=1",
             query_id=query_id,
         )
     )
     instance.query("SYSTEM FLUSH LOGS")
-    assert 107220 == int(
+    bytes_read = int(
         instance.query(
             f"SELECT ProfileEvents['ReadBufferFromS3Bytes'] FROM system.query_log WHERE query_id = '{query_id}' and type = 'QueryFinish'"
         )
     )
+    # Slightly different number depending on reader implementation.
+    assert 107220 <= bytes_read <= 107232
 
     query_id = f"query_{TABLE_NAME}_2"
     assert sum == int(
         instance.query(
-            f"SELECT sum(id) FROM {table_function} SETTINGS enable_filesystem_cache=0, max_read_buffer_size_remote_fs=100",
+            f"SELECT sum(id) FROM {table_function} SETTINGS enable_filesystem_cache=0, max_read_buffer_size_remote_fs=100, remote_read_min_bytes_for_seek=1, input_format_parquet_use_native_reader_v3=1",
             query_id=query_id,
         )
     )
@@ -2294,12 +2320,13 @@ def test_column_pruning(started_cluster):
             f"SELECT ProfileEvents['EngineFileLikeReadFiles'] FROM system.query_log WHERE query_id = '{query_id}' and type = 'QueryFinish'"
         )
     )
-    # Small diff because in case of delta-kernel metadata reading is not counted in the metric.
-    assert 105677 == int(
+    bytes_read = int(
         instance.query(
             f"SELECT ProfileEvents['ReadBufferFromS3Bytes'] FROM system.query_log WHERE query_id = '{query_id}' and type = 'QueryFinish'"
         )
     )
+    # Small diff because in case of delta-kernel metadata reading is not counted in the metric.
+    assert 105677 <= bytes_read <= 105689
 
 
 def test_concurrent_reads(started_cluster):
@@ -3316,4 +3343,234 @@ def test_writes_spark_compatibility(started_cluster):
     assert len(files) == 3
 
     df = spark.read.format("delta").load(f"/{result_file}").collect()
-    assert "[Row(id=10, name='10'), Row(id=11, name='11'), Row(id=12, name='12'), Row(id=13, name='13'), Row(id=14, name='14'), Row(id=15, name='15'), Row(id=16, name='16'), Row(id=17, name='17'), Row(id=18, name='18'), Row(id=19, name='19'), Row(id=0, name='0'), Row(id=1, name='1'), Row(id=2, name='2'), Row(id=3, name='3'), Row(id=4, name='4'), Row(id=5, name='5'), Row(id=6, name='6'), Row(id=7, name='7'), Row(id=8, name='8'), Row(id=9, name='9')]" == str(df)
+    assert (
+        "[Row(id=10, name='10'), Row(id=11, name='11'), Row(id=12, name='12'), Row(id=13, name='13'), Row(id=14, name='14'), Row(id=15, name='15'), Row(id=16, name='16'), Row(id=17, name='17'), Row(id=18, name='18'), Row(id=19, name='19'), Row(id=0, name='0'), Row(id=1, name='1'), Row(id=2, name='2'), Row(id=3, name='3'), Row(id=4, name='4'), Row(id=5, name='5'), Row(id=6, name='6'), Row(id=7, name='7'), Row(id=8, name='8'), Row(id=9, name='9')]"
+        == str(df)
+    )
+
+
+@pytest.mark.parametrize("partitioned", [False, True])
+@pytest.mark.parametrize("limit_enabled", [False, True])
+def test_write_limits(started_cluster, partitioned, limit_enabled):
+    instance = started_cluster.instances["node1"]
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    table_name = randomize_table_name("test_write_limits")
+    result_file = f"{table_name}_data"
+
+    schema = pa.schema([("id", pa.int32()), ("name", pa.string())])
+    empty_arrays = [pa.array([], type=pa.int32()), pa.array([], type=pa.string())]
+    write_deltalake(
+        f"file:///{result_file}",
+        pa.Table.from_arrays(empty_arrays, schema=schema),
+        mode="overwrite",
+        partition_by=["id"] if partitioned else [],
+    )
+    LocalUploader(instance).upload_directory(f"/{result_file}/", f"/{result_file}/")
+    files = (
+        instance.exec_in_container(["bash", "-c", f"ls /{result_file}"])
+        .strip()
+        .split("\n")
+    )
+    assert len(files) == 1
+
+    instance.query(
+        f"CREATE TABLE {table_name} (id Int32, name String) ENGINE = DeltaLakeLocal('/{result_file}') SETTINGS output_format_parquet_compression_method = 'none'"
+    )
+
+    num_rows = 1000000
+    partitions_num = 5
+    limit_rows = 10 if limit_enabled else (num_rows + 1)
+    instance.query(
+        f"INSERT INTO {table_name} SELECT number % {partitions_num}, randomString(10) FROM numbers({num_rows}) SETTINGS delta_lake_insert_max_rows_in_data_file = {limit_rows}, max_insert_block_size = 1000, min_chunk_bytes_for_parallel_parsing = 1000"
+    )
+
+    files = LocalDownloader(instance).download_directory(f"/{result_file}/", f"/{result_file}/")
+    data_files = [file for file in files if file.endswith(".parquet")]
+    assert len(data_files) > 0, f"No data files: {files}"
+
+    if partitioned:
+        if limit_enabled:
+            assert len(data_files) > partitions_num, f"Data files: {data_files}"
+        else:
+            assert len(data_files) == partitions_num, f"Data files: {data_files}"
+    else:
+        if limit_enabled:
+            assert len(data_files) > 1, f"Data files: {data_files}"
+        else:
+            assert len(data_files) == 1, f"Data files: {data_files}"
+
+    assert num_rows == int(instance.query(f"SELECT count() FROM {table_name}"))
+
+    spark = started_cluster.spark_session
+    df = spark.read.format("delta").load(f"/{result_file}")
+    assert df.count() == num_rows
+
+
+def test_column_mapping_id(started_cluster):
+    node = started_cluster.instances["node1"]
+    table_name = randomize_table_name("test_column_mapping_id")
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    path = f"/{table_name}"
+
+    schema = StructType(
+        [
+            StructField("id", IntegerType(), True),
+            StructField(
+                "person",
+                StructType(
+                    [
+                        StructField("first_name", StringType(), True),
+                        StructField("last_name", StringType(), True),
+                    ]
+                ),
+                True,
+            ),
+        ]
+    )
+    data = [(1, ("Alice", "Smith")), (2, ("Bob", "Johnson"))]
+    df = spark.createDataFrame(data, schema=schema)
+    df.write.format("delta").option("delta.minReaderVersion", "2").option(
+        "delta.minWriterVersion", "5"
+    ).option("delta.columnMapping.mode", "id").save(path)
+    upload_directory(minio_client, bucket, path, "")
+
+    delta_function = f"""
+deltaLake(
+        'http://{started_cluster.minio_ip}:{started_cluster.minio_port}/root/{table_name}' ,
+        '{minio_access_key}',
+        '{minio_secret_key}')
+    """
+    assert (
+        "Column mapping ID mode not supported"
+        in node.query_and_get_error(
+            f"SELECT * FROM {delta_function} ORDER BY all"
+        ).strip()
+    )
+
+
+@pytest.mark.parametrize("column_mapping", ["", "name"])
+def test_subcolumns(started_cluster, column_mapping):
+    node = started_cluster.instances["node1"]
+    table_name = randomize_table_name("test_struct")
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    path = f"/{table_name}"
+
+    data_file = "field_ids_struct_test/data/00000-1-7cad83a6-af90-42a9-8a10-114cbc862a42-0-00001.parquet"
+
+    def s3_function(path):
+        return f""" s3(
+            'http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/{path}' ,
+            '{minio_access_key}',
+            '{minio_secret_key}')
+        """
+
+    func = s3_function(data_file)
+    assert (
+        "2025-06-04\t('100022','2025-06-04 18:40:56.000000','2025-06-09 21:19:00.364000')\t100022"
+        == node.query(f"select * from {func}").strip()
+    )
+    assert (
+        "col_x2D1\tNullable(Date32)\t\t\t\t\t\n"
+        "col_x2D2\tTuple(\\n    col_x2D3 Nullable(String),\\n    col_x2D4 Nullable(DateTime64(6, \\'UTC\\')),\\n    col_x2D5 Nullable(DateTime64(6, \\'UTC\\')))\t\t\t\t\t\n"
+        "col_x2D6\tNullable(Int64)" == node.query(f"describe table {func}").strip()
+    )
+
+    df = spark.read.parquet(os.path.join(SCRIPT_DIR, data_file))
+    write_delta_from_df(spark, df, path, mode="overwrite")
+    default_upload_directory(started_cluster, "s3", path, "")
+
+    s3_objects = list(minio_client.list_objects(bucket, table_name, recursive=True))
+    file_names = []
+    object_name = None
+    for obj in s3_objects:
+        print(f"File: {obj.object_name}")
+        if obj.object_name.endswith(".parquet"):
+            object_name = obj.object_name
+
+    func = s3_function(object_name)
+    assert (
+        "2025-06-04\t('100022','2025-06-04 18:40:56.000000000','2025-06-09 21:19:00.364000000')\t100022"
+        == node.query(f"select * from {func}").strip()
+    )
+    data_file_desc = node.query(f"describe table {func}").strip()
+    assert "col-" in data_file_desc
+    assert "col_" not in data_file_desc
+
+    data_file_schema = node.query(f"describe table {func}")
+    print(f"Data file schema: {data_file_schema}")
+
+    delta_function = f"""
+deltaLake(
+        'http://{started_cluster.minio_ip}:{started_cluster.minio_port}/root/{table_name}' ,
+        '{minio_access_key}',
+        '{minio_secret_key}')
+    """
+
+    assert (
+        "2025-06-04\t('100022','2025-06-04 18:40:56.000000','2025-06-09 21:19:00.364000')\t100022"
+        == node.query(f"SELECT * FROM {delta_function} ORDER BY all").strip()
+    )
+
+    assert (
+        "col_x2D1\tNullable(Date32)\t\t\t\t\t\n"
+        "col_x2D2\tTuple(\\n    col_x2D3 Nullable(String),\\n    col_x2D4 Nullable(DateTime64(6)),\\n    col_x2D5 Nullable(DateTime64(6)))\t\t\t\t\t\n"
+        "col_x2D6\tNullable(Int64)"
+        == node.query(f"describe table {delta_function}").strip()
+    )
+
+    node.query(
+        f"""
+    CREATE TABLE {table_name} (
+    col_x2D1 Nullable(Date32),
+    col_x2D2 Tuple(col_x2D3 Nullable(String), col_x2D4 Nullable(DateTime64(6)), col_x2D5 Nullable(DateTime64(6))),
+    col_x2D6 Nullable(Int64)) ENGINE = DeltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/root/{table_name}' ,
+        '{minio_access_key}',
+        '{minio_secret_key}')
+    """
+    )
+
+    assert (
+        "2025-06-04\t('100022','2025-06-04 18:40:56.000000','2025-06-09 21:19:00.364000')\t100022"
+        == node.query(f"SELECT * FROM {table_name} ORDER BY all").strip()
+    )
+
+
+def test_write_column_order(started_cluster):
+    instance = started_cluster.instances["node1"]
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    table_name = randomize_table_name("test_write_column_order")
+    result_file = f"{table_name}_data"
+    schema = pa.schema([("c1", pa.int32()), ("c0", pa.string())])
+    empty_arrays = [pa.array([], type=pa.int32()), pa.array([], type=pa.string())]
+    write_deltalake(
+        f"file:///{result_file}",
+        pa.Table.from_arrays(empty_arrays, schema=schema),
+        mode="overwrite",
+    )
+    LocalUploader(instance).upload_directory(f"/{result_file}/", f"/{result_file}/")
+
+    instance.query(
+        f"CREATE TABLE {table_name} (c0 String, c1 Int32) ENGINE = DeltaLakeLocal('/{result_file}') SETTINGS output_format_parquet_compression_method = 'none'"
+    )
+    num_rows = 10
+    instance.query(
+        f"INSERT INTO {table_name} (c1, c0) SELECT number as c1, toString(number % 2) as c0 FROM numbers(10)"
+    )
+
+    assert num_rows == int(instance.query(f"SELECT count() FROM {table_name}"))
+    assert (
+        "0\t0\n1\t1\n0\t2\n1\t3\n0\t4\n1\t5\n0\t6\n1\t7\n0\t8\n1\t9"
+        == instance.query(f"SELECT c0, c1 FROM {table_name}").strip()
+    )
+
+    instance.query(
+        f"INSERT INTO {table_name} (c1, c0) SELECT c1, c0 FROM generateRandom('c1 Int32, c0 String', 16920040705558589162, 7706, 3) LIMIT {num_rows}"
+    )
+
+    assert num_rows * 2 == int(instance.query(f"SELECT count() FROM {table_name}"))
diff --git a/tests/integration/test_storage_iceberg/configs/config.d/metadata_log.xml b/tests/integration/test_storage_iceberg/configs/config.d/metadata_log.xml
new file mode 100644
index 000000000000..c1fece21745c
--- /dev/null
+++ b/tests/integration/test_storage_iceberg/configs/config.d/metadata_log.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+  <iceberg_metadata_log>
+    <database>system</database>
+    <table>iceberg_metadata_log</table>
+    <flush_interval_milliseconds>10</flush_interval_milliseconds>
+  </iceberg_metadata_log>
+</clickhouse>
diff --git a/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml b/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
index 516e4ba63a3a..7dfec41b2df8 100644
--- a/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
+++ b/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
@@ -11,5 +11,19 @@
     </azure>
     <local>
     </local>
+    <s3_with_type>
+        <url>http://minio1:9001/root/</url>
+        <access_key_id>minio</access_key_id>
+        <secret_access_key>ClickHouse_Minio_P@ssw0rd</secret_access_key>
+        <storage_type>s3</storage_type>
+    </s3_with_type>
+    <azure_with_type>
+        <account_name>devstoreaccount1</account_name>
+        <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
+        <storage_type>azure</storage_type>
+    </azure_with_type>
+    <local_with_type>
+        <storage_type>local</storage_type>
+    </local_with_type>
   </named_collections>
 </clickhouse>
diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py
index c74aa3e877fa..793cd27c4f1f 100644
--- a/tests/integration/test_storage_iceberg/test.py
+++ b/tests/integration/test_storage_iceberg/test.py
@@ -1,21 +1,19 @@
-import glob
-import json
 import logging
+import json
 import os
 import subprocess
 import time
 import uuid
+import time
 from datetime import datetime, timezone
 
 import pyspark
 import pytest
-from azure.storage.blob import BlobServiceClient
 from minio.deleteobjects import DeleteObject
 from pyspark.sql.functions import (
     monotonically_increasing_id,
     row_number,
 )
-from pyspark.sql.readwriter import DataFrameWriter, DataFrameWriterV2
 from pyspark.sql.types import (
     ArrayType,
     BooleanType,
@@ -40,6 +38,7 @@
 
 from helpers.iceberg_utils import (
     default_upload_directory,
+    additional_upload_directory,
     default_download_directory,
     execute_spark_query_general,
     get_creation_expression,
@@ -86,6 +85,7 @@ def started_cluster():
                 "configs/config.d/cluster.xml",
                 "configs/config.d/named_collections.xml",
                 "configs/config.d/filesystem_caches.xml",
+                "configs/config.d/metadata_log.xml",
             ],
             user_configs=["configs/users.d/users.xml"],
             with_minio=True,
@@ -99,6 +99,7 @@ def started_cluster():
                 "configs/config.d/cluster.xml",
                 "configs/config.d/named_collections.xml",
                 "configs/config.d/filesystem_caches.xml",
+                "configs/config.d/metadata_log.xml",
             ],
             user_configs=["configs/users.d/users.xml"],
             stay_alive=True,
@@ -110,6 +111,7 @@ def started_cluster():
                 "configs/config.d/cluster.xml",
                 "configs/config.d/named_collections.xml",
                 "configs/config.d/filesystem_caches.xml",
+                "configs/config.d/metadata_log.xml",
             ],
             user_configs=["configs/users.d/users.xml"],
             stay_alive=True,
@@ -340,10 +342,78 @@ def test_types(started_cluster, format_version, storage_type):
         ]
     )
 
+    # Test storage type as function argument
+    table_function_expr = get_creation_expression(
+        storage_type,
+        TABLE_NAME,
+        started_cluster,
+        table_function=True,
+        storage_type_as_arg=True,
+    )
+    assert (
+        instance.query(f"SELECT a, b, c, d, e FROM {table_function_expr}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
+    )
+
+    assert instance.query(f"DESCRIBE {table_function_expr} FORMAT TSV") == TSV(
+        [
+            ["a", "Nullable(Int32)"],
+            ["b", "Nullable(String)"],
+            ["c", "Nullable(Date)"],
+            ["d", "Array(Nullable(String))"],
+            ["e", "Nullable(Bool)"],
+        ]
+    )
+
+    # Test storage type as field in named collection
+    table_function_expr = get_creation_expression(
+        storage_type,
+        TABLE_NAME,
+        started_cluster,
+        table_function=True,
+        storage_type_in_named_collection=True,
+    )
+    assert (
+        instance.query(f"SELECT a, b, c, d, e FROM {table_function_expr}").strip()
+        == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
+    )
+
+    assert instance.query(f"DESCRIBE {table_function_expr} FORMAT TSV") == TSV(
+        [
+            ["a", "Nullable(Int32)"],
+            ["b", "Nullable(String)"],
+            ["c", "Nullable(Date)"],
+            ["d", "Array(Nullable(String))"],
+            ["e", "Nullable(Bool)"],
+        ]
+    )
+
+
+def count_secondary_subqueries(started_cluster, query_id, expected, comment):
+    for node_name, replica in started_cluster.instances.items():
+        cluster_secondary_queries = (
+            replica.query(
+                f"""
+                SELECT count(*) FROM system.query_log
+                WHERE
+                    type = 'QueryFinish'
+                    AND NOT is_initial_query
+                    AND initial_query_id='{query_id}'
+            """
+            )
+            .strip()
+        )
+
+        logging.info(
+            f"[{node_name}] cluster_secondary_queries {comment}: {cluster_secondary_queries}"
+        )
+        assert int(cluster_secondary_queries) == expected
+
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure"])
-def test_cluster_table_function(started_cluster, format_version, storage_type):
+@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
+@pytest.mark.parametrize("cluster_name_as_literal", [True, False])
+def test_cluster_table_function(started_cluster, format_version, storage_type, cluster_name_as_literal):
 
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
@@ -375,6 +445,19 @@ def add_df(mode):
 
         logging.info(f"Adding another dataframe. result files: {files}")
 
+        if storage_type == "local":
+            # For local storage we need to upload data from each node
+            for node_name, replica in started_cluster.instances.items():
+                if node_name == "node1":
+                    continue
+                additional_upload_directory(
+                    started_cluster,
+                    node_name,
+                    storage_type,
+                    f"/iceberg_data/default/{TABLE_NAME}/",
+                    f"/iceberg_data/default/{TABLE_NAME}/",
+                )
+
         return files
 
     files = add_df(mode="overwrite")
@@ -389,59 +472,183 @@ def add_df(mode):
 
     # Regular Query only node1
     table_function_expr = get_creation_expression(
-        storage_type, TABLE_NAME, started_cluster, table_function=True
+        storage_type, TABLE_NAME, started_cluster, table_function=True, cluster_name_as_literal=cluster_name_as_literal
     )
     select_regular = (
         instance.query(f"SELECT * FROM {table_function_expr}").strip().split()
     )
 
+    def make_query_from_function(
+            run_on_cluster=False,
+            alt_syntax=False,
+            remote=False,
+            storage_type_as_arg=False,
+            storage_type_in_named_collection=False,
+            ):
+        expr = get_creation_expression(
+            storage_type,
+            TABLE_NAME,
+            started_cluster,
+            table_function=True,
+            run_on_cluster=run_on_cluster,
+            storage_type_as_arg=storage_type_as_arg,
+            storage_type_in_named_collection=storage_type_in_named_collection,
+            cluster_name_as_literal=cluster_name_as_literal,
+        )
+        query_id = str(uuid.uuid4())
+        settings = f"SETTINGS object_storage_cluster='cluster_simple'" if (alt_syntax and not run_on_cluster) else ""
+        if remote:
+            query = f"SELECT * FROM remote('node2', {expr}) {settings}"
+        else:
+            query = f"SELECT * FROM {expr} {settings}"
+        responce = instance.query(query, query_id=query_id).strip().split()
+        return responce, query_id
+
     # Cluster Query with node1 as coordinator
-    table_function_expr_cluster = get_creation_expression(
-        storage_type,
-        TABLE_NAME,
-        started_cluster,
-        table_function=True,
+    select_cluster, query_id_cluster = make_query_from_function(run_on_cluster=True)
+
+    # Cluster Query with node1 as coordinator with alternative syntax
+    select_cluster_alt_syntax, query_id_cluster_alt_syntax = make_query_from_function(
+        run_on_cluster=True,
+        alt_syntax=True)
+
+    # Cluster Query with node1 as coordinator and storage type as arg
+    select_cluster_with_type_arg, query_id_cluster_with_type_arg = make_query_from_function(
         run_on_cluster=True,
+        storage_type_as_arg=True,
     )
-    select_cluster = (
-        instance.query(f"SELECT * FROM {table_function_expr_cluster}").strip().split()
+
+    # Cluster Query with node1 as coordinator and storage type in named collection
+    select_cluster_with_type_in_nc, query_id_cluster_with_type_in_nc = make_query_from_function(
+        run_on_cluster=True,
+        storage_type_in_named_collection=True,
     )
 
+    # Cluster Query with node1 as coordinator and storage type as arg, alternative syntax
+    select_cluster_with_type_arg_alt_syntax, query_id_cluster_with_type_arg_alt_syntax = make_query_from_function(
+        storage_type_as_arg=True,
+        alt_syntax=True,
+    )
+
+    # Cluster Query with node1 as coordinator and storage type in named collection, alternative syntax
+    select_cluster_with_type_in_nc_alt_syntax, query_id_cluster_with_type_in_nc_alt_syntax = make_query_from_function(
+        storage_type_in_named_collection=True,
+        alt_syntax=True,
+    )
+
+    #select_remote_cluster, _ = make_query_from_function(run_on_cluster=True, remote=True)
+
+    def make_query_from_table(alt_syntax=False):
+        query_id = str(uuid.uuid4())
+        settings = "SETTINGS object_storage_cluster='cluster_simple'" if alt_syntax else ""
+        responce = (
+            instance.query(
+                f"SELECT * FROM {TABLE_NAME} {settings}",
+                query_id=query_id,
+            )
+            .strip()
+            .split()
+        )
+        return responce, query_id
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, object_storage_cluster='cluster_simple')
+    select_cluster_table_engine, query_id_cluster_table_engine = make_query_from_table()
+
+    #select_remote_cluster = (
+    #    instance.query(f"SELECT * FROM remote('node2',{table_function_expr_cluster})")
+    #    .strip()
+    #    .split()
+    #)
+
+    instance.query(f"DROP TABLE IF EXISTS `{TABLE_NAME}` SYNC")
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    select_pure_table_engine, query_id_pure_table_engine = make_query_from_table()
+    select_pure_table_engine_cluster, query_id_pure_table_engine_cluster = make_query_from_table(alt_syntax=True)
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, storage_type_as_arg=True)
+    select_pure_table_engine_with_type_arg, query_id_pure_table_engine_with_type_arg = make_query_from_table()
+    select_pure_table_engine_cluster_with_type_arg, query_id_pure_table_engine_cluster_with_type_arg = make_query_from_table(alt_syntax=True)
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, storage_type_in_named_collection=True)
+    select_pure_table_engine_with_type_in_nc, query_id_pure_table_engine_with_type_in_nc = make_query_from_table()
+    select_pure_table_engine_cluster_with_type_in_nc, query_id_pure_table_engine_cluster_with_type_in_nc = make_query_from_table(alt_syntax=True)
+
     # Simple size check
     assert len(select_regular) == 600
     assert len(select_cluster) == 600
+    assert len(select_cluster_alt_syntax) == 600
+    assert len(select_cluster_table_engine) == 600
+    #assert len(select_remote_cluster) == 600
+    assert len(select_cluster_with_type_arg) == 600
+    assert len(select_cluster_with_type_in_nc) == 600
+    assert len(select_cluster_with_type_arg_alt_syntax) == 600
+    assert len(select_cluster_with_type_in_nc_alt_syntax) == 600
+    assert len(select_pure_table_engine) == 600
+    assert len(select_pure_table_engine_cluster) == 600
+    assert len(select_pure_table_engine_with_type_arg) == 600
+    assert len(select_pure_table_engine_cluster_with_type_arg) == 600
+    assert len(select_pure_table_engine_with_type_in_nc) == 600
+    assert len(select_pure_table_engine_cluster_with_type_in_nc) == 600
 
     # Actual check
     assert select_cluster == select_regular
+    assert select_cluster_alt_syntax == select_regular
+    assert select_cluster_table_engine == select_regular
+    #assert select_remote_cluster == select_regular
+    assert select_cluster_with_type_arg == select_regular
+    assert select_cluster_with_type_in_nc == select_regular
+    assert select_cluster_with_type_arg_alt_syntax == select_regular
+    assert select_cluster_with_type_in_nc_alt_syntax == select_regular
+    assert select_pure_table_engine == select_regular
+    assert select_pure_table_engine_cluster == select_regular
+    assert select_pure_table_engine_with_type_arg == select_regular
+    assert select_pure_table_engine_cluster_with_type_arg == select_regular
+    assert select_pure_table_engine_with_type_in_nc == select_regular
+    assert select_pure_table_engine_cluster_with_type_in_nc == select_regular
 
     # Check query_log
     for replica in started_cluster.instances.values():
         replica.query("SYSTEM FLUSH LOGS")
 
-    for node_name, replica in started_cluster.instances.items():
-        cluster_secondary_queries = (
-            replica.query(
-                f"""
-                SELECT query, type, is_initial_query, read_rows, read_bytes FROM system.query_log
-                WHERE
-                    type = 'QueryStart' AND
-                    positionCaseInsensitive(query, '{storage_type}Cluster') != 0 AND
-                    position(query, '{TABLE_NAME}') != 0 AND
-                    position(query, 'system.query_log') = 0 AND
-                    NOT is_initial_query
-            """
-            )
-            .strip()
-            .split("\n")
-        )
+    count_secondary_subqueries(started_cluster, query_id_cluster, 1, "table function")
+    count_secondary_subqueries(started_cluster, query_id_cluster_alt_syntax, 1, "table function alt syntax")
+    count_secondary_subqueries(started_cluster, query_id_cluster_table_engine, 1, "cluster table engine")
+    count_secondary_subqueries(started_cluster, query_id_cluster_with_type_arg, 1, "table function with storage type in args")
+    count_secondary_subqueries(started_cluster, query_id_cluster_with_type_in_nc, 1, "table function with storage type in named collection")
+    count_secondary_subqueries(started_cluster, query_id_cluster_with_type_arg_alt_syntax, 1, "table function with storage type in args alt syntax")
+    count_secondary_subqueries(started_cluster, query_id_cluster_with_type_in_nc_alt_syntax, 1, "table function with storage type in named collection alt syntax")
+    count_secondary_subqueries(started_cluster, query_id_pure_table_engine, 0, "table engine")
+    count_secondary_subqueries(started_cluster, query_id_pure_table_engine_cluster, 1, "table engine with cluster setting")
+    count_secondary_subqueries(started_cluster, query_id_pure_table_engine_with_type_arg, 0, "table engine with storage type in args")
+    count_secondary_subqueries(started_cluster, query_id_pure_table_engine_cluster_with_type_arg, 1, "table engine with cluster setting with storage type in args")
+    count_secondary_subqueries(started_cluster, query_id_pure_table_engine_with_type_in_nc, 0, "table engine with storage type in named collection")
+    count_secondary_subqueries(started_cluster, query_id_pure_table_engine_cluster_with_type_in_nc, 1, "table engine with cluster setting with storage type in named collection")
 
-        logging.info(
-            f"[{node_name}] cluster_secondary_queries: {cluster_secondary_queries}"
-        )
-        assert len(cluster_secondary_queries) == 1
 
-    # write 3 times
-    assert int(instance.query(f"SELECT count() FROM {table_function_expr_cluster}")) == 100 * 3
+    # Cluster Query with node1 as coordinator
+    table_function_expr_cluster = get_creation_expression(
+        storage_type,
+        TABLE_NAME,
+        started_cluster,
+        table_function=True,
+        run_on_cluster=True,
+    )
+    select_remote_cluster = (
+        instance.query(f"SELECT * FROM remote('node2',{table_function_expr_cluster})")
+        .strip()
+        .split()
+    )
+    assert len(select_remote_cluster) == 600
+    assert select_remote_cluster == select_regular
+
+    select_remote_cluster = (
+        instance.query(f"SELECT * FROM remote('node2',{table_function_expr_cluster})")
+        .strip()
+        .split()
+    )
+    assert len(select_remote_cluster) == 600
+    assert select_remote_cluster == select_regular
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
@@ -530,6 +737,12 @@ def test_delete_files(started_cluster, format_version, storage_type):
     assert instance.query(f"SELECT ProfileEvents['IcebergTrivialCountOptimizationApplied'] FROM system.query_log where query_id = '{query_id}' and type = 'QueryFinish'") == "1\n"
 
 
+def get_array(query_result: str):
+    arr = sorted([int(x) for x in query_result.strip().split("\n")])
+    print(arr)
+    return arr
+
+
 @pytest.mark.parametrize("use_roaring_bitmaps", [0, 1])
 @pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
 def test_position_deletes(started_cluster, use_roaring_bitmaps,  storage_type):
@@ -546,11 +759,6 @@ def test_position_deletes(started_cluster, use_roaring_bitmaps,  storage_type):
     )
     spark.sql(f"INSERT INTO {TABLE_NAME} select id, char(id + ascii('a')) from range(10, 100)")
 
-    def get_array(query_result: str):
-        arr = sorted([int(x) for x in query_result.strip().split("\n")])
-        print(arr)
-        return arr
-
     default_upload_directory(
         started_cluster,
         storage_type,
@@ -631,6 +839,49 @@ def get_array(query_result: str):
     instance.query(f"DROP TABLE {TABLE_NAME}")
 
 
+@pytest.mark.parametrize("use_roaring_bitmaps", [0, 1])
+def test_position_deletes_out_of_order(started_cluster, use_roaring_bitmaps):
+    storage_type = "local"
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_position_deletes_out_of_order_" + get_uuid_str()
+    instance.query(f"SET use_roaring_bitmap_iceberg_positional_deletes={use_roaring_bitmaps};")
+    instance.query(f"SET input_format_parquet_use_native_reader_v3=1;")
+
+    # There are a few flaky hacks chained together here.
+    # We want the parquet reader to produce chunks corresponding to row groups out of order if
+    # `format_settings.parquet.preserve_order` wasn't enabled. For that we:
+    #  * Use `PREWHERE NOT sleepEachRow(...)` to make the reader take longer for bigger row groups.
+    #  * Set spark row group size limit to 1 byte. Rely on current spark implementation detail:
+    #    it'll check this limit every 100 rows. So effectively we've set row group size to 100 rows.
+    #  * Insert 105 rows. So the first row group will have 100 rows, the second 5 rows.
+    # If one of these steps breaks in future, this test will be less effective but won't fail.
+
+    spark.sql(
+        f"""
+        CREATE TABLE {TABLE_NAME} (id bigint, data string) USING iceberg TBLPROPERTIES ('format-version' = '2', 'write.update.mode'='merge-on-read', 'write.delete.mode'='merge-on-read', 'write.merge.mode'='merge-on-read', 'write.parquet.row-group-size-bytes'='1')
+        """
+    )
+    spark.sql(f"INSERT INTO {TABLE_NAME} select /*+ COALESCE(1) */ id, char(id + ascii('a')) from range(0, 105)")
+    # (Fun fact: if you replace these two queries with one query with `WHERE id < 10 OR id = 103`,
+    #  spark either quetly fails to delete row 103 or outright crashes with segfault in jre.)
+    spark.sql(f"DELETE FROM {TABLE_NAME} WHERE id < 10")
+    spark.sql(f"DELETE FROM {TABLE_NAME} WHERE id = 103")
+
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{TABLE_NAME}/",
+        f"/iceberg_data/default/{TABLE_NAME}/",
+    )
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, additional_settings=["input_format_parquet_use_native_reader_v3=1", f"use_roaring_bitmap_iceberg_positional_deletes={use_roaring_bitmaps}"])
+
+    # TODO: Replace WHERE with PREWHERE when we add prewhere support for datalakes.
+    assert get_array(instance.query(f"SELECT id FROM {TABLE_NAME} WHERE NOT sleepEachRow(1/100) order by id")) == list(range(10, 103)) + [104]
+
+    instance.query(f"DROP TABLE {TABLE_NAME}")
+
 @pytest.mark.parametrize("format_version", ["1", "2"])
 @pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
 def test_schema_inference(started_cluster, format_version, storage_type):
@@ -851,7 +1102,7 @@ def test_metadata_file_selection_from_version_hint(started_cluster, format_versi
         spark.sql(
             f"INSERT INTO {TABLE_NAME} select id, char(id + ascii('a')) from range(10)"
         )
-        
+
     # test the case where version_hint.text file contains just the version number
     with open(f"/iceberg_data/default/{TABLE_NAME}/metadata/version-hint.text", "w") as f:
         f.write('5')
@@ -1023,7 +1274,7 @@ def test_filesystem_cache(started_cluster, storage_type):
 
 @pytest.mark.parametrize(
     "storage_type, run_on_cluster",
-    [("s3", False), ("s3", True), ("azure", False), ("local", False)],
+    [("s3", False), ("s3", True), ("azure", False), ("azure", True), ("local", False), ("local", True)],
 )
 def test_partition_pruning(started_cluster, storage_type, run_on_cluster):
     instance = started_cluster.instances["node1"]
@@ -1037,6 +1288,7 @@ def execute_spark_query(query: str):
             storage_type,
             TABLE_NAME,
             query,
+            additional_nodes=["node2", "node3"] if storage_type=="local" else [],
         )
 
     execute_spark_query(
@@ -1813,6 +2065,7 @@ def check_validity_and_get_prunned_files(select_expression):
         == 1
     )
 
+
 @pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
 def test_explicit_metadata_file(started_cluster, storage_type):
     instance = started_cluster.instances["node1"]
@@ -1857,8 +2110,10 @@ def test_explicit_metadata_file(started_cluster, storage_type):
     with pytest.raises(Exception):
         create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, explicit_metadata_path="../metadata/v11.metadata.json")
 
+
 @pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_minmax_pruning_with_null(started_cluster, storage_type):
+@pytest.mark.parametrize("run_on_cluster", [False, True])
+def test_minmax_pruning_with_null(started_cluster, storage_type, run_on_cluster):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
     TABLE_NAME = "test_minmax_pruning_with_null" + storage_type + "_" + get_uuid_str()
@@ -1870,6 +2125,7 @@ def execute_spark_query(query: str):
             storage_type,
             TABLE_NAME,
             query,
+            additional_nodes=["node2", "node3"] if storage_type=="local" else [],
         )
 
     execute_spark_query(
@@ -1928,7 +2184,7 @@ def execute_spark_query(query: str):
     )
 
     creation_expression = get_creation_expression(
-        storage_type, TABLE_NAME, started_cluster, table_function=True
+        storage_type, TABLE_NAME, started_cluster, table_function=True, run_on_cluster=run_on_cluster
     )
 
     def check_validity_and_get_prunned_files(select_expression):
@@ -2449,7 +2705,7 @@ def test_writes_create_table(started_cluster, format_version, storage_type):
     with pytest.raises(Exception):
         create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, "(x String)", format_version)
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, "(x String)", format_version, "", True)    
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster, "(x String)", format_version, "", True)
 
     assert '`x` String' in instance.query(f"SHOW CREATE TABLE {TABLE_NAME}")
 
@@ -2514,7 +2770,7 @@ def test_relevant_iceberg_schema_chosen(started_cluster, storage_type):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
     TABLE_NAME = "test_relevant_iceberg_schema_chosen_" + storage_type + "_" + get_uuid_str()
-    
+
     spark.sql(
         f"""
         CREATE TABLE IF NOT EXISTS {TABLE_NAME} (
@@ -2587,6 +2843,23 @@ def test_writes_with_compression_metadata(started_cluster, format_version, stora
     instance.query(f"INSERT INTO {TABLE_NAME} VALUES ('123', 1);", settings={"allow_experimental_insert_into_iceberg": 1, "iceberg_metadata_compression_method": "gzip"})
     assert instance.query(f"SELECT * FROM {TABLE_NAME} ORDER BY ALL") == '123\t1\n'
 
+def test_writes_create_table_bugs(started_cluster):
+    instance = started_cluster.instances["node1"]
+    TABLE_NAME = "test_writes_create_table_bugs_" + get_uuid_str()
+    TABLE_NAME_1 = "test_writes_create_table_bugs_" + get_uuid_str()
+    instance.query(
+        f"CREATE TABLE {TABLE_NAME} (c0 Int) ENGINE = IcebergLocal('/iceberg_data/default/{TABLE_NAME}/', 'CSV') AS (SELECT 1 OFFSET 1 ROW);",
+        settings={"allow_experimental_insert_into_iceberg": 1}
+    )
+
+    error = instance.query_and_get_error(
+        f"CREATE TABLE {TABLE_NAME_1} (c0 Int) ENGINE = IcebergLocal('/iceberg_data/default/{TABLE_NAME_1}/', 'CSV') PARTITION BY (icebergTruncate(c0));",
+        settings={"allow_experimental_insert_into_iceberg": 1}
+    )
+
+    assert "BAD_ARGUMENTS" in error
+    assert "LOGICAL_ERROR" not in error
+
 
 @pytest.mark.parametrize("format_version", [1, 2])
 @pytest.mark.parametrize("storage_type", ["local"])
@@ -2964,3 +3237,1000 @@ def test_writes_mutate_delete(started_cluster, storage_type, partition_type):
     df = spark.read.format("iceberg").load(f"/iceberg_data/default/{TABLE_NAME}").collect()
     assert len(df) == 1
 
+class PrunedInfo:
+    def __init__(self, not_pruned, partition_pruned, min_max_index_pruned):
+        self.not_pruned = not_pruned
+        self.partition_pruned = partition_pruned
+        self.min_max_index_pruned = min_max_index_pruned
+
+    def __repr__(self):
+        return "PrunedInfo(not_pruned={}, partition_pruned={}, min_max_index_pruned={})".format(self.not_pruned, self.partition_pruned, self.min_max_index_pruned)
+
+    def __eq__(self, other):
+        return (self.not_pruned == other.not_pruned and
+                self.partition_pruned == other.partition_pruned and
+                self.min_max_index_pruned == other.min_max_index_pruned)
+
+def get_date_and_time_columns(instance, query_id: str):
+    result = dict()
+    for name in ['event_date', 'event_time']:
+        query_result = instance.query(f"SELECT {name} FROM system.iceberg_metadata_log WHERE query_id = '{query_id}'")
+        result[name] = query_result.split('\n')
+        result[name] = list(filter(lambda x: len(x) > 0, result[name]))
+    return result
+
+def get_iceberg_metadata_to_dict(instance, query_id: str):
+    result = dict()
+    for name in ['content', 'content_type', 'table_path', 'file_path', 'row_in_file', 'pruning_status']:
+        # We are ok with duplicates in the table itself but for test purposes we want to remove duplicates here
+        select_distinct_expression = f"SELECT DISTINCT(*) FROM (SELECT content, content_type, table_path, file_path, row_in_file, pruning_status FROM system.iceberg_metadata_log WHERE query_id = '{query_id}') ORDER BY ALL"
+        query_result = instance.query(f"SELECT {name} FROM ({select_distinct_expression})")
+        print("Query result for {}: {}".format(name, query_result))
+        result[name] = query_result.split('\n')[:-1]
+    result['row_in_file'] = list(map(lambda x : int(x) if x.isdigit() else None, result['row_in_file']))
+    result['pruning_status'] = list(map(lambda x : x if x != '\\N' else None, result['pruning_status']))
+    print("Result dictionary: {}".format(result))
+    return result
+
+def verify_result_dictionary(diction : dict, allowed_content_types : set):
+    prunned_info = PrunedInfo(0, 0, 0)
+    # Expected content_type and only it is present
+    if set(diction['content_type']) != allowed_content_types:
+        raise ValueError("Content type mismatch. Expected: {}, got: {}".format(allowed_content_types, set(diction['content_type'])))
+    # For all entries we have the same table_path
+    if not (len(set(diction['table_path'])) == 1 or (len(allowed_content_types) == 0 and len(diction['table_path']) == 0)):
+        raise ValueError("Unexpected number of table paths are found for one query. Set: {}".format(set(diction['table_path'])))
+    extensions = list(map(lambda x: x.split('.')[-1], diction['file_path']))
+    for i in range(len(diction['content_type'])):
+        if diction['content_type'][i] == 'Metadata':
+            # File with content_type 'Metadata' has json extension
+            if extensions[i] != 'json':
+                raise ValueError("Unexpected file extension for Metadata. Expected: json, got: {}".format(extensions[i]))
+        else:
+            # File with content_types except 'Metadata' has avro extension
+            if extensions[i] != 'avro':
+                raise ValueError("Unexpected file extension for {}. Expected: avro, got: {}".format(diction['content_type'][i], extensions[i]))
+
+    # All content is json-serializable
+    for content in diction['content']:
+        if content == '':
+            continue
+        try:
+            json.loads(content)
+        except:
+            raise ValueError("Content is not valid JSON. Content: {}".format(content))
+    for file_path in set(diction['file_path']):
+        row_values = set()
+        number_of_missing_row_values = 0
+        number_of_rows = 0
+        partitioned_rows = set()
+        not_deleted_files = set()
+        for i in range(len(diction['file_path'])):
+            if file_path == diction['file_path'][i]:
+                if diction['row_in_file'][i] is not None:
+                    row_values.add(diction['row_in_file'][i])
+                    # If row is present the type is entry
+                    if diction['content_type'][i] not in ['ManifestFileEntry', 'ManifestListEntry']:
+                        raise ValueError("Row should not be specified for an entry {}, file_path: {}".format(diction['content_type'][i], file_path))
+                    if diction['content'][i] != '':
+                        number_of_rows += 1
+
+                    if diction['content_type'][i] == 'ManifestFileEntry':
+                        if diction['content'][i] == '':
+                            if diction['pruning_status'][i] is None:
+                                raise ValueError("Pruning status should be specified for this manifest file entry, file_path: {}".format(file_path))
+                            partitioned_rows.add(diction['row_in_file'][i])
+                            if diction['pruning_status'][i] == 'NotPruned':
+                                prunned_info.not_pruned += 1
+                            elif diction['pruning_status'][i] == 'PartitionPruned':
+                                prunned_info.partition_pruned += 1
+                            elif diction['pruning_status'][i] == 'MinMaxIndexPruned':
+                                prunned_info.min_max_index_pruned += 1
+                            else:
+                                raise ValueError("Unexpected pruning status: {}, file_path: {}".format(diction['pruning_status'][i], file_path))
+                        else:
+                            data_object = json.loads(diction['content'][i])
+                            print("Data object: {}".format(data_object))
+                            if data_object['status'] < 2:
+                                not_deleted_files.add(diction['row_in_file'][i])
+                else:
+                    # If row is not present that the type is metadata
+                    if diction['content_type'][i] not in ['Metadata', 'ManifestFileMetadata', 'ManifestListMetadata']:
+                        raise ValueError("Row should be specified for an entry {}, file_path: {}".format(diction['content_type'][i], file_path))
+
+                    number_of_missing_row_values += 1
+        if partitioned_rows != not_deleted_files:
+            raise ValueError("Partitioned rows are not consistent with not deleted files for file path: {}, partitioned rows: {}, not deleted files: {}".format(file_path, partitioned_rows, not_deleted_files))
+
+        # We have exactly one metadata file
+        if number_of_missing_row_values != 1:
+            raise ValueError("Not a one row value (corresponding to metadata file) is missing for file path: {}".format(file_path))
+
+        # Rows in avro files are consistent
+        if len(row_values) != number_of_rows:
+            raise ValueError("Unexpected number of row values for file path: {}".format(file_path))
+        for i in range(number_of_rows):
+            if not i in row_values:
+                raise ValueError("Missing row value for file path: {}, missing row index: {}".format(file_path, i))
+    return prunned_info
+
+def get_prunned_info_from_profile_events(instance, query_id: str):
+    instance.query("SYSTEM FLUSH LOGS")
+
+    not_pruned = int(
+        instance.query(
+            f"SELECT ProfileEvents['IcebergMetadataReturnedObjectInfos'] FROM system.query_log WHERE query_id = '{query_id}' AND type = 'QueryFinish'"
+        )
+    )
+
+    partition_pruned = int(
+        instance.query(
+            f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id}' AND type = 'QueryFinish'"
+        )
+    )
+
+    min_max_index_pruned = int(
+        instance.query(
+            f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id}' AND type = 'QueryFinish'"
+        )
+    )
+
+    return PrunedInfo(not_pruned, partition_pruned, min_max_index_pruned)
+
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+@pytest.mark.parametrize("storage_type", ["s3", "local", "azure"])
+def test_system_iceberg_metadata(started_cluster, format_version, storage_type):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = (
+        "test_system_iceberg_metadata_"
+        + format_version
+        + "_"
+        + storage_type
+        + "_"
+        + get_uuid_str()
+    )
+
+    def execute_spark_query(query: str):
+        return execute_spark_query_general(
+            spark,
+            started_cluster,
+            storage_type,
+            TABLE_NAME,
+            query,
+        )
+
+    execute_spark_query(
+        f"""
+            CREATE TABLE {TABLE_NAME} (
+                a INT,
+                b STRING
+            )
+            USING iceberg
+            PARTITIONED BY (identity(a))
+            OPTIONS('format-version'='2')
+        """
+    )
+
+    for i in range(5):
+        spark.sql(
+            f"""
+                INSERT INTO {TABLE_NAME} VALUES
+                ({i}, '{i}');
+            """
+        )
+
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{TABLE_NAME}/",
+        f"/iceberg_data/default/{TABLE_NAME}/",
+    )
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+
+    content_types = ["Metadata", "ManifestListMetadata", "ManifestListEntry", "ManifestFileMetadata", "ManifestFileEntry"]
+    settings = ["none", "metadata", "manifest_list_metadata", "manifest_list_entry", "manifest_file_metadata", "manifest_file_entry"]
+
+
+    for i in range(len(settings)):
+        allowed_content_types = set(content_types[:i])
+
+        query_id = TABLE_NAME + "_" + str(i) + "_" + get_uuid_str()
+
+        instance.query(f"SELECT * FROM {TABLE_NAME} WHERE a >= 2", query_id = query_id,  settings={"iceberg_metadata_log_level":settings[i], "use_iceberg_partition_pruning": 1})
+
+        expected_prunned_info = get_prunned_info_from_profile_events(instance, query_id)
+
+        diction = get_iceberg_metadata_to_dict(instance, query_id)
+
+        try:
+            if settings[i] == 'manifest_file_entry':
+                table_prunned_info = verify_result_dictionary(diction, allowed_content_types)
+                assert table_prunned_info == expected_prunned_info, "Not prunned files count mismatch. Table: {}, ProfileEvents: {}".format(table_prunned_info, expected_prunned_info)
+        except:
+            print("Dictionary: {}, Allowed Content Types: {}".format(diction, allowed_content_types))
+            raise
+
+
+@pytest.mark.parametrize("storage_type", ["s3", "azure"])
+@pytest.mark.parametrize("run_on_cluster", [False, True])
+def test_read_constant_columns_optimization(started_cluster, storage_type, run_on_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_read_constant_columns_optimization_" + storage_type + "_" + get_uuid_str()
+
+    def execute_spark_query(query: str):
+        return execute_spark_query_general(
+            spark,
+            started_cluster,
+            storage_type,
+            TABLE_NAME,
+            query,
+        )
+
+    execute_spark_query(
+        f"""
+            CREATE TABLE {TABLE_NAME} (
+                tag INT,
+                date DATE,
+                date2 DATE,
+                name VARCHAR(50),
+                number BIGINT
+            )
+            USING iceberg
+            PARTITIONED BY (identity(tag), years(date))
+            OPTIONS('format-version'='2')
+        """
+    )
+
+    execute_spark_query(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES
+        (1, DATE '2024-01-20', DATE '2024-01-20', 'vasya', 5),
+        (1, DATE '2024-01-20', DATE '2024-01-20', 'vasilisa', 5),
+        (1, DATE '2025-01-20', DATE '2025-01-20', 'vasya', 5),
+        (1, DATE '2025-01-20', DATE '2025-01-20', 'vasya', 5),
+        (2, DATE '2025-01-20', DATE '2025-01-20', 'vasilisa', 5),
+        (2, DATE '2025-01-21', DATE '2025-01-20', 'vasilisa', 5)
+    """
+    )
+
+    execute_spark_query(
+        f"""
+            ALTER TABLE {TABLE_NAME} ALTER COLUMN number FIRST;
+        """
+    )
+
+    execute_spark_query(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES
+        (5, 3, DATE '2025-01-20', DATE '2024-01-20', 'vasilisa'),
+        (5, 3, DATE '2025-01-20', DATE '2025-01-20', 'vasilisa')
+    """
+    )
+
+    execute_spark_query(
+        f"""
+            ALTER TABLE {TABLE_NAME} RENAME COLUMN name TO name_old;
+        """
+    )
+
+    execute_spark_query(
+        f"""
+            ALTER TABLE {TABLE_NAME}
+            ADD COLUMNS (
+                name string
+            );
+        """
+    )
+
+    execute_spark_query(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES
+        (5, 4, DATE '2025-01-20', DATE '2024-01-20', 'vasya', 'iceberg'),
+        (5, 4, DATE '2025-01-20', DATE '2025-01-20', 'vasilisa', 'iceberg'),
+        (5, 5, DATE '2025-01-20', DATE '2024-01-20', 'vasya', 'iceberg'),
+        (5, 5, DATE '2025-01-20', DATE '2024-01-20', 'vasilisa', 'icebreaker'),
+        (5, 6, DATE '2025-01-20', DATE '2024-01-20', 'vasya', 'iceberg'),
+        (5, 6, DATE '2025-01-20', DATE '2024-01-20', 'vasya', 'iceberg')
+    """
+    )
+
+    # Totally must be 7 files
+    # Partitioned column 'tag' is constant in each file
+    # Column 'date' is constant in 6 files, has different values in (2-2025)
+    # Column 'date2' is constant in 4 files (1-2024, 2-2025, 5-2025, 6-2025)
+    # Column 'name_old' is constant in 3 files (1-2025, 2-2025 as 'name', 6-2025 as 'name_old')
+    # Column 'number' is globally constant
+    # New column 'name2' is present only in 3 files (4-2025, 5-2025, 6-2025), constant in two (4-2025, 6-2025)
+    # Files 1-2025 and 6-2025 have only constant columns
+
+    creation_expression = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True, run_on_cluster=run_on_cluster
+    )
+
+    # Warm up metadata cache
+    for replica in started_cluster.instances.values():
+        replica.query("SYSTEM DROP UNCOMPRESSED CACHE")
+        replica.query("SYSTEM DROP QUERY CACHE")
+        replica.query("SYSTEM DROP FILESYSTEM CACHE")
+        replica.query("SYSTEM DROP ICEBERG METADATA CACHE")
+        replica.query(f"SELECT * FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=0")
+
+    all_data_expected_query_id = str(uuid.uuid4())
+    all_data_expected = instance.query(
+        f"SELECT * FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=0",
+        query_id=all_data_expected_query_id,
+        )
+    const_only_expected_query_id = str(uuid.uuid4())
+    const_only_expected = instance.query(
+        f"SELECT tag, number FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=0",
+        query_id=const_only_expected_query_id,
+        )
+    const_partial_expected_query_id = str(uuid.uuid4())
+    const_partial_expected = instance.query(
+        f"SELECT tag, date2, number, name_old FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=0",
+        query_id=const_partial_expected_query_id,
+        )
+    const_partial2_expected_query_id = str(uuid.uuid4())
+    const_partial2_expected = instance.query(
+        f"SELECT tag, date2, number, name FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=0",
+        query_id=const_partial2_expected_query_id,
+        )
+    count_expected_query_id = str(uuid.uuid4())
+    count_expected = instance.query(
+        f"SELECT count(),tag FROM {creation_expression} GROUP BY ALL ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=0",
+        query_id=count_expected_query_id,
+        )
+
+    all_data_query_id = str(uuid.uuid4())
+    all_data_optimized = instance.query(
+        f"SELECT * FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=1",
+        query_id=all_data_query_id,
+        )
+    const_only_query_id = str(uuid.uuid4())
+    const_only_optimized = instance.query(
+        f"SELECT tag, number FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=1",
+        query_id=const_only_query_id,
+        )
+    const_partial_query_id = str(uuid.uuid4())
+    const_partial_optimized = instance.query(
+        f"SELECT tag, date2, number, name_old FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=1",
+        query_id=const_partial_query_id,
+        )
+    const_partial2_query_id = str(uuid.uuid4())
+    const_partial2_optimized = instance.query(
+        f"SELECT tag, date2, number, name FROM {creation_expression} ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=1",
+        query_id=const_partial2_query_id,
+        )
+    count_query_id = str(uuid.uuid4())
+    count_optimized = instance.query(
+        f"SELECT count(),tag FROM {creation_expression} GROUP BY ALL ORDER BY ALL SETTINGS allow_experimental_iceberg_read_optimization=1",
+        query_id=count_query_id,
+        )
+
+    assert all_data_expected == all_data_optimized
+    assert const_only_expected == const_only_optimized
+    assert const_partial_expected == const_partial_optimized
+    assert const_partial2_expected == const_partial2_optimized
+    assert count_expected == count_optimized
+
+    for replica in started_cluster.instances.values():
+        replica.query("SYSTEM FLUSH LOGS")
+
+    def check_events(query_id, event, expected):
+        res = instance.query(
+            f"""
+            SELECT
+                sum(tupleElement(arrayJoin(ProfileEvents),2)) as value
+            FROM
+                clusterAllReplicas('cluster_simple', system.query_log)
+            WHERE
+                type='QueryFinish'
+                AND tupleElement(arrayJoin(ProfileEvents),1)='{event}'
+                AND initial_query_id='{query_id}'
+            GROUP BY ALL
+            FORMAT CSV
+            """)
+        assert int(res) == expected
+
+    event = "S3GetObject" if storage_type == "s3" else "AzureGetObject"
+
+    # Without optimization clickhouse reads all 7 files
+    check_events(all_data_expected_query_id, event, 7)
+    check_events(const_only_expected_query_id, event, 7)
+    check_events(const_partial_expected_query_id, event, 7)
+    check_events(const_partial2_expected_query_id, event, 7)
+    check_events(count_expected_query_id, event, 7)
+
+    # If file has only constant columns it is not read
+    check_events(all_data_query_id, event, 5) # 1-2025, 6-2025 must not be read
+    check_events(const_only_query_id, event, 0) # All must not be read
+    check_events(const_partial_query_id, event, 4) # 1-2025, 6-2025 and 2-2025 must not be read
+    check_events(const_partial2_query_id, event, 3) # 6-2025 must not be read, 1-2024, 1-2025, 2-2025 don't have new column 'name'
+    check_events(count_query_id, event, 0) # All must not be read
+
+    def compare_selects(query):
+        result_expected = instance.query(f"{query} SETTINGS allow_experimental_iceberg_read_optimization=0")
+        result_optimized = instance.query(f"{query} SETTINGS allow_experimental_iceberg_read_optimization=1")
+        assert result_expected == result_optimized
+
+    compare_selects(f"SELECT _path,* FROM {creation_expression} ORDER BY ALL")
+    compare_selects(f"SELECT _path,* FROM {creation_expression} WHERE name_old='vasily' ORDER BY ALL")
+    compare_selects(f"SELECT _path,* FROM {creation_expression} WHERE ((tag + length(name_old)) % 2 = 1) ORDER BY ALL")
+
+
+@pytest.mark.parametrize("storage_type", ["s3", "azure"])
+def test_cluster_joins(started_cluster, storage_type):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_cluster_joins_" + storage_type + "_" + get_uuid_str()
+    TABLE_NAME_2 = "test_cluster_joins_2_" + storage_type + "_" + get_uuid_str()
+    TABLE_NAME_LOCAL = "test_cluster_joins_local_" + storage_type + "_" + get_uuid_str()
+
+    def execute_spark_query(query: str, table_name):
+        return execute_spark_query_general(
+            spark,
+            started_cluster,
+            storage_type,
+            table_name,
+            query,
+        )
+
+    execute_spark_query(
+        f"""
+            CREATE TABLE {TABLE_NAME} (
+                tag INT,
+                name VARCHAR(50)
+            )
+            USING iceberg
+            OPTIONS('format-version'='2')
+        """, TABLE_NAME
+    )
+
+    execute_spark_query(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES
+        (1, 'john'),
+        (2, 'jack')
+    """, TABLE_NAME
+    )
+
+    execute_spark_query(
+        f"""
+            CREATE TABLE {TABLE_NAME_2} (
+                id INT,
+                second_name VARCHAR(50)
+            )
+            USING iceberg
+            OPTIONS('format-version'='2')
+        """, TABLE_NAME_2
+    )
+
+    execute_spark_query(
+        f"""
+        INSERT INTO {TABLE_NAME_2} VALUES
+        (1, 'dow'),
+        (2, 'sparrow')
+    """, TABLE_NAME_2
+    )
+
+    creation_expression = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True, run_on_cluster=True
+    )
+
+    creation_expression_2 = get_creation_expression(
+        storage_type, TABLE_NAME_2, started_cluster, table_function=True, run_on_cluster=True
+    )
+
+    instance.query(f"CREATE TABLE `{TABLE_NAME_LOCAL}` (id Int64, second_name String) ENGINE = Memory()")
+    instance.query(f"INSERT INTO `{TABLE_NAME_LOCAL}` VALUES (1, 'silver'), (2, 'black')")
+
+    res = instance.query(
+        f"""
+            SELECT t1.name,t2.second_name
+            FROM {creation_expression} AS t1
+                JOIN {creation_expression_2} AS t2
+                ON t1.tag=t2.id
+            WHERE t1.tag < 10 AND t2.id < 20
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "jack\tsparrow\njohn\tdow\n"
+
+    res = instance.query(
+        f"""
+            SELECT name
+            FROM {creation_expression}
+            WHERE tag in (
+                SELECT id
+                FROM {creation_expression_2}
+            )
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "jack\njohn\n"
+
+    res = instance.query(
+        f"""
+            SELECT t1.name,t2.second_name
+            FROM {creation_expression} AS t1
+                JOIN `{TABLE_NAME_LOCAL}` AS t2
+                ON t1.tag=t2.id
+            WHERE t1.tag < 10 AND t2.id < 20
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "jack\tblack\njohn\tsilver\n"
+
+    res = instance.query(
+        f"""
+            SELECT name
+            FROM {creation_expression}
+            WHERE tag in (
+                SELECT id
+                FROM `{TABLE_NAME_LOCAL}`
+            )
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "jack\njohn\n"
+
+    res = instance.query(
+        f"""
+            SELECT t1.name,t2.second_name
+            FROM {creation_expression} AS t1
+                CROSS JOIN `{TABLE_NAME_LOCAL}` AS t2
+            WHERE t1.tag < 10 AND t2.id < 20
+            ORDER BY ALL
+            SETTINGS
+                object_storage_cluster='cluster_simple',
+                object_storage_cluster_join_mode='local'
+        """
+    )
+
+    assert res == "jack\tblack\njack\tsilver\njohn\tblack\njohn\tsilver\n"
+
+
+@pytest.mark.parametrize("storage_type", ["s3"])
+def test_system_tables_partition_sorting_keys(started_cluster, storage_type):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+
+    table_name = f"test_sys_tables_keys_{storage_type}_{uuid.uuid4().hex[:8]}"
+    fq_table = f"spark_catalog.default.{table_name}"
+
+    spark.sql(f"DROP TABLE IF EXISTS {fq_table}")
+    spark.sql(f"""
+        CREATE TABLE {fq_table} (
+            id INT,
+            ts TIMESTAMP,
+            payload STRING
+        )
+        USING iceberg
+        PARTITIONED BY (bucket(16, id), day(ts))
+        TBLPROPERTIES ('format-version' = '2')
+    """)
+    spark.sql(f"ALTER TABLE {fq_table} WRITE ORDERED BY (id DESC NULLS LAST, hour(ts))")
+    spark.sql(f"""
+        INSERT INTO {fq_table} VALUES
+        (1, timestamp'2024-01-01 10:00:00', 'a'),
+        (2, timestamp'2024-01-02 11:00:00', 'b'),
+        (NULL, timestamp'2024-01-03 12:00:00', 'c')
+    """)
+
+    time.sleep(2)
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{table_name}/",
+        f"/iceberg_data/default/{table_name}/",
+    )
+
+    create_iceberg_table(storage_type, instance, table_name, started_cluster)
+
+    res = instance.query(f"""
+        SELECT partition_key, sorting_key
+        FROM system.tables
+        WHERE name = '{table_name}' FORMAT csv
+    """).strip().lower()
+
+    assert res == '"bucket(16, id), day(ts)","id desc, hour(ts) asc"'
+
+
+
+@pytest.mark.parametrize(
+    "storage_type",
+    ["s3", "azure", "local"],
+)
+def test_partition_pruning_with_subquery_set(started_cluster, storage_type):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_partition_pruning_" + storage_type + "_" + get_uuid_str()
+    IN_MEMORY_TABLE = "in_memory_table_" + get_uuid_str()
+
+    def execute_spark_query(query: str):
+        return execute_spark_query_general(
+            spark,
+            started_cluster,
+            storage_type,
+            TABLE_NAME,
+            query,
+        )
+
+    execute_spark_query(
+        f"""
+            CREATE TABLE {TABLE_NAME} (
+                id INT,
+                data STRING
+            )
+            USING iceberg
+            PARTITIONED BY (identity(id))
+            OPTIONS('format-version'='2')
+        """
+    )
+
+    execute_spark_query(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES
+        (1, 'a'),
+        (2, 'b'),
+        (3, 'c'),
+        (4, 'd'),
+        (5, 'e');
+    """
+    )
+
+    creation_expression = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True
+    )
+
+    instance.query(f"CREATE TABLE {IN_MEMORY_TABLE} (id INT) ENGINE = Memory")
+    instance.query(f"INSERT INTO {IN_MEMORY_TABLE} VALUES (2), (4)")
+
+    def check_validity_and_get_prunned_files(select_expression):
+        settings1 = {
+            "use_iceberg_partition_pruning": 0
+        }
+        settings2 = {
+            "use_iceberg_partition_pruning": 1
+        }
+        return check_validity_and_get_prunned_files_general(
+            instance, TABLE_NAME, settings1, settings2, 'IcebergPartitionPrunedFiles', select_expression
+        )
+
+    assert (
+        check_validity_and_get_prunned_files(
+            f"SELECT * FROM {creation_expression} WHERE id in (SELECT id FROM {IN_MEMORY_TABLE}) ORDER BY ALL"
+        )
+        == 3
+    )
+
+
+def test_iceberg_write_minmax(started_cluster):
+    instance = started_cluster.instances["node1"]
+    TABLE_NAME = "test_iceberg_write_minmax_" + get_uuid_str()
+
+    create_iceberg_table("local", instance, TABLE_NAME, started_cluster, "(x Int32, y Int32)", partition_by="identity(x)")
+
+    instance.query(f"INSERT INTO {TABLE_NAME} VALUES (1, 1), (1, 2)", settings={"allow_experimental_insert_into_iceberg": 1})
+
+    res = instance.query(f"SELECT x,y FROM {TABLE_NAME} WHERE y=1 ORDER BY ALL").strip()
+    assert res == "1\t1"
+
+    res = instance.query(f"SELECT x,y FROM {TABLE_NAME} WHERE y=2 ORDER BY ALL").strip()
+    assert res == "1\t2"
+
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+@pytest.mark.parametrize("storage_type", ["s3", "azure"])
+@pytest.mark.parametrize("cluster_table_function_buckets_batch_size", [0, 100, 1000])
+@pytest.mark.parametrize("input_format_parquet_use_native_reader_v3", [0, 1])
+def test_cluster_table_function_split_by_row_groups(started_cluster, format_version, storage_type, cluster_table_function_buckets_batch_size,input_format_parquet_use_native_reader_v3):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+
+    TABLE_NAME = (
+        "test_iceberg_cluster_"
+        + format_version
+        + "_"
+        + storage_type
+        + "_"
+        + get_uuid_str()
+    )
+
+    def add_df(mode):
+        write_iceberg_from_df(
+            spark,
+            generate_data(spark, 0, 100000),
+            TABLE_NAME,
+            mode=mode,
+            format_version=format_version,
+        )
+
+        files = default_upload_directory(
+            started_cluster,
+            storage_type,
+            f"/iceberg_data/default/{TABLE_NAME}/",
+            f"/iceberg_data/default/{TABLE_NAME}/",
+        )
+
+        logging.info(f"Adding another dataframe. result files: {files}")
+
+        return files
+
+    files = add_df(mode="overwrite")
+    for i in range(1, 5 * len(started_cluster.instances)):
+        files = add_df(mode="append")
+
+    clusters = instance.query(f"SELECT * FROM system.clusters")
+    logging.info(f"Clusters setup: {clusters}")
+
+    # Regular Query only node1
+    table_function_expr = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True
+    )
+    select_regular = (
+        instance.query(f"SELECT * FROM {table_function_expr} ORDER BY ALL").strip().split()
+    )
+
+    # Cluster Query with node1 as coordinator
+    table_function_expr_cluster = get_creation_expression(
+        storage_type,
+        TABLE_NAME,
+        started_cluster,
+        table_function=True,
+        run_on_cluster=True,
+    )
+    instance.query("SYSTEM FLUSH LOGS")
+
+    def get_buffers_count(func):
+        buffers_count_before = int(
+            instance.query(
+                f"SELECT sum(ProfileEvents['EngineFileLikeReadFiles']) FROM system.query_log WHERE type = 'QueryFinish'"
+            )
+        )
+
+        func()
+        instance.query("SYSTEM FLUSH LOGS")
+        buffers_count = int(
+            instance.query(
+                f"SELECT sum(ProfileEvents['EngineFileLikeReadFiles']) FROM system.query_log WHERE type = 'QueryFinish'"
+            )
+        )
+        return buffers_count - buffers_count_before
+
+    select_cluster = (
+        instance.query(f"SELECT * FROM {table_function_expr_cluster} ORDER BY ALL SETTINGS input_format_parquet_use_native_reader_v3={input_format_parquet_use_native_reader_v3},cluster_table_function_split_granularity='bucket', cluster_table_function_buckets_batch_size={cluster_table_function_buckets_batch_size}").strip().split()
+    )
+
+    # Simple size check
+    assert len(select_cluster) == len(select_regular)
+    # Actual check
+    assert select_cluster == select_regular
+
+    buffers_count_with_splitted_tasks = get_buffers_count(lambda: instance.query(f"SELECT * FROM {table_function_expr_cluster} ORDER BY ALL SETTINGS input_format_parquet_use_native_reader_v3={input_format_parquet_use_native_reader_v3},cluster_table_function_split_granularity='bucket', cluster_table_function_buckets_batch_size={cluster_table_function_buckets_batch_size}").strip().split())
+    buffers_count_default = get_buffers_count(lambda: instance.query(f"SELECT * FROM {table_function_expr_cluster} ORDER BY ALL SETTINGS input_format_parquet_use_native_reader_v3={input_format_parquet_use_native_reader_v3}, cluster_table_function_buckets_batch_size={cluster_table_function_buckets_batch_size}").strip().split())
+    assert buffers_count_with_splitted_tasks > buffers_count_default
+
+
+@pytest.mark.parametrize("storage_type", ["s3"])
+def test_column_names_with_dots(started_cluster, storage_type):
+    """
+    Test that Iceberg tables with dot-separated column names are read correctly.
+    This tests the fix for field ID-based column name mapping in Parquet V3 reader.
+    """
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_column_names_with_dots_" + storage_type + "_" + get_uuid_str()
+
+    # Create DataFrame with column names containing dots
+    data = [
+        (1, "value1", "multi_dot_value1"),
+        (2, "value2", "multi_dot_value2"),
+        (3, "value3", "multi_dot_value3"),
+    ]
+    schema = StructType(
+        [
+            StructField("id", IntegerType()),
+            StructField("name.column", StringType()),
+            StructField("double.column.dot", StringType()),
+        ]
+    )
+    df = spark.createDataFrame(data=data, schema=schema)
+
+    write_iceberg_from_df(spark, df, TABLE_NAME, mode="overwrite", format_version="2")
+
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{TABLE_NAME}/",
+        f"/iceberg_data/default/{TABLE_NAME}/",
+    )
+
+    # Test via table function
+    table_function_expr = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True
+    )
+
+    # Verify single-dot column name
+    result = instance.query(
+        f"SELECT `name.column` FROM {table_function_expr} ORDER BY id"
+    ).strip()
+    assert result == "value1\nvalue2\nvalue3", f"Expected values, got: {result}"
+
+    # Verify multi-dot column name
+    result = instance.query(
+        f"SELECT `double.column.dot` FROM {table_function_expr} ORDER BY id"
+    ).strip()
+    assert result == "multi_dot_value1\nmulti_dot_value2\nmulti_dot_value3", f"Expected values, got: {result}"
+
+    # Verify all columns together
+    result = instance.query(
+        f"SELECT id, `name.column`, `double.column.dot` FROM {table_function_expr} ORDER BY id"
+    ).strip()
+    expected = "1\tvalue1\tmulti_dot_value1\n2\tvalue2\tmulti_dot_value2\n3\tvalue3\tmulti_dot_value3"
+    assert result == expected, f"Expected:\n{expected}\nGot:\n{result}"
+
+    # Test via table engine
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+
+    result = instance.query(
+        f"SELECT `name.column`, `double.column.dot` FROM {TABLE_NAME} ORDER BY id"
+    ).strip()
+    expected = "value1\tmulti_dot_value1\nvalue2\tmulti_dot_value2\nvalue3\tmulti_dot_value3"
+    assert result == expected, f"Expected:\n{expected}\nGot:\n{result}"
+
+
+@pytest.mark.parametrize("storage_type", ["s3"])
+def test_nested_struct_with_dotted_field(started_cluster, storage_type):
+    """
+    Test that nested struct fields with dot-separated names are read correctly.
+    This tests the fix for prefix stripping (not splitName) in useColumnMapperIfNeeded.
+    E.g., for my_struct.weird.field, we should return "weird.field" not just "field".
+    """
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_nested_struct_dotted_field_" + storage_type + "_" + get_uuid_str()
+
+    # Create DataFrame with nested struct containing a dotted field name
+    nested_schema = StructType(
+        [
+            StructField("id", IntegerType()),
+            StructField(
+                "my_struct",
+                StructType(
+                    [
+                        StructField("normal_field", IntegerType()),
+                        StructField("weird.field", StringType()),
+                    ]
+                ),
+            ),
+        ]
+    )
+
+    data = [
+        (1, (100, "nested_dot_value1")),
+        (2, (200, "nested_dot_value2")),
+        (3, (300, "nested_dot_value3")),
+    ]
+    df = spark.createDataFrame(data=data, schema=nested_schema)
+
+    write_iceberg_from_df(spark, df, TABLE_NAME, mode="overwrite", format_version="2")
+
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{TABLE_NAME}/",
+        f"/iceberg_data/default/{TABLE_NAME}/",
+    )
+
+    # Test via table function
+    table_function_expr = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True
+    )
+
+    # Verify nested struct with dotted field via table function
+    result = instance.query(
+        f"SELECT my_struct.normal_field, `my_struct.weird.field` FROM {table_function_expr} ORDER BY id"
+    ).strip()
+    expected = "100\tnested_dot_value1\n200\tnested_dot_value2\n300\tnested_dot_value3"
+    assert result == expected, f"Expected:\n{expected}\nGot:\n{result}"
+
+    # Test via table engine
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+
+    result = instance.query(
+        f"SELECT my_struct.normal_field, `my_struct.weird.field` FROM {TABLE_NAME} ORDER BY id"
+    ).strip()
+    assert result == expected, f"Expected:\n{expected}\nGot:\n{result}"
+
+
+@pytest.mark.parametrize("storage_type", ["s3"])
+def test_deeply_nested_struct_with_dotted_names(started_cluster, storage_type):
+    """
+    Test deeply nested structs where EVERY level has dots in the name.
+    Structure: my.struct -> some_dot.separated_parent -> weird.field
+    Full path: my.struct.some_dot.separated_parent.weird.field
+
+    This verifies that prefix stripping works correctly at all nesting depths.
+    """
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = "test_deeply_nested_dotted_" + storage_type + "_" + get_uuid_str()
+
+    # Create 3-level nested schema with dots at every level
+    nested_schema = StructType(
+        [
+            StructField("id", IntegerType()),
+            StructField(
+                "my.struct",
+                StructType(
+                    [
+                        StructField(
+                            "some_dot.separated_parent",
+                            StructType(
+                                [
+                                    StructField("weird.field", StringType()),
+                                ]
+                            ),
+                        ),
+                    ]
+                ),
+            ),
+        ]
+    )
+
+    data = [
+        (1, (("deep_value1",),)),
+        (2, (("deep_value2",),)),
+        (3, (("deep_value3",),)),
+    ]
+    df = spark.createDataFrame(data=data, schema=nested_schema)
+
+    write_iceberg_from_df(spark, df, TABLE_NAME, mode="overwrite", format_version="2")
+
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{TABLE_NAME}/",
+        f"/iceberg_data/default/{TABLE_NAME}/",
+    )
+
+    # Test via table function
+    table_function_expr = get_creation_expression(
+        storage_type, TABLE_NAME, started_cluster, table_function=True
+    )
+
+    # Query the deeply nested dotted field
+    result = instance.query(
+        f"SELECT `my.struct.some_dot.separated_parent.weird.field` FROM {table_function_expr} ORDER BY id"
+    ).strip()
+    expected = "deep_value1\ndeep_value2\ndeep_value3"
+    assert result == expected, f"Expected:\n{expected}\nGot:\n{result}"
+
+    # Test via table engine
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+
+    result = instance.query(
+        f"SELECT `my.struct.some_dot.separated_parent.weird.field` FROM {TABLE_NAME} ORDER BY id"
+    ).strip()
+    assert result == expected, f"Expected:\n{expected}\nGot:\n{result}"
diff --git a/tests/integration/test_storage_iceberg_schema_evolution/test.py b/tests/integration/test_storage_iceberg_schema_evolution/test.py
index 6355162916e8..23cb2c1fa1cb 100644
--- a/tests/integration/test_storage_iceberg_schema_evolution/test.py
+++ b/tests/integration/test_storage_iceberg_schema_evolution/test.py
@@ -16,14 +16,18 @@
 from helpers.test_tools import TSV
 
 from helpers.iceberg_utils import (
+    convert_schema_and_data_to_pandas_df,
     default_upload_directory,
     execute_spark_query_general,
     get_creation_expression,
     check_schema_and_data,
+    get_raw_schema_and_data,
     get_uuid_str,
     get_spark,
 )
 
+from pandas.testing import assert_frame_equal
+
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 
@@ -1935,3 +1939,97 @@ def execute_spark_query(query: str):
         ]
     )
 
+
+@pytest.mark.parametrize("format_version", ["1", "2"])
+@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
+def test_correct_column_mapper_is_chosen(
+    started_cluster,
+    storage_type,
+    format_version
+):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    TABLE_NAME = (
+        "test_correct_column_mapper_is_chosen_"
+        + format_version
+        + "_"
+        + storage_type
+        + "_"
+        + get_uuid_str()
+    )
+
+    spark.sql(
+        f"""
+        CREATE TABLE {TABLE_NAME} (
+            a int NOT NULL,
+            b int NOT NULL
+        )
+        USING iceberg
+        OPTIONS ('format-version'='{format_version}');
+        """
+    )
+
+    spark.sql(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES (0, 1);
+        """
+    )
+
+    spark.sql(
+        f"""
+        ALTER TABLE {TABLE_NAME} RENAME COLUMN b TO c;
+        """
+    )
+
+    spark.sql(
+        f"""
+        ALTER TABLE {TABLE_NAME} RENAME COLUMN a TO b;
+        """
+    )
+
+    spark.sql(
+        f"""
+        ALTER TABLE {TABLE_NAME} RENAME COLUMN c TO a;
+        """
+    )
+
+    spark.sql(
+        f"""
+        ALTER TABLE {TABLE_NAME} ALTER COLUMN b AFTER a;
+        """
+    )
+    
+    spark.sql(
+        f"""
+        INSERT INTO {TABLE_NAME} VALUES (1, 0);
+        """
+    )
+
+    table_function = get_creation_expression(
+        storage_type,
+        TABLE_NAME,
+        started_cluster,
+        table_function=True,
+        allow_dynamic_metadata_for_data_lakes=True,
+        is_cluster=True,
+    )
+
+
+    default_upload_directory(
+        started_cluster,
+        storage_type,
+        f"/iceberg_data/default/{TABLE_NAME}/",
+        f"/iceberg_data/default/{TABLE_NAME}/",
+    )
+
+    raw_schema, raw_data = get_raw_schema_and_data(instance, table_function)
+
+    _schema_df, data_df = convert_schema_and_data_to_pandas_df(raw_schema, raw_data)
+
+    reference_df = spark.sql(
+        f"""
+        SELECT * FROM {TABLE_NAME} ORDER BY a;
+        """
+    ).toPandas()
+
+    assert_frame_equal(data_df, reference_df)
diff --git a/tests/integration/test_storage_kafka/test_batch_fast.py b/tests/integration/test_storage_kafka/test_batch_fast.py
index db0f6c51074c..8ecd5a7d49d3 100644
--- a/tests/integration/test_storage_kafka/test_batch_fast.py
+++ b/tests/integration/test_storage_kafka/test_batch_fast.py
@@ -1368,7 +1368,7 @@ def test_kafka_virtual_columns_with_materialized_view(
                 ENGINE = MergeTree()
                 ORDER BY key;
             CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT *, _key as kafka_key, _topic as topic, _offset as offset, _partition as partition, _timestamp = 0 ? '0000-00-00 00:00:00' : toString(_timestamp) as timestamp FROM test.kafka;
+                SELECT *, _key as kafka_key, _topic as topic, _offset as offset, _partition as partition, _timestamp = 0 ? '1970-01-01 00:00:00' : toString(_timestamp) as timestamp FROM test.kafka;
         """
         )
 
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index 047f46c6cb3d..9fc04890310a 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -1471,3 +1471,23 @@ def test_numbers_parsing(started_cluster):
 
     node.query("DROP TABLE numbers_parsing_table")
     numbers_parsing_table.drop()
+
+
+def test_url_validation(started_cluster):
+    mongo_connection = get_mongo_connection(started_cluster)
+    db = mongo_connection["test"]
+    db.command("dropAllUsersFromDatabase")
+    db.command("createUser", "root@aa.com", pwd=mongo_pass, roles=["readWrite"])
+    drop_mongo_collection_if_exists(db, "url_validation_table")
+    url_validation_table = db["url_validation_table"]
+    data = []
+    for i in range(0, 100):
+        data.append({"key": i, "data": hex(i * i)})
+    url_validation_table.insert_many(data)
+
+    node = started_cluster.instances["node"]
+    node.query(
+        f"CREATE OR REPLACE TABLE url_validation_table(key UInt64, data String) ENGINE = MongoDB('mongo1', 'test', 'url_validation_table', 'root@aa.com', '{mongo_pass}')"
+    )
+
+    assert node.query("SELECT COUNT() FROM url_validation_table") == "100\n"
\ No newline at end of file
diff --git a/tests/integration/test_storage_s3/configs/lock_object_storage_task_distribution_ms.xml b/tests/integration/test_storage_s3/configs/lock_object_storage_task_distribution_ms.xml
new file mode 100644
index 000000000000..a8239a28293c
--- /dev/null
+++ b/tests/integration/test_storage_s3/configs/lock_object_storage_task_distribution_ms.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <lock_object_storage_task_distribution_ms>0</lock_object_storage_task_distribution_ms>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 48a6b533504a..cd23dd4ba409 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -8,6 +8,7 @@
 import uuid
 
 import pytest
+from pathlib import Path
 
 import helpers.client
 from helpers.cluster import ClickHouseCluster, ClickHouseInstance
@@ -73,6 +74,7 @@ def started_cluster():
                 "configs/access.xml",
                 "configs/users.xml",
                 "configs/s3_retry.xml",
+                "configs/lock_object_storage_task_distribution_ms.xml",
             ],
         )
         cluster.add_instance(
@@ -121,6 +123,7 @@ def started_cluster():
                 "configs/users.xml",
                 "configs/s3_retry.xml",
                 "configs/process_archives_as_whole_with_cluster.xml",
+                "configs/lock_object_storage_task_distribution_ms.xml",
             ],
         )
         cluster.add_instance(
@@ -2791,3 +2794,170 @@ def test_key_value_args(started_cluster):
         f"S3(\\'{url}\\', \\'TSVRaw\\', format = \\'TSVRaw\\', access_key_id = \\'minio\\', secret_access_key = \\'[HIDDEN]\\', compression_method = \\'gzip\\')"
         in node.query(f"SHOW CREATE TABLE {table_name}")
     )
+
+
+def test_file_pruning_with_hive_style_partitioning(started_cluster):
+    node = started_cluster.instances["dummy"]
+    table_name = f"test_pruning_with_hive_style_partitioning_{generate_random_string()}"
+    bucket = started_cluster.minio_bucket
+    minio = started_cluster.minio_client
+
+    url = f"http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{table_name}"
+    node.query(
+        f"""
+    CREATE TABLE {table_name} (a Int32, b Int32, c String) ENGINE = S3('{url}', format = 'Parquet', partition_strategy = 'hive')
+    PARTITION BY (b, c)
+    """
+    )
+    node.query(
+        f"INSERT INTO {table_name} SELECT number, number % 5, toString(number % 2) FROM numbers(20)",
+        settings={"use_hive_partitioning": True},
+    )
+
+    objects = []
+    for obj in list(
+        minio.list_objects(
+            started_cluster.minio_bucket,
+            prefix=table_name,
+            recursive=True,
+        )
+    ):
+        objects.append(obj.object_name)
+
+    objects.sort()
+    assert len(objects) == 10
+
+    prefixes = []
+    for object in objects:
+        assert object.endswith(".parquet")
+        path = Path(object)
+        prefixes.append(str(path.parent))
+
+    assert len(prefixes) == 10
+    assert prefixes == [
+        f"{table_name}/b=0/c=0",
+        f"{table_name}/b=0/c=1",
+        f"{table_name}/b=1/c=0",
+        f"{table_name}/b=1/c=1",
+        f"{table_name}/b=2/c=0",
+        f"{table_name}/b=2/c=1",
+        f"{table_name}/b=3/c=0",
+        f"{table_name}/b=3/c=1",
+        f"{table_name}/b=4/c=0",
+        f"{table_name}/b=4/c=1",
+    ]
+
+    def check_read_files(expected, query_id):
+        node.query("SYSTEM FLUSH LOGS")
+        assert expected == int(
+            node.query(
+                f"SELECT ProfileEvents['EngineFileLikeReadFiles'] FROM system.query_log WHERE query_id = '{query_id}' AND type='QueryFinish'"
+            )
+        )
+
+    # 5 files, each file contains 2 rows
+    assert 5 == int(
+        node.query(f"SELECT uniqExact(_path) FROM {table_name} WHERE c == '0'")
+    )
+
+    query_id = f"{table_name}_query_1"
+    assert 10 == int(
+        node.query(
+            f"SELECT count() FROM {table_name} WHERE c == '0'", query_id=query_id
+        )
+    )
+    # Check files are pruned.
+    check_read_files(5, query_id)
+
+    # 2 files, each contains 2 rows
+    assert 2 == int(
+        node.query(f"SELECT uniqExact(_path) FROM {table_name} WHERE b == 3")
+    )
+
+    query_id = f"{table_name}_query_2"
+    assert 4 == int(
+        node.query(f"SELECT count() FROM {table_name} WHERE b == 3", query_id=query_id)
+    )
+    # Check files are pruned.
+    check_read_files(2, query_id)
+
+    # 1 file with 2 rows.
+    assert 1 == int(
+        node.query(
+            f"SELECT uniqExact(_path) FROM {table_name} WHERE b == 3 AND c == '1'"
+        )
+    )
+
+    query_id = f"{table_name}_query_3"
+    assert 2 == int(
+        node.query(
+            f"SELECT count() FROM {table_name} WHERE b == 3 AND c == '1'",
+            query_id=query_id,
+        )
+    )
+    # Check files are pruned.
+    check_read_files(1, query_id)
+
+    query_id = f"{table_name}_query_4"
+    assert 1 == int(
+        node.query(f"SELECT count() FROM {table_name} WHERE a == 1", query_id=query_id)
+    )
+    # Nothing is pruned, because `a` is not a partition column.
+    check_read_files(10, query_id)
+
+
+def test_partition_by_without_wildcard(started_cluster):
+    node = started_cluster.instances["dummy"]
+    table_name = f"test_partition_by_without_wildcard_{generate_random_string()}"
+    bucket = started_cluster.minio_bucket
+
+    url = f"http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{table_name}"
+    # An exception "Partition strategy wildcard can not be used without a '_partition_id' wildcard"
+    # should not be thrown.
+    node.query(
+        f"""
+CREATE TABLE {table_name} (a Int32, b Int32, c String) ENGINE = S3('{url}', format = 'Parquet')
+PARTITION BY (b, c)
+"""
+    )
+
+def test_schema_inference_cache_multi_path(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]
+    s3_path_prefix = f"http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_schema_infer_cache"
+    query1 = "insert into table function s3('{}/{}', 'Parquet', '{}') settings s3_truncate_on_insert=1 values {}".format(
+        s3_path_prefix,
+        "test1.parquet",
+        "column1 UInt32, column2 String",
+        "(1, 'a'), (2, 'b')",
+    )
+    query2 = "insert into table function s3('{}/{}', 'Parquet', '{}') settings s3_truncate_on_insert=1 values {}".format(
+        s3_path_prefix,
+        "test2.parquet",
+        "column1 String, column2 UInt32",
+        "('a', 1), ('b', 2)",
+    )
+
+    run_query(instance, query1)
+    run_query(instance, query2)
+
+    # Sleep so files last modification time is in the past
+    time.sleep(2)
+
+    instance.query(f"DESCRIBE TABLE s3('{s3_path_prefix}/*')")
+
+    assert "a\t1\nb\t2\n" == instance.query(
+        f"SELECT * FROM s3('{s3_path_prefix}/test2.parquet')"
+    )
+    assert "1\ta\n2\tb\n" == instance.query(
+        f"SELECT * FROM s3('{s3_path_prefix}/test1.parquet')"
+    )
+
+    instance.query(f"DESCRIBE TABLE url('{s3_path_prefix}/{{test1.parquet,test2.parquet}}')")
+
+    assert "a\t1\nb\t2\n" == instance.query(
+        f"SELECT * FROM url('{s3_path_prefix}/test2.parquet')"
+    )
+    assert "1\ta\n2\tb\n" == instance.query(
+        f"SELECT * FROM url('{s3_path_prefix}/test1.parquet')"
+    )
diff --git a/tests/integration/test_storage_s3_queue/configs/users.xml b/tests/integration/test_storage_s3_queue/configs/users.xml
index e47df8e4b945..0d45700bfd6b 100644
--- a/tests/integration/test_storage_s3_queue/configs/users.xml
+++ b/tests/integration/test_storage_s3_queue/configs/users.xml
@@ -4,6 +4,8 @@
             <stream_like_engine_allow_direct_select>1</stream_like_engine_allow_direct_select>
             <s3queue_enable_logging_to_s3queue_log>1</s3queue_enable_logging_to_s3queue_log>
             <s3queue_allow_experimental_sharded_mode>1</s3queue_allow_experimental_sharded_mode>
+            <function_sleep_max_microseconds_per_block>100000000</function_sleep_max_microseconds_per_block>
+            <keeper_max_retries>6</keeper_max_retries>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/integration/test_storage_s3_queue/test_4.py b/tests/integration/test_storage_s3_queue/test_4.py
index a19977364355..851f5f3bd4de 100644
--- a/tests/integration/test_storage_s3_queue/test_4.py
+++ b/tests/integration/test_storage_s3_queue/test_4.py
@@ -1,6 +1,7 @@
 import logging
 import time
 import uuid
+import random
 from multiprocessing.dummy import Pool
 
 import pytest
@@ -322,6 +323,7 @@ def get_count():
         ).strip()
     )
 
+    use_persistent_nodes = random.choice(["true", "false"])
     node1.query(
         f"""
         ALTER TABLE r.{table_name}
@@ -340,7 +342,11 @@ def get_count():
         enable_hash_ring_filtering=false,
         list_objects_batch_size=1234,
         min_insert_block_size_rows_for_materialized_views=123,
-        min_insert_block_size_bytes_for_materialized_views=321
+        min_insert_block_size_bytes_for_materialized_views=321,
+        cleanup_interval_min_ms=34500,
+        cleanup_interval_max_ms=45600,
+        use_persistent_processing_nodes={use_persistent_nodes},
+        persistent_processing_node_ttl_seconds=89
     """
     )
 
@@ -360,6 +366,10 @@ def get_count():
         "list_objects_batch_size": 1234,
         "min_insert_block_size_rows_for_materialized_views": 123,
         "min_insert_block_size_bytes_for_materialized_views": 321,
+        "cleanup_interval_min_ms": 34500,
+        "cleanup_interval_max_ms": 45600,
+        "use_persistent_processing_nodes": use_persistent_nodes,
+        "persistent_processing_node_ttl_seconds": 89
     }
     string_settings = {"after_processing": "delete"}
 
diff --git a/tests/integration/test_storage_s3_queue/test_5.py b/tests/integration/test_storage_s3_queue/test_5.py
index 40391c90fa63..a0bfad4ccce5 100644
--- a/tests/integration/test_storage_s3_queue/test_5.py
+++ b/tests/integration/test_storage_s3_queue/test_5.py
@@ -545,7 +545,7 @@ def test_failed_commit(started_cluster):
 
     def check_failpoint():
         return node.contains_in_log(
-            f"StorageS3Queue (default.{table_name}): Failed to process data: Code: 710. DB::Exception: Failed to commit processed files."
+            f"StorageS3Queue (default.{table_name}): Failed to process data: Code: 999. Coordination::Exception: Failed to commit processed files"
         )
 
     for _ in range(100):
@@ -567,7 +567,7 @@ def get_count():
 
     count_failed = int(
         node.count_in_log(
-            f"StorageS3Queue (default.{table_name}): Failed to process data: Code: 710. DB::Exception: Failed to commit processed files."
+            f"StorageS3Queue (default.{table_name}): Failed to process data: Code: 999. Coordination::Exception: Failed to commit processed files"
         )
     )
     count = get_count()
@@ -1061,7 +1061,7 @@ def test_detach_attach_table(started_cluster):
             "s3queue_processing_threads_num": 1,
             "polling_max_timeout_ms": 0,
             "polling_min_timeout_ms": 0,
-        }
+        },
     )
 
     node.query(f"DETACH TABLE {table_name}")
@@ -1069,6 +1069,7 @@ def test_detach_attach_table(started_cluster):
 
     num_rows = 10000
     file_count = [0]
+
     def insert():
         table_name_suffix = f"{uuid.uuid4()}"
         file_count[0] += 1
@@ -1122,7 +1123,7 @@ def test_failed_startup(started_cluster):
             "s3queue_processing_threads_num": 1,
             "polling_max_timeout_ms": 0,
             "polling_min_timeout_ms": 0,
-        }
+        },
     )
     node.query(f"SYSTEM DISABLE FAILPOINT object_storage_queue_fail_startup")
 
@@ -1145,7 +1146,7 @@ def test_failed_startup(started_cluster):
             "s3queue_processing_threads_num": 1,
             "polling_max_timeout_ms": 0,
             "polling_min_timeout_ms": 0,
-        }
+        },
     )
 
     assert len(zk.get(f"{keeper_path}")) > 0
@@ -1203,3 +1204,226 @@ def test_create_or_replace_table(started_cluster):
 
     create_mv(node1, f"{db_name}.{table_name}", dst_table_name, mv_name=mv_name)
     node2.query(f"SYSTEM SYNC DATABASE REPLICA {db_name}")
+
+
+def test_persistent_processing_nodes_cleanup(started_cluster):
+    node = started_cluster.instances["instance"]
+    table_name = "max_persistent_processing_nodes_cleanup"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    files_path = f"{table_name}_data"
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        "unordered",
+        files_path,
+        additional_settings={
+            "keeper_path": keeper_path,
+            "polling_max_timeout_ms": 1000,
+            "polling_backoff_ms": 1000,
+            "use_persistent_processing_nodes": 1,
+            "persistent_processing_node_ttl_seconds": 10,
+            "cleanup_interval_min_ms": 0,
+            "cleanup_interval_max_ms": 0,
+        },
+    )
+
+    zk = started_cluster.get_kazoo_client("zoo1")
+    zk.create(f"{keeper_path}/processing/test", b"somedata")
+    zk.create(f"{keeper_path}/persistent_processing/test", b"somedata")
+    assert b"somedata" == zk.get(f"{keeper_path}/persistent_processing/test")[0]
+
+    time.sleep(5)
+    assert b"somedata" == zk.get(f"{keeper_path}/persistent_processing/test")[0]
+    time.sleep(6)
+    try:
+        zk.get(f"{keeper_path}/persistent_processing/test")[0]
+        assert False
+    except NoNodeError:
+        pass
+    assert b"somedata" == zk.get(f"{keeper_path}/processing/test")[0]
+
+
+def test_persistent_processing(started_cluster):
+    node = started_cluster.instances["instance"]
+    table_name = "max_persistent_processing"
+    dst_table_name = f"{table_name}_dst"
+    mv_name = f"{table_name}_mv"
+    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    files_path = f"{table_name}_data"
+    format = "a Int32, b String"
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        "unordered",
+        files_path,
+        format=format,
+        additional_settings={
+            "keeper_path": keeper_path,
+            "polling_max_timeout_ms": 1000,
+            "polling_backoff_ms": 1000,
+            "use_persistent_processing_nodes": 1,
+            "persistent_processing_node_ttl_seconds": 10,
+            "cleanup_interval_min_ms": 100,
+            "cleanup_interval_max_ms": 500,
+            "polling_max_timeout_ms": 1000,
+            "polling_backoff_ms": 100,
+        },
+    )
+    file_name = f"file_{table_name}.csv"
+    s3_function = f"s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{started_cluster.minio_bucket}/{files_path}/{file_name}', 'minio', '{minio_secret_key}')"
+    node.query(
+        f"INSERT INTO FUNCTION {s3_function} select number, randomString(100) FROM numbers(10)"
+    )
+
+    zk = started_cluster.get_kazoo_client("zoo1")
+    nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+    assert len(nodes) == 0
+
+    node.query(
+        f"""
+        CREATE TABLE {dst_table_name} ({format})
+        ENGINE = MergeTree
+        ORDER BY a;
+    """
+    )
+    node.query(
+        f"""
+        CREATE MATERIALIZED VIEW {mv_name} TO {dst_table_name} AS SELECT * FROM {table_name} WHERE NOT sleepEachRow(1);
+        """
+    )
+
+    found = False
+    for _ in range(10):
+        nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+        if len(nodes) > 0:
+            found = True
+            break
+        time.sleep(1)
+    assert found
+
+    time.sleep(10)
+
+    nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+    assert len(nodes) == 0
+
+
+def test_persistent_processing_failed_commit_retries(started_cluster):
+    node = started_cluster.instances["instance"]
+    table_name = f"max_persistent_processing_failed_commit_retries_{generate_random_string()}"
+    dst_table_name = f"{table_name}_dst"
+    mv_name = f"{table_name}_mv"
+    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    files_path = f"{table_name}_data"
+    format = "a Int32, b String"
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        "unordered",
+        files_path,
+        format=format,
+        additional_settings={
+            "keeper_path": keeper_path,
+            "polling_max_timeout_ms": 1000,
+            "polling_backoff_ms": 1000,
+            "use_persistent_processing_nodes": 1,
+            "persistent_processing_node_ttl_seconds": 60,
+            "cleanup_interval_min_ms": 100,
+            "cleanup_interval_max_ms": 500,
+            "polling_max_timeout_ms": 1000,
+            "polling_backoff_ms": 100,
+        },
+    )
+    i = [0]
+
+    def insert():
+        i[0] += 1
+        file_name = f"file_{table_name}_{i[0]}.csv"
+        s3_function = f"s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{started_cluster.minio_bucket}/{files_path}/{file_name}', 'minio', '{minio_secret_key}')"
+        node.query(
+            f"INSERT INTO FUNCTION {s3_function} select number, randomString(100) FROM numbers(10)"
+        )
+
+    insert()
+
+    zk = started_cluster.get_kazoo_client("zoo1")
+    nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+    assert len(nodes) == 0
+
+    node.query(
+        f"""
+        CREATE TABLE {dst_table_name} ({format})
+        ENGINE = MergeTree
+        ORDER BY a;
+    """
+    )
+
+    node.query(f"SYSTEM ENABLE FAILPOINT object_storage_queue_fail_commit_once")
+    node.query(
+        f"""
+        CREATE MATERIALIZED VIEW {mv_name} TO {dst_table_name} AS SELECT * FROM {table_name} WHERE NOT sleepEachRow(0.3);
+        """
+    )
+
+    found = False
+    for _ in range(10):
+        nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+        if len(nodes) > 0:
+            found = True
+            break
+        time.sleep(1)
+    assert found
+
+    found = False
+    for _ in range(10):
+        if node.contains_in_log(
+            f"StorageS3Queue (default.{table_name}): Successfully committed"
+        ):
+            found = True
+            break
+        time.sleep(1)
+    assert found
+
+    assert node.contains_in_log(
+        f"StorageS3Queue (default.{table_name}): Failed to commit processed files at try 1/6"
+    )
+    assert not node.contains_in_log(
+        f"StorageS3Queue (default.{table_name}): Failed to commit processed files at try 5/6"
+    )
+
+    nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+    assert len(nodes) == 0
+
+    node.query(f"SYSTEM ENABLE FAILPOINT object_storage_queue_fail_commit")
+    insert()
+
+    found = False
+    for _ in range(20):
+        if node.contains_in_log(
+            f"StorageS3Queue (default.{table_name}): Failed to process data: Code: 999. Coordination::Exception: Failed to commit processed files"
+        ):
+            found = True
+            break
+        time.sleep(1)
+
+    node.query(f"SYSTEM DISABLE FAILPOINT object_storage_queue_fail_commit")
+    assert found
+
+    assert node.contains_in_log(
+        f"StorageS3Queue (default.{table_name}): Failed to commit processed files at try 6/6"
+    )
+
+    found = False
+    for _ in range(30):
+        nodes = zk.get_children(f"{keeper_path}/persistent_processing")
+        if len(nodes) == 0:
+            found = True
+            break
+        time.sleep(1)
+    assert found
diff --git a/tests/integration/test_string_aggregation_compatibility/__init__.py b/tests/integration/test_string_aggregation_compatibility/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/integration/test_string_aggregation_compatibility/test.py b/tests/integration/test_string_aggregation_compatibility/test.py
new file mode 100644
index 000000000000..5e916fd7f195
--- /dev/null
+++ b/tests/integration/test_string_aggregation_compatibility/test.py
@@ -0,0 +1,108 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance("node1")
+node2 = cluster.add_instance("node2")
+node256 = cluster.add_instance(
+    "node256",
+    image="clickhouse/clickhouse-server",
+    tag="25.6",
+    with_installed_binary=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_string_aggregation_compatibility(started_cluster):
+    def create_tables(node, other_node_name):
+        node.query(
+            "DROP TABLE IF EXISTS repro1 SYNC; CREATE TABLE repro1 (id UInt64, s1 String, s2 LowCardinality(String)) ENGINE = MergeTree ORDER BY id"
+        )
+        node.query(
+            "INSERT INTO repro1 SELECT number, 'somestring', 'somestring' FROM numbers(10000)"
+        )
+        node.query(
+            f"CREATE TABLE IF NOT EXISTS dist_repro1 (id UInt64, s1 String, s2 LowCardinality(String)) AS remote('{other_node_name}', 'default.repro1', 'default', '')"
+        )
+        node.query(
+            "CREATE TABLE IF NOT EXISTS global_repro1 (id UInt64, s1 String, s2 LowCardinality(String)) ENGINE = Merge('default', '.*repro1')"
+        )
+
+    create_tables(node1, other_node_name=node256.name)
+    create_tables(node256, other_node_name=node1.name)
+
+    def run_query(node, extra_settings={}):
+        return int(
+            node.query(
+                """
+        SELECT count()
+        FROM
+        (
+            SELECT
+                id,
+                s2
+            FROM global_repro1
+            GROUP BY ALL
+        )""",
+                settings={"group_by_two_level_threshold": 1} | extra_settings,
+            )
+        )
+
+    assert run_query(node1) == 10000
+    assert run_query(node256) == 10000
+    assert (
+        run_query(node1, extra_settings={"serialize_string_in_memory_with_zero_byte": 0})
+        == 20000
+    )
+
+def test_string_aggregation_compatibility_setting(started_cluster):
+    def create_tables(n, other_node_name):
+        n.query(
+            "DROP TABLE IF EXISTS repro2 SYNC; CREATE TABLE repro2 (id UInt64, s1 String, s2 LowCardinality(String)) ENGINE = MergeTree ORDER BY id"
+        )
+        n.query(
+            "INSERT INTO repro2 SELECT number, 'somestring', 'somestring' FROM numbers(10000)"
+        )
+        n.query(
+            f"CREATE TABLE IF NOT EXISTS dist_repro2 (id UInt64, s1 String, s2 LowCardinality(String)) AS remote('{other_node_name}', 'default.repro2', 'default', '')"
+        )
+        n.query(
+            "CREATE TABLE IF NOT EXISTS global_repro2 (id UInt64, s1 String, s2 LowCardinality(String)) ENGINE = Merge('default', '.*repro2')"
+        )
+
+    create_tables(node1, other_node_name=node2.name)
+    create_tables(node2, other_node_name=node1.name)
+
+    def run_query(n, extra_settings={}):
+        return int(
+            n.query(
+                """
+        SELECT count()
+        FROM
+        (
+            SELECT
+                id,
+                s2
+            FROM global_repro2
+            GROUP BY ALL
+        )""",
+                settings={"group_by_two_level_threshold": 1} | extra_settings,
+            )
+        )
+
+    assert run_query(node1) == 10000
+    assert run_query(node2) == 10000
+    assert (
+        run_query(node1, extra_settings={"serialize_string_in_memory_with_zero_byte": 0})
+        == 10000
+    )
diff --git a/tests/integration/test_structured_logging_json/configs/config_json_logging_per_channel.xml b/tests/integration/test_structured_logging_json/configs/config_json_logging_per_channel.xml
new file mode 100644
index 000000000000..b283c124fb0b
--- /dev/null
+++ b/tests/integration/test_structured_logging_json/configs/config_json_logging_per_channel.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <logger>
+        <formatting>
+            <type>json</type>
+            <channel>errorlog</channel>
+            <names>
+                <date_time>DATE_TIME</date_time>
+                <date_time_utc>DATE_TIME_UTC</date_time_utc>
+                <thread_name>THREAD_NAME</thread_name>
+                <thread_id>THREAD_ID</thread_id>
+                <level>LEVEL</level>
+                <query_id>QUERY_ID</query_id>
+                <logger_name>LOGGER_NAME</logger_name>
+                <message>MESSAGE</message>
+                <source_file>SOURCE_FILE</source_file>
+                <source_line>SOURCE_LINE</source_line>
+            </names>
+        </formatting>
+    </logger>
+</clickhouse>
diff --git a/tests/integration/test_structured_logging_json/test.py b/tests/integration/test_structured_logging_json/test.py
index 7ea3d26ba949..06833621e017 100644
--- a/tests/integration/test_structured_logging_json/test.py
+++ b/tests/integration/test_structured_logging_json/test.py
@@ -17,6 +17,10 @@
     "node_no_keys", main_configs=["configs/config_no_keys_json.xml"]
 )
 
+node_json_logging_per_channel = cluster.add_instance(
+    "node_json_logging_per_channel", main_configs=["configs/config_json_logging_per_channel.xml"]
+)
+
 
 @pytest.fixture(scope="module")
 def start_cluster():
@@ -147,3 +151,12 @@ def test_structured_logging_json_format(start_cluster):
         == True
     )
     assert validate_everything(config_no_keys, node_no_keys, "config_no_keys") == True
+
+def test_structured_logging_per_channel(start_cluster):
+    logs = node_json_logging_per_channel.grep_in_log("").split("\n")
+    assert len(logs) > 0
+    assert not validate_logs(logs)
+
+    error_logs = node_json_logging_per_channel.grep_in_log("", filename="clickhouse-server.err.log").strip().split("\n")
+    assert len(error_logs) > 0
+    assert validate_logs(error_logs)
diff --git a/tests/integration/test_table_db_num_limit/config/config.xml b/tests/integration/test_table_db_num_limit/config/config.xml
index 88438d51b940..bb683a874716 100644
--- a/tests/integration/test_table_db_num_limit/config/config.xml
+++ b/tests/integration/test_table_db_num_limit/config/config.xml
@@ -1,21 +1,31 @@
 <clickhouse>
     <remote_servers>
-		<cluster>
-			<shard>
-				<replica>
-					<host>node1</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>node2</host>
-					<port>9000</port>
-				</replica>
-			</shard>
-		</cluster>
-	</remote_servers>
+       <cluster>
+          <shard>
+             <replica>
+                <host>node1</host>
+                <port>9000</port>
+             </replica>
+             <replica>
+                <host>node2</host>
+                <port>9000</port>
+             </replica>
+          </shard>
+       </cluster>
+    </remote_servers>
 
-    <max_dictionary_num_to_throw>10</max_dictionary_num_to_throw>
+    <!-- Limits set to verify Warning/Throw logic -->
+    <!-- Warning limit is 5, Throw limit is 10 for all metrics to allow consistent testing -->
+
+    <max_table_num_to_warn>5</max_table_num_to_warn>
     <max_table_num_to_throw>10</max_table_num_to_throw>
+
+    <max_view_num_to_warn>5</max_view_num_to_warn>
+    <max_view_num_to_throw>10</max_view_num_to_throw>
+
+    <max_dictionary_num_to_warn>5</max_dictionary_num_to_warn>
+    <max_dictionary_num_to_throw>10</max_dictionary_num_to_throw>
+
+    <max_database_num_to_warn>5</max_database_num_to_warn>
     <max_database_num_to_throw>10</max_database_num_to_throw>
 </clickhouse>
-
diff --git a/tests/integration/test_table_db_num_limit/test.py b/tests/integration/test_table_db_num_limit/test.py
index 969c8e0a0b24..7d9020c64492 100644
--- a/tests/integration/test_table_db_num_limit/test.py
+++ b/tests/integration/test_table_db_num_limit/test.py
@@ -1,6 +1,7 @@
 import pytest
-
+import re
 from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
 
 cluster = ClickHouseCluster(__file__)
 
@@ -23,102 +24,264 @@
 def started_cluster():
     try:
         cluster.start()
-
         yield cluster
-
     finally:
         cluster.shutdown()
 
 
-def test_table_db_limit(started_cluster):
-    # By the way, default database already exists.
-    for i in range(9):
-        node.query("create database db{}".format(i))
+def verify_warning_with_values(node, current_val, warn_val, throw_val):
+    """
+    Parses system.warnings to find a warning message matching the expected values.
+    """
+    warnings_result = node.query("SELECT message, message_format_string FROM system.warnings")
+    rows = warnings_result.strip().split('\n')
+
+    found = False
+    found_message = ""
+
+    for row in rows:
+        if not row: continue
+        parts = row.split('\t')
+        if len(parts) < 1: continue
+
+        message = parts[0]
 
-    assert "TOO_MANY_DATABASES" in node.query_and_get_error(
-        "create database db_exp".format(i)
+        # Regex to capture values from message:
+        match = re.search(
+            r"\((\d+)\) exceeds the warning limit of (\d+)(?:\. You will not be able to create new .* limit of (\d+) is reached)?",
+            message)
+
+        if match:
+            msg_curr = int(match.group(1))
+            msg_warn = int(match.group(2))
+            msg_throw = int(match.group(3)) if match.group(3) else None
+
+            # We allow current_val to be >= expected because some internal system objects might have been attached
+            if msg_curr >= current_val and msg_warn == warn_val and msg_throw == throw_val:
+                found = True
+                found_message = message
+                break
+
+    assert found, (
+        f"Warning not found or values mismatch.\n"
+        f"Expected: Current>={current_val}, Warn={warn_val}, Throw={throw_val}\n"
+        f"Last found message: {found_message}"
     )
 
-    for i in range(10):
-        node.query("create table t{} (a Int32) Engine = Log".format(i))
 
-    # This checks that system tables are not accounted in the number of tables.
-    node.query("system flush logs")
+def verify_no_warning(node, message_part):
+    """
+    Verifies that no warning containing message_part exists in system.warnings.
+    """
+    warnings = node.query("SELECT message FROM system.warnings").strip()
+    if not warnings:
+        return
+    assert message_part not in warnings, f"Found unexpected warning containing '{message_part}':\n{warnings}"
 
-    # Regular tables
-    for i in range(10):
-        node.query("drop table t{}".format(i))
 
-    for i in range(10):
-        node.query("create table t{} (a Int32) Engine = Log".format(i))
+def test_table_limit(started_cluster):
+    warn_limit = 5
+    throw_limit = 10
 
-    assert "TOO_MANY_TABLES" in node.query_and_get_error(
-        "create table default.tx (a Int32) Engine = Log"
+    for i in range(15):
+        node.query(f"DROP TABLE IF EXISTS t{i} SYNC")
+
+    for i in range(warn_limit):
+        node.query(f"CREATE TABLE t{i} (a Int32) Engine = Log")
+
+    node.query(f"CREATE TABLE t{warn_limit} (a Int32) Engine = Log")
+
+    verify_warning_with_values(
+        node,
+        current_val=warn_limit + 1,
+        warn_val=warn_limit,
+        throw_val=throw_limit
     )
 
-    # Dictionaries
-    for i in range(10):
-        node.query(
-            "create dictionary d{} (a Int32) primary key a source(null()) layout(flat()) lifetime(1000)".format(
-                i
-            )
-        )
+    for i in range(warn_limit + 1, throw_limit):
+        node.query(f"CREATE TABLE t{i} (a Int32) Engine = Log")
+
+    verify_warning_with_values(
+        node,
+        current_val=throw_limit,
+        warn_val=warn_limit,
+        throw_val=throw_limit
+    )
 
     assert "TOO_MANY_TABLES" in node.query_and_get_error(
-        "create dictionary dx (a Int32) primary key a source(null()) layout(flat()) lifetime(1000)"
+        f"CREATE TABLE t{throw_limit} (a Int32) Engine = Log"
     )
 
-    # Replicated tables
-    for i in range(10):
-        node.query("drop table t{}".format(i))
+    # Cleanup and check warning disappears
+    for i in range(throw_limit):
+        node.query(f"DROP TABLE t{i} SYNC")
 
-    for i in range(3):
-        node.query(
-            "create table t{} on cluster 'cluster' (a Int32) Engine = ReplicatedMergeTree('/clickhouse/tables/t{}', '{{replica}}') order by a".format(
-                i, i
-            )
-        )
+    verify_no_warning(node, "The number of attached tables")
 
-    # Test limit on other replica
-    assert "Too many replicated tables" in node2.query_and_get_error(
-        "create table tx (a Int32) Engine = ReplicatedMergeTree('/clickhouse/tables/tx', '{replica}') order by a"
-    )
 
-    for i in range(3, 5):
-        node.query(
-            "create table t{} (a Int32) Engine = ReplicatedMergeTree('/clickhouse/tables/t{}', '{{replica}}') order by a".format(
-                i, i
-            )
-        )
+def test_view_limit(started_cluster):
+    warn_limit = 5
+    throw_limit = 10
+
+    for i in range(warn_limit + 1):
+        node.query(f"CREATE VIEW v{i} AS SELECT 1")
 
-    assert "Too many replicated tables" in node.query_and_get_error(
-        "create table tx (a Int32) Engine = ReplicatedMergeTree('/clickhouse/tables/tx', '{replica}') order by a"
+    verify_warning_with_values(
+        node,
+        current_val=warn_limit + 1,
+        warn_val=warn_limit,
+        throw_val=throw_limit
     )
 
-    # Checks that replicated tables are also counted as regular tables
-    for i in range(5, 10):
-        node.query("create table t{} (a Int32) Engine = Log".format(i))
+    for i in range(warn_limit + 1, throw_limit):
+        node.query(f"CREATE VIEW v{i} AS SELECT 1")
 
     assert "TOO_MANY_TABLES" in node.query_and_get_error(
-        "create table tx (a Int32) Engine = Log"
+        f"CREATE VIEW v{throw_limit} AS SELECT 1"
     )
 
-    # Cleanup
-    for i in range(10):
-        node.query("drop table t{} sync".format(i))
-    for i in range(3):
-        node2.query("drop table t{} sync".format(i))
-    for i in range(9):
-        node.query("drop database db{}".format(i))
-    for i in range(10):
-        node.query("drop dictionary d{}".format(i))
-
-
-def test_replicated_database(started_cluster):
-    node.query("CREATE DATABASE db_replicated ENGINE = Replicated('/clickhouse/db_replicated', '{replica}');")
-    for i in range(10):
-        node.query(f"CREATE TABLE db_replicated.t{i} (a Int32) ENGINE = Log;")
+    # Cleanup and check warning disappears
+    for i in range(throw_limit):
+        node.query(f"DROP VIEW v{i}")
+
+    verify_no_warning(node, "The number of attached views")
+
+
+def test_database_limit(started_cluster):
+    warn_limit = 5
+    throw_limit = 10
+    created_dbs = []
+
+    try:
+        initial_dbs = int(node.query("SELECT value FROM system.metrics WHERE name = 'AttachedDatabase'"))
+
+        # 1. Reach Warning Limit
+        dbs_to_warn = max(0, warn_limit - initial_dbs + 1)
+        for i in range(dbs_to_warn):
+            name = f"db_test_{i}"
+            node.query(f"CREATE DATABASE {name}")
+            created_dbs.append(name)
+
+        current_total = int(node.query("SELECT value FROM system.metrics WHERE name = 'AttachedDatabase'"))
+
+        verify_warning_with_values(
+            node,
+            current_val=current_total,
+            warn_val=warn_limit,
+            throw_val=throw_limit
+        )
+
+        # 2. Reach Throw Limit (and try to exceed)
+        limit_hit = False
+
+        # Try creating enough databases to definitely hit the limit + safety margin
+        for i in range(len(created_dbs), throw_limit + 10):
+            name = f"db_test_{i}"
+            try:
+                node.query(f"CREATE DATABASE {name}")
+                created_dbs.append(name)
+            except QueryRuntimeException as e:
+                if "TOO_MANY_DATABASES" in str(e):
+                    limit_hit = True
+                    break
+                else:
+                    raise e
+
+        assert limit_hit, f"Failed to trigger TOO_MANY_DATABASES limit. Created {len(created_dbs)} databases on top of {initial_dbs} initial."
+
+        # Cleanup and verify warning disappears
+        for db in created_dbs:
+            node.query(f"DROP DATABASE IF EXISTS {db}")
+
+        verify_no_warning(node, "The number of attached databases")
+        created_dbs = []  # Clear list so finally block doesn't duplicate effort
+
+    finally:
+        for db in created_dbs:
+            node.query(f"DROP DATABASE IF EXISTS {db}")
+
+
+def test_dictionary_limit(started_cluster):
+    warn_limit = 5
+    throw_limit = 10
+
+    for i in range(warn_limit + 1):
+        node.query(f"CREATE DICTIONARY d{i} (a Int32) primary key a source(null()) layout(flat()) lifetime(1000)")
+
+    verify_warning_with_values(
+        node,
+        current_val=warn_limit + 1,
+        warn_val=warn_limit,
+        throw_val=throw_limit
+    )
+
+    for i in range(warn_limit + 1, throw_limit):
+        node.query(f"CREATE DICTIONARY d{i} (a Int32) primary key a source(null()) layout(flat()) lifetime(1000)")
+
     assert "TOO_MANY_TABLES" in node.query_and_get_error(
-        "CREATE TABLE db_replicated.tx (a Int32) ENGINE = Log;"
+        f"CREATE DICTIONARY d{throw_limit} (a Int32) primary key a source(null()) layout(flat()) lifetime(1000)"
     )
-    node.query("DROP DATABASE db_replicated SYNC;")
+
+    # Cleanup and check warning disappears
+    for i in range(throw_limit):
+        node.query(f"DROP DICTIONARY d{i}")
+
+    verify_no_warning(node, "The number of attached dictionaries")
+
+
+# def test_named_collection_limit(started_cluster):
+#     warn_limit = 5
+#     throw_limit = 10
+#
+#     def _get_number_of_collections():
+#         return int(node.query("SELECT value FROM system.metrics WHERE name = 'NamedCollection'"))
+#
+#     try:
+#         for i in range(warn_limit):
+#             node.query(f"CREATE NAMED COLLECTION nc_{i} AS key=1")
+#
+#         node.query(f"CREATE NAMED COLLECTION nc_{warn_limit} AS key=1")
+#
+#         verify_warning_with_values(
+#             node,
+#             current_val=warn_limit + 1,
+#             warn_val=warn_limit,
+#             throw_val=throw_limit
+#         )
+#
+#         for i in range(warn_limit + 1, throw_limit):
+#             node.query(f"CREATE NAMED COLLECTION nc_{i} AS key=1")
+#
+#         assert _get_number_of_collections() == throw_limit
+#
+#         assert "TOO_MANY_NAMED_COLLECTIONS" in node.query_and_get_error(
+#             f"CREATE NAMED COLLECTION nc_{throw_limit} AS key=1"
+#         )
+#
+#         node.query(f"DROP NAMED COLLECTION IF EXISTS nc_1")
+#
+#         verify_warning_with_values(
+#             node,
+#             current_val=throw_limit-1,
+#             warn_val=warn_limit,
+#             throw_val=throw_limit
+#         )
+#
+#         node.query(f"DROP NAMED COLLECTION IF EXISTS nc_1")
+#
+#         verify_warning_with_values(
+#             node,
+#             current_val=throw_limit-1,
+#             warn_val=warn_limit,
+#             throw_val=throw_limit
+#         )
+#
+#         # Cleanup and check warning disappears
+#         for i in range(throw_limit + 1):
+#             node.query(f"DROP NAMED COLLECTION IF EXISTS nc_{i}")
+#
+#         verify_no_warning(node, "The number of named collections")
+#
+#     finally:
+#         for i in range(throw_limit + 1):
+#             node.query(f"DROP NAMED COLLECTION IF EXISTS nc_{i}")
diff --git a/tests/integration/test_table_functions_access_rights/test.py b/tests/integration/test_table_functions_access_rights/test.py
index b6e6f0c1f03c..ce63280dbb91 100644
--- a/tests/integration/test_table_functions_access_rights/test.py
+++ b/tests/integration/test_table_functions_access_rights/test.py
@@ -36,7 +36,8 @@ def cleanup_after_test():
 
 
 def test_merge():
-    select_query = "SELECT * FROM merge('default', 'table[0-9]+') ORDER BY x"
+    merge_spec = "merge('default', 'table[0-9]+')"
+    select_query = f"SELECT * FROM {merge_spec} ORDER BY x"
     assert instance.query(select_query) == "1\n2\n"
 
     instance.query("CREATE USER A")
@@ -62,6 +63,20 @@ def test_merge():
         in instance.query_and_get_error(select_query, user="A")
     )
 
+    instance.query("REVOKE ALL ON default.* FROM A")
+    describe_query = f"DESCRIBE TABLE {merge_spec}"
+    assert (
+        "Either there is no database, which matches regular expression `default`, or there are no tables in the database matches `default`, which fit tables expression: table[0-9]+"
+        in instance.query_and_get_error(describe_query, user="A")
+    )
+    instance.query("GRANT SHOW TABLES ON default.table1 TO A")
+    assert (
+        "it's necessary to have the grant SHOW COLUMNS ON default.table1"
+        in instance.query_and_get_error(describe_query, user="A")
+    )
+    instance.query("GRANT SHOW COLUMNS ON default.table1 TO A")
+    assert instance.query(describe_query) == "x\tUInt32\t\t\t\t\t\n"
+
 
 def test_view_if_permitted():
     assert (
diff --git a/tests/integration/test_throttling/test.py b/tests/integration/test_throttling/test.py
index 05bcd6208731..b11b7acc8f53 100644
--- a/tests/integration/test_throttling/test.py
+++ b/tests/integration/test_throttling/test.py
@@ -16,6 +16,7 @@
 # - and that max_backup_bandwidth from the query will override setting from the user profile
 
 import time
+import uuid
 
 import pytest
 
@@ -24,11 +25,28 @@
 cluster = ClickHouseCluster(__file__)
 
 
-def elapsed(func, *args, **kwargs):
-    start = time.time()
-    ret = func(*args, **kwargs)
-    end = time.time()
-    return ret, end - start
+def elapsed(node, query, **kwargs):
+    # Generate a unique query_id to reliably find this query in logs
+    query_id = f"elapsed_{uuid.uuid4().hex}"
+
+    # Execute the query with the unique query_id
+    ret = node.query(query, query_id=query_id, **kwargs)
+
+    # Flush logs to ensure the query appears in system.query_log
+    node.query("SYSTEM FLUSH LOGS query_log")
+
+    # Get the server-side query duration from system.query_log using the query_id
+    duration_result = node.query(
+        f"""
+        SELECT query_duration_ms / 1000.0 as duration
+        FROM system.query_log
+        WHERE type = 'QueryFinish'
+          AND query_id = '{query_id}'
+        LIMIT 1
+        """
+    )
+    duration = float(duration_result.strip())
+    return ret, duration
 
 
 node = cluster.add_instance(
@@ -281,7 +299,7 @@ def test_backup_throttling(policy, backup_storage, mode, setting, value, should_
         insert into data select * from numbers(1e6);
     """
     )
-    _, took = elapsed(node.query, f"backup table data to {next_backup_name(backup_storage)}")
+    _, took = elapsed(node, f"backup table data to {next_backup_name(backup_storage)}")
     assert_took(took, should_take)
 
 
@@ -297,7 +315,7 @@ def test_backup_throttling_override():
 
     backup_name = next_backup_name("local")
     _, took = elapsed(
-        node.query,
+        node,
         f"backup table data to {backup_name}",
         settings={
             "max_backup_bandwidth": "500K",
@@ -365,7 +383,7 @@ def test_read_throttling(policy, mode, setting, value, should_take):
         insert into data select * from numbers(1e6);
     """
     )
-    _, took = elapsed(node.query, f"select * from data")
+    _, took = elapsed(node, f"select * from data")
     assert_took(took, should_take)
 
 
@@ -378,7 +396,7 @@ def test_remote_read_throttling_reload():
     """
     )
     # without bandwidth limit
-    _, took = elapsed(node.query, f"select * from data")
+    _, took = elapsed(node, f"select * from data")
     assert_took(took, 0)
 
     # add bandwidth limit and reload config on fly
@@ -388,7 +406,7 @@ def test_remote_read_throttling_reload():
     node.query("SYSTEM RELOAD CONFIG")
 
     # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
-    _, took = elapsed(node.query, f"select * from data")
+    _, took = elapsed(node, f"select * from data")
     assert_took(took, 3)
 
     # update bandwidth back to 0
@@ -397,8 +415,8 @@ def test_remote_read_throttling_reload():
     )
     node.query("SYSTEM RELOAD CONFIG")
 
-    _, took = elapsed(node.query, f"select * from data")
-    assert took < 1
+    _, took = elapsed(node, f"select * from data")
+    assert took < 3
 
 def test_local_read_throttling_reload():
     node.query(
@@ -409,7 +427,7 @@ def test_local_read_throttling_reload():
     """
     )
     # without bandwidth limit
-    _, took = elapsed(node.query, f"select * from data")
+    _, took = elapsed(node, f"select * from data")
     assert_took(took, 0)
 
     # add bandwidth limit and reload config on fly
@@ -419,7 +437,7 @@ def test_local_read_throttling_reload():
     node.query("SYSTEM RELOAD CONFIG")
 
     # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
-    _, took = elapsed(node.query, f"select * from data")
+    _, took = elapsed(node, f"select * from data")
     assert_took(took, 3)
 
     # update bandwidth back to 0
@@ -428,8 +446,8 @@ def test_local_read_throttling_reload():
     )
     node.query("SYSTEM RELOAD CONFIG")
 
-    _, took = elapsed(node.query, f"select * from data")
-    assert took < 1
+    _, took = elapsed(node, f"select * from data")
+    assert took < 3
 
 @pytest.mark.parametrize(
     "policy,mode,setting,value,should_take",
@@ -488,7 +506,7 @@ def test_write_throttling(policy, mode, setting, value, should_take):
         create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9, storage_policy='{policy}';
     """
     )
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
     assert_took(took, should_take)
 
 
@@ -501,7 +519,7 @@ def test_remote_write_throttling_reload():
     """
     )
     # without bandwidth limit
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
     assert_took(took, 0)
 
     # add bandwidth limit and reload config on fly
@@ -511,7 +529,7 @@ def test_remote_write_throttling_reload():
     node.query("SYSTEM RELOAD CONFIG")
 
     # writing 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
     assert_took(took, 3)
 
     # update bandwidth back to 0
@@ -520,8 +538,8 @@ def test_remote_write_throttling_reload():
     )
     node.query("SYSTEM RELOAD CONFIG")
 
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
-    assert took < 1
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
+    assert took < 3
 
 def test_local_write_throttling_reload():
     node.query(
@@ -532,7 +550,7 @@ def test_local_write_throttling_reload():
     """
     )
     # without bandwidth limit
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
     assert_took(took, 0)
 
     # add bandwidth limit and reload config on fly
@@ -542,7 +560,7 @@ def test_local_write_throttling_reload():
     node.query("SYSTEM RELOAD CONFIG")
 
     # writing 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
     assert_took(took, 3)
 
     # update bandwidth back to 0
@@ -551,8 +569,8 @@ def test_local_write_throttling_reload():
     )
     node.query("SYSTEM RELOAD CONFIG")
 
-    _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
-    assert took < 1
+    _, took = elapsed(node, f"insert into data select * from numbers(1e6)")
+    assert took < 3
 
 def test_max_mutations_bandwidth_for_server():
     node.query(
@@ -563,7 +581,7 @@ def test_max_mutations_bandwidth_for_server():
     )
     node.query("insert into data select * from numbers(1e6)")
     _, took = elapsed(
-        node.query,
+        node,
         "alter table data update key = -key where 1 settings mutations_sync = 1",
     )
     # reading 1e6*8 bytes with 1M/s bandwidth should take (8-1)/1=7 seconds
@@ -578,6 +596,6 @@ def test_max_merges_bandwidth_for_server():
     """
     )
     node.query("insert into data select * from numbers(1e6)")
-    _, took = elapsed(node.query, "optimize table data final")
+    _, took = elapsed(node, "optimize table data final")
     # reading 1e6*8 bytes with 1M/s bandwidth should take (8-1)/1=7 seconds
     assert_took(took, 7)
diff --git a/tests/integration/test_trace_log_build_id/test.py b/tests/integration/test_trace_log_build_id/test.py
index e74aa7d49f91..ae63f1e4a422 100644
--- a/tests/integration/test_trace_log_build_id/test.py
+++ b/tests/integration/test_trace_log_build_id/test.py
@@ -12,7 +12,7 @@
 node = cluster.add_instance(
     "node",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_ttl_replicated/test.py b/tests/integration/test_ttl_replicated/test.py
index 4de81ca9880a..6927d2e1537c 100644
--- a/tests/integration/test_ttl_replicated/test.py
+++ b/tests/integration/test_ttl_replicated/test.py
@@ -18,7 +18,7 @@
 node4 = cluster.add_instance(
     "node4",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
@@ -30,7 +30,7 @@
 node5 = cluster.add_instance(
     "node5",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
@@ -41,7 +41,7 @@
 node6 = cluster.add_instance(
     "node6",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
diff --git a/tests/integration/test_version_update/test.py b/tests/integration/test_version_update/test.py
index fd1bfb2ba849..1f33b9e69a37 100644
--- a/tests/integration/test_version_update/test.py
+++ b/tests/integration/test_version_update/test.py
@@ -10,7 +10,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
diff --git a/tests/integration/test_version_update_after_mutation/test.py b/tests/integration/test_version_update_after_mutation/test.py
index 9aea0c0844be..e750c82c2f1c 100644
--- a/tests/integration/test_version_update_after_mutation/test.py
+++ b/tests/integration/test_version_update_after_mutation/test.py
@@ -10,7 +10,7 @@
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
@@ -21,7 +21,7 @@
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
@@ -32,7 +32,7 @@
 node3 = cluster.add_instance(
     "node3",
     with_zookeeper=True,
-    image="clickhouse/clickhouse-server",
+    image="altinity/clickhouse-server",
     tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
diff --git a/tests/integration/test_wrong_db_or_table_name/test.py b/tests/integration/test_wrong_db_or_table_name/test.py
index 93c9b512bb82..df035f7a9907 100644
--- a/tests/integration/test_wrong_db_or_table_name/test.py
+++ b/tests/integration/test_wrong_db_or_table_name/test.py
@@ -159,3 +159,38 @@ def test_drop_wrong_table_name(start):
         DROP DATABASE test2;
         """
     )
+
+
+def test_wrong_database_name_hint(start):
+    node.query(
+        """
+        CREATE DATABASE test_db_visible;
+        CREATE DATABASE test_db_hidden;
+
+        CREATE TABLE test_db_visible.depth (id UInt32, value String) ENGINE = Memory;
+        CREATE TABLE test_db_hidden.depth (id UInt32, secret_data String) ENGINE = Memory;
+
+        INSERT INTO test_db_visible.depth VALUES (1, 'visible data');
+        INSERT INTO test_db_hidden.depth VALUES (1, 'hidden secret');
+
+        CREATE USER restricted_user;
+
+        GRANT SELECT ON test_db_visible.* TO restricted_user;
+        REVOKE ALL ON test_db_hidden.* FROM restricted_user;
+        """
+    )
+
+    error_message = node.query_and_get_error("SELECT * FROM test_db_hidde.depth;", user="restricted_user")
+    assert (
+        "test_db_hidden"
+        not in error_message
+    )
+
+    node.query(
+        """
+        DROP DATABASE IF EXISTS test_db_visible;
+        DROP DATABASE IF EXISTS test_db_hidden;
+
+        DROP USER IF EXISTS restricted_user;
+        """
+    )
diff --git a/tests/queries/0_stateless/00443_optimize_final_vertical_merge.reference b/tests/queries/0_stateless/00443_optimize_final_vertical_merge.reference
index bdc7c3527b4c..6de4a4aa6c90 100644
--- a/tests/queries/0_stateless/00443_optimize_final_vertical_merge.reference
+++ b/tests/queries/0_stateless/00443_optimize_final_vertical_merge.reference
@@ -1,3 +1,3 @@
 150000	150000	150000	150000	150000	150000
-[['def']]	[['','']]
+[['def']]	[['zzz']]
 0
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
deleted file mode 100644
index 2316afeb2e70..000000000000
--- a/tests/queries/0_stateless/00900_long_parquet_load.reference
+++ /dev/null
@@ -1,922 +0,0 @@
-=== Try load data from alltypes_dictionary.parquet
-0	1	0	0	0	0	0	0	01/01/09	0	1230768000
-1	0	1	1	1	10	1.1	10.1	01/01/09	1	1230768060
-=== Try load data from alltypes_list.parquet
-[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
-[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['1999-12-31 23:00:00','2000-12-31 23:00:00','2001-12-31 23:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
-[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['1999-12-31 23:00:00','2000-12-31 23:00:00','2001-12-31 23:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
-=== Try load data from alltypes_plain.parquet
-0	1	0	0	0	0	0	0	01/01/09	0	1230768000
-1	0	1	1	1	10	1.1	10.1	01/01/09	1	1230768060
-2	1	0	0	0	0	0	0	02/01/09	0	1233446400
-3	0	1	1	1	10	1.1	10.1	02/01/09	1	1233446460
-4	1	0	0	0	0	0	0	03/01/09	0	1235865600
-5	0	1	1	1	10	1.1	10.1	03/01/09	1	1235865660
-6	1	0	0	0	0	0	0	04/01/09	0	1238544000
-7	0	1	1	1	10	1.1	10.1	04/01/09	1	1238544060
-=== Try load data from alltypes_plain.snappy.parquet
-6	1	0	0	0	0	0	0	04/01/09	0	1238544000
-7	0	1	1	1	10	1.1	10.1	04/01/09	1	1238544060
-=== Try load data from array_float.parquet
-idx1	[]
-idx10	[10.2,8.2]
-idx2	[10.2,8.2,7.2]
-idx3	[10.2,8.2]
-idx4	[10.2]
-idx5	[10.2,8.2]
-idx6	[10.2]
-idx7	[10.2,8.2]
-idx8	[10.2,8.2]
-idx9	[10.2]
-=== Try load data from array_int.parquet
-idx1	[100,101,102]
-idx10	[100,101,102]
-idx2	[100,101]
-idx3	[100,101,102,101]
-idx4	[100]
-idx5	[100,101]
-idx6	[100,101]
-idx7	[100,101]
-idx8	[100,101]
-idx9	[100,101,102]
-=== Try load data from array_string.parquet
-idx1	['This','is','a','test']
-idx10	['This','is','a','test']
-idx2	['cigarette','smoke']
-idx3	['the','grocery','clerks']
-idx4	[]
-idx5	['wants','to','get','out']
-idx6	['me','up?']
-idx7	['then','I','put','him','back']
-idx8	['make','a','man']
-idx9	['Which','Heaven','to','gaudy','day','denies']
-=== Try load data from binary.parquet
-\0
-

-
-
-
-
-
-
-\b
-\t
-\n
-
-=== Try load data from byte_array_decimal.parquet
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-=== Try load data from case_insensitive_column_matching.parquet
-123	1
-456	2
-=== Try load data from datapage_v2.snappy.parquet
-abc	1	2	1	[1,2,3]
-abc	2	3	1	[]
-abc	3	4	1	[]
-abc	5	2	1	[1,2]
-\N	4	5	0	[1,2,3]
-=== Try load data from datatype-date32.parquet
-1925-01-01
-1949-10-01
-2021-10-01
-2282-12-31
-=== Try load data from dict-page-offset-zero.parquet
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-1552
-=== Try load data from fixed_array_int.parquet
-idx1	[73,33,88,34,94,96,11,90,20,17]
-idx10	[10,15,52,43,22,50,42,87,19,91]
-idx2	[10,18,74,39,2,55,13,41,6,42]
-idx3	[48,27,74,82,70,46,18,78,63,73]
-idx4	[87,56,32,98,25,18,66,21,20,2]
-idx5	[67,84,56,84,50,21,93,90,37,42]
-idx6	[53,14,44,96,40,71,26,74,27,25]
-idx7	[46,1,21,11,83,74,11,63,28,49]
-idx8	[55,30,50,19,12,95,5,83,71,34]
-idx9	[90,53,83,54,35,87,73,74,98,50]
-=== Try load data from fixed_array_nested_list_int.parquet
-idx1	[[34,11,56,20,90,20,17,55,54,99],[22,18,15,77,68,51,30,76,9,40],[67,24,2,27,72,53,99,57,67,96],[95,77,60,47,68,56,91,28,90,38],[77,8,75,89,84,81,60,82,71,26],[41,89,60,15,43,81,31,68,71,65],[84,97,22,9,26,59,97,10,16,60],[13,82,16,47,32,74,34,78,90,15],[35,44,50,18,82,71,20,68,89,41],[60,59,7,65,18,23,24,37,48,45]]
-idx10	[[10,72,13,85,89,15,51,73,64,49],[78,28,54,57,10,1,3,35,23,15],[97,93,76,87,86,21,30,9,58,21],[27,23,35,71,4,68,90,14,93,87],[59,98,66,94,8,90,16,20,33,10],[73,84,79,37,75,50,64,74,79,31],[20,64,79,51,20,41,7,69,5,22],[37,60,1,99,45,43,56,26,15,83],[7,96,6,58,7,59,57,6,22,92],[97,11,71,55,32,79,88,20,58,31]]
-idx2	[[72,32,17,44,69,37,95,64,47,70],[15,4,28,31,80,63,40,93,17,87],[28,46,56,21,65,20,5,76,18,61],[66,44,5,66,71,73,26,70,47,22],[9,9,62,21,74,75,32,71,2,61],[66,81,43,46,10,78,66,31,34,17],[30,5,10,15,56,52,36,3,88,16],[45,84,39,12,39,13,43,66,67,16],[27,18,68,80,87,19,98,39,90,54],[48,96,24,67,66,91,3,10,7,66]]
-idx3	[[54,93,69,82,45,54,35,59,20,39],[80,3,15,33,45,22,45,11,28,94],[68,26,89,38,49,28,29,59,93,57],[11,62,53,12,16,83,2,55,65,6],[37,49,56,93,33,77,22,53,20,22],[4,75,2,5,34,5,90,67,2,79],[22,2,80,14,13,44,33,11,31,24],[11,54,75,33,60,20,10,51,56,33],[72,5,84,78,7,95,21,2,88,75],[69,88,52,85,70,96,51,69,48,20]]
-idx4	[[65,58,31,62,38,29,32,71,87,49],[66,89,59,83,29,32,59,49,68,34],[81,54,14,69,39,84,95,37,15,47],[15,51,15,38,90,61,76,51,11,24],[64,93,27,26,29,15,15,4,95,36],[60,61,57,66,61,25,21,97,34,36],[7,34,30,4,8,29,68,48,58,64],[77,19,92,77,81,21,52,1,86,92],[16,91,1,40,57,44,76,10,78,10],[88,13,70,61,2,76,78,69,90,24]]
-idx5	[[52,98,63,41,2,6,56,80,72,15],[11,64,89,57,65,92,63,39,76,51],[47,25,33,28,58,22,83,19,54,63],[61,8,20,24,83,44,33,32,65,90],[51,75,72,55,54,5,43,90,64,30],[86,87,48,65,84,67,82,94,2,9],[1,75,83,79,64,63,52,51,33,72],[12,84,92,27,66,32,40,48,34,55],[59,91,19,77,70,56,10,82,40,60],[79,83,14,82,42,22,72,54,12,9]]
-idx6	[[71,60,6,31,40,66,78,6,23,14],[62,88,38,68,37,37,63,18,57,3],[45,93,1,49,99,33,10,91,6,17],[13,40,57,85,48,14,74,89,43,49],[18,17,39,75,52,30,48,4,13,55],[3,34,73,71,75,58,6,73,73,31],[28,74,26,3,2,49,50,60,27,79],[35,28,12,10,1,21,61,70,65,37],[30,27,51,85,89,84,73,48,4,71],[1,86,23,68,82,9,6,95,14,25]]
-idx7	[[58,24,79,16,32,36,36,91,18,22],[85,29,36,16,75,79,71,70,6,39],[47,15,82,30,55,14,49,47,38,13],[28,54,95,82,25,16,44,82,33,11],[58,16,87,96,65,3,10,68,87,15],[94,84,65,50,21,78,8,78,89,72],[39,41,67,23,21,83,43,94,31,15],[67,58,73,87,58,71,52,10,30,90],[69,65,72,89,51,8,39,80,49,79],[32,36,76,11,88,87,75,55,33,74]]
-idx8	[[8,26,45,3,25,83,88,77,98,38],[52,76,79,94,6,74,73,31,93,53],[89,24,62,83,35,24,60,24,41,14],[52,13,13,32,87,77,19,20,52,47],[50,46,66,30,26,85,91,50,98,83],[87,44,5,11,25,52,9,55,15,37],[18,24,36,72,84,10,13,59,16,65],[93,4,19,13,75,64,73,29,81,25],[61,65,1,45,75,88,19,4,73,32],[23,20,27,55,13,34,97,80,8,19]]
-idx9	[[32,6,44,30,66,48,93,67,62,16],[49,67,73,32,86,78,28,88,25,60],[70,10,95,16,10,49,12,47,22,62],[95,86,63,43,4,96,3,34,60,53],[60,75,96,66,96,82,62,31,78,72],[17,44,13,7,45,54,27,84,10,68],[43,49,86,10,57,99,32,72,73,41],[57,79,15,62,79,87,67,69,75,59],[45,18,2,19,45,96,8,86,71,97],[20,20,11,15,82,29,16,12,87,87]]
-=== Try load data from fixed_array_str.parquet
-idx1	['str10','str11','str12','str13','str14','str15','str16','str17','str18','str19']
-idx10	['str100','str101','str102','str103','str104','str105','str106','str107','str108','str109']
-idx2	['str20','str21','str22','str23','str24','str25','str26','str27','str28','str29']
-idx3	['str30','str31','str32','str33','str34','str35','str36','str37','str38','str39']
-idx4	['str40','str41','str42','str43','str44','str45','str46','str47','str48','str49']
-idx5	['str50','str51','str52','str53','str54','str55','str56','str57','str58','str59']
-idx6	['str60','str61','str62','str63','str64','str65','str66','str67','str68','str69']
-idx7	['str70','str71','str72','str73','str74','str75','str76','str77','str78','str79']
-idx8	['str80','str81','str82','str83','str84','str85','str86','str87','str88','str89']
-idx9	['str90','str91','str92','str93','str94','str95','str96','str97','str98','str99']
-=== Try load data from fixed_length_decimal.parquet
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-=== Try load data from fixed_length_decimal_1.parquet
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-=== Try load data from fixed_length_decimal_legacy.parquet
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-=== Try load data from hadoop_lz4_compressed.parquet
-1593604800	abc	42
-1593604800	def	7.7
-1593604801	abc	42.125
-1593604801	def	7.7
-=== Try load data from int32_decimal.parquet
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-=== Try load data from int64_decimal.parquet
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-=== Try load data from list_columns.parquet
-[1,2,3]	['abc','efg','hij']
-[4]	['efg',NULL,'hij','xyz']
-[NULL,1]	[]
-=== Try load data from nation.dict-malformed.parquet
-0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai
-1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon
-2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 
-3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold
-4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d
-5	ETHIOPIA	0	ven packages wake quickly. regu
-6	FRANCE	3	refully final requests. regular, ironi
-7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco
-8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun
-9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull
-10	IRAN	4	efully alongside of the slyly final dependencies. 
-11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula
-12	JAPAN	2	ously. final, express gifts cajole a
-13	JORDAN	4	ic deposits are blithely about the carefully regular pa
-14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t
-15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?
-16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r
-17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun
-18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos
-19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account
-20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely
-21	VIETNAM	2	hely enticingly express accounts. even, final 
-22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint
-23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull
-24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
-=== Try load data from nested_lists.parquet
-[[[1,2,3],[1,2,3]],[[1,2,3]],[[],[1,2,3]]]	[[['Some string','Some string'],[]],[['Some string']],[[]]]	[[NULL,1,2],[NULL],[1,2],[]]	[['Some string',NULL,'Some string'],[NULL],[]]
-=== Try load data from nested_lists.snappy.parquet
-[[['a','b'],['c']],[[],['d']]]	1
-[[['a','b'],['c','d']],[[],['e']]]	1
-[[['a','b'],['c','d'],['e']],[[],['f']]]	1
-=== Try load data from nested_maps.snappy.parquet
-{'a':{1:1,2:0}}	1	1
-{'b':{1:1}}	1	1
-{'c':{}}	1	1
-{'d':{}}	1	1
-{'e':{1:1}}	1	1
-{'f':{3:1,4:0,5:1}}	1	1
-=== Try load data from non_hadoop_lz4_compressed.parquet
-1593604800	abc	42
-1593604800	def	7.7
-1593604801	abc	42.125
-1593604801	def	7.7
-=== Try load data from nonnullable.impala.parquet
-8	[-1]	[[-1,-2],[]]	{'k1':-1}	[{},{'k1':1},{},{}]	(-1,[-1],([[(-1,'nonnullable')]]),{})
-=== Try load data from nullable.impala.parquet
-1	[1,2,3]	[[1,2],[3,4]]	{'k1':1,'k2':100}	[{'k1':1}]	(1,[1],([[(10,'aaa'),(-10,'bbb')],[(11,'c')]]),{'foo':(([1.1]))})
-2	[NULL,1,2,NULL,3,NULL]	[[NULL,1,2,NULL],[3,NULL,4],[],[]]	{'k1':2,'k2':NULL}	[{'k3':NULL,'k1':1},{},{}]	(NULL,[NULL],([[(NULL,NULL),(10,'aaa'),(NULL,NULL),(-10,'bbb'),(NULL,NULL)],[(11,'c'),(NULL,NULL)],[],[]]),{'g1':(([2.2,NULL])),'g2':(([])),'g3':(([])),'g4':(([])),'g5':(([]))})
-3	[]	[[]]	{}	[{},{}]	(NULL,[],([]),{})
-4	[]	[]	{}	[]	(NULL,[],([]),{})
-5	[]	[]	{}	[]	(NULL,[],([]),{'foo':(([2.2,3.3]))})
-6	[]	[]	{}	[]	(NULL,[],([]),{})
-7	[]	[[],[5,6]]	{'k1':NULL,'k3':NULL}	[]	(7,[2,3,NULL],([[],[(NULL,NULL)],[]]),{})
-=== Try load data from nullable_list.parquet
-[]	[]	[]
-[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
-[NULL]	[NULL]	[NULL]
-=== Try load data from nulls.snappy.parquet
-(NULL)
-(NULL)
-(NULL)
-(NULL)
-(NULL)
-(NULL)
-(NULL)
-(NULL)
-=== Try load data from single_nan.parquet
-\N
-=== Try load data from userdata1.parquet
-1454457660	721	Shirley	Williams	swilliamsk0@sciencedirect.com		132.137.10.218	5610801309305920	Indonesia	8/13/1978	\N	Help Desk Technician	
-1454457663	785	Daniel	Spencer	dspencerls@cargocollective.com	Male	241.143.186.140		China	12/3/1997	194214.08	Internal Auditor	
-1454457674	880	Lillian	Murray	lmurrayof@guardian.co.uk	Female	222.252.22.1	201713786459078	Norway	4/16/1981	282503.77	Business Systems Development Analyst	
-1454457684	852	Carol	Patterson	cpattersonnn@ycombinator.com	Female	244.190.113.241	0604512080706322395	Liberia	5/8/1984	263412.02	Assistant Professor	
-1454457705	244	Sarah	Freeman	sfreeman6r@wikimedia.org	Female	219.8.22.27	30520943172503	United States	3/25/1958	25806.31	Budget/Accounting Analyst II	⁰⁴⁵
-1454457740	633	Maria	Fowler	mfowlerhk@chronoengine.com	Female	246.85.249.122	3584144503415501	China	11/25/1998	276712.79	Staff Scientist	␣
-1454457782	925	Chris	Murphy	cmurphypo@nature.com		89.217.243.136	5602220700741429	Russia		\N		
-1454457790	788	Nicholas	Butler	nbutlerlv@thetimes.co.uk	Male	77.38.58.165	3575506969751259	Brazil	2/10/1981	192076.79	Data Coordiator	
-1454457853	301	Jerry	Welch	jwelch8c@paginegialle.it	Male	141.166.33.218	5602252929753349	Latvia	3/14/1973	28731.89	Software Engineer I	
-1454457952	53	Ralph	Price	rprice1g@tmall.com	Male	152.6.235.33	4844227560658222	China	8/26/1986	168208.4	Teacher	
-1454458004	607	Johnny	Owens	jowensgu@blogspot.com	Male	181.25.18.91	5602239825516409	Indonesia	2/14/1960	169429.76	Health Coach III	
-1454458010	375	Bruce	Gonzales	bgonzalesae@studiopress.com	Male	19.195.169.187		Sweden	7/4/1993	118244.57	Human Resources Manager	"<>?:""{}|_+"
-1454458170	744	Heather	Richardson	hrichardsonkn@twitter.com	Female	129.15.137.135		Ukraine	12/26/1980	164117.18	GIS Technical Architect	
-1454458178	635	Willie	Dixon	wdixonhm@diigo.com	Male	27.245.227.220		Japan	8/29/1992	265321.18	Senior Cost Accountant	
-1454458242	11	Susan	Perkins	sperkinsa@patch.com	Female	180.85.0.62	3573823609854134	Russia		210001.95		
-1454458282	175	Samuel	Edwards	sedwards4u@businessweek.com	Male	60.248.106.175	676249211413011686	Russia	10/15/1986	75886.69	Senior Sales Associate	<img src=x onerror=alert(\'hi\') />
-1454458493	78	Mildred	Torres	mtorres25@alibaba.com	Female	38.102.60.15	6399156779396437	Russia	9/24/1960	166987.55	Paralegal	
-1454458506	40	Jack	Flores	jflores13@yolasite.com	Male	162.215.65.11	3577342788590928	Argentina	1/28/1958	81685.1	Financial Advisor	
-1454458536	749	Larry	Fields	lfieldsks@theguardian.com	Male	46.57.123.222	3531208154739438	Yemen		139177.38		Œ„´‰ˇÁ¨ˆØ∏”’
-1454458564	521	Roy	Palmer	rpalmereg@nsw.gov.au	Male	255.242.77.68	3589146577885209	Nepal	8/28/1964	262816.87	Software Test Engineer IV	
-1454458607	314	James	Harvey	jharvey8p@npr.org	Male	96.88.41.248	3589416270039051	China		211553.57		
-1454458706	995	Jose	Mccoy	jmccoyrm@elpais.com	Male	117.37.215.98	560222933605513180	Norway	7/30/1987	275898.37	Graphic Designer	
-1454458727	835	Sean	Castillo	scastillon6@altervista.org		211.77.61.195		Portugal	6/15/1979	\N	Quality Control Specialist	
-1454458739	821	Juan	Foster	jfosterms@reference.com	Male	219.231.170.245	5108759901583907	Portugal	2/16/1969	120076.81	Quality Engineer	1E02
-1454458751	670	Irene	Hughes	ihughesil@topsy.com	Female	154.194.86.224	3536739760978536	Netherlands	6/17/1973	274295.42	Structural Analysis Engineer	
-1454458801	149	Gregory	Edwards	gedwards44@icq.com	Male	5.204.156.34	3548268624172124	Portugal	2/5/1977	236421.33	Librarian	
-1454458805	683	Joshua	Ramirez	jramireziy@liveinternet.ru	Male	164.224.133.177	3574998106893089	France	10/24/1987	17658.63	Senior Developer	
-1454458862	226	James	Austin	jaustin69@istockphoto.com	Male	228.107.68.143	4913037818454290	Russia		25084.49		
-1454458909	659	Doris	Welch	dwelchia@about.com	Female	195.125.217.107	3537263234825586	Indonesia	3/31/1995	183928.71	Quality Engineer	
-1454458914	479	Joseph	Gordon	jgordonda@trellian.com	Male	140.193.192.82	3533495991170988	Indonesia	6/30/1960	262448.45	Health Coach II	
-1454458932	615	Marie	Matthews	mmatthewsh2@smugmug.com		8.217.73.21	589312447234085155	Indonesia	8/10/1973	\N	Chief Design Engineer	<img src=x onerror=alert(\'hi\') />
-1454458946	379	Martha	Simmons	msimmonsai@tripadvisor.com	Female	8.141.39.185		Russia	9/18/1978	92766.32	Staff Scientist	
-1454458967	730	Anne	Perez	aperezk9@freewebs.com	Female	208.87.2.91		China	8/18/1966	47293.4	Nuclear Power Engineer	❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
-1454458979	426	Lois	Green	lgreenbt@1688.com		39.174.95.97	5100146457712544	Bulgaria	2/22/1955	\N	Health Coach III	
-1454459038	810	Mark	Kelley	mkelleymh@blog.com		210.153.220.197	3543227090716355	Poland	5/31/1969	\N	Programmer Analyst I	
-1454459045	475	Richard	Howell	rhowelld6@springer.com	Male	176.182.155.97		Central African Republic		138775.31		‪‪test‪
-1454459058	523	Phillip	Butler	pbutlerei@storify.com	Male	184.124.14.67		China	12/18/1957	106832.85	Paralegal	
-1454459092	437	Virginia	Robinson	vrobinsonc4@opensource.org	Female	148.213.54.195	3567035727522042	China	6/27/1995	24623.44	Senior Sales Associate	
-1454459132	722	Robin	Spencer	rspencerk1@github.com	Female	83.129.98.63	3580163142176138	Poland	1/18/1987	171963.73	Budget/Accounting Analyst I	
-1454459226	291	Julia	Medina	jmedina82@cbc.ca	Female	43.27.110.171	30163835573619	Russia	8/12/1991	109927.88	Software Engineer II	
-1454459288	800	Sarah	Andrews	sandrewsm7@kickstarter.com	Female	238.132.217.166	5018303367167648843	China	4/19/1970	42010.56	Computer Systems Analyst IV	
-1454459290	162	Steve	Spencer	sspencer4h@deliciousdays.com	Male	109.138.4.34		China	6/2/1964	79184.71	Teacher	() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }
-1454459301	322	Frances	Fisher	ffisher8x@businessinsider.com	Female	55.187.133.82	30168292124913	Poland	11/4/1997	140594.79	Geologist IV	社會科學院語學研究所
-1454459320	370	Roger	Gilbert	rgilberta9@businesswire.com	Male	46.96.123.235		Finland	1/20/1999	16506.02	Analog Circuit Design manager	
-1454459328	929	Susan	Jordan	sjordanps@ucla.edu	Female	108.42.4.149	589358467890938815	Philippines	5/31/1995	44739.92	Account Coordinator	
-1454459330	215	Philip	Fox	pfox5y@vimeo.com	Male	65.223.141.140		Israel	9/5/1991	218538.31	Graphic Designer	
-1454459356	265	Judith	Simpson	jsimpson7c@taobao.com		105.52.110.107	6378542962124121	Indonesia	12/12/1983	\N	Project Manager	"""\'""\'""\'\'\'"""
-1454459359	708	Judy	Young	jyoungjn@dailymail.co.uk	Female	21.109.231.236	3554148278137055	Tunisia	1/2/1958	212070.86	Chief Design Engineer	田中さんにあげて下さい
-1454459394	795	Clarence	Edwards	cedwardsm2@ed.gov		111.156.147.232	3533231926493017	Poland	12/23/1981	\N	General Manager	
-1454459439	589	Gerald	Porter	gportergc@pcworld.com	Male	97.189.77.0		Philippines	7/2/1979	278447.61	Professor	
-1454459459	33	Christina	Mason	cmasonw@nydailynews.com	Female	74.214.22.120		Greece	7/21/1986	242593.85	Senior Sales Associate	
-1454459497	524	Brenda	Willis	bwillisej@sun.com	Female	45.122.116.217	6380803357074248	Poland		108844.98		
-1454459499	591	Rose	Garrett	rgarrettge@mit.edu	Female	116.228.6.108	30147178065069	Philippines	10/5/1988	244134.1	Accountant III	
-1454459516	653		Lane		Male	192.59.226.245	3528384158258405	China	12/26/1997	127912.54	Geologist I	
-1454459556	779	Richard	Hunt	rhuntlm@ovh.net	Male	162.73.16.141	5203349476569897	China	6/24/1969	13375.17	Environmental Tech	
-1454459562	681	Betty	Hamilton	bhamiltoniw@facebook.com	Female	193.209.0.183		Morocco	5/5/1965	210804.85	Human Resources Assistant II	
-1454459577	173	Amy	Garza	agarza4s@woothemes.com	Female	75.187.251.37		China		82283.83		
-1454459605	57	Willie	Palmer	wpalmer1k@t-online.de	Male	164.107.46.161	4026614769857244	China	8/23/1986	184978.64	Environmental Specialist	
-1454459605	888	Marie	Torres	mtorreson@tamu.edu	Female	190.148.84.34	5610170119678060511	Bosnia and Herzegovina		261087.2		
-1454459709	293	Amy	Cook	acook84@prlog.org		186.92.46.224		Ukraine	7/23/1976	\N	Human Resources Assistant III	
-1454459719	920	Johnny	Brown	jbrownpj@constantcontact.com	Male	25.161.139.20		Sweden	4/17/1998	149870.24	Speech Pathologist	
-1454459729	137	Phillip	Vasquez	pvasquez3s@canalblog.com	Male	195.121.180.8	5602221706127365	Ethiopia	7/28/1992	274927.74	Internal Auditor	
-1454459747	876	Samuel	Hughes	shughesob@dion.ne.jp	Male	29.127.239.106	3535476909940686	Indonesia		220585.61		Œ„´‰ˇÁ¨ˆØ∏”’
-1454459781	4	Denise	Riley	driley3@gmpg.org	Female	140.35.109.83	3576031598965625	China	4/8/1997	90263.05	Senior Cost Accountant	
-1454459806	195	Joe	Hayes	jhayes5e@opensource.org	Male	96.48.27.170	343842871636339	Indonesia		239690.34		
-1454459806	525	Elizabeth	Porter	eporterek@china.com.cn	Female	249.248.212.114		Indonesia	7/7/1993	33270.67	Recruiter	
-1454459905	958	Louis	Griffin	lgriffinql@umn.edu		184.242.195.194	3571277617780793	China	10/31/1988	\N	Assistant Media Planner	
-1454459969	655	Johnny	Reed	jreedi6@chicagotribune.com	Male	169.161.103.111	4844445630272291	Russia	5/23/1979	68913.72	Quality Engineer	
-1454459981	614	Marie	Ramirez	mramirezh1@wikia.com	Female	143.213.146.199	633390820329851783	China	7/17/1988	131783.55	Dental Hygienist	
-1454460012	200	Russell	Ward	rward5j@surveymonkey.com	Male	73.156.128.8		Sweden		173849.81		
-1454460033	454	Ashley	Crawford	acrawfordcl@weather.com	Female	61.81.102.117	3563365997409370	Vietnam		264109.73		
-1454460230	685	Joan	Jackson	jjacksonj0@paypal.com	Female	153.5.15.100		Yemen	8/16/1992	54385.21	Structural Analysis Engineer	
-1454460236	222	Sara	Price	sprice65@usatoday.com	Female	46.58.242.198		Canada	2/11/1959	49611.44	Sales Representative	
-1454460241	16	Bruce	Willis	bwillisf@bluehost.com	Male	239.182.219.189	3573030625927601	Brazil		239100.65		
-1454460496	906	Amanda	Clark	aclarkp5@facebook.com	Female	190.75.162.144	56022268731524616	Norway	7/19/1982	39551.7	General Manager	
-1454460516	68	Rachel	Price	rprice1v@census.gov	Female	89.52.192.105		Indonesia	5/6/1982	234502.16	Payment Adjustment Coordinator	
-1454460605	879	Diane	Flores	dfloresoe@wiley.com	Female	88.102.252.118	201739112087937	Philippines	12/2/1969	250449.32	Sales Associate	
-1454460715	676	Michael	Jackson	mjacksonir@scribd.com	Male	130.159.201.48	201788384710734	China	7/8/1957	170234.61	Database Administrator III	
-1454460728	550	Cheryl	Evans	cevansf9@yolasite.com	Female	244.155.129.93		Japan	7/24/1955	12380.49	Budget/Accounting Analyst II	
-1454460813	761	Kathleen	Cook	kcookl4@geocities.jp	Female	154.7.81.231		Bulgaria	5/12/1996	107594.9	Analyst Programmer	
-1454460817	599	Sean	Garcia	sgarciagm@blogger.com	Male	94.211.15.55	3557998741604165	Serbia	8/24/1963	131270.12	Structural Engineer	0/0
-1454460934	939	Keith	Hernandez	khernandezq2@amazon.com	Male	153.51.249.140	3550284883492520	Belarus	10/12/1977	56167.67	Environmental Tech	
-1454460945	763	Amanda	Miller	amillerl6@dagondesign.com	Female	15.140.92.92		Philippines	11/24/1979	118824.39	Structural Engineer	
-1454460961	664	Kathleen	Torres	ktorresif@vistaprint.com	Female	11.165.183.246		Nicaragua	4/6/1960	257366	Environmental Specialist	
-1454461065	17	Emily	Andrews	eandrewsg@cornell.edu	Female	29.231.180.172	30271790537626	Russia	4/13/1990	116800.65	Food Chemist	
-1454461083	569	Heather	Johnson	hjohnsonfs@skype.com	Female	3.121.91.120	3552946432961233	Argentina	11/24/1966	197315	Cost Accountant	
-1454461104	768	Gregory	James	gjameslb@businessweek.com	Male	80.18.249.93	30041579214659	Sweden		78310.93		
-1454461128	584	Lois	Ross	lrossg7@irs.gov	Female	176.213.236.60		Brazil	6/23/1989	95013.72	Database Administrator IV	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
-1454461201	856	Mildred	Harper	mharpernr@samsung.com	Female	153.214.193.120	6763961170182948344	Finland		37573.27		
-1454461259	383	Beverly	Carter	bcarteram@wordpress.com	Female	4.251.6.51	3535631087457545	Indonesia	11/15/1982	272520.3	Compensation Analyst	
-1454461332	909	Samuel	Henry	shenryp8@163.com	Male	204.10.183.241	6771639706876926	Philippines	4/3/1998	164954.8	Compensation Analyst	
-1454461498	678	Wanda	Ford	wfordit@sitemeter.com	Female	63.28.195.79		Poland		28276.84		
-1454461562	801	Annie	Bradley	abradleym8@jimdo.com	Female	166.216.149.179		Poland	2/17/1970	267475.37	Quality Control Specialist	
-1454461671	643	Thomas	Hunter	thunterhu@pinterest.com	Male	91.145.126.98	3574840401671309	China	3/3/1962	201611.79	Programmer II	
-1454461690	428	Dennis	Marshall	dmarshallbv@bloglines.com		51.104.218.177	3544646067494556	Pakistan		\N		
-1454461771	3	Evelyn	Morgan	emorgan2@altervista.org	Female	7.161.136.94	6767119071901597	Russia	2/1/1960	144972.51	Structural Engineer	
-1454461843	832	Anthony	Duncan	aduncann3@merriam-webster.com	Male	54.202.218.90	3561384853362062	China	10/5/1982	239812.39	Human Resources Manager	
-1454461880	648	Eric	Bryant	ebryanthz@tripod.com	Male	11.228.180.159		Sweden	3/21/1981	46534.77	Budget/Accounting Analyst I	١٢٣
-1454462013	943	Arthur	Nelson	anelsonq6@sun.com	Male	201.79.146.145	5602257963938888	Ukraine		185554.08		
-1454462053	994	Carol	Williams	cwilliamsrl@army.mil	Female	53.242.60.20		France	1/5/1988	120933.54	Recruiter	
-=== Try load data from userdata2.parquet
-1454457626	638	Richard	Perkins	rperkinshp@princeton.edu	Male	206.117.180.117		China	4/11/2000	123221.64	Tax Accountant	
-1454457675	77	Doris	Elliott	delliott24@shinystat.com	Female	36.27.140.126		Portugal	9/23/1987	98288.74	Design Engineer	
-1454457741	472	Sara	Collins	scollinsd3@yellowbook.com	Female	238.228.239.222	5002357683259593	Philippines	1/6/1966	220244.65	Internal Auditor	-1E02
-1454457764	681	Samuel	Foster	sfosteriw@github.io	Male	101.228.90.125	676725448783712104	Brazil	6/27/1982	275514.12	Office Assistant II	
-1454457800	216	Robin	Reed	rreed5z@guardian.co.uk		191.104.133.70		Portugal	3/15/1978	\N	Desktop Support Technician	test⁠test‫
-1454457912	321	Joe	Collins	jcollins8w@google.com.hk	Male	135.236.105.189	3573647966682865	Dominican Republic		106582.46		
-1454457928	837	Jonathan	Romero	jromeron8@hp.com	Male	129.49.88.101	30180713638645	Brazil	2/27/1957	238966.77	Speech Pathologist	
-1454457982	95	Teresa	Ruiz	truiz2m@diigo.com	Female	22.118.240.24	337941028849437	Brazil	7/25/1994	243603.67	Cost Accountant	
-1454458012	218	Samuel	Reed	sreed61@sohu.com	Male	131.124.128.124	3540638382406385	Brazil		257041.54		
-1454458014	128	Harold	Jenkins	hjenkins3j@hostgator.com		204.144.188.106	374283629923426	Dominican Republic		\N		
-1454458024	26	Sandra	Coleman	scolemanp@blogger.com	Female	230.159.39.252	3555708337891155	China	8/7/1971	113688.11	VP Sales	
-1454458038	609	Joyce	Palmer	jpalmergw@mashable.com	Female	164.56.14.55	6371540406366768	China		201121.46		
-1454458083	879	Kevin	Meyer	kmeyeroe@squarespace.com	Male	233.187.65.16		France		98010.89		
-1454458190	705	Beverly	Gonzales	bgonzalesjk@wufoo.com	Female	38.31.68.95	4405331360959318	Philippines	9/21/1957	42738.65	Director of Sales	
-1454458307	237	Richard	Grant	rgrant6k@etsy.com	Male	241.252.232.2	6304639002149768801	Poland	2/23/1991	71635.33	Paralegal	
-1454458377	986	Melissa	George	mgeorgerd@apple.com	Female	143.50.124.180	5602226915795555	Czech Republic	12/6/1962	63403.41	Internal Auditor	
-1454458390	181	Scott	Marshall	smarshall50@geocities.jp	Male	137.234.29.113	3571996025746621	Philippines	4/23/1978	206952.7	Staff Scientist	␣
-1454458452	61	Sean	Greene	sgreene1o@goo.gl	Male	71.195.178.59	5602246313163081	China	2/20/1991	70656.63	Sales Representative	
-1454458464	327	Janice	Matthews	jmatthews92@guardian.co.uk	Female	71.195.173.202	6304527633260205	Russia	7/29/2000	157292.61	Physical Therapy Assistant	
-1454458470	657	Kathy	Boyd	kboydi8@skyrock.com		36.183.199.94	6389206450992194	China	4/24/1982	\N	General Manager	🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧
-1454458494	390	Chris	Mason	cmasonat@purevolume.com	Male	21.36.118.254		China	4/28/1983	168120.17	Sales Representative	
-1454458497	365	Albert	Mills	amillsa4@t.co	Male	181.108.162.242		China	8/25/1962	180913.71	Recruiter	
-1454458508	999	Marie	Medina	mmedinarq@thetimes.co.uk	Female	223.83.175.211		Kazakhstan	3/25/1969	53564.76	Speech Pathologist	
-1454458512	185	Brandon	Williamson	bwilliamson54@vimeo.com	Male	4.249.36.104	4913822210519505	Russia		277603.75		
-1454458529	5	Howard	Miller	hmiller4@fema.gov	Male	103.193.150.230	3583473261055014	France	11/26/1998	50210.02	Senior Editor	
-1454458591	978	Jean	Jacobs	jjacobsr5@springer.com	Female	143.77.255.89	6377468383747335	Guatemala	11/13/1977	218108.02	Accounting Assistant III	
-1454458647	788	Dennis	Price	dpricelv@google.co.jp	Male	50.213.201.120	3588056573581168	Albania	10/29/1962	218338.58	Environmental Specialist	
-1454458655	450	Rose	Mccoy	rmccoych@livejournal.com	Female	91.93.75.71		Dominican Republic	1/2/1972	192818.85	Executive Secretary	\N
-1454458657	213	Norma	Garrett	ngarrett5w@technorati.com	Female	65.49.237.93		Albania		80916.71		
-1454458725	110	Theresa	Gardner	tgardner31@photobucket.com	Female	232.118.202.192		Ukraine	1/6/1982	243844.4	Health Coach II	
-1454458764	346	Thomas	Richards	trichards9l@ifeng.com	Male	0.111.159.70	5610777337517834253	Thailand	2/19/1981	221644.31	Analog Circuit Design manager	
-1454458768	430	Linda	Harvey	lharveybx@google.ca	Female	138.19.27.11		Indonesia	8/19/1961	200606	Teacher	-1/2
-1454458782	287	Martin	Ferguson	mferguson7y@eventbrite.com	Male	67.188.95.86		Portugal	7/2/1981	262746.89	Cost Accountant	
-1454458853	926	Joan	Graham	jgrahampp@icio.us	Female	209.238.1.225	3557860962551501	China	3/1/1972	197284.8	Chief Design Engineer	‪‪test‪
-1454458888	533	Sarah	Jordan	sjordanes@europa.eu	Female	120.197.115.153	5002357582121340	Indonesia	9/10/1963	146649.24	Programmer Analyst IV	
-1454458948	2	Walter	Collins	wcollins1@bloglovin.com	Male	247.28.26.93	3587726269478025	China		\N		
-1454459077	720	Theresa	Hayes	thayesjz@dion.ne.jp	Female	43.78.228.159		Russia		231701.16		
-1454459120	214	Margaret	Hughes	mhughes5x@biglobe.ne.jp	Female	36.234.5.134	3546342491809456	Azerbaijan		127862.72		˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥
-1454459148	737	Joseph	Gray	jgraykg@bbb.org	Male	60.23.118.26	3540391233313117	United States		159699.28		
-1454459184	419	Larry	Black	lblackbm@github.com	Male	61.181.102.70	5108758999951786	Canada	4/12/1997	263463.01	Staff Accountant I	
-1454459341	559	Raymond	Gray	rgrayfi@mapy.cz	Male	104.112.4.152	201619406564124	Brazil	4/29/1955	132421.37	VP Quality Control	和製漢語
-1454459366	71	Jacqueline	Wallace	jwallace1y@dagondesign.com	Female	203.83.140.84	3578315582149538	Turkmenistan	4/15/1997	89436.49	Cost Accountant	
-1454459447	315	Earl	Rivera	erivera8q@weebly.com	Male	249.22.156.255	6333306262684398	Macedonia		33051.81		""""
-1454459464	298	Johnny	Kelly	jkelly89@dailymail.co.uk	Male	56.120.150.167	4614973744018	Malaysia	10/20/1965	254369.91	Automation Specialist III	
-1454459540	329	Mary	Diaz	mdiaz94@macromedia.com	Female	60.49.220.52	5108751463671162	Mongolia	9/12/1997	112279.71	Project Manager	
-1454459624	842	Brenda	Jones	bjonesnd@mysql.com	Female	200.142.153.124		Colombia	10/1/1963	250051.84	Safety Technician III	
-1454459634	775	Lillian	Ryan	lryanli@t-online.de	Female	152.216.220.164	3541599165648107	Iran	8/19/1967	138178.35	VP Marketing	
-1454459634	998	Stephanie	Sims	ssimsrp@newyorker.com	Female	135.66.68.181	3548125808139842	Poland		112275.78		
-1454459658	659	Julie	Anderson	jandersonia@shareasale.com	Female	21.61.224.82	343450744553044	Netherlands	12/27/1976	68225.51	Compensation Analyst	
-1454459679	634	Harry	Olson	holsonhl@skyrock.com	Male	57.82.212.119	5002351465267817	Chile	4/3/1956	173608.69	Assistant Professor	
-1454459732	892		Thompson		Female	9.228.212.189		Czech Republic	10/3/1964	184732.94	Budget/Accounting Analyst IV	
-1454459817	495	Steve	Ramos	sramosdq@go.com	Male	209.215.139.231	5602239349519376	France		194636.12		
-1454459838	271	Nicole	Wright	nwright7i@businessinsider.com	Female	213.168.29.131	3551761943539373	Chile	2/22/1967	34243.03	Budget/Accounting Analyst III	
-1454459839	424	Kimberly	Coleman	kcolemanbr@bizjournals.com	Female	83.237.12.153	5641829981259605	Iran		280387.11		
-1454459870	701	Bobby	Chavez	bchavezjg@tinypic.com	Male	71.18.120.35	3575292555485293	China	5/20/1965	13910.56	Product Engineer	åß∂ƒ©˙∆˚¬…æ
-1454459921	954	Willie	Thomas	wthomasqh@earthlink.net	Male	173.219.113.26	3560763628353111	Mexico	5/31/1990	201325.44	Programmer Analyst I	
-1454459944	694	Theresa	Graham	tgrahamj9@amazon.com	Female	176.19.106.64	3539554098566813	China	4/8/1983	155735.87	Administrative Assistant III	
-1454459984	693	Jonathan	Graham	jgrahamj8@berkeley.edu	Male	239.139.123.46	3581752291204508	Sweden	9/12/1961	16159.02	Statistician III	
-1454460022	127	Anna	Moreno	amoreno3i@cafepress.com	Female	2.85.251.176	5610875550247635	Guatemala	12/30/1983	156757.41	Research Nurse	
-1454460158	232	Susan	Burns	sburns6f@cbsnews.com	Female	2.93.31.196	5602245359290816	China	10/25/1992	58832.39	Research Assistant IV	
-1454460185	711	Alice	Robertson	arobertsonjq@sakura.ne.jp	Female	182.147.6.194		Thailand	8/9/1955	54046.02	Legal Assistant	
-1454460227	661	Phyllis	Brown	pbrownic@macromedia.com	Female	115.89.196.124		Brazil	7/31/1990	245014.11	Librarian	
-1454460293	146	Christina	Gibson	cgibson41@over-blog.com	Female	226.138.197.167		China	3/14/1987	201589	Accountant II	
-1454460311	259	Donna	Marshall	dmarshall76@jimdo.com	Female	249.36.126.149	6709877241918640	Indonesia	4/15/1986	281443.65	Structural Engineer	１２３
-1454460317	899	Harold	Robinson	hrobinsonoy@privacy.gov.au	Male	94.237.36.16	5602247816220394	Philippines	10/3/1955	181832.97	Civil Engineer	0/0
-1454460450	391		Stone		Female	205.229.198.173		Portugal	10/13/1968	173807.29	Web Developer I	
-1454460563	814	Kelly	Riley	krileyml@4shared.com		166.51.39.101	3529610026130015	China	6/24/1987	\N	Data Coordiator	
-1454460586	350	Ruth	Green	rgreen9p@vk.com	Female	170.37.204.80	3567581372052553	Poland	10/30/1990	76094.37	Community Outreach Specialist	
-1454460599	284	Joyce	Bryant	jbryant7v@stumbleupon.com	Female	125.142.215.135	3551722227261571	Czech Republic		26866.76		""""
-1454460658	129	Paula	Oliver	poliver3k@barnesandnoble.com	Female	108.49.104.111	3551237510305944	China		149572.54		
-1454460668	85	John	Hudson	jhudson2c@rediff.com	Male	75.191.191.171	3538638405093479	Georgia	6/22/1994	82621.71	Tax Accountant	
-1454460753	578	Clarence	Gonzales	cgonzalesg1@fc2.com		13.29.242.81	30237628216824	Norway		\N		
-1454460790	754	Rose	Brooks	rbrookskx@chron.com	Female	99.103.60.118	201422963957371	China	4/8/1994	201004.89	Legal Assistant	1/2
-1454460792	118	Charles	Gonzalez	cgonzalez39@google.com.au	Male	52.126.168.127		Nigeria	8/26/1958	108318.24	Internal Auditor	
-1454460806	479	Henry	Scott	hscottda@cornell.edu	Male	53.161.182.142	5602240199354518	Indonesia	6/22/1992	32141.19	Assistant Professor	
-1454460806	791	Anthony	Butler	abutlerly@springer.com	Male	84.141.89.156		Czech Republic	8/21/1969	282078.29	Health Coach IV	
-1454460833	1000	Alice	Peterson	apetersonrr@parallels.com	Female	244.89.94.58	5602227843485236	Nigeria		239858.7		
-1454460836	246	Billy	Spencer	bspencer6t@mozilla.com	Male	1.121.193.207	5127963978663124	Malta		275300.87		
-1454460842	236	Susan	Wilson	swilson6j@mapy.cz	Female	253.105.50.250	4913609318117229	Cameroon	5/10/2000	135956.76	Director of Sales	
-1454460867	161	Janice	Armstrong	jarmstrong4g@sciencedirect.com	Female	76.231.89.120	6759331684315962	Philippines	7/14/1996	64638.14	Project Manager	
-1454460947	250		Larson		Male	250.66.116.249	6709520051264027651	Indonesia	9/30/1975	121560.88	Staff Accountant I	
-1454460979	951	Arthur	Long	alongqe@devhub.com	Male	92.244.136.245	4175006438208322	China	3/4/1959	74667.22	Pharmacist	
-1454461020	339	Doris	Bennett	dbennett9e@de.vu	Female	98.5.171.133	4041599256556998	Nicaragua		85802.06		$1.00
-1454461049	725	Patrick	Rodriguez	prodriguezk4@blogs.com	Male	233.167.251.29	3543135453573752	Poland	8/10/1956	129023.91	Web Designer IV	
-1454461082	359	Ruby	Fox	rfox9y@chron.com	Female	39.224.24.103	3566813987246457	Moldova		199091.31		
-1454461084	488	Mark	Weaver	mweaverdj@dot.gov	Male	36.130.233.58	3568615406520315	China		225258.27		
-1454461184	802	Joyce	Lopez	jlopezm9@ocn.ne.jp	Female	232.61.24.78		Ecuador		258343.17		
-1454461219	258	Paul	Gordon	pgordon75@gravatar.com	Male	160.61.49.169	3567008825292446	Czech Republic	2/25/2000	258680.6	Structural Analysis Engineer	
-1454461293	230	Victor	Campbell	vcampbell6d@stumbleupon.com	Male	212.43.106.70		China	9/19/1993	42985.78	Analog Circuit Design manager	
-1454461314	421	Timothy	Gomez	tgomezbo@examiner.com	Male	33.5.250.113	373343849259778	Czech Republic		215485.48		
-1454461350	944	Kelly	Hanson	khansonq7@phpbb.com		250.78.86.48		United States	1/2/1969	\N	Account Executive	
-1454461510	985	Rachel	Holmes	rholmesrc@hubpages.com	Female	182.16.233.193	3578965006812598	Nigeria	4/1/1980	273229.15	Assistant Professor	
-1454461537	400	Arthur	Smith	asmithb3@accuweather.com	Male	107.97.38.111	5602233710304252	China	1/30/1985	114652.62	Mechanical Systems Engineer	
-1454461604	993	Christina	Hayes	chayesrk@xing.com	Female	199.58.20.93		North Korea	10/30/1967	121659.5	Librarian	
-1454461701	67	Tina	Reid	treid1u@163.com	Female	116.38.145.226		Germany	4/25/1967	228301.51	Financial Analyst	
-1454461723	708	Carlos	Mason	cmasonjn@state.tx.us	Male	171.189.25.159	5402971302511824	Thailand	4/8/1965	163810.9	Business Systems Development Analyst	
-1454461756	816	Sara	Sanders	ssandersmn@cornell.edu	Female	54.250.225.134		Netherlands	7/26/1998	261953.95	Quality Engineer	
-1454461763	299	Diane	Watkins	dwatkins8a@netvibes.com		141.246.209.93		Yemen		\N		
-1454461897	976	Paula	Ross	prossr3@tumblr.com		39.229.193.40	3535447138661799	Jordan	8/19/1990	\N	Budget/Accounting Analyst IV	
-1454461902	56	Thomas	Freeman	tfreeman1j@java.com	Male	161.123.216.250	3536920916224146	Colombia	8/4/1973	239571.27	Senior Developer	
-=== Try load data from userdata3.parquet
-1454457607	457	Clarence	Hunt	chuntco@drupal.org	Male	89.135.47.216		Zambia	9/27/1977	97179.31	Staff Accountant III	1E02
-1454457613	723	Arthur	Jones	ajonesk2@theguardian.com	Male	31.151.216.146		France	2/6/1986	12068.96	Teacher	
-1454457706	234	Doris	Grant	dgrant6h@nasa.gov	Female	195.132.180.36	5602256096038525	Colombia	7/14/1969	283813.79	Senior Cost Accountant	
-1454457712	14	Eric	Parker	eparkerd@usa.gov	Male	25.73.91.135	5602249431899032	Russia	8/12/1986	102832.54	Tax Accountant	
-1454457781	846	Sharon	Porter	sporternh@yelp.com	Female	206.179.138.50	6706029727013149	Colombia	7/3/1966	175902.84	Project Manager	
-1454457884	637	Frank	Hudson	fhudsonho@walmart.com	Male	52.37.91.110	4405081678166102	China	2/7/1997	126102.31	Senior Developer	
-1454457968	134	Teresa	Gray	tgray3p@ox.ac.uk	Female	60.117.57.222		China	9/18/1994	159276.6	Assistant Media Planner	
-1454458022	549	Aaron	Reid	areidf8@topsy.com	Male	117.148.230.113		Russia	3/25/1983	211580.8	Product Engineer	
-1454458079	156	Ann	Morris	amorris4b@newyorker.com	Female	14.165.90.97	3553147941910493	Indonesia	6/4/1956	158396.75	Engineer I	
-1454458121	794	Joshua	Flores	jfloresm1@sphinn.com	Male	84.212.10.197	3587575297567030	China	2/9/1989	267751.84	Developer III	
-1454458182	604	Steve	Castillo	scastillogr@ezinearticles.com	Male	159.158.95.181	3545937730645529	China	6/8/1993	86028	Programmer III	
-1454458233	64	Rose	Fernandez	rfernandez1r@usgs.gov	Female	199.141.221.229	3564435193511524	Brazil	5/5/1972	196329.18	Senior Cost Accountant	
-1454458334	79	Robin	Price	rprice26@jugem.jp	Female	235.141.108.176	5610389618618837	Russia	1/7/1977	120293.75	Biostatistician IV	
-1454458337	86		West		Female	247.72.186.254	3541609903446548	Indonesia	12/11/1984	132544.98	Physical Therapy Assistant	
-1454458375	939	Craig	Jones	cjonesq2@de.vu	Male	154.208.206.255		Indonesia	1/29/1989	266312.01	Safety Technician II	
-1454458415	805	George	Meyer	gmeyermc@google.nl	Male	146.59.222.51		Syria	5/28/1973	242409.4	Analog Circuit Design manager	
-1454458434	914	Earl	Martinez	emartinezpd@squidoo.com	Male	150.29.51.94	677135530260451546	Philippines	10/25/1970	257708.77	Software Engineer II	1E+02
-1454458516	5	Jacqueline	Ellis	jellis4@amazon.com	Female	158.137.238.6		Russia	7/12/1959	286038.78	Marketing Assistant	
-1454458597	371	Heather	Fisher	hfisheraa@printfriendly.com	Female	190.23.234.91	6304245587473860	Portugal	4/24/1955	101118.28	Associate Professor	
-1454458619	680	Mildred	Dean	mdeaniv@alibaba.com	Female	173.255.221.184	3576992005749797	Armenia	4/3/1979	78889.63	Desktop Support Technician	"__ﾛ(
-1454458806	695	Ashley	Olson	aolsonja@noaa.gov	Female	233.175.155.3	376319939588935	Indonesia	5/8/1979	256795.8	Systems Administrator III	
-1454458825	946	Beverly	Henderson	bhendersonq9@amazon.com	Female	96.37.213.162	3554635936579520	Russia	8/4/1979	65339.1	VP Marketing	
-1454458897	881		Collins		Male	100.212.189.244	3531552235272517	South Korea	7/5/1981	72539.92	VP Sales	
-1454458915	332	Raymond	Ward	rward97@drupal.org	Male	89.82.25.71	3538744508795034	South Africa	5/4/1994	163739.08	Data Coordiator	
-1454458981	216	Judy	Gutierrez	jgutierrez5z@ftc.gov	Female	120.107.239.171		China	11/13/1965	36744.51	Statistician I	🐵 🙈 🙉 🙊
-1454458994	539	Donald	Holmes	dholmesey@examiner.com	Male	24.129.145.78	3532611982139532	Czech Republic	11/7/1988	256744.28	Administrative Assistant I	
-1454459168	721	Christopher	Hunt	chuntk0@blogtalkradio.com	Male	69.240.85.94	201463274401428	Indonesia	6/8/1968	32269.1	Data Coordiator	
-1454459172	733	Bonnie	Hawkins	bhawkinskc@vinaora.com	Female	150.107.139.217	5010121004388204	China	8/28/1971	133958.72	Information Systems Manager	
-1454459204	768	Victor	Nichols	vnicholslb@blogs.com	Male	231.113.119.58	3587933684998468	France		13777.53		
-1454459243	803	Donald	Wood	dwoodma@parallels.com	Male	212.8.149.51	67610717455795070	Mexico	6/22/1971	20752.43	Chief Design Engineer	Œ„´‰ˇÁ¨ˆØ∏”’
-1454459252	752	Mark	Gomez	mgomezkv@hud.gov	Male	116.39.31.225	337941154145279	Indonesia	1/12/1965	232731.06	Professor	
-1454459281	282	Jason	Kelly	jkelly7t@themeforest.net	Male	129.110.129.46	3532753335256769	Botswana		122812.35		
-1454459307	681	Carlos	Fields	cfieldsiw@trellian.com	Male	253.69.168.229	3573119954905542	Japan		121346.35		
-1454459430	892	Gloria	Fowler	gfowleror@apache.org	Female	31.26.133.176	5602245069101311	Jamaica	5/31/1962	172923.11	Desktop Support Technician	-1E+02
-1454459462	728	Jacqueline	Porter	jporterk7@example.com	Female	183.189.204.28	3558636209028613	China	2/18/1966	60948.17	VP Marketing	
-1454459482	847	Brenda	Hall	bhallni@craigslist.org	Female	239.232.28.195		Sweden	12/5/1962	14658.92	Senior Quality Engineer	
-1454459511	512	Phyllis	Rice	pricee7@t-online.de	Female	141.247.60.33	4041591621552	China	3/9/1992	74670.8	Web Developer I	
-1454459535	331	Patrick	White	pwhite96@sina.com.cn	Male	145.132.114.239	3534146356970178	Ukraine	1/19/1994	96246.01	Executive Secretary	
-1454459549	611	Elizabeth	Day	edaygy@archive.org	Female	244.129.35.183	4903539550370988748	China	6/28/1974	217382.97	Paralegal	𠜎𠜱𠝹𠱓𠱸𠲖𠳏
-1454459623	424	Lillian	Vasquez	lvasquezbr@about.me	Female	15.233.130.74	6706936038940735306	Netherlands	6/28/2000	256419.66	Account Representative I	
-1454459691	579	Irene	Day	idayg2@theglobeandmail.com	Female	124.253.55.20	3564632724049897	Argentina	9/3/1974	58715.23	Teacher	
-1454459729	362	Melissa	Stephens	mstephensa1@comsenz.com	Female	105.158.98.174	3534057744078246	Philippines	1/22/1974	210781.96	Cost Accountant	᠎
-1454459735	103	Justin	Grant	jgrant2u@lycos.com	Male	251.111.132.81	3542141314461899	China	1/7/2001	140911.2	Project Manager	
-1454459793	662	Jesse	Gonzales	jgonzalesid@google.fr	Male	215.192.238.90	3550826252709387	Peru	7/22/1978	260505.75	Environmental Specialist	
-1454459819	866	Andrea	Carpenter	acarpentero1@taobao.com	Female	246.154.31.121		Japan	3/6/1984	248740.81	Senior Quality Engineer	
-1454459841	923	Marilyn	Long	mlongpm@walmart.com	Female	215.6.99.179	5602241011840536	Cameroon	10/28/1964	110571.54	Social Worker	
-1454459858	560	Judy	Wright	jwrightfj@blogs.com		7.139.209.42	560222806370845260	Colombia	3/6/1961	\N	Software Test Engineer IV	
-1454459862	244	Diane	Hawkins	dhawkins6r@hatena.ne.jp	Female	90.247.138.242	4026763155071942	China	5/10/1968	171218.47	Help Desk Operator	
-1454459921	639	Gloria	Fields	gfieldshq@mlb.com	Female	76.62.183.159	6334660493144630501	Peru	5/7/1996	210991.41	Accounting Assistant II	
-1454459945	193	Catherine	Rivera	crivera5c@liveinternet.ru	Female	197.164.37.102	4903900636714991	China	10/17/1984	240545.5	Cost Accountant	
-1454459958	186	Larry	Coleman	lcoleman55@imdb.com	Male	139.205.254.237	3549906950974212	Germany	12/19/1958	182376.29	Compensation Analyst	
-1454459959	195	Andrew	Henderson	ahenderson5e@ftc.gov	Male	44.116.118.204		United States	5/27/1977	108242.9	Accountant I	
-1454460044	743	Mildred	Clark	mclarkkm@issuu.com	Female	179.135.234.32	3589587359210761	Philippines		268426		-1E+02
-1454460050	189	Samuel	Fox	sfox58@bing.com	Male	220.161.213.119	3535192418612498	Argentina	9/2/1991	56084.78	Marketing Assistant	
-1454460053	209	Anne	Flores	aflores5s@marketwatch.com	Female	8.136.212.14		Canada	6/17/1964	195673.07	Occupational Therapist	
-1454460230	956	John	Baker	jbakerqj@exblog.jp	Male	96.167.232.236		Spain	9/29/1992	177531.95	Sales Representative	
-1454460278	683	Paula	Johnston	pjohnstoniy@marketwatch.com	Female	246.57.43.147	560221588257454843	Mongolia	10/20/1978	227145.54	Administrative Officer	
-1454460325	341	Samuel	Jordan	sjordan9g@jimdo.com	Male	183.29.32.119	3535569167756420	China	3/29/1975	130541.17	Safety Technician IV	
-1454460330	654	Michael	Sims	msimsi5@discuz.net	Male	169.136.209.75		Bulgaria	6/14/1982	277854.98	Recruiting Manager	
-1454460342	814	Deborah	Hudson	dhudsonml@parallels.com		186.205.3.210		Ukraine	11/3/2000	\N	Marketing Manager	
-1454460373	813	Mildred	Harris	mharrismk@vistaprint.com	Female	250.65.167.151	3577530968521354	Greece		238399.8		
-1454460382	624	Wayne	Henry	whenryhb@dedecms.com	Male	173.2.93.236		China		147631.62		
-1454460446	1000	Wanda	Brooks	wbrooksrr@yellowpages.com	Female	241.43.62.149	3539260761630759	Japan		158607.84		
-1454460471	685	Joe	Rivera	jriveraj0@ebay.com	Male	101.130.15.106	4903855508114581	Thailand		74067.89		
-1454460482	330	Robin	Campbell	rcampbell95@stanford.edu	Female	144.152.165.130	4662544509352	Sierra Leone	4/9/1969	64481.72	Quality Engineer	
-1454460569	67	Eric	Armstrong	earmstrong1u@arizona.edu	Male	128.202.252.112	4041590574307	Indonesia	5/30/1973	75347.18	Web Designer II	
-1454460587	37	Frank	Stevens	fstevens10@samsung.com	Male	61.182.84.178		Philippines	3/19/1958	47326.14	VP Product Management	
-1454460615	42	Carlos	Armstrong	carmstrong15@technorati.com	Male	85.22.216.153	3532000356234436	Indonesia		23446.58		
-1454460668	556	Lisa	Turner	lturnerff@ustream.tv	Female	192.4.71.81	3579076936527626	China		127717.62		
-1454460696	958	Howard	Gomez	hgomezql@people.com.cn		226.78.136.12	6706662408386172373	Philippines		\N		test⁠test‫
-1454460697	959	Kimberly	Alvarez	kalvarezqm@gizmodo.com	Female	244.177.51.246	30135810163038	Philippines	8/5/1976	211292	Design Engineer	
-1454460701	612	Dorothy	Hanson	dhansongz@i2i.jp	Female	165.73.75.69		Azerbaijan	9/5/1971	246728.41	Information Systems Manager	
-1454460759	126	Amy	Roberts	aroberts3h@dyndns.org	Female	166.99.225.202		Costa Rica		273960.79		𠜎𠜱𠝹𠱓𠱸𠲖𠳏
-1454460768	822	Jane	Tucker	jtuckermt@arizona.edu	Female	43.88.112.223		Sweden		55680.59		
-1454460788	41	Joyce	Butler	jbutler14@csmonitor.com	Female	88.243.175.236		Indonesia		135825.27		
-1454460812	496	Jesse	Cole	jcoledr@sogou.com	Male	106.227.88.115	50184107778776571	Peru	6/2/1965	205296.96	Actuary	
-1454460898	516	Wayne	Carter	wcartereb@g.co	Male	151.122.136.210	3547971451281253	Portugal	1/22/1992	122139.24	Cost Accountant	
-1454460912	571	Joan	Chavez	jchavezfu@com.com	Female	17.161.255.139		Poland	10/16/1972	277679.98	Safety Technician I	
-1454460930	166	Pamela	Perkins	pperkins4l@wsj.com	Female	237.225.95.141	378608444146629	China		141169.54		
-1454460959	128	Wayne	Kim	wkim3j@cdc.gov		196.5.87.192	5007668319479461	Malaysia	1/27/1979	\N	Internal Auditor	
-1454460980	465	Julie	Phillips	jphillipscw@ning.com	Female	186.219.160.248	5602251286921119	Spain	6/10/1976	120755.68	Marketing Manager	/dev/null; touch /tmp/blns.fail ; echo
-1454460991	144	Martha	Martin	mmartin3z@sakura.ne.jp	Female	220.126.107.146	201779098970730	New Zealand	5/23/1985	88724.94	Administrative Officer	
-1454461001	874	Laura	Wells	lwellso9@mit.edu	Female	135.67.140.204	5482317399663099	Sweden	12/4/1993	262303.96	Environmental Tech	
-1454461065	833	Lois	Lee	lleen4@zdnet.com	Female	31.87.204.102	5602245033844400	Bulgaria		113425.72		
-1454461292	575	Jessica	Watkins	jwatkinsfy@marketwatch.com	Female	165.50.211.193	201566979007298	Macedonia	7/12/1989	253506.67	Food Chemist	
-1454461361	184	Clarence	Moore	cmoore53@bloglines.com	Male	212.30.218.42		Indonesia	6/16/1974	283539.78	Internal Auditor	
-1454461642	406	Frances	Ray	frayb9@theguardian.com	Female	24.12.13.133	3555958533555779	Colombia	9/19/2000	282052.82	Staff Accountant III	
-1454461847	446	Helen	Ward	hwardcd@indiegogo.com	Female	249.175.182.167	3550054667502541	Colombia	2/15/1959	115934.54	Graphic Designer	
-1454461863	101	Irene	Adams	iadams2s@biblegateway.com	Female	135.79.211.166		Palestinian Territory	7/29/1994	73723.8	Help Desk Technician	00˙Ɩ$-
-1454461907	99	Ruth	Howell	rhowell2q@cornell.edu	Female	190.170.191.14		China	5/2/1969	286113.38	Senior Quality Engineer	
-1454461978	340	Gloria	Wilson	gwilson9f@soup.io	Female	116.58.188.151	3539542269827494	Croatia		206401.2		
-1454462106	132	Amanda	Porter	aporter3n@cloudflare.com	Female	64.254.17.111		Brazil	7/26/1964	41956.4	Nurse	
-1454462425	102	Ralph	Walker	rwalker2t@sitemeter.com		101.111.216.188		Peru	4/15/1959	\N	VP Accounting	
-1454462469	188	Christine	Rodriguez	crodriguez57@sciencedaily.com		240.122.189.81	6397046163164230	China	12/13/1998	\N	Sales Representative	
-1454462692	106	Cynthia	Vasquez	cvasquez2x@washingtonpost.com	Female	70.52.238.194		Kazakhstan		175907.62		1E+02
-1454462763	121	Heather	Davis	hdavis3c@hhs.gov	Female	154.156.181.140		Poland		71140.46		
-1454462944	704	Patrick	Torres	ptorresjj@ask.com	Male	122.10.211.188	5602254083107544	Russia	10/28/1995	119841.99	Environmental Tech	
-1454463056	718	Tammy	Simpson	tsimpsonjx@imdb.com	Female	28.114.238.250	5602250512089980	Russia	4/30/1987	240161.08	Human Resources Manager	-1/2
-1454463110	548		Ryan			48.44.183.147		Russia	12/7/1999	\N	Recruiting Manager	
-1454463111	206	Jeremy	Boyd	jboyd5p@sciencedirect.com	Male	190.221.209.41		Mexico	8/17/1963	169562.93	Legal Assistant	$1.00
-=== Try load data from userdata4.parquet
-1454544135	174	Arthur	Bishop	abishop4t@deliciousdays.com	Male	23.143.216.45	3543731590226021	Portugal		74352.02		
-1454544166	397	Adam	Harrison	aharrisonb0@symantec.com	Male	24.23.251.104	30250631299455	United States	10/14/1976	220537.78	Systems Administrator IV	
-1454544275	676	Julia	Turner	jturnerir@tripadvisor.com	Female	246.75.105.64	3573355428855000	Philippines	9/23/1975	43244.37	Engineer I	
-1454544290	694	Carol	Griffin	cgriffinj9@zimbio.com		4.106.189.110		Philippines	5/5/1958	\N	Quality Engineer	
-1454544350	790	Michael	Mitchell	mmitchelllx@blog.com	Male	142.112.74.125		China		74089.46		
-1454544355	372	Brandon	Hicks	bhicksab@unicef.org	Male	14.1.141.83	564182403737341280	China	10/4/1985	62678.54	Sales Representative	
-1454544427	582	Annie	Spencer	aspencerg5@gizmodo.com	Female	193.135.127.103		Philippines	7/29/1965	32342.28	Cost Accountant	
-1454544628	802	Lois	Gibson	lgibsonm9@mayoclinic.com	Female	226.250.177.108	5610916546870112	Thailand	5/16/1955	149273.02	Occupational Therapist	
-1454544647	382	Paul	Sanders	psandersal@photobucket.com	Male	216.84.37.205	6385564398040268	Sweden	6/9/1980	240223.98	Mechanical Systems Engineer	1
-1454544648	364	Jason	Fox	jfoxa3@unesco.org	Male	184.48.48.126		Japan	8/9/1976	84483.3	Mechanical Systems Engineer	
-1454544719	716	Diana	Little	dlittlejv@shop-pro.jp	Female	168.15.235.95		Argentina		267712.23		
-1454544765	766	Lisa	Harper	lharperl9@boston.com	Female	26.253.184.166	4903454632131201206	China	9/30/1986	177862.14	Analog Circuit Design manager	
-1454544797	471	Linda	Arnold	larnoldd2@yellowbook.com	Female	25.72.220.19	3573669257084239	Indonesia	2/6/1983	249094.03	GIS Technical Architect	"
-1454544833	508	Andrea	Alvarez	aalvareze3@amazon.co.uk	Female	94.93.141.212		Indonesia		165484.69		　
-1454544883	991	Mary	Willis	mwillisri@i2i.jp	Female	188.83.241.84		Russia	9/4/1992	133498.3	Payment Adjustment Coordinator	
-1454544907	137	Harry	Thomas	hthomas3s@edublogs.org	Male	203.181.156.216	3586074069338235	Poland	6/6/1979	159098.74	Chemical Engineer	
-1454545008	824	Jack	Hudson	jhudsonmv@hp.com	Male	195.27.62.30		Ukraine	9/19/1970	163426.27	Community Outreach Specialist	
-1454545044	173	Ruth	Welch	rwelch4s@spotify.com	Female	7.253.134.135	3543426983427878	Japan	8/6/1964	203330.7	Paralegal	
-1454545053	225	Judy	Greene	jgreene68@discovery.com		246.203.234.47	589310636256482728	Dominica		\N		
-1454545135	948	Janet	Lawson	jlawsonqb@indiatimes.com	Female	90.48.142.31	4026186827051821	Philippines		197991.65		
-1454545185	757	James	Pierce	jpiercel0@meetup.com	Male	14.116.62.43	5018717793434778	Greece	12/25/1989	17173.34	Assistant Manager	
-1454545221	995	Philip	Mcdonald	pmcdonaldrm@tripadvisor.com	Male	224.59.55.103	5108753554344402	France	4/22/1955	59331.14	Recruiting Manager	
-1454545227	6	William	Williamson	wwilliamson5@trellian.com	Male	44.86.73.201	201849487683564	Indonesia	12/6/1993	95352.25	Librarian	1E+02
-1454545361	770	Gregory	Henderson	ghendersonld@issuu.com	Male	233.65.87.175		Philippines		79047.27		
-1454545379	713	Ruth	Barnes	rbarnesjs@google.it	Female	29.37.239.173	56108753791531632	Sweden	8/23/1965	268965.5	Occupational Therapist	
-1454545666	430	Stephen	Knight	sknightbx@so-net.ne.jp	Male	233.213.210.160		China	7/7/1969	183842.12	Quality Control Specialist	
-1454545825	470	Carl	Freeman	cfreemand1@de.vu	Male	40.13.20.8	5002357075956137	Armenia	1/6/1984	140264.63	Accountant III	
-1454545841	736	Ashley	Black	ablackkf@freewebs.com	Female	130.87.75.86	30046346841197	China	5/8/1991	263407.66	Senior Developer	
-1454545876	36	Earl	Mccoy	emccoyz@bigcartel.com	Male	161.179.122.154	5038877150819047588	Japan	10/12/1976	114766.43	Software Test Engineer IV	0.00
-1454545911	981	Martin	Hudson	mhudsonr8@senate.gov	Male	103.7.125.212	3580063273741488	Azerbaijan		55371.91		
-1454545934	728	Brandon	Oliver	boliverk7@tuttocitta.it	Male	190.202.45.71	3561315827587251	Norway	10/31/1960	157819.05	Structural Engineer	
-1454545941	224	Julia	Lane	jlane67@networksolutions.com	Female	126.98.58.100	3566544839563357	Brazil	9/24/1975	77279.09	Business Systems Development Analyst	
-1454545957	112	Mildred	Martinez	mmartinez33@wufoo.com		206.47.25.150		Brazil		\N		
-1454546022	147	John	Henry	jhenry42@google.nl	Male	175.38.124.31	3534881822199867	China	7/7/1959	180821.73	Engineer I	"<>?:""{}|_+"
-1454546057	132	Rose	Evans	revans3n@hubpages.com	Female	18.134.14.151	6767390430172490489	United States	2/11/1977	109352.69	Automation Specialist II	
-1454546075	162	Nancy	Sanchez	nsanchez4h@yahoo.com	Female	180.250.167.88		Malawi	5/12/1956	280050.1	Health Coach III	
-1454546122	913	Lisa	Oliver	loliverpc@nydailynews.com	Female	153.239.15.222	201665522335840	Sweden	1/28/1957	180645.76	Marketing Assistant	() { 0; }; touch /tmp/blns.shellshock1.fail;
-1454546163	55	Nancy	Stephens	nstephens1i@godaddy.com	Female	211.0.225.116		Mongolia		20805.69		
-1454546263	498	Lillian	Lynch	llynchdt@posterous.com	Female	13.168.64.88		Brazil	6/18/1982	203558.13	Accountant I	
-1454546287	934	Mark	Dunn	mdunnpx@booking.com	Male	77.125.49.164		Indonesia	7/2/1990	120101.43	Financial Advisor	
-1454546293	748	Carol	Perry	cperrykr@cmu.edu	Female	113.54.30.174	675928304974727871	Colombia		122048.92		
-1454546294	830	Catherine	Rice	cricen1@hexun.com	Female	134.65.177.193		Portugal		100751.27		
-1454546294	924	Jimmy	Nelson	jnelsonpn@rediff.com	Male	244.130.194.232		Norway		259092.5		
-1454546377	431	Pamela	Ruiz	pruizby@java.com		42.71.124.95		Pakistan	9/15/1976	\N	Software Engineer I	
-1454546405	158	Melissa	Alexander	malexander4d@google.pl	Female	186.71.215.96		Greece	5/7/1972	180150.8	VP Marketing	
-1454546406	94	Debra	Sims	dsims2l@meetup.com	Female	150.198.93.159	5602215295621929	Brazil	12/21/1984	276704.96	Office Assistant IV	
-1454546500	909	Cynthia	Smith	csmithp8@house.gov	Female	166.21.108.146	374622628177056	China	9/30/1974	252566.03	Physical Therapy Assistant	
-1454546508	599	John	Lewis	jlewisgm@youtube.com	Male	90.227.58.221		Sweden	5/16/1970	58222.46	Software Engineer II	
-1454546576	617	Jonathan	Hall	jhallh4@upenn.edu	Male	12.13.126.157	491109978928388311	China	5/16/1986	50824.51	GIS Technical Architect	
-1454546653	227	Helen	Green	hgreen6a@vimeo.com	Female	156.198.175.255	5048379124161648	Uganda	10/20/2000	163189.36	Computer Systems Analyst III	
-1454546690	349	David	Washington	dwashington9o@un.org	Male	131.53.93.63	3578517361666653	Greece	10/16/1998	34742.07	Staff Accountant IV	
-1454546703	474	Betty	Cook	bcookd5@admin.ch	Female	23.9.243.170		China	5/16/1962	151829.78	Budget/Accounting Analyst I	
-1454546726	767	Philip	Burton	pburtonla@zimbio.com	Male	138.134.59.28	3528288812489043	Russia	5/27/1983	241065.94	Software Engineer III	
-1454546741	904	Debra	Wilson	dwilsonp3@desdev.cn	Female	254.162.119.226	630461807132739339	Poland	4/20/1969	107766.71	Financial Analyst	
-1454546820	480	Todd	Wagner	twagnerdb@reuters.com		25.149.209.61	3560449524302754	Tunisia	8/31/1983	\N	Research Associate	
-1454546835	62	Donna	Gonzalez	dgonzalez1p@instagram.com	Female	81.57.136.186		China	3/3/1975	181562.45	Junior Executive	
-1454546857	666	Anthony	Sullivan	asullivanih@boston.com	Male	119.85.206.152	561007482254370160	Portugal	5/20/1970	164827.57	Systems Administrator IV	
-1454546901	366	Julie	Garrett	jgarretta5@wsj.com	Female	40.18.147.38		China		225753.62		
-1454546930	808	Russell	Freeman	rfreemanmf@comcast.net	Male	244.181.177.133	30295400628590	Greece		173731.67		
-1454546970	739	Nicholas	Sanders	nsanderski@scientificamerican.com	Male	13.8.6.64	347899819407351	Portugal	6/3/1991	130727.91	Research Associate	
-1454547011	198	Timothy	Ford	tford5h@vk.com	Male	3.35.147.123	5602236379905962	Morocco	4/27/1998	55901.49	Paralegal	
-1454547029	644	Jean	Cole	jcolehv@mac.com	Female	5.188.221.124		Comoros	7/24/1985	215195.83	Civil Engineer	
-1454547030	916	Andrew	Campbell	acampbellpf@nymag.com	Male	172.206.158.110		Guatemala	8/12/1962	33394.2	Financial Analyst	
-1454547032	264	Charles	James	cjames7b@wordpress.org	Male	40.115.241.175	6761364619849686314	Canada	9/21/1958	227083.18	Professor	
-1454547070	727	Louise	Castillo	lcastillok6@cmu.edu	Female	54.15.177.72	3586380225985649	France	3/22/1978	17830.21	Nurse	
-1454547124	168	Christopher	Hughes	chughes4n@businessinsider.com	Male	23.110.32.151	6304281728252855	Serbia	12/9/1975	220573.8	Design Engineer	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
-1454547192	232	Angela	Evans	aevans6f@a8.net	Female	115.244.254.13	6333718316396730	China	1/7/1968	265380.99	VP Quality Control	
-1454547201	464	Marie	Harris	mharriscv@dot.gov	Female	26.45.137.53		Tajikistan	9/24/1961	203845.4	Analog Circuit Design manager	
-1454547203	427	Rebecca	Thompson	rthompsonbu@wikipedia.org	Female	110.47.151.2		Indonesia	4/29/1992	216830.25	Assistant Manager	
-1454547212	575	Arthur	Reyes	areyesfy@ca.gov	Male	161.254.47.140		Poland	3/9/1962	214072.68	Health Coach I	
-1454547223	564	Rebecca	Ford	rfordfn@stanford.edu	Female	210.231.201.84		Indonesia	9/3/1969	204041.63	Office Assistant II	ÅÍÎÏ˝ÓÔÒÚÆ☃
-1454547242	997	William	Patterson	wpattersonro@omniture.com	Male	149.242.140.255	3528460022712031	Colombia	3/1/2000	108955.05	Executive Secretary	✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿
-1454547281	463	Gerald	Knight	gknightcu@independent.co.uk	Male	34.192.129.107		China	4/27/1975	84585.78	Civil Engineer	⁰⁴⁵
-1454547356	276	Albert	Gordon	agordon7n@examiner.com	Male	88.159.237.102	3534524682255003	Sweden	8/25/1996	265299.22	Assistant Media Planner	
-1454547362	317	Clarence	Simpson	csimpson8s@comsenz.com	Male	104.53.119.249	3586887721906879	Venezuela	3/7/1977	35314.18	Professor	
-1454547369	217	Anthony	Jacobs	ajacobs60@ycombinator.com	Male	59.162.173.59	374283051163301	Ivory Coast	7/11/1988	103409	Safety Technician II	(｡◕ ∀ ◕｡)
-1454547401	230	Jimmy	Bailey	jbailey6d@odnoklassniki.ru	Male	22.173.156.124	3576503167968271	China		197603.47		$1.00
-1454547508	960	Craig	Shaw	cshawqn@wordpress.org	Male	88.203.243.165	5602229798654196	Tanzania	8/5/1999	119584.32	Senior Sales Associate	
-1454547541	585	Bonnie	Snyder	bsnyderg8@ftc.gov	Female	170.100.220.94	3564602303009802	Japan	6/5/1998	89020.39	Desktop Support Technician	
-1454547577	871	Gloria	Howard	ghowardo6@harvard.edu	Female	173.45.99.88		Egypt	8/27/1972	140945.69	Human Resources Assistant I	
-1454547609	878	Kathryn	Snyder	ksnyderod@e-recht24.de	Female	235.195.131.110	6761199763991532	Indonesia	3/29/1973	168235	GIS Technical Architect	
-1454547697	473	Joseph	Coleman	jcolemand4@ucoz.ru	Male	1.40.64.123	4508104337648496	Argentina	6/14/1975	167526.19	Librarian	/dev/null; touch /tmp/blns.fail ; echo
-1454547707	206	Shirley	Ruiz	sruiz5p@dagondesign.com	Female	159.102.238.195	201955789975119	Bosnia and Herzegovina	10/8/1963	197240.2	General Manager	
-1454548013	705	Alan	Sims	asimsjk@ed.gov	Male	180.200.150.10	3531118427209962	Israel	12/8/1982	269504.53	Biostatistician III	
-1454548122	108	Craig	Knight	cknight2z@ucsd.edu	Male	139.37.241.169	3556934424099549	Greece	2/21/1955	247303.71	Senior Financial Analyst	Ω≈ç√∫˜µ≤≥÷
-1454548170	611	Steve	Ford	sfordgy@hubpages.com	Male	190.25.153.64	56022386492755060	China	6/7/1979	39645.72	Health Coach IV	̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕
-1454548319	40	Joan	Price	jprice13@mtv.com		233.4.158.135	3584182571037112	Portugal		\N		
-1454548438	618	Jeremy	Roberts	jrobertsh5@go.com	Male	89.14.246.154		Russia	7/31/1989	273400	Research Assistant II	
-1454548507	314		Dixon		Male	93.252.91.51	670677121929947139	Ireland		209533.24		
-1454548522	522	Eric	Kelley	ekelleyeh@pcworld.com	Male	131.75.70.227		Syria	7/22/1990	163141.3	General Manager	"__ﾛ(
-1454548725	133	Lillian	Collins	lcollins3o@csmonitor.com		80.80.47.76	4175009027155995	Czech Republic		\N		
-1454549109	306	Mark	Boyd	mboyd8h@cocolog-nifty.com	Male	158.13.1.119	3562815747212335	Brazil	2/15/1967	66134.2	Social Worker	
-1454549131	371	Carl	Knight	cknightaa@unc.edu	Male	64.176.41.31		Macedonia	6/4/1973	116193.06	Environmental Specialist	
-1454549158	346	Kathryn	Butler	kbutler9l@washingtonpost.com		32.220.87.246	374288729624402	China	11/24/1972	\N	Staff Accountant II	
-1454549169	59	John	Rogers	jrogers1m@miitbeian.gov.cn	Male	91.131.170.178	3578552255653202	Croatia	9/25/1971	164207.53	Administrative Assistant III	
-1454549202	304	Billy	Howard	bhoward8f@geocities.com	Male	101.47.248.109	3561004867229459	Ireland	2/23/1963	147308.45	Software Test Engineer II	
-1454549230	702	Patricia	Oliver	poliverjh@cmu.edu		18.206.245.40		Ireland		\N		ÅÍÎÏ˝ÓÔÒÚÆ☃
-1454549233	179	Christine	Duncan	cduncan4y@furl.net		49.36.119.18	30544573199206	China	8/15/2000	\N	Mechanical Systems Engineer	
-1454549243	72	Walter	Hill	whill1z@fda.gov	Male	169.189.26.193		Philippines	4/25/1989	170789.26	Executive Secretary	
-1454549360	862	Joseph	Patterson	jpattersonnx@google.it	Male	79.70.102.172	3548682692624495	Argentina		87931.98		
-=== Try load data from userdata5.parquet
-1454544139	20	Debra	White	dwhitej@umn.edu	Female	142.140.184.111		Indonesia		47859.54		
-1454544152	53	Ralph	Simmons	rsimmons1g@google.cn	Male	180.159.250.232	3554040768947822	Pakistan		111413.03		
-1454544187	564	Christine	Willis	cwillisfn@pagesperso-orange.fr	Female	166.102.221.213	3534808021291708	Russia	8/3/1991	112850.81	Desktop Support Technician	
-1454544201	40	Christine	Alexander	calexander13@aboutads.info	Female	163.32.3.92	50183677518131890	China	1/14/1981	213713.99	Sales Associate	
-1454544213	992	Anna	Dean	adeanrj@netvibes.com	Female	113.127.227.85	3586135192218451	Vietnam	5/29/1962	286181.88	Automation Specialist II	
-1454544238	601	Aaron	Kim	akimgo@mayoclinic.com	Male	182.52.179.175	3587685548758112	Kazakhstan	11/6/1963	156217.14	Accounting Assistant I	
-1454544284	903	John	Harris	jharrisp2@goo.ne.jp	Male	65.10.215.144	3565387100757980	China	6/7/1970	153671.44	Analog Circuit Design manager	
-1454544326	325	Billy	Meyer	bmeyer90@nature.com	Male	163.186.10.162	3538589516492193	Colombia	7/20/1983	84716.67	Assistant Professor	
-1454544328	746	Christine	Howell	chowellkp@php.net	Female	71.95.250.29	5100170292026399	China	1/11/1964	30533.25	Account Executive	
-1454544347	353	Alan	Collins	acollins9s@cpanel.net	Male	16.99.94.145	3536005999242155	Guatemala	6/1/1980	38434.4	Software Test Engineer II	・(￣∀￣)・:*:
-1454544495	879	Marie	Vasquez	mvasquezoe@is.gd	Female	101.194.66.108	3563730358790256	China	9/21/1958	12182.09	Nurse	
-1454544507	912	Evelyn	Fisher	efisherpb@soup.io	Female	221.207.200.158	201473318880354	China	5/17/1998	208654.68	Geological Engineer	
-1454544523	923	Jessica	George	jgeorgepm@so-net.ne.jp	Female	119.65.145.55		Russia	6/22/1965	73210.79	Nurse	
-1454544624	96	Brandon	Owens	bowens2n@si.edu	Male	5.39.151.46	4591258400528650	France	3/13/1998	74028.68	Software Engineer III	
-1454544685	617	Judith	Bishop	jbishoph4@weibo.com	Female	50.167.35.101	3536263290947101	Taiwan		147732.13		(｡◕ ∀ ◕｡)
-1454544809	89	Carolyn	Gutierrez	cgutierrez2g@smh.com.au	Female	109.77.234.103		Madagascar	2/13/1999	139612.73	Nurse	
-1454544817	929	Harold	Tucker	htuckerps@stanford.edu	Male	243.182.109.135	374622077056546	China		161472.14		
-1454544819	590	Irene	Larson	ilarsongd@addthis.com	Female	67.196.118.250		Syria	8/11/1969	222598.25	Business Systems Development Analyst	
-1454544888	577	Frances	Day	fdayg0@ox.ac.uk	Female	54.131.119.123	3534463936023182	Portugal	11/15/1969	206386.03	Environmental Specialist	
-1454544926	908	Bruce	Banks	bbanksp7@ifeng.com	Male	3.58.102.49	560224852697998794	Indonesia	1/18/1983	146835.33	Professor	
-1454544936	951	Carolyn	Lewis	clewisqe@blogger.com	Female	154.230.220.164	5469666950681032	Uruguay	11/25/1955	119686.8	Help Desk Technician	
-1454545198	56	Jane	Murray	jmurray1j@apache.org	Female	174.82.82.71	5100149053428994	China	7/15/1973	57832.83	Software Consultant	
-1454545225	439	Keith	Cook	kcookc6@usa.gov	Male	22.162.180.159		Poland		146503.61		
-1454545268	358	Todd	Meyer	tmeyer9x@huffingtonpost.com	Male	183.45.201.202	5593314243312813	China	7/31/1987	115187.5	Paralegal	
-1454545307	204	Lillian	Long	llong5n@skype.com	Female	146.238.55.254	5641820612278798844	Czech Republic	6/18/1999	150598.38	Human Resources Assistant IV	
-1454545319	409	Doris	Bishop	dbishopbc@spotify.com	Female	199.116.182.20	3575820879808061	Canada	11/29/1964	169913.1	Geological Engineer	
-1454545330	559	Eric	West	ewestfi@mapquest.com	Male	229.67.66.9	3584340222063867	Italy	8/31/1998	59102.31	General Manager	1E2
-1454545330	702	Dennis	Kelly	dkellyjh@cargocollective.com	Male	159.10.27.86	3586421938986530	China	3/22/1982	260296.17	Desktop Support Technician	
-1454545334	371	Gerald	Russell	grussellaa@last.fm		174.119.43.205	3545489024436298	Bahrain	12/21/2000	\N	Senior Cost Accountant	
-1454545338	369	Judy	Perez	jpereza8@gmpg.org	Female	109.68.19.234	5249772984361935	Philippines	7/9/1989	257973.8	Sales Associate	
-1454545351	178	Melissa	Thomas	mthomas4x@mysql.com	Female	192.210.201.207	5562824139318432	Equatorial Guinea	8/17/1965	267092.73	Junior Executive	
-1454545414	831	Arthur	Hill	ahilln2@usnews.com	Male	231.181.126.173	5602223371820245193	Colombia	3/25/1993	247436.07	Mechanical Systems Engineer	
-1454545426	170	Anne	Oliver	aoliver4p@jimdo.com	Female	205.100.30.244	3530095445603833	Indonesia	3/31/1970	232499.96	Software Test Engineer III	
-1454545483	48	Frances	Willis	fwillis1b@linkedin.com		102.186.57.75	4175001067968122	Philippines	8/3/1998	\N	VP Marketing	
-1454545502	478	Joshua	Harrison	jharrisond9@noaa.gov	Male	231.249.108.195	30492555718355	Japan	11/24/1971	143815.22	Clinical Specialist	
-1454545547	98	Timothy	Boyd	tboyd2p@imdb.com	Male	211.20.45.168	5602253132446507	Peru	7/8/1976	127883.56	Data Coordiator	
-1454545556	148		Powell		Female	77.50.112.73	5303311226469439	China		175168.8		
-1454545565	998	Louis	Lee	lleerp@thetimes.co.uk	Male	8.88.141.81		Russia	11/20/1982	13134.47	Office Assistant IV	
-1454545585	116	Lisa	James	ljames37@walmart.com		149.162.35.129		Sweden	3/19/1986	\N	Graphic Designer	
-1454545601	269	Carlos	Flores	cflores7g@samsung.com	Male	121.205.206.52		France		89368.56		
-1454545680	197	Eugene	Shaw	eshaw5g@topsy.com	Male	75.2.214.89	5602236558365152	France	11/25/1983	204106.08	Associate Professor	
-1454545733	536	Charles	Welch	cwelchev@paginegialle.it	Male	135.156.127.116	3540766046216294	Bulgaria	11/26/1980	280230.13	Accountant II	
-1454545747	800	Sharon	Crawford	scrawfordm7@google.cn	Female	185.219.127.5	5141634704661813	Pakistan	12/1/1980	14880.86	Clinical Specialist	
-1454545784	370	Martin	Webb	mwebba9@shutterfly.com	Male	241.183.200.48		Portugal	5/28/1981	134676.08	Database Administrator III	
-1454545905	425	Wanda	Olson	wolsonbs@pen.io	Female	136.216.93.167	3579427292475142	Slovenia		195983.76		
-1454545917	158		Nelson		Female	158.42.83.104		Nigeria		56092.93		
-1454545926	144	Ruth	Ryan	rryan3z@reference.com	Female	157.117.150.254	3580511168862041	Indonesia	9/9/1972	56717.9	Account Coordinator	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
-1454545928	432	Aaron	Sims	asimsbz@squidoo.com	Male	176.74.122.74	3553550116250639	China	12/20/1992	245201.62	Recruiting Manager	
-1454545988	167	Frank	Cunningham	fcunningham4m@github.com	Male	150.174.230.186	5602249442759621	France	4/17/1969	254828.23	Nuclear Power Engineer	
-1454546017	736	Doris	Reyes	dreyeskf@trellian.com	Female	50.37.101.111		Russia	3/23/1967	48543.29	Electrical Engineer	١٢٣
-1454546051	696	Walter	Baker	wbakerjb@webmd.com	Male	33.81.54.207		Poland	12/4/1985	257839.28	Occupational Therapist	
-1454546096	418	Nicole	Weaver	nweaverbl@yellowbook.com	Female	178.127.204.49	6333547435590930225	Brazil		91251		
-1454546121	521	Jesse	Mccoy	jmccoyeg@illinois.edu	Male	77.2.76.98	5602212301270239	Indonesia		265697.47		
-1454546176	324	Randy	Perkins	rperkins8z@spotify.com	Male	90.152.116.122	4903530859961340	Canada	9/29/1982	59754.4	Programmer IV	
-1454546214	720	Daniel	Roberts	drobertsjz@blog.com	Male	200.191.212.146	4917780904858553	Argentina	3/31/1965	151397.44	Analog Circuit Design manager	
-1454546253	279	Ernest	Palmer	epalmer7q@zdnet.com	Male	24.129.157.239	5384992294623031	China		158317.63		
-1454546269	937	Julia	Hawkins	jhawkinsq0@businesswire.com	Female	41.247.95.119		Japan		52113.66		
-1454546342	307	Phillip	Mason	pmason8i@hubpages.com	Male	231.103.199.111	5602233897712483	China		277619.14		␢
-1454546380	547	Benjamin	Garcia	bgarciaf6@spotify.com	Male	151.228.6.14	3555896626891000	Macedonia		240109.95		
-1454546423	616	Frances	Hamilton	fhamiltonh3@tamu.edu	Female	188.88.34.240		Peru	3/19/1989	69117.34	Assistant Professor	
-1454546426	753	Raymond	Harper	rharperkw@facebook.com	Male	148.46.64.54	5002351763645136	China	1/27/1980	191542.74	VP Accounting	
-1454546437	972	Bonnie	Morrison	bmorrisonqz@simplemachines.org		13.205.160.142	6763571935984496	Georgia	3/8/1973	\N	Tax Accountant	../../../../../../../../../../../etc/passwd%00
-1454546468	185	Lisa	Castillo	lcastillo54@ebay.com	Female	96.65.226.75	5100133275364427	Iran	4/8/1989	19003.55	Database Administrator I	
-1454546507	980	Marilyn	Castillo	mcastillor7@wikipedia.org	Female	225.8.34.64	3560325383537120	Thailand		166569.16		
-1454546551	293	Barbara	Diaz	bdiaz84@usnews.com	Female	176.106.164.136	30109403344362	Egypt	11/25/1984	41388.68	Quality Control Specialist	
-1454546607	172	Christina	Payne	cpayne4r@umich.edu		208.172.251.134	3567551256592404	Hungary	5/9/1977	\N	Quality Control Specialist	
-1454546678	454	Amy	Phillips	aphillipscl@blog.com	Female	156.231.253.161		Russia	11/21/1997	136062.09	Environmental Tech	␣
-1454546732	792	Christine	Howard	chowardlz@prweb.com	Female	69.22.66.149		Kosovo	3/10/1998	90266.03	Civil Engineer	
-1454546852	671	Juan	Scott	jscottim@theatlantic.com	Male	170.84.164.52	3530364751135776	Indonesia	12/29/1979	127445.95	Assistant Professor	
-1454546865	878	Robin	Matthews	rmatthewsod@alexa.com	Female	168.96.0.234	5108756854169874	China	11/17/1975	155909.78	Staff Accountant I	
-1454546874	578	Lisa	Foster	lfosterg1@va.gov	Female	116.239.143.83	30550897409197	Canada	12/25/1980	282301.9	Product Engineer	
-1454546885	514	Clarence	Gardner	cgardnere9@addthis.com	Male	241.164.83.193	3567799117668968	Mexico	2/8/1983	69661.64	Business Systems Development Analyst	
-1454546937	32	Roy	Simmons	rsimmonsv@telegraph.co.uk	Male	21.20.158.183	5602244835346375	Mongolia	6/27/1994	13987.6	Senior Editor	"<>?:""{}|_+"
-1454546996	140	Christina	Hanson	chanson3v@seattletimes.com	Female	154.87.3.146	3589004738797807	Peru	12/6/1994	157444.39	Budget/Accounting Analyst I	
-1454547050	714	Sean	Shaw	sshawjt@stumbleupon.com	Male	190.171.138.84	4041370678096900	Portugal	11/13/1987	280420.03	Director of Sales	
-1454547183	440	David	Dixon	ddixonc7@google.es	Male	102.192.92.231	3571723971536297	China		197005		ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ
-1454547190	109	Janice	Edwards	jedwards30@huffingtonpost.com	Female	156.5.183.66		Czech Republic	9/3/1977	166805.79	Account Coordinator	
-1454547193	807	Helen	Roberts	hrobertsme@marketwatch.com	Female	242.160.113.180	201415538184406	Armenia	9/30/1968	131695.03	Help Desk Technician	
-1454547199	6	Irene	Wells	iwells5@fema.gov	Female	85.5.67.113		Iran		74337.42		
-1454547206	629	Donna	Crawford	dcrawfordhg@google.fr	Female	139.87.72.237	3548002968267145	Philippines	9/10/1974	120949.74	Senior Quality Engineer	
-1454547314	239	Terry	Anderson	tanderson6m@joomla.org	Male	126.193.158.217		Slovenia	6/2/1988	241130.56	Senior Sales Associate	
-1454547413	874	Roger	Armstrong	rarmstrongo9@shop-pro.jp	Male	176.127.63.161		Sweden	1/4/1969	195125.77	Environmental Tech	
-1454547442	85	Scott	Washington	swashington2c@bloomberg.com	Male	79.185.72.100	6395647151650882	Brazil	2/17/1957	240505.52	Professor	
-1454547470	265	Ronald	Simmons	rsimmons7c@php.net	Male	231.21.126.12		Colombia	5/12/1959	28563.27	Staff Accountant III	
-1454547497	574	Laura	Lawson	llawsonfx@disqus.com	Female	227.157.239.115	5108755030972003	Mongolia	6/17/1987	192790.7	Sales Representative	../../../../../../../../../../../etc/hosts
-1454547546	582		Medina		Male	230.187.35.16		China		87740.62		
-1454547580	868	Todd	Simmons	tsimmonso3@amazon.co.uk	Male	232.231.42.85		Peru	1/28/1977	70099.6	Sales Associate	NULL
-1454547632	421	Sara	Murray	smurraybo@instagram.com	Female	83.32.41.79		Mongolia	3/2/1972	21859.35	Research Associate	
-1454547659	83	Tammy	Walker	twalker2a@craigslist.org	Female	115.94.89.2	4508955158259501	China	1/1/1972	241046.96	Community Outreach Specialist	
-1454547745	476	Norma	Palmer	npalmerd7@etsy.com	Female	24.81.30.107	6759877990739668322	China	2/22/1974	273005.88	Executive Secretary	
-1454547823	333	Ruth	Ryan	rryan98@gov.uk	Female	165.226.217.32	6771454237379758	Philippines	4/25/1993	246324.26	Staff Accountant I	
-1454547897	523	Raymond	Green	rgreenei@sciencedaily.com	Male	129.154.223.20	5020525177159002	Brazil	7/25/1966	217735.34	Sales Associate	
-1454547914	626	Steven	Cooper	scooperhd@home.pl	Male	226.75.17.73	30583351914956	United States	4/22/2000	174475.39	Web Developer II	
-1454547938	51	Terry	Mitchell	tmitchell1e@soundcloud.com	Male	64.34.240.165		Peru		101626.65		
-1454547979	282	Lisa	Romero	lromero7t@pinterest.com	Female	54.113.22.9		Portugal		224233.61		
-1454548111	899	Raymond	Payne	rpayneoy@purevolume.com	Male	170.237.246.144	201978019687940	Philippines	1/21/1993	126392.14	Staff Accountant I	
-1454548272	966	Kevin	Martin	kmartinqt@hostgator.com	Male	87.47.66.144	3550408592420163	Sweden	10/24/1965	213135.46	Senior Sales Associate	
-1454548342	846	Keith	Taylor	ktaylornh@about.me	Male	90.199.26.239	4175007392203366	South Africa	2/4/1990	64012.82	Associate Professor	
-1454548358	164	Lawrence	Johnston	ljohnston4j@businessweek.com	Male	150.125.123.49		China	6/14/1993	243318.68	Design Engineer	
-1454548489	550	Brandon	Owens	bowensf9@wired.com	Male	220.236.132.34		Vietnam		271248.99		
-=== Try load data from v0.7.1.all-named-index.parquet
-0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1
-0.22	65.1	61	337	3.87	3.78	2.49	Fair	E	VS2
-0.23	56.9	65	327	4.05	4.07	2.31	Good	E	VS1
-0.23	59.4	61	338	4	4.05	2.39	Very Good	H	VS1
-0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2
-0.24	62.3	57	336	3.95	3.98	2.47	Very Good	I	VVS1
-0.24	62.8	57	336	3.94	3.96	2.48	Very Good	J	VVS2
-0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1
-0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2
-0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2
-=== Try load data from v0.7.1.column-metadata-handling.parquet
-1	0.1	2017-01-01 02:00:00	a	2017-01-01 02:00:00
-2	0.2	2017-01-02 02:00:00	b	2017-01-02 02:00:00
-3	0.3	2017-01-03 02:00:00	c	2017-01-03 02:00:00
-=== Try load data from v0.7.1.parquet
-0.21	Premium	E	SI1	59.8	61	326	3.89	3.84	2.31	1
-0.22	Fair	E	VS2	65.1	61	337	3.87	3.78	2.49	8
-0.23	Good	E	VS1	56.9	65	327	4.05	4.07	2.31	2
-0.23	Ideal	E	SI2	61.5	55	326	3.95	3.98	2.43	0
-0.23	Very Good	H	VS1	59.4	61	338	4	4.05	2.39	9
-0.24	Very Good	I	VVS1	62.3	57	336	3.95	3.98	2.47	6
-0.24	Very Good	J	VVS2	62.8	57	336	3.94	3.96	2.48	5
-0.26	Very Good	H	SI1	61.9	55	337	4.07	4.11	2.53	7
-0.29	Premium	I	VS2	62.4	58	334	4.2	4.23	2.63	3
-0.31	Good	J	SI2	63.3	58	335	4.34	4.35	2.75	4
-=== Try load data from v0.7.1.some-named-index.parquet
-0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1
-0.22	65.1	61	337	3.87	3.78	2.49	Fair	E	VS2
-0.23	56.9	65	327	4.05	4.07	2.31	Good	E	VS1
-0.23	59.4	61	338	4	4.05	2.39	Very Good	H	VS1
-0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2
-0.24	62.3	57	336	3.95	3.98	2.47	Very Good	I	VVS1
-0.24	62.8	57	336	3.94	3.96	2.48	Very Good	J	VVS2
-0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1
-0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2
-0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
deleted file mode 100755
index 0a7f10fe16dd..000000000000
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-# Tags: long, no-fasttest, no-debug, no-asan, no-msan, no-tsan
-
-#
-# Load all possible .parquet files found in submodules.
-# TODO: Add more files.
-#
-
-# Also 5 sample files from
-# wget https://github.com/Teradata/kylo/raw/master/samples/sample-data/parquet/userdata1.parquet
-# ...
-# wget https://github.com/Teradata/kylo/raw/master/samples/sample-data/parquet/userdata5.parquet
-
-
-# set -x
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-CB_DIR=$(dirname "$CLICKHOUSE_CLIENT_BINARY")
-[ "$CB_DIR" == "." ] && ROOT_DIR=$CUR_DIR/../../..
-[ -z "$ROOT_DIR" ] && ROOT_DIR=$CB_DIR/../..
-
-DATA_DIR=$CUR_DIR/data_parquet
-
-[ -n "$ROOT_DIR" ] && [ -z "$PARQUET_READER" ] && PARQUET_READER="$ROOT_DIR"/contrib/arrow/cpp/build/release/parquet-reader
-
-# To update:
-# cp $ROOT_DIR/contrib/arrow/cpp/submodules/parquet-testing/data/*.parquet $ROOT_DIR/contrib/arrow/python/pyarrow/tests/data/parquet/*.parquet $CUR_DIR/data_parquet/
-
-# ClickHouse Parquet reader doesn't support such complex types, so I didn't burrow into the issue.
-# There is failure due parsing nested arrays or nested maps with NULLs:
-# ../contrib/arrow/cpp/src/arrow/array/array_nested.cc:192:  Check failed: (self->list_type_->value_type()->id()) == (data->child_data[0]->type->id())
-
-# Strange behaviour for repeated_no_annotation.parquet around __buitin_expect, so this file was disabled:
-# debug:
-#   ../contrib/arrow/cpp/src/arrow/array/array_nested.cc:193:  Check failed: self->list_type_->value_type()->Equals(data->child_data[0]->type)
-# release:
-#   Code: 349. DB::Ex---tion: Can not insert NULL data into non-nullable column "phoneNumbers": data for INSERT was parsed from stdin
-
-for NAME in $(find "$DATA_DIR"/*.parquet -print0 | xargs -0 -n 1 basename | LC_ALL=C sort); do
-    JSON=$DATA_DIR/$NAME.json
-    COLUMNS_FILE=$DATA_DIR/$NAME.columns
-
-    { [ -z "$PARQUET_READER" ] || [ ! -s "$PARQUET_READER" ]; } && [ ! -s "$COLUMNS_FILE" ] && continue
-
-    echo "=== Try load data from $NAME"
-
-    # If you want change or add .parquet file - rm data_parquet/*.json data_parquet/*.columns
-    [ -n "$PARQUET_READER" ] && [ ! -s "$COLUMNS_FILE" ] && [ ! -s "$JSON" ] && "$PARQUET_READER" --json "$DATA_DIR"/"$NAME" > "$JSON"
-    [ ! -s "$COLUMNS_FILE" ] && "$CUR_DIR"/helpers/00900_parquet_create_table_columns.py "$JSON" > "$COLUMNS_FILE"
-
-    # Debug only:
-    # [ -n "$PARQUET_READER" ] && $PARQUET_READER $DATA_DIR/$NAME > $DATA_DIR/$NAME.dump
-
-    # COLUMNS=`$CUR_DIR/00900_parquet_create_table_columns.py $JSON` 2>&1 || continue
-    COLUMNS=$(cat "$COLUMNS_FILE") || continue
-
-    ${CLICKHOUSE_CLIENT} -n --query="
-        DROP TABLE IF EXISTS parquet_load;
-        CREATE TABLE parquet_load ($COLUMNS) ENGINE = Memory;"
-
-    # Some files contain unsupported data structures, exception is ok.
-    ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_load FORMAT Parquet" < "$DATA_DIR"/"$NAME" 2>&1 | sed 's/Exception/Ex---tion/'
-
-    ${CLICKHOUSE_CLIENT} -n --query="
-        SELECT * FROM parquet_load ORDER BY tuple(*) LIMIT 100;
-        DROP TABLE parquet_load;"
-done
diff --git a/tests/queries/0_stateless/00900_long_parquet_load_2.reference b/tests/queries/0_stateless/00900_long_parquet_load_2.reference
new file mode 100644
index 000000000000..e3f9cd89e089
--- /dev/null
+++ b/tests/queries/0_stateless/00900_long_parquet_load_2.reference
@@ -0,0 +1,867 @@
+=== Try load data from 02588_data.parquet
+36993	cta	224.0.90.10	1670947008433897216	22204819	EDGX	cqs_pillar	quote	\N	\N	\N	82.57	1	R	83.36	2	R	1	\N
+139613	cta	224.0.90.10	1670964613107206144	65892770	NASDAQ	cqs_pillar	quote	\N	\N	\N	82.78	1	R	82.83	1	R	1	\N
+105492	cta	224.0.90.10	1670960913931416320	56544849	BZX	cqs_pillar	quote	\N	\N	\N	82.85	1	R	83.16	1	R	1	\N
+36152	cta	224.0.90.10	1670946823125135616	21622585	EDGX	cqs_pillar	quote	\N	\N	\N	82.75	1	R	83.47	2	R	1	\N
+69158	cta	224.0.90.10	1670953640446284544	40764014	IEX	cqs_pillar	quote	\N	\N	\N	80.88	1	R	82.53	2	R	1	\N
+27530	cta	224.0.90.10	1670945419685089024	16077821	NYSE	cqs_pillar	quote	\N	\N	\N	83.51	1	R	83.71	1	R	1	\N
+149156	cta	224.0.90.10	1670965092304685312	67996527	EDGA	cqs_pillar	quote	\N	\N	\N	82.53	1	R	82.64	1	R	1	\N
+110613	cta	224.0.90.10	1670961649615504128	58147008	EDGA	cqs_pillar	quote	\N	\N	\N	82.35	1	R	82.59	1	R	1	\N
+140891	cta	224.0.90.10	1670964672789551360	66162030	BZX	cqs_pillar	quote	\N	\N	\N	82.52	2	R	82.84	1	R	1	\N
+76346	cta	224.0.90.10	1670955037463045376	44631551	CSX	cqs_pillar	quote	\N	\N	\N	82.88	1	R	82.99	1	R	1	\N
+101143	cta	224.0.89.10	1670959978724152576	2456274	BZX	cts_pillar	trade	82.86	10		\N	\N	\N	\N	\N	\N	1	\N
+101742	cta	224.0.90.10	1670960130004183808	55040364	OTC	cqs_pillar	quote	\N	\N	\N	78.8	0	 	87.09	0	 	1	\N
+72936	cta	224.0.90.10	1670954283346099712	42646692	NYSE	cqs_pillar	quote	\N	\N	\N	82.73	2	R	82.88	1	R	1	\N
+31762	cta	224.0.90.10	1670945915357103360	18166318	BYX	cqs_pillar	quote	\N	\N	\N	83.04	1	R	83.61	1	R	1	\N
+9462	cta	224.0.90.10	1670943070913110784	6523476	EDGX	cqs_pillar	quote	\N	\N	\N	85.83	2	R	86.79	2	R	1	\N
+110924	cta	224.0.90.10	1670961662057144576	58201805	NYSE	cqs_pillar	quote	\N	\N	\N	82.25	1	R	82.35	7	R	1	\N
+87134	cta	224.0.90.10	1670957393338548736	49239199	CSX	cqs_pillar	quote	\N	\N	\N	82.66	1	R	82.8	1	R	1	\N
+118463	cta	224.0.90.10	1670962682025828096	60652181	AMEX	cqs_pillar	quote	\N	\N	\N	82.18	4	R	82.49	3	R	1	\N
+107704	cta	224.0.90.10	1670961253161367040	57218136	NYSE	cqs_pillar	quote	\N	\N	\N	82.59	1	R	82.73	1	R	1	\N
+117169	cta	224.0.90.10	1670962550347156736	60310620	EDGX	cqs_pillar	quote	\N	\N	\N	81.76	1	R	82.15	1	R	1	\N
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	153071	\N
+=== Try load data from 02718_data.parquet
+36993	993	Hello993	\N	1	\N
+36152	152	Hello152	2	1	119401713636491372
+69158	158	Hello158	8	1	1991930319586584116
+27530	530	Hello530	0	1	259638476471573956
+76346	346	Hello346	6	1	2834077831228187571
+72936	936	Hello936	6	1	3888695898929829382
+31762	762	Hello762	2	1	11110522506606775460
+9462	462	Hello462	2	1	6275131136942537266
+87134	134	Hello134	4	1	1219316186974625286
+74898	898	Hello898	8	1	5066180111327518250
+50958	958	Hello958	8	1	4077715651062815935
+15467	467	Hello467	\N	1	\N
+22775	775	Hello775	\N	1	\N
+67503	503	Hello503	\N	1	\N
+65837	837	Hello837	\N	1	\N
+29002	2	Hello2	2	1	6000600018545075778
+40596	596	Hello596	6	1	1428087471198311791
+37204	204	Hello204	4	1	6955606590448669529
+75722	722	Hello722	2	1	8736384626514688031
+39807	807	Hello807	\N	1	\N
+
+\N	\N	\N	\N	100000	16777408911109712567
+=== Try load data from 02725_data.parquet
+0	0	1	5222652260262540557
+1	1	1	2963573356302499406
+2	2	1	787535183767392522
+
+\N	\N	3	8973760800332432485
+=== Try load data from 02960_polygon_bound_bug.parquet
+0	[[[(-157.9582991377384,21.28868463439519),(-157.9582991377384,21.35254833902807),(-157.89014212298457,21.35254833902807),(-157.89014212298457,21.28868463439519),(-157.9582991377384,21.28868463439519)]]]	1	2965019508272517993
+1	[[[(174.76274050943928,-41.35902838296618),(174.76274050943928,-41.29535963198179),(174.8472037311771,-41.29535963198179),(174.8472037311771,-41.35902838296618),(174.76274050943928,-41.35902838296618)]]]	1	12759744261968863701
+
+\N	[]	2	15724763770241381694
+=== Try load data from 03445_geoparquet_null_linestring.parquet
+0	[(0,0),(1,1)]	linestring1	1	11952067038708389267
+1	[]	linestring2	1	6193756679726488702
+
+\N	[]	\N	2	18145823718434877969
+=== Try load data from 03445_geoparquet_null_point.parquet
+0	(1,1)	Point1	1	13965490122443935483
+1	(0,0)	Point2	1	17718043395310203769
+
+\N	(0,0)	\N	2	13236789444044587636
+=== Try load data from 03445_geoparquet_null_polygon.parquet
+0	[[(0,0),(2,0),(2,2),(0,2),(0,0)]]	Polygon1	1	8425904500992146115
+1	[]	Polygon2	1	16721826817827418522
+
+\N	[]	\N	2	6700987245110013021
+=== Try load data from 03445_geoparquet_wkb.parquet
+0	(0,0)	[(0,0),(5,5)]	[[(1,1),(2,1),(2,2),(1,2),(1,1)]]	[[(0,0),(5,5)],[(1,1),(2,4),(5,5)]]	[[[(1,1),(2,1),(2,2),(1,2),(1,1)]],[[(3,3),(4,3),(4,4),(3,4),(3,3)]]]	1	609312927898875547
+1	(1,1)	[(1,1),(2,4),(5,5)]	[[(3,3),(4,3),(4,4),(3,4),(3,3)]]	[[(0,0),(5,5)],[(1,1),(2,4),(5,5)]]	[[[(1,1),(2,1),(2,2),(1,2),(1,1)]],[[(3,3),(4,3),(4,4),(3,4),(3,3)]]]	1	18202783414119897595
+
+\N	(0,0)	[]	[]	[]	[]	2	365352268309221526
+=== Try load data from 03445_geoparquet_wkt.parquet
+0	1	(30,10)	[(30,10),(10,30),(40,40)]	[[(35,10),(45,45),(15,40),(10,20),(35,10)],[(20,30),(35,35),(30,20),(20,30)]]	1	2151260364810557833
+1	2	(40,20)	[(40,20),(20,40),(50,50)]	[[(35,10),(45,45),(15,40),(10,20),(35,10)]]	1	17365314224586431973
+
+\N	\N	(0,0)	[]	[]	2	1069830515687438190
+=== Try load data from 68131.parquet
+0	[1,2]	1	5845551876324623491
+
+\N	[]	1	5845551876324623491
+=== Try load data from alltypes_dictionary.parquet
+0	0	true	0	0	0	0	0	0	01/01/09	0	2009-01-01 00:00:00.000000000	1	2660886053874804793
+1	1	false	1	1	1	10	1.1	10.1	01/01/09	1	2009-01-01 00:01:00.000000000	1	8346836977294016814
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	2	11007723031168821607
+=== Try load data from alltypes_list.parquet
+0	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	1	16503550532047480981
+1	[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	[10957,11323,11688]	[946674000,978296400,1009832400]	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]	1	15124318519444847550
+2	[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	[10957,11323,11688]	[946674000,978296400,1009832400]	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]	1	3202145420792745352
+
+\N	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	3	16383270398575522267
+=== Try load data from alltypes_plain.parquet
+0	4	true	0	0	0	0	0	0	03/01/09	0	2009-03-01 00:00:00.000000000	1	8465924141596626920
+4	2	true	0	0	0	0	0	0	02/01/09	0	2009-02-01 00:00:00.000000000	1	15267283463947283488
+3	7	false	1	1	1	10	1.1	10.1	04/01/09	1	2009-04-01 00:01:00.000000000	1	8084360163536046539
+1	5	false	1	1	1	10	1.1	10.1	03/01/09	1	2009-03-01 00:01:00.000000000	1	15868711115761948062
+6	0	true	0	0	0	0	0	0	01/01/09	0	2009-01-01 00:00:00.000000000	1	18177502423429277302
+7	1	false	1	1	1	10	1.1	10.1	01/01/09	1	2009-01-01 00:01:00.000000000	1	5076808624665456456
+5	3	false	1	1	1	10	1.1	10.1	02/01/09	1	2009-02-01 00:01:00.000000000	1	15096584967546526452
+2	6	true	0	0	0	0	0	0	04/01/09	0	2009-04-01 00:00:00.000000000	1	4477898818565688651
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	8	16728097424210647406
+=== Try load data from alltypes_plain.snappy.parquet
+0	6	true	0	0	0	0	0	0	04/01/09	0	2009-04-01 00:00:00.000000000	1	4638961571363325565
+1	7	false	1	1	1	10	1.1	10.1	04/01/09	1	2009-04-01 00:01:00.000000000	1	10118128356831336697
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	2	14757089928194662262
+=== Try load data from array_float.parquet
+9	idx10	[10.2,8.2]	1	6500220947925738428
+0	idx1	[]	1	12173579943307849648
+4	idx5	[10.2,8.2]	1	12410529623371858105
+3	idx4	[10.2]	1	10296189669222279578
+1	idx2	[10.2,8.2,7.2]	1	1784870960298998108
+8	idx9	[10.2]	1	13922970413406815839
+6	idx7	[10.2,8.2]	1	4112649194148461660
+7	idx8	[10.2,8.2]	1	5240844288156881892
+5	idx6	[10.2]	1	3798195961072290386
+2	idx3	[10.2,8.2]	1	1513321551386387090
+
+\N	\N	[]	10	16413140331168905886
+=== Try load data from array_int.parquet
+9	idx10	[100,101,102]	1	13206811767060123460
+0	idx1	[100,101,102]	1	1468807849511680661
+4	idx5	[100,101]	1	5865660290831628184
+3	idx4	[100]	1	17591298091891296814
+1	idx2	[100,101]	1	7229523771491093755
+8	idx9	[100,101,102]	1	13974023397309305358
+6	idx7	[100,101]	1	7948251195409708470
+7	idx8	[100,101]	1	2180201009889543106
+5	idx6	[100,101]	1	4988466500581683121
+2	idx3	[100,101,102,101]	1	13792751652532249689
+
+\N	\N	[]	10	14458819231670106154
+=== Try load data from array_string.parquet
+9	idx10	['This','is','a','test']	1	8058991263431016296
+0	idx1	['This','is','a','test']	1	4316848877505089401
+4	idx5	['wants','to','get','out']	1	15659577912664352409
+3	idx4	[]	1	15229575922646986842
+1	idx2	['cigarette','smoke']	1	2611073676543300327
+8	idx9	['Which','Heaven','to','gaudy','day','denies']	1	16225894291786653140
+6	idx7	['then','I','put','him','back']	1	13493172719522718923
+7	idx8	['make','a','man']	1	15077948755334701219
+5	idx6	['me','up?']	1	8103829450440236616
+2	idx3	['the','grocery','clerks']	1	14008392062650720804
+
+\N	\N	[]	10	2104840490268466281
+=== Try load data from binary.parquet
+9	\t	1	13249380382722804046
+0	\0	1	13370574831107216623
+11		1	9579149237072969620
+4		1	13244713168078657249
+10	\n	1	1444330909894844834
+3		1	13076407284415682324
+1	
	1	6974130533670503360
+8	\b	1	439548861610966662
+6		1	16660782491328850550
+7		1	18276792018525247702
+5		1	14590984139361154376
+2		1	15175603013226953226
+
+\N	\N	12	6955188355048989260
+=== Try load data from byte_array_decimal.parquet
+20	21	1	14249832127278749837
+18	19	1	8782556698832744361
+9	10	1	1928879545261732492
+0	1	1	3679262401748128310
+15	16	1	10115147958821052082
+11	12	1	6139620041083242203
+22	23	1	15516880273489139801
+23	24	1	16401735415014746636
+4	5	1	17051611891056893642
+14	15	1	14806847963466793184
+10	11	1	5493709197750930073
+12	13	1	6787141652406725654
+19	20	1	15665309129618128622
+3	4	1	12537652640196058813
+1	2	1	16863671454656808012
+8	9	1	8782944891374641799
+17	18	1	7522801893698749378
+6	7	1	11491618852443552134
+13	14	1	16678362120261280996
+7	8	1	7441211880741634496
+
+\N	\N	24	1955102309460433818
+=== Try load data from case_insensitive_column_matching.parquet
+0	123	1	1	24960983393539569
+1	456	2	1	10860017704905464526
+
+\N	\N	\N	2	10884978688299004095
+=== Try load data from conversion_to_datetime64_test.parquet
+0	1	2020-01-01 14:00:00	2020-01-01 14:00:00+00:00	1	14913180766044805002
+
+\N	\N	\N	\N	1	14913180766044805002
+=== Try load data from datapage_v2.snappy.parquet
+0	abc	1	2	true	[1,2,3]	1	16078188846132661856
+4	abc	5	2	true	[1,2]	1	6454514002962808519
+3	\N	4	5	false	[1,2,3]	1	\N
+1	abc	2	3	true	[]	1	243797108142459904
+2	abc	3	4	true	[]	1	16370920853893187024
+
+\N	\N	\N	\N	\N	[]	5	2253932663712014071
+=== Try load data from datatype-date32.parquet
+0	1925-01-01	1	95355579932678910
+3	2282-12-31	1	1199432099726642882
+1	1949-10-01	1	11226486318317443606
+2	2021-10-01	1	14120462944390486409
+
+\N	\N	4	8194992868657700191
+=== Try load data from delta_length_byte_array_encoding.parquet
+0	SWEEP	SWETT	00459	\N	('20221206100111','+0100')	('20221206100111','+0100')	('20221206100111','+0100')	3	11	T	\N	1	\N
+
+\N	\N	\N	\N	\N	(NULL,NULL)	(NULL,NULL)	(NULL,NULL)	\N	\N	\N	\N	1	\N
+=== Try load data from dict-page-offset-zero.parquet
+30	1552	1	8422143286990545479
+24	1552	1	10300175852787330865
+34	1552	1	11618054463714841641
+32	1552	1	14967043328803827083
+20	1552	1	616429680791283190
+28	1552	1	15309599966318093138
+18	1552	1	9219274452570041950
+9	1552	1	11166776644758002338
+0	1552	1	1110107121126640579
+15	1552	1	2043878238511573955
+36	1552	1	7370540478052318116
+27	1552	1	1968222612518557249
+33	1552	1	10663086133314837259
+11	1552	1	14050429072743601145
+22	1552	1	12748313231675201650
+23	1552	1	10990797888557012014
+4	1552	1	2906092155432956845
+29	1552	1	15224319568498500590
+14	1552	1	1468386472401779279
+10	1552	1	14846008954777106711
+
+\N	\N	39	8745471155267852610
+=== Try load data from example_half_float.parquet
+0	1.5	1	15974859270407168234
+4	0	1	9247474980253145447
+3	-1	1	8983465089972530386
+1	2.5	1	15230195726587115037
+2	3.140625	1	16022017580069504368
+
+\N	\N	5	10117780426160808624
+=== Try load data from fixed_array_int.parquet
+9	idx10	[10,15,52,43,22,50,42,87,19,91]	1	16021513271056229789
+0	idx1	[73,33,88,34,94,96,11,90,20,17]	1	4629975054797286940
+4	idx5	[67,84,56,84,50,21,93,90,37,42]	1	17290372351898611615
+3	idx4	[87,56,32,98,25,18,66,21,20,2]	1	12000235215545123457
+1	idx2	[10,18,74,39,2,55,13,41,6,42]	1	5967127131809967594
+8	idx9	[90,53,83,54,35,87,73,74,98,50]	1	16114439062892910195
+6	idx7	[46,1,21,11,83,74,11,63,28,49]	1	18320969301847648369
+7	idx8	[55,30,50,19,12,95,5,83,71,34]	1	12253618457445158216
+5	idx6	[53,14,44,96,40,71,26,74,27,25]	1	14205911744472535748
+2	idx3	[48,27,74,82,70,46,18,78,63,73]	1	8582050234588949331
+
+\N	\N	[]	10	14705747384097111558
+=== Try load data from fixed_array_nested_list_int.parquet
+9	idx10	[[10,72,13,85,89,15,51,73,64,49],[78,28,54,57,10,1,3,35,23,15],[97,93,76,87,86,21,30,9,58,21],[27,23,35,71,4,68,90,14,93,87],[59,98,66,94,8,90,16,20,33,10],[73,84,79,37,75,50,64,74,79,31],[20,64,79,51,20,41,7,69,5,22],[37,60,1,99,45,43,56,26,15,83],[7,96,6,58,7,59,57,6,22,92],[97,11,71,55,32,79,88,20,58,31]]	1	17970853696231218182
+0	idx1	[[34,11,56,20,90,20,17,55,54,99],[22,18,15,77,68,51,30,76,9,40],[67,24,2,27,72,53,99,57,67,96],[95,77,60,47,68,56,91,28,90,38],[77,8,75,89,84,81,60,82,71,26],[41,89,60,15,43,81,31,68,71,65],[84,97,22,9,26,59,97,10,16,60],[13,82,16,47,32,74,34,78,90,15],[35,44,50,18,82,71,20,68,89,41],[60,59,7,65,18,23,24,37,48,45]]	1	2178808435128197877
+4	idx5	[[52,98,63,41,2,6,56,80,72,15],[11,64,89,57,65,92,63,39,76,51],[47,25,33,28,58,22,83,19,54,63],[61,8,20,24,83,44,33,32,65,90],[51,75,72,55,54,5,43,90,64,30],[86,87,48,65,84,67,82,94,2,9],[1,75,83,79,64,63,52,51,33,72],[12,84,92,27,66,32,40,48,34,55],[59,91,19,77,70,56,10,82,40,60],[79,83,14,82,42,22,72,54,12,9]]	1	10102655348078839145
+3	idx4	[[65,58,31,62,38,29,32,71,87,49],[66,89,59,83,29,32,59,49,68,34],[81,54,14,69,39,84,95,37,15,47],[15,51,15,38,90,61,76,51,11,24],[64,93,27,26,29,15,15,4,95,36],[60,61,57,66,61,25,21,97,34,36],[7,34,30,4,8,29,68,48,58,64],[77,19,92,77,81,21,52,1,86,92],[16,91,1,40,57,44,76,10,78,10],[88,13,70,61,2,76,78,69,90,24]]	1	9171162259712295701
+1	idx2	[[72,32,17,44,69,37,95,64,47,70],[15,4,28,31,80,63,40,93,17,87],[28,46,56,21,65,20,5,76,18,61],[66,44,5,66,71,73,26,70,47,22],[9,9,62,21,74,75,32,71,2,61],[66,81,43,46,10,78,66,31,34,17],[30,5,10,15,56,52,36,3,88,16],[45,84,39,12,39,13,43,66,67,16],[27,18,68,80,87,19,98,39,90,54],[48,96,24,67,66,91,3,10,7,66]]	1	14152623021723637344
+8	idx9	[[32,6,44,30,66,48,93,67,62,16],[49,67,73,32,86,78,28,88,25,60],[70,10,95,16,10,49,12,47,22,62],[95,86,63,43,4,96,3,34,60,53],[60,75,96,66,96,82,62,31,78,72],[17,44,13,7,45,54,27,84,10,68],[43,49,86,10,57,99,32,72,73,41],[57,79,15,62,79,87,67,69,75,59],[45,18,2,19,45,96,8,86,71,97],[20,20,11,15,82,29,16,12,87,87]]	1	14877241838559228840
+6	idx7	[[58,24,79,16,32,36,36,91,18,22],[85,29,36,16,75,79,71,70,6,39],[47,15,82,30,55,14,49,47,38,13],[28,54,95,82,25,16,44,82,33,11],[58,16,87,96,65,3,10,68,87,15],[94,84,65,50,21,78,8,78,89,72],[39,41,67,23,21,83,43,94,31,15],[67,58,73,87,58,71,52,10,30,90],[69,65,72,89,51,8,39,80,49,79],[32,36,76,11,88,87,75,55,33,74]]	1	5485679170602838617
+7	idx8	[[8,26,45,3,25,83,88,77,98,38],[52,76,79,94,6,74,73,31,93,53],[89,24,62,83,35,24,60,24,41,14],[52,13,13,32,87,77,19,20,52,47],[50,46,66,30,26,85,91,50,98,83],[87,44,5,11,25,52,9,55,15,37],[18,24,36,72,84,10,13,59,16,65],[93,4,19,13,75,64,73,29,81,25],[61,65,1,45,75,88,19,4,73,32],[23,20,27,55,13,34,97,80,8,19]]	1	5246976039550502726
+5	idx6	[[71,60,6,31,40,66,78,6,23,14],[62,88,38,68,37,37,63,18,57,3],[45,93,1,49,99,33,10,91,6,17],[13,40,57,85,48,14,74,89,43,49],[18,17,39,75,52,30,48,4,13,55],[3,34,73,71,75,58,6,73,73,31],[28,74,26,3,2,49,50,60,27,79],[35,28,12,10,1,21,61,70,65,37],[30,27,51,85,89,84,73,48,4,71],[1,86,23,68,82,9,6,95,14,25]]	1	6035658836658698306
+2	idx3	[[54,93,69,82,45,54,35,59,20,39],[80,3,15,33,45,22,45,11,28,94],[68,26,89,38,49,28,29,59,93,57],[11,62,53,12,16,83,2,55,65,6],[37,49,56,93,33,77,22,53,20,22],[4,75,2,5,34,5,90,67,2,79],[22,2,80,14,13,44,33,11,31,24],[11,54,75,33,60,20,10,51,56,33],[72,5,84,78,7,95,21,2,88,75],[69,88,52,85,70,96,51,69,48,20]]	1	8704823891163505117
+
+\N	\N	[]	10	1692762168861203775
+=== Try load data from fixed_array_str.parquet
+9	idx10	['str100','str101','str102','str103','str104','str105','str106','str107','str108','str109']	1	11290285949581330773
+0	idx1	['str10','str11','str12','str13','str14','str15','str16','str17','str18','str19']	1	8071043625235141093
+4	idx5	['str50','str51','str52','str53','str54','str55','str56','str57','str58','str59']	1	13678605401710213392
+3	idx4	['str40','str41','str42','str43','str44','str45','str46','str47','str48','str49']	1	7840105480765753525
+1	idx2	['str20','str21','str22','str23','str24','str25','str26','str27','str28','str29']	1	8007482149540455162
+8	idx9	['str90','str91','str92','str93','str94','str95','str96','str97','str98','str99']	1	12166079781402687071
+6	idx7	['str70','str71','str72','str73','str74','str75','str76','str77','str78','str79']	1	16266405848887210870
+7	idx8	['str80','str81','str82','str83','str84','str85','str86','str87','str88','str89']	1	5655882823175845862
+5	idx6	['str60','str61','str62','str63','str64','str65','str66','str67','str68','str69']	1	2220108651520481848
+2	idx3	['str30','str31','str32','str33','str34','str35','str36','str37','str38','str39']	1	12690465408294469025
+
+\N	\N	[]	10	5652744751565830541
+=== Try load data from fixed_length_decimal.parquet
+20	21	1	11198275065492030391
+18	19	1	351877431427227425
+9	10	1	10154485708636235935
+0	1	1	8400161416641029105
+15	16	1	5316068084098049881
+11	12	1	492436284488452913
+22	23	1	9703814451674327669
+23	24	1	7776632914114470965
+4	5	1	11637472902120684352
+14	15	1	11714025203378226649
+10	11	1	2832942064114283293
+12	13	1	11263380343111977755
+19	20	1	5134307520953471473
+3	4	1	1592352314383541392
+1	2	1	16790405582299928683
+8	9	1	1533117082386042720
+17	18	1	15842453746690660649
+6	7	1	13407742669739090137
+13	14	1	2885392384039107169
+7	8	1	2892786383714126928
+
+\N	\N	24	7048233601027308485
+=== Try load data from fixed_length_decimal_1.parquet
+20	21	1	11198275065492030391
+18	19	1	351877431427227425
+9	10	1	10154485708636235935
+0	1	1	8400161416641029105
+15	16	1	5316068084098049881
+11	12	1	492436284488452913
+22	23	1	9703814451674327669
+23	24	1	7776632914114470965
+4	5	1	11637472902120684352
+14	15	1	11714025203378226649
+10	11	1	2832942064114283293
+12	13	1	11263380343111977755
+19	20	1	5134307520953471473
+3	4	1	1592352314383541392
+1	2	1	16790405582299928683
+8	9	1	1533117082386042720
+17	18	1	15842453746690660649
+6	7	1	13407742669739090137
+13	14	1	2885392384039107169
+7	8	1	2892786383714126928
+
+\N	\N	24	7048233601027308485
+=== Try load data from fixed_length_decimal_legacy.parquet
+20	21	1	98871632974742800
+18	19	1	12286414994539395392
+9	10	1	4015198646268050837
+0	1	1	5707119067460400703
+15	16	1	13816866841100736535
+11	12	1	9251720416939280334
+22	23	1	5565784470055769873
+23	24	1	5988838306095885468
+4	5	1	14537087045384223761
+14	15	1	4448174729128812515
+10	11	1	1016747994366367371
+12	13	1	17033975816505265696
+19	20	1	7405892054282145799
+3	4	1	8774318004330791847
+1	2	1	12562399927720453883
+8	9	1	6051866097990639565
+17	18	1	12713912483641764543
+6	7	1	7899984304259045775
+13	14	1	15558757953562584889
+7	8	1	12196684160062922979
+
+\N	\N	24	9181524539748381587
+=== Try load data from hadoop_lz4_compressed.parquet
+0	1593604800	abc	42	1	3806095617483730328
+3	1593604801	def	7.7	1	13482131770667370456
+1	1593604800	def	7.7	1	5861304996888164348
+2	1593604801	abc	42.125	1	9545089655608587545
+
+\N	\N	\N	\N	4	14247877966938301061
+=== Try load data from hudi_array.parquet.gz
+0	20251021133601353	20251021133601353_0_0	20251021133601353_31_0		02b5ff08-ab93-41f4-a646-2ae35d622787-0_0-16-109_20251021133601353.parquet	['str1','str2']	1	10899520343274658172
+
+\N	\N	\N	\N	\N	\N	[]	1	10899520343274658172
+=== Try load data from hudi_array_nonnullable.parquet.gz
+0	20251021135411504	20251021135411504_0_0	20251021135411504_31_0		80554b2b-65e4-49de-8a21-dfd9d5cabb1b-0_0-16-109_20251021135411504.parquet	['str1','str2']	1	2444990607497031498
+
+\N	\N	\N	\N	\N	\N	[]	1	2444990607497031498
+=== Try load data from hudi_nested_array.parquet.gz
+0	20251021135942392	20251021135942392_0_0	20251021135942392_31_0		8a501b64-754c-4677-b643-cc06603bf4a8-0_0-16-109_20251021135942392.parquet	[['a','b'],['c','d']]	1	17699594303488273172
+
+\N	\N	\N	\N	\N	\N	[]	1	17699594303488273172
+=== Try load data from hudi_nested_array_nonnullable.parquet.gz
+0	20251021135758096	20251021135758096_0_0	20251021135758096_31_0		0f908091-95de-49c1-9ebe-213449570767-0_0-16-109_20251021135758096.parquet	[['a','b'],['c','d']]	1	14842865479642761902
+
+\N	\N	\N	\N	\N	\N	[]	1	14842865479642761902
+=== Try load data from int-list-zero-based-chunked-array.parquet
+36993	[36993,36994,36995,36996,36997,36998,36999,37000,37001]	1	13704691802482625316
+36152	[36152,36153,36154,36155,36156,36157,36158,36159,36160]	1	17679192445898543326
+69158	[69158,69159,69160,69161,69162]	1	4041534779580111776
+27530	[27530,27531,27532,27533,27534,27535,27536,27537,27538]	1	3713124893993513562
+31762	[31762,31763,31764,31765,31766,31767,31768,31769,31770]	1	3389122341925034518
+9462	[9462,9463,9464,9465,9466,9467,9468]	1	14863022561367924217
+50958	[]	1	11385693486036653406
+15467	[15467,15468]	1	6342543614213518156
+22775	[]	1	12108733369505759980
+67503	[67503,67504,67505,67506,67507,67508,67509,67510,67511]	1	1801937764717624249
+65837	[65837,65838,65839,65840,65841,65842,65843]	1	755465894404509620
+29002	[29002]	1	8456747141270642978
+40596	[40596,40597,40598,40599]	1	3374998285434442417
+37204	[37204,37205,37206,37207,37208,37209]	1	6512084231507538650
+39807	[39807,39808,39809,39810,39811,39812,39813,39814,39815]	1	11144369402569825757
+47225	[47225,47226,47227,47228]	1	3629702947909304977
+10927	[10927,10928,10929,10930,10931,10932,10933]	1	12795261822175527468
+4611	[4611]	1	434672168758103656
+34745	[34745,34746,34747,34748,34749]	1	8563244607249095096
+55007	[]	1	738411964590426114
+
+\N	[]	70000	6594662959574000636
+=== Try load data from int32_decimal.parquet
+20	21	1	14249832127278749837
+18	19	1	8782556698832744361
+9	10	1	1928879545261732492
+0	1	1	3679262401748128310
+15	16	1	10115147958821052082
+11	12	1	6139620041083242203
+22	23	1	15516880273489139801
+23	24	1	16401735415014746636
+4	5	1	17051611891056893642
+14	15	1	14806847963466793184
+10	11	1	5493709197750930073
+12	13	1	6787141652406725654
+19	20	1	15665309129618128622
+3	4	1	12537652640196058813
+1	2	1	16863671454656808012
+8	9	1	8782944891374641799
+17	18	1	7522801893698749378
+6	7	1	11491618852443552134
+13	14	1	16678362120261280996
+7	8	1	7441211880741634496
+
+\N	\N	24	1955102309460433818
+=== Try load data from int64_decimal.parquet
+20	21	1	98871632974742800
+18	19	1	12286414994539395392
+9	10	1	4015198646268050837
+0	1	1	5707119067460400703
+15	16	1	13816866841100736535
+11	12	1	9251720416939280334
+22	23	1	5565784470055769873
+23	24	1	5988838306095885468
+4	5	1	14537087045384223761
+14	15	1	4448174729128812515
+10	11	1	1016747994366367371
+12	13	1	17033975816505265696
+19	20	1	7405892054282145799
+3	4	1	8774318004330791847
+1	2	1	12562399927720453883
+8	9	1	6051866097990639565
+17	18	1	12713912483641764543
+6	7	1	7899984304259045775
+13	14	1	15558757953562584889
+7	8	1	12196684160062922979
+
+\N	\N	24	9181524539748381587
+=== Try load data from integers_1_5_no_3_bf_minmax.parquet
+0	-1	1	11935486105267972682
+3	5	1	8454527814154760371
+1	2	1	463667963421364848
+2	4	1	17956467173040956166
+
+\N	\N	4	1916660908465950835
+=== Try load data from ipv6_bloom_filter.gz.parquet
+0	z����TNx��7��ꙕ	1	13288000489149796924
+4	�w�*I���\n���+�	1	9468751629168416770
+3	}ϔ8<\fA뙠��Ѻ�	1	17226734039706043359
+1	 �}�B�,K�32�	1	7253289996785367618
+2	�Z�D/�y����	1	842579928916594899
+
+\N	\N	5	11185867936307116338
+=== Try load data from iris.parquet
+73	6.1	2.8	4.7	1.2	Versicolor	1	18204632795337117686
+89	5.5	2.5	4	1.3	Versicolor	1	4653652012410455888
+63	6.1	2.9	4.7	1.4	Versicolor	1	13689724364604468360
+57	4.9	2.4	3.3	1	Versicolor	1	2127827660748014277
+104	6.5	3	5.8	2.2	Virginica	1	13296829535387120114
+30	4.8	3.1	1.6	0.2	Setosa	1	9117040247783135681
+88	5.6	3	4.1	1.3	Versicolor	1	7185603935448442167
+116	6.5	3	5.5	1.8	Virginica	1	12427820264215610117
+24	4.8	3.4	1.9	0.2	Setosa	1	12950528231928803659
+34	4.9	3.1	1.5	0.2	Setosa	1	1207689558702002101
+109	7.2	3.6	6.1	2.5	Virginica	1	2684941844963881116
+145	6.7	3	5.2	2.3	Virginica	1	3711702047148575642
+93	5	2.3	3.3	1	Versicolor	1	17560318037338666120
+43	5	3.5	1.6	0.6	Setosa	1	16730113477114499272
+32	5.2	4.1	1.5	0.1	Setosa	1	2860566811651200307
+20	5.4	3.4	1.7	0.2	Setosa	1	16845040626516367712
+91	6.1	3	4.6	1.4	Versicolor	1	8232897093452463750
+62	6	2.2	4	1	Versicolor	1	16022163764249252264
+61	5.9	3	4.2	1.5	Versicolor	1	12092451575184938334
+124	6.7	3.3	5.7	2.1	Virginica	1	14064025372312110514
+
+\N	\N	\N	\N	\N	\N	150	14770655198702124555
+=== Try load data from list_columns.parquet
+0	[1,2,3]	['abc','efg','hij']	1	5809983990759233283
+1	[NULL,1]	[]	1	9854762345037358727
+2	[4]	['efg',NULL,'hij','xyz']	1	118071435199055165
+
+\N	[]	[]	3	15782817770995647175
+=== Try load data from multi_column_bf.gz.parquet
+540	-62	60904	524	4294967391	13439599920079768466	false	VIRE	{"key":400, "value":"BNHSB"}	GMKT	M�ư��FI�6e���Ă	1	9735371321288412055
+923	-58	46518	345	4294967327	18309803705868924873	true	LJHD	{"key":97, "value":"EIUNN"}	WVRQ	|�w�G����Z_P	1	12513952248079036776
+988	-89	47241	756	4294967373	15522063381546272260	true	CLDK	{"key":604, "value":"JSQFX"}	USNQ	�>�8�O��;i�,��	1	4175486705904763621
+73	116	32428	513	4294967384	10876946806756585544	false	SGPI	{"key":711, "value":"XMEED"}	IOIX	�d�\rO�FЂ���n\b	1	11079779081220916748
+639	-69	45537	315	4294967315	7263280072686713102	false	CHFC	{"key":48, "value":"MFGFA"}	ZLBS	]Ʇ̠Bʹ(LuբW	1	1884003582258998694
+959	-51	56925	86	4294967348	2903746547904555720	true	XHJC	{"key":355, "value":"MQETE"}	QIQA	/�<3@C��x*��	1	12551571122189109470
+286	7	32408	89	4294967349	11768163425287102515	true	JBWQ	{"key":63, "value":"LBRXP"}	IHTI	2���B=�f*���_�	1	2293773524378365089
+815	-16	37808	207	4294967396	18058293579070949154	true	AEZA	{"key":656, "value":"GOJYT"}	ZODP	e�W�E����>��	1	9939955730329575199
+212	-74	50116	784	4294967316	4639886571322169794	true	JZKC	{"key":844, "value":"WYFIG"}	KELP	��w+ʰO�����]���	1	5464573773970257898
+510	-44	14672	697	4294967323	3203265463862679482	true	QPXM	{"key":408, "value":"BJCSQ"}	NMGV	x��|��A2�^q���m�	1	18363658913862052503
+827	38	52135	612	4294967349	2177159037635926390	false	KWOV	{"key":384, "value":"PLUUJ"}	VACB	>�$=L����$Q�\t	1	1291085690902008617
+705	-96	7506	479	4294967337	1919118169111152342	true	EGEU	{"key":522, "value":"AOPEL"}	TZFW	����s�Iޣ�r^�3	1	12776128745828051091
+174	-38	10608	469	4294967369	8139895279544416045	false	SUED	{"key":348, "value":"KDIJQ"}	VKSM	���v3�A����,���	1	8457376369144183832
+89	79	31144	138	4294967379	3327168023216233174	true	MRTX	{"key":492, "value":"NGCXD"}	GVCG	y�>L�
O(�xج;&��	1	9669048967548569557
+802	92	55937	83	4294967368	13260877643210989136	true	FNXX	{"key":566, "value":"KVFDZ"}	CMMV	m:�u��L{�Tz��f�	1	8531841042433805304
+599	-107	36579	116	4294967311	4635153073869187643	true	BURQ	{"key":259, "value":"VNMQQ"}	TMOJ	�Yz�n�M<��~<J�	1	11473429595650353132
+911	34	36532	706	4294967329	14021278886426583739	true	LHWZ	{"key":851, "value":"VRWYO"}	WJSU	dE��X�O�"����? 	1	688709139001106823
+63	23	47242	306	4294967323	9406756381740182185	false	TOSA	{"key":686, "value":"PLZFZ"}	PSMI	%��W�O�rbۃQ�	1	6695500581448672443
+162	-61	16727	488	4294967364	10247569155516682409	true	CGBM	{"key":290, "value":"HXAPM"}	QQKP	{�?Gx�D�����Z\r�	1	14424261032199581839
+958	37	11953	67	4294967298	6685068849521451102	true	NBTZ	{"key":681, "value":"RYARL"}	IEBX	��5�I��\'9~^8�	1	4887123917339036857
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	1000	5163471426232818546
+=== Try load data from nation.dict-malformed.parquet
+24	24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	1	12039456768470916139
+20	20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	1	1938971365265172649
+18	18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	1	683999204158310715
+9	9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	1	3249448427684188229
+0	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	1	3665617652529628747
+15	15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	1	17282739652778517877
+11	11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	1	16019780170188069682
+22	22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	1	5434661548379039976
+23	23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	1	4795264701375312065
+4	4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	1	248382863470129023
+14	14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	1	16065900911605223082
+10	10	IRAN	4	efully alongside of the slyly final dependencies. 	1	5841757293138085613
+12	12	JAPAN	2	ously. final, express gifts cajole a	1	8541089608434969707
+19	19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	1	4451411823131861426
+3	3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	1	2693927435503992040
+1	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	1	36374910591807349
+8	8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	1	14585860963857978647
+17	17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	1	14666307967178401707
+6	6	FRANCE	3	refully final requests. regular, ironi	1	9533338348525445448
+13	13	JORDAN	4	ic deposits are blithely about the carefully regular pa	1	1596275401608298445
+
+\N	\N	\N	\N	\N	25	3086641797717397689
+=== Try load data from native_parquet_reader.parquet
+540	1542391450	215201660	wid	pkv	kfq	1940-09-27 22:09:29.803023000	1938-12-29 14:03:44.995783000	19029950029215964495020667607618357.495	1	16129008451439418493
+1072	\N	-1216912862	wrd	bvh	grm	1942-11-05 18:41:17.934486000	1963-07-22 12:23:08.945284000	-18290901911935759093601504297025319.706	1	\N
+1232	119386566	1646333132	xsn	cwr	oje	1969-02-07 22:10:53.947318000	1963-05-31 09:22:00.597388000	-13238395454897448517514986345639419.724	1	3317574382596584188
+1790	-1305256738	214808438	jup	xje	xje	1949-05-17 12:48:24.850720000	1987-12-12 13:07:09.551855000	17678309787292811185111752582474938.357	1	4341596037526956406
+1474	\N	215463808	bvh	fal	sey	1948-02-16 10:23:26.806632000	1939-03-04 17:50:10.430653000	-13626525646694188070563619481401319.32	1	\N
+1031	-1314825140	215332734	fal	jep	bvh	1946-05-18 21:24:29.544908000	1963-06-13 10:07:17.684362000	14189033056219786885922193778871547.221	1	16520299597208682302
+923	129217116	-1216257492	cwr	lgr	kfa	1945-12-13 12:21:04.501220000	1939-02-19 17:04:53.343679000	13690564951780783414609399664071062.773	1	4393424864422486741
+1941	1573849210	-1216519640	nid	pkf	cwi	1973-01-25 05:30:11.829231000	1939-02-06 16:19:36.256705000	4200848445661105366350011959305768.399	1	14722538790177482523
+988	\N	-1216388566	pkf	toj	gbv	1966-11-15 05:41:25.579378000	1939-02-06 16:19:36.256705000	-11591114220234923896036376845966007.824	1	\N
+73	1549207298	1646988502	ykf	kfq	cwi	1987-08-17 01:26:23.314606000	1939-02-06 16:19:36.256705000	9785898133675256222659179098133934.597	1	2674337776604452515
+1433	1472791156	215070586	wrd	lgr	grm	1958-11-12 16:40:57.531308000	1939-02-19 17:04:53.343679000	1874663958279089166890306090236840.975	1	11349656755302587961
+639	-1400154314	214677364	qcw	cni	sni	1941-02-18 06:27:37.759736000	1987-11-16 11:36:35.377907000	19486879124951717677057395546185468.239	1	2251511650700253535
+1332	-1391765578	214677364	ito	mxs	bvh	1968-03-24 10:22:14.884388000	1939-01-11 14:49:02.082757000	-97140623417626533569488373809460.586	1	9928125553742068785
+959	-1302110962	1646726354	xse	cwi	bvq	1946-02-03 15:22:12.849116000	1987-10-08 09:20:44.116985000	13856720986593784571713664369004557.589	1	3881530246594358625
+1886	127906376	215332734	hcn	vqc	fau	1937-07-31 14:55:49.628244000	1963-06-26 10:52:34.771336000	-14552391128643233058755548436021686.346	1	7619979472299782582
+286	1538721378	214808438	ytf	sny	kfq	1977-07-25 09:29:17.242434000	1938-12-29 14:03:44.995783000	19298655650225066609763302722578336.045	1	1583510682637371895
+815	127906376	1646595280	oje	nit	kfa	1945-07-10 03:17:39.457533000	1987-11-29 12:21:52.464881000	-12380355385596679392281634194400108.2	1	1823475491365725801
+212	119648714	1646595280	mxs	qcw	fau	1963-10-21 12:46:56.099618000	1939-01-24 15:34:19.169731000	-17932303438364731205710464260010648.276	1	14541536766160368581
+510	123974156	1646333132	oju	xje	sey	1964-12-24 13:41:19.969758000	1987-11-03 10:51:18.290933000	-16561516151157471659600280444309316.044	1	178258849115440901
+1716	-1386915840	214808438	rdx	grm	xje	1972-03-05 10:38:04.654883000	1987-11-03 10:51:18.290933000	15846698963823916936357127586734274.194	1	12503764324218626853
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	2000	9949434493652059365
+=== Try load data from nested_lists.parquet
+0	[[[1,2,3],[1,2,3]],[[1,2,3]],[[],[1,2,3]]]	[[['Some string','Some string'],[]],[['Some string']],[[]]]	[[NULL,1,2],[NULL],[1,2],[]]	[['Some string',NULL,'Some string'],[NULL],[]]	1	31407507191887523
+
+\N	[]	[]	[]	[]	1	31407507191887523
+=== Try load data from nested_lists.snappy.parquet
+0	[[['a','b'],['c']],[[],['d']]]	1	1	4061584267911780845
+1	[[['a','b'],['c','d']],[[],['e']]]	1	1	8741655072046188693
+2	[[['a','b'],['c','d'],['e']],[[],['f']]]	1	1	16465740724229345044
+
+\N	[]	\N	3	10822235990477762966
+=== Try load data from nested_maps.snappy.parquet
+0	{'a':{1:true,2:false}}	1	1	1	13131726677860377679
+4	{'e':{1:true}}	1	1	1	4543095021381921673
+3	{'d':{}}	1	1	1	18422800995686840063
+1	{'b':{1:true}}	1	1	1	241718800187546775
+5	{'f':{3:true,4:false,5:true}}	1	1	1	8080011959117096065
+2	{'c':{}}	1	1	1	410499042983863970
+
+\N	{}	\N	\N	6	7936364349798542993
+=== Try load data from nine_byte_decimals_from_spark.parquet
+73	73	74	1	13383650340633121129
+89	89	90	1	7405217149357997963
+63	63	64	1	1804193497654891441
+57	57	58	1	16385732679971556412
+30	30	31	1	8454387457306212691
+88	88	89	1	7795300400624040795
+24	24	25	1	15534891196928694623
+34	34	35	1	16915990901636100219
+93	93	94	1	257248148041633870
+43	43	44	1	5995768512886442660
+32	32	33	1	3286764249329561284
+20	20	21	1	8660670988091427939
+91	91	92	1	1706413246976081167
+62	62	63	1	4566422876176878314
+61	61	62	1	12081972361270352628
+52	52	53	1	10094666377388986504
+40	40	41	1	13846444967102787149
+28	28	29	1	6008842195427523154
+80	80	81	1	5258319620755990316
+72	72	73	1	17254100521666330494
+
+\N	\N	\N	100	6473906733798180669
+=== Try load data from non_hadoop_lz4_compressed.parquet
+0	1593604800	abc	42	1	3806095617483730328
+3	1593604801	def	7.7	1	13482131770667370456
+1	1593604800	def	7.7	1	5861304996888164348
+2	1593604801	abc	42.125	1	9545089655608587545
+
+\N	\N	\N	\N	4	14247877966938301061
+=== Try load data from nonnullable.impala.parquet
+0	8	[-1]	[[-1,-2],[]]	{'k1':-1}	[{},{'k1':1},{},{}]	(-1,[-1],([[(-1,'nonnullable')]]),{})	1	9565612059618739419
+
+\N	\N	[]	[]	{}	[]	(NULL,[],([]),{})	1	9565612059618739419
+=== Try load data from not_utc.parquet
+0	2023-01-01 12:00:00.000	1	2604320271863989052
+1	\N	1	\N
+2	2023-01-02 13:00:00.000	1	1660056001302137693
+
+\N	\N	3	4264376273166126745
+=== Try load data from nullable.impala.parquet
+0	1	[1,2,3]	[[1,2],[3,4]]	{'k1':1,'k2':100}	[{'k1':1}]	(1,[1],([[(10,'aaa'),(-10,'bbb')],[(11,'c')]]),{'foo':(([1.1]))})	1	5288452023017997993
+4	5	[]	[]	{}	[]	(NULL,[],([]),{'foo':(([2.2,3.3]))})	1	5760559227194221665
+3	4	[]	[]	{}	[]	(NULL,[],([]),{})	1	5410682466636276414
+1	2	[NULL,1,2,NULL,3,NULL]	[[NULL,1,2,NULL],[3,NULL,4],[],[]]	{'k1':2,'k2':NULL}	[{'k3':NULL,'k1':1},{},{}]	(NULL,[NULL],([[(NULL,NULL),(10,'aaa'),(NULL,NULL),(-10,'bbb'),(NULL,NULL)],[(11,'c'),(NULL,NULL)],[],[]]),{'g1':(([2.2,NULL])),'g2':(([])),'g3':(([])),'g4':(([])),'g5':(([]))})	1	17639551135115977867
+6	7	[]	[[],[5,6]]	{'k1':NULL,'k3':NULL}	[]	(7,[2,3,NULL],([[],[(NULL,NULL)],[]]),{})	1	11378887133582446905
+5	6	[]	[]	{}	[]	(NULL,[],([]),{})	1	7298320024919514315
+2	3	[]	[[]]	{}	[{},{}]	(NULL,[],([]),{})	1	5128636477988636844
+
+\N	\N	[]	[]	{}	[]	(NULL,[],([]),{})	7	2564856267326417155
+=== Try load data from nullable_list.parquet
+0	[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]	1	12566315861162514645
+1	[NULL]	[NULL]	[NULL]	1	9802642836484068497
+2	[]	[]	[]	1	13718037031212026605
+
+\N	[]	[]	[]	3	17640251655149058131
+=== Try load data from nullbool.parquet
+9	9	\N	1	\N
+0	0	false	1	13941544710297623600
+4	4	false	1	4115121547489342701
+3	3	\N	1	\N
+1	1	\N	1	\N
+8	8	true	1	5835168380286919845
+6	6	false	1	3453955549258391088
+7	7	\N	1	\N
+5	5	\N	1	\N
+2	2	false	1	15522680419900289749
+
+\N	\N	\N	10	5974982459813463751
+=== Try load data from nulls.snappy.parquet
+0	(NULL)	1	2635166664326777715
+4	(NULL)	1	16032008459108269792
+3	(NULL)	1	17732081864748531568
+1	(NULL)	1	7883836132540916187
+6	(NULL)	1	4911754097603171207
+7	(NULL)	1	868238185466099514
+5	(NULL)	1	3812504911722612611
+2	(NULL)	1	7748429148434536745
+
+\N	(NULL)	8	6283787242822260491
+=== Try load data from row_group.parquet
+73	world	74	1	4937392231375272272
+89	world	90	1	18166975957598732095
+63	world	64	1	16795238454967994314
+57	world	58	1	3074351889881737943
+30	hello	31	1	507986147287932957
+88	world	89	1	1963213915465389535
+24	hello	25	1	16961432289565991844
+34	hello	35	1	18399396830157476543
+93	world	94	1	2529867773585904489
+43	hello	44	1	11472143225441089367
+32	hello	33	1	8968819706141308891
+20	hello	21	1	4366587807278277131
+91	world	92	1	11959821635554173167
+62	world	63	1	580733585660640784
+61	world	62	1	6917570203325130743
+52	world	53	1	2744754167875686923
+40	hello	41	1	3741961724686193153
+28	hello	29	1	348203798938029109
+80	world	81	1	4044864824098130253
+72	world	73	1	11447480741144542289
+
+\N	\N	\N	100	13135809584443979190
+=== Try load data from sample_json.parquet
+0	1	{"user":{"name":"Alice","age":31},"scores":[10,20]}	{"user":{"name":"Alice","age":31},"scores":[10,20]}	1	15256175106691618132
+3	4	{"app":{"name":"ClickHouse","version":"24.2"},"metrics":{"qps":900}}	{"app":{"name":"ClickHouse","version":"24.2"},"metrics":{"qps":900}}	1	363144030559379256
+1	2	{"user":{"name":"Bob","age":27},"flags":["dev","chess"]}	{"user":{"name":"Bob","age":27},"flags":["dev","chess"]}	1	8881728193563867596
+2	3	{"system":{"name":"DuckDB","version":"0.10"},"ok":true}	{"system":{"name":"DuckDB","version":"0.10"},"ok":true}	1	10757164136181617745
+
+\N	\N	\N	\N	4	16811467393286931113
+=== Try load data from single_nan.parquet
+0	\N	1	\N
+
+\N	\N	1	\N
+=== Try load data from time32_test.parquet
+0	1970-01-01 01:23:20.000	1	10947751440015320054
+1	1970-01-01 00:00:20.000	1	15670985760378118505
+2	1970-01-01 00:50:00.000	1	13834241766106716383
+
+\N	\N	3	3559490819081051710
+=== Try load data from time64_test.parquet
+0	1970-01-01 01:23:20.000000	1	10490142917697966113
+1	1970-01-01 00:00:20.000000	1	7444079326559404847
+2	1970-01-01 00:50:00.000000	1	10556662479801981010
+
+\N	\N	3	10044140650349800354
+=== Try load data from userdata1.parquet
+540	2016-02-03 21:46:57.000000000	541	Wayne	Reynolds	wreynoldsf0@uiuc.edu	Male	236.248.157.116	3584812562974861	Namibia	3/31/1977	140645.72	Professor		1	14810974818873034229
+923	2016-02-03 21:44:30.000000000	924	Paul	Ortiz	portizpn@webs.com	Male	118.67.131.128	5010121904688869	China	11/25/1995	51338.19	Electrical Engineer	1E+02	1	14956325379451549331
+988	2016-02-03 21:16:14.000000000	989	Theresa	Harrison	tharrisonrg@shinystat.com	Female	27.99.44.151	3550012649915231	Slovenia	8/28/1972	261999.27	Nurse Practicioner	1E2	1	16251143598447093620
+73	2016-02-03 03:33:24.000000000	74	Kathryn	Henderson	khenderson21@ask.com	Female	218.212.63.68	4936394111685353310	Ukraine	4/11/1985	59413.85	Pharmacist	-$1.00	1	16875653206827754012
+639	2016-02-03 04:22:55.000000000	640	Eugene	Garza	egarzahr@howstuffworks.com	Male	249.154.22.8	3575077978216973	Ukraine	6/23/1956	177925.54	VP Product Management		1	13026117274850974863
+959	2016-02-03 08:28:01.000000000	960	Jonathan	Dean	jdeanqn@ft.com	Male	109.230.115.123	3572982317825785	Bangladesh		222839.61		Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮	1	13388589282945596990
+286	2016-02-03 06:12:42.000000000	287	Jack	Medina	jmedina7y@fda.gov	Male	9.75.62.253		Nigeria	10/11/1972	170057.49	Actuary		1	12545533976541745456
+815	2016-02-03 23:41:43.000000000	816	Donna	Shaw	dshawmn@marriott.com	Female	76.80.32.95	6771163030158648170	Poland	10/3/1991	14673.04	Administrative Assistant II		1	7146469771473547530
+212	2016-02-03 04:55:14.000000000	213	Denise	Rivera	drivera5w@ibm.com	Female	188.252.157.157	560225515529479734	China	2/3/1963	185445.08	Registered Nurse		1	3254819623841203221
+510	2016-02-03 19:49:56.000000000	511	William	Kelley	wkelleye6@dropbox.com	Male	83.210.124.193		China	4/30/1978	256375.52	Nurse		1	7183808603399873068
+827	2016-02-03 17:07:19.000000000	828	Wanda	Stanley	wstanleymz@sourceforge.net	Female	76.197.174.115		Nigeria	5/21/1961	279697.41	Teacher		1	17848602833713352630
+705	2016-02-03 11:54:38.000000000	706	Paul	Barnes	pbarnesjl@seattletimes.com		172.79.227.21		Serbia	1/6/1986	\N	Junior Executive		1	\N
+174	2016-02-03 00:11:22.000000000	175	Samuel	Edwards	sedwards4u@businessweek.com	Male	60.248.106.175	676249211413011686	Russia	10/15/1986	75886.69	Senior Sales Associate	<img src=x onerror=alert(\'hi\') />	1	17862243500288186925
+89	2016-02-03 18:45:51.000000000	90	Jacqueline	Carr	jcarr2h@freewebs.com	Female	197.40.38.49	201939989746686	China	5/31/1961	100733.44	Civil Engineer	(｡◕ ∀ ◕｡)	1	2232484032009753154
+802	2016-02-03 05:23:27.000000000	803	Brian	Ray	brayma@behance.net	Male	160.155.56.47	5602241665830742	Portugal	3/18/1958	143938.05	Speech Pathologist		1	15167281104907264518
+599	2016-02-03 15:51:59.000000000	600	Sarah	Nguyen	snguyengn@yellowpages.com	Female	253.60.3.4	3560343605032408	China		181835.15			1	8724166627869322326
+911	2016-02-03 22:12:59.000000000	912	Amanda	Franklin	afranklinpb@1688.com	Female	175.199.163.26	201793148639880	Colombia		224605.37			1	10158977932363585382
+63	2016-02-03 04:59:53.000000000	64	Dennis	Ross	dross1r@parallels.com	Male	78.25.77.223		Portugal	5/27/1959	280933.71	Biostatistician II		1	8446384695916288357
+162	2016-02-03 10:24:45.000000000	163	Marie	Smith	msmith4i@quantcast.com	Female	203.14.230.232	3531257958056309	Philippines		42270.96			1	14201445153743764259
+958	2016-02-03 18:03:51.000000000	959	Frances	Martin	fmartinqm@who.int	Female	42.157.13.217	3582151311470687	Vietnam	11/4/1958	124538.92	Quality Control Specialist		1	6817154704817639963
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	1000	15027035030807841507
+=== Try load data from userdata2.parquet
+540	2016-02-03 22:07:47.000000000	541	Donna	Owens	dowensf0@etsy.com	Female	243.24.71.38		Philippines	12/14/1983	156479.16	Senior Quality Engineer		1	10268099683213748654
+923	2016-02-03 20:46:19.000000000	924	Gerald	Powell	gpowellpn@so-net.ne.jp	Male	12.250.87.136	3581939603817750	Democratic Republic of the Congo	4/15/1996	205302	Desktop Support Technician	田中さんにあげて下さい	1	16056284383264880013
+988	2016-02-03 15:50:57.000000000	989	Aaron	Wallace	awallacerg@ebay.com	Male	190.175.69.165	5641822506407465150	Ukraine	8/11/1963	204058.01	Compensation Analyst	<img src=x onerror=alert(\'hi\') />	1	6690638294356353033
+73	2016-02-03 05:13:12.000000000	74	Kathryn	Torres	ktorres21@rakuten.co.jp	Female	4.124.222.88	4026779356659103	Portugal	7/31/1956	121285.58	Project Manager		1	17443966047479479990
+639	2016-02-03 16:14:28.000000000	640	Johnny	Williams	jwilliamshr@topsy.com	Male	49.99.17.206		China	2/15/1956	243542.02	Sales Associate		1	6428256511174345077
+959	2016-02-03 23:36:19.000000000	960	Randy	Phillips	rphillipsqn@mail.ru	Male	2.135.69.233	201453749304505	Russia	11/23/1972	152452.33	Physical Therapy Assistant		1	4761216647766398181
+286	2016-02-03 00:19:42.000000000	287	Martin	Ferguson	mferguson7y@eventbrite.com	Male	67.188.95.86		Portugal	7/2/1981	262746.89	Cost Accountant		1	6268611945850019602
+815	2016-02-03 01:09:16.000000000	816	Sara	Sanders	ssandersmn@cornell.edu	Female	54.250.225.134		Netherlands	7/26/1998	261953.95	Quality Engineer		1	2265259250359460068
+212	2016-02-03 00:17:37.000000000	213	Norma	Garrett	ngarrett5w@technorati.com	Female	65.49.237.93		Albania		80916.71			1	11448011014978600303
+510	2016-02-03 02:24:25.000000000	511	Chris	Robertson	crobertsone6@myspace.com	Male	170.164.38.187	3528761574735043	Poland	3/18/1992	252042.53	Biostatistician I	‪‪test‪	1	17051879510685654573
+827	2016-02-03 10:14:47.000000000	828	Roger	Garrett	rgarrettmz@twitter.com	Male	239.61.51.53	3541088069104649	Philippines	2/2/1962	262160.19	Structural Engineer		1	8036646087262902024
+705	2016-02-03 09:40:35.000000000	706	Nicole	Lewis	nlewisjl@angelfire.com	Female	211.40.223.211		Peru		38409.93		田中さんにあげて下さい	1	15936963868833675750
+174	2016-02-03 14:41:49.000000000	175	Diana	Larson	dlarson4u@goodreads.com	Female	219.199.189.122	201506716061117	Philippines	4/11/1978	93166.24	Web Designer I		1	16565753450667403965
+89	2016-02-03 16:11:14.000000000	90	Nicole	Reid	nreid2h@cisco.com	Female	10.75.131.59	5610704755842409780	Philippines	12/15/1985	24922.19	Marketing Assistant		1	14693622815454580058
+802	2016-02-03 14:24:43.000000000	803	Michael	Carter	mcarterma@dmoz.org	Male	210.55.134.180	3571410217580228	Indonesia		113847.16		-1E2	1	3907836235968444221
+599	2016-02-03 06:04:47.000000000	600	Jeremy	Roberts	jrobertsgn@sciencedaily.com	Male	226.251.11.3	5602231165341266	Portugal	5/27/1987	230061.8	Programmer Analyst IV		1	13109642909942519912
+911	2016-02-03 20:40:16.000000000	912	Kathleen	Chavez	kchavezpb@hexun.com	Female	153.82.30.155	4936181486905879	Greece	10/31/1999	217386.03	Engineer IV		1	4072791798945819223
+63	2016-02-03 05:23:22.000000000	64	Roy	Hughes	rhughes1r@stanford.edu	Male	209.120.70.78	3552886646968253	Canada	10/30/1968	191750.33	Mechanical Systems Engineer		1	473622384063714892
+162	2016-02-03 09:34:51.000000000	163	Eric	Murray	emurray4i@elegantthemes.com	Male	160.195.27.97		Russia	11/4/1995	188482.04	Automation Specialist II	(ﾉಥ益ಥ）ﾉ ┻━┻	1	3298881357870304748
+958	2016-02-03 02:06:34.000000000	959	Amanda	Welch	awelchqm@tamu.edu	Female	120.101.158.18		China	1/26/1975	231408.83	Budget/Accounting Analyst I		1	15464217041974416631
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	1000	5963528300449987764
+=== Try load data from userdata3.parquet
+540	2016-02-03 21:02:34.000000000	541	Betty	Welch	bwelchf0@opensource.org	Female	198.236.215.180	3567431388419919	Mexico	7/3/1960	16569.92	VP Marketing		1	2713478761142492000
+923	2016-02-03 11:03:46.000000000	924	Juan	Reid	jreidpn@cyberchimps.com	Male	171.183.44.28		Argentina	7/18/1965	196585.93	VP Sales	᠎	1	5468821878054872581
+988	2016-02-03 09:02:34.000000000	989	Carol	Stanley	cstanleyrg@technorati.com	Female	191.209.90.103		Croatia	3/25/1956	233179.25	Product Engineer	-1	1	14150682749368749560
+73	2016-02-03 02:05:42.000000000	74	Roger	Jacobs	rjacobs21@rediff.com	Male	51.122.147.153	36548589951538	Benin	7/18/1977	18545.32	Paralegal	1/2	1	13402678875674353025
+639	2016-02-03 22:33:30.000000000	640	Ralph	Alexander	ralexanderhr@cbslocal.com	Male	185.34.97.159	3573288479096101	China	11/21/1962	278447.74	Analyst Programmer		1	5355672025070760067
+959	2016-02-03 07:39:35.000000000	960	Jennifer	Green	jgreenqn@instagram.com	Female	18.250.186.105	3561679391138043	Israel	12/28/1959	185355.5	Human Resources Assistant II	ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ 	1	5062265660321592197
+286	2016-02-03 02:23:13.000000000	287	Bruce	Foster	bfoster7y@wordpress.org	Male	96.73.83.237	5100143005021627	Netherlands	4/8/1971	205483.59	Graphic Designer		1	5572762546433119772
+815	2016-02-03 11:43:23.000000000	816	Edward	Harvey	eharveymn@vk.com	Male	101.136.168.169	6304208202785626682	China	10/17/1961	142265.07	Programmer Analyst IV		1	4829781136518707641
+212	2016-02-03 11:39:09.000000000	213	Donald	Rodriguez	drodriguez5w@sun.com	Male	225.164.245.48	374283580717023	Poland	9/3/1982	251008.63	Health Coach IV	Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮	1	16921058688961234934
+510	2016-02-03 23:26:27.000000000	511	Joshua	Henderson	jhendersone6@ibm.com	Male	189.194.172.167	3549636412646146	Georgia		224387.52			1	14619781117756705513
+827	2016-02-03 10:25:17.000000000	828	Dennis	Hudson	dhudsonmz@bluehost.com	Male	149.206.203.200		Slovenia	10/19/1973	277837.4	Health Coach I		1	9582925868983761804
+705	2016-02-03 06:13:59.000000000	706	Bonnie	Webb	bwebbjl@typepad.com	Female	156.229.251.59	5108754882959325	Japan		91063.61			1	17189555236089554906
+174	2016-02-03 07:37:27.000000000	175	Frank	Fuller	ffuller4u@reverbnation.com	Male	202.196.250.12	337941772142823	Russia	5/23/1967	70592.13	Professor		1	10679779506911848348
+89	2016-02-03 23:22:18.000000000	90	Edward	Garza	egarza2h@moonfruit.com	Male	43.21.138.236		New Zealand	3/27/1965	139025.58	Structural Analysis Engineer		1	621718393876357924
+802	2016-02-03 00:27:23.000000000	803	Donald	Wood	dwoodma@parallels.com	Male	212.8.149.51	67610717455795070	Mexico	6/22/1971	20752.43	Chief Design Engineer	Œ„´‰ˇÁ¨ˆØ∏”’	1	16726890607545042626
+599	2016-02-03 18:41:21.000000000	600	Gregory	Hunt	ghuntgn@economist.com		30.25.113.84		Thailand	8/13/1966	\N	Editor	åß∂ƒ©˙∆˚¬…æ	1	\N
+911	2016-02-03 03:21:08.000000000	912	Anna	Gardner	agardnerpb@tmall.com	Female	124.152.61.231	3588670541278424	Pakistan	11/22/1962	51597.06	Quality Engineer		1	5179387130181465779
+63	2016-02-03 00:10:33.000000000	64	Rose	Fernandez	rfernandez1r@usgs.gov	Female	199.141.221.229	3564435193511524	Brazil	5/5/1972	196329.18	Senior Cost Accountant		1	9074151447130954378
+162	2016-02-03 19:18:03.000000000	163	Beverly	Stanley	bstanley4i@csmonitor.com	Female	168.4.61.47	4903829552442845848	Mexico		204157.29			1	3613874353723744397
+958	2016-02-03 00:51:37.000000000	959	Kimberly	Alvarez	kalvarezqm@gizmodo.com	Female	244.177.51.246	30135810163038	Philippines	8/5/1976	211292	Design Engineer		1	16582665575228982440
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	1000	15440837781074178314
+=== Try load data from userdata4.parquet
+540	2016-02-04 02:16:52.000000000	541	Richard	Cook	rcookf0@tmall.com	Male	188.91.20.3	56022193398456680	Brazil	8/30/1994	100666.86	Geological Engineer		1	10437379725430447236
+923	2016-02-04 00:38:14.000000000	924	Jimmy	Nelson	jnelsonpn@rediff.com	Male	244.130.194.232		Norway		259092.5			1	353377476397909171
+988	2016-02-04 07:11:31.000000000	989	Pamela	Jones	pjonesrg@wisc.edu		35.142.52.21		Czech Republic	6/17/1999	\N	Chemical Engineer		1	\N
+73	2016-02-04 13:29:27.000000000	74	Sandra	Lee	slee21@hatena.ne.jp	Female	196.212.29.124		China	12/25/1976	190399.56	Assistant Media Planner	../../../../../../../../../../../etc/passwd%00	1	10099339221456216644
+639	2016-02-04 06:34:51.000000000	640	Kenneth	Kelley	kkelleyhr@wix.com	Male	231.69.59.210	502031912635378130	China	5/20/1997	203635.14	Systems Administrator IV		1	9415252749604975816
+959	2016-02-04 00:58:28.000000000	960	Craig	Shaw	cshawqn@wordpress.org	Male	88.203.243.165	5602229798654196	Tanzania	8/5/1999	119584.32	Senior Sales Associate		1	4406609943576080992
+286	2016-02-04 17:22:55.000000000	287	Mary	Fuller	mfuller7y@4shared.com	Female	39.100.185.164	6759049803103370	Philippines		76958.57			1	11262262179434553359
+815	2016-02-04 08:01:05.000000000	816	Carolyn	Berry	cberrymn@merriam-webster.com		248.80.238.134	630475212324214080	China	7/14/1983	\N	Environmental Specialist		1	\N
+212	2016-02-04 01:44:35.000000000	213	Stephanie	Stephens	sstephens5w@noaa.gov	Female	46.204.42.128		Poland	5/9/1970	111085.25	VP Product Management		1	11707927600058205217
+510	2016-02-04 05:36:45.000000000	511	Ashley	Wallace	awallacee6@businesswire.com	Female	42.73.144.160	3533785396589455	Afghanistan		253647.58			1	10616068838779795227
+827	2016-02-04 02:56:30.000000000	828	Phyllis	Thompson	pthompsonmz@dyndns.org	Female	194.131.117.5	67639203453515726	Guatemala	1/14/1965	169581.64	Account Representative II		1	2913164633101786028
+705	2016-02-04 02:32:16.000000000	706	Randy	Lynch	rlynchjl@smh.com.au		150.42.215.175	633412716325659135	Guadeloupe		\N			1	\N
+174	2016-02-04 04:22:19.000000000	175	Matthew	West	mwest4u@woothemes.com	Male	84.96.179.102	201597130637699	China		162836.18			1	1664772539401809508
+89	2016-02-04 05:58:21.000000000	90	Terry	Parker	tparker2h@hc360.com	Male	189.36.77.133		China	4/2/1987	232623.76	GIS Technical Architect		1	14233491041490997279
+802	2016-02-04 01:42:21.000000000	803	Ann	Rose	arosema@weather.com	Female	100.21.196.218	343079152971743	Panama	8/4/1982	23346.01	Recruiter		1	16223618844547598244
+599	2016-02-04 20:52:10.000000000	600	Matthew	Johnson	mjohnsongn@zdnet.com	Male	90.233.99.234	3576872442196283	Greece	8/2/1956	192843.59	Database Administrator I		1	13239287735152636039
+911	2016-02-04 23:09:08.000000000	912	Carl	Reid	creidpb@who.int	Male	118.17.115.33	3529372387916827	Madagascar		119188.6		̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟	1	18058487470247735990
+63	2016-02-04 19:20:35.000000000	64	Samuel	Bishop	sbishop1r@npr.org	Male	87.38.89.122	3534693555244475	Indonesia		97009.57			1	439069544912696274
+162	2016-02-04 11:25:44.000000000	163	Joe	Campbell	jcampbell4i@woothemes.com	Male	51.128.14.99	3565057982691561	Ireland	5/17/1987	128833.87	Human Resources Assistant I		1	14365997131972604627
+958	2016-02-04 05:52:40.000000000	959	Adam	Robinson	arobinsonqm@ameblo.jp	Male	246.55.43.219	36766354159810	China	3/18/1986	214321.9	Administrative Assistant II		1	5979803470117383329
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	1000	17094857519419304960
+=== Try load data from userdata5.parquet
+540	2016-02-04 17:40:57.000000000	541	Stephanie	Watkins	swatkinsf0@state.gov	Female	145.133.26.223	3568947026673228	China	1/6/1970	182075.75	Accounting Assistant I		1	12719679438472110629
+923	2016-02-04 11:12:31.000000000	924	Karen	Bryant	kbryantpn@phpbb.com	Female	201.240.171.189		China	2/27/1965	209754.44	Librarian		1	9513760761369238532
+988	2016-02-04 23:53:57.000000000	989	Raymond	Reynolds	rreynoldsrg@ezinearticles.com	Male	131.241.110.218	3548006380185694	Cameroon	9/29/1987	234254.11	Administrative Officer		1	9292996498794941706
+73	2016-02-04 01:54:58.000000000	74	Jesse	Dixon	jdixon21@bloglines.com	Male	156.125.120.208		Syria		277530.58		(╯°□°）╯︵ ┻━┻)  	1	7700275595939105069
+639	2016-02-04 02:33:38.000000000	640	Rose	Franklin	rfranklinhr@eepurl.com		117.58.38.167		Japan	3/2/1971	\N	Help Desk Operator	"ثم نفس سقطت وبالتحديد،	1	\N
+959	2016-02-04 18:54:50.000000000	960	Ralph	Mitchell	rmitchellqn@fda.gov	Male	75.18.221.126		Sweden	1/19/1991	55185.48	Developer III		1	7269044307705662703
+286	2016-02-04 16:22:26.000000000	287	Raymond	Perez	rperez7y@fc2.com	Male	103.116.49.188	6384418686319994	France		133705.64		-1/2	1	5779306157384476126
+815	2016-02-04 19:16:50.000000000	816	Bonnie	Lawrence	blawrencemn@amazon.de		134.65.96.123	5002353226125524	Thailand	10/10/1982	\N	Tax Accountant		1	\N
+212	2016-02-04 08:28:49.000000000	213	Emily	Hansen	ehansen5w@house.gov	Female	218.61.79.46	3539439843757224	China	11/3/1962	212085.53	Technical Writer	1E+02	1	13040741097555162852
+510	2016-02-04 07:35:46.000000000	511	Shirley	Graham	sgrahame6@clickbank.net	Female	233.119.183.15		Philippines	11/19/1995	123469.85	Account Representative I		1	4682654051550734590
+827	2016-02-04 04:16:18.000000000	828	John	Wallace	jwallacemz@sbwire.com	Male	252.210.159.180		Japan		145020.04			1	17121090033668971382
+705	2016-02-04 04:32:57.000000000	706	Nancy	Brown	nbrownjl@scientificamerican.com		153.67.146.80		China	8/25/1962	\N	Nuclear Power Engineer	␡	1	\N
+174	2016-02-04 04:45:00.000000000	175	Robert	Spencer	rspencer4u@tinypic.com	Male	229.31.140.211		China	9/5/1977	134844.31	Business Systems Development Analyst		1	5982920501085697949
+89	2016-02-04 13:14:27.000000000	90	Jose	Wallace	jwallace2h@about.com	Male	250.231.81.57		Philippines	12/17/1983	213500.16	Design Engineer		1	5655515634053624982
+802	2016-02-04 20:42:48.000000000	803	Paula	Allen	pallenma@boston.com	Female	113.118.168.148	4917830849224286	Indonesia	7/22/1974	285735.68	Nurse		1	6738378110910741598
+599	2016-02-04 06:29:32.000000000	600	Wanda	Reyes	wreyesgn@chicagotribune.com	Female	138.59.39.89	30241930229004	China	11/1/1969	41876.49	Design Engineer		1	6802731161147542418
+911	2016-02-04 00:08:27.000000000	912	Evelyn	Fisher	efisherpb@soup.io	Female	221.207.200.158	201473318880354	China	5/17/1998	208654.68	Geological Engineer		1	9524608675424609675
+63	2016-02-04 09:26:01.000000000	64	Dorothy	Gray	dgray1r@vimeo.com	Female	206.99.76.117	3582462082297450	China	10/8/1975	58802.03	Staff Scientist	-1.00	1	658839239639963073
+162	2016-02-04 14:50:17.000000000	163	Linda	Mason	lmason4i@i2i.jp	Female	142.61.140.106	3584383784706648	Finland	12/31/1995	174353.91	Sales Associate		1	12432536431851155457
+958	2016-02-04 20:53:58.000000000	959	Kevin	Ruiz	kruizqm@eventbrite.com	Male	227.54.214.102	5602259166959980322	Philippines	1/1/1974	193459.78	Speech Pathologist		1	16616073755473516051
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	1000	9687591295559685771
+=== Try load data from v0.7.1.all-named-index.parquet
+9	0.24	62.8	57	336	3.94	3.96	2.48	Very Good	J	VVS2	1	3996266068447330517
+0	0.22	65.1	61	337	3.87	3.78	2.49	Fair	E	VS2	1	3997278206514178950
+4	0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1	1	8019383158266555191
+3	0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2	1	14186841138840780957
+1	0.23	56.9	65	327	4.05	4.07	2.31	Good	E	VS1	1	15443496918742015947
+8	0.24	62.3	57	336	3.95	3.98	2.47	Very Good	I	VVS1	1	13900850617142433881
+6	0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1	1	14657634484271004934
+7	0.23	59.4	61	338	4	4.05	2.39	Very Good	H	VS1	1	8407731385089321422
+5	0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2	1	15768860839508581766
+2	0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2	1	774416328789992944
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	10	6919038777064438429
+=== Try load data from v0.7.1.column-metadata-handling.parquet
+0	1	0.1	2016-12-31 23:00:00.000000	a	2016-12-31 23:00:00.000000	1	4077140958183322084
+1	2	0.2	2017-01-01 23:00:00.000000	b	2017-01-01 23:00:00.000000	1	7684735238820339858
+2	3	0.3	2017-01-02 23:00:00.000000	c	2017-01-02 23:00:00.000000	1	18375738761744497728
+
+\N	\N	\N	\N	\N	\N	3	11690870885038608054
+=== Try load data from v0.7.1.parquet
+9	0.23	Very Good	H	VS1	59.4	61	338	4	4.05	2.39	9	1	7435848941623393462
+0	0.23	Ideal	E	SI2	61.5	55	326	3.95	3.98	2.43	0	1	9641248315475845441
+4	0.31	Good	J	SI2	63.3	58	335	4.34	4.35	2.75	4	1	1951911154143418891
+3	0.29	Premium	I	VS2	62.4	58	334	4.2	4.23	2.63	3	1	11507922016923702495
+1	0.21	Premium	E	SI1	59.8	61	326	3.89	3.84	2.31	1	1	6071398217214065536
+8	0.22	Fair	E	VS2	65.1	61	337	3.87	3.78	2.49	8	1	12958836396990906934
+6	0.24	Very Good	I	VVS1	62.3	57	336	3.95	3.98	2.47	6	1	196947299945926025
+7	0.26	Very Good	H	SI1	61.9	55	337	4.07	4.11	2.53	7	1	3545027448448316782
+5	0.24	Very Good	J	VVS2	62.8	57	336	3.94	3.96	2.48	5	1	18280121696268577926
+2	0.23	Good	E	VS1	56.9	65	327	4.05	4.07	2.31	2	1	14500005620171806395
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	10	12302290812367753423
+=== Try load data from v0.7.1.some-named-index.parquet
+9	0.24	62.8	57	336	3.94	3.96	2.48	Very Good	J	VVS2	1	3996266068447330517
+0	0.22	65.1	61	337	3.87	3.78	2.49	Fair	E	VS2	1	3997278206514178950
+4	0.21	59.8	61	326	3.89	3.84	2.31	Premium	E	SI1	1	8019383158266555191
+3	0.23	61.5	55	326	3.95	3.98	2.43	Ideal	E	SI2	1	14186841138840780957
+1	0.23	56.9	65	327	4.05	4.07	2.31	Good	E	VS1	1	15443496918742015947
+8	0.24	62.3	57	336	3.95	3.98	2.47	Very Good	I	VVS1	1	13900850617142433881
+6	0.26	61.9	55	337	4.07	4.11	2.53	Very Good	H	SI1	1	14657634484271004934
+7	0.23	59.4	61	338	4	4.05	2.39	Very Good	H	VS1	1	8407731385089321422
+5	0.29	62.4	58	334	4.2	4.23	2.63	Premium	I	VS2	1	15768860839508581766
+2	0.31	63.3	58	335	4.34	4.35	2.75	Good	J	SI2	1	774416328789992944
+
+\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	10	6919038777064438429
diff --git a/tests/queries/0_stateless/00900_long_parquet_load_2.sh b/tests/queries/0_stateless/00900_long_parquet_load_2.sh
new file mode 100755
index 000000000000..0070a97983fb
--- /dev/null
+++ b/tests/queries/0_stateless/00900_long_parquet_load_2.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# Tags: long, no-fasttest, no-asan, no-msan, no-tsan
+#asdqwe no-debug
+
+# Load various .parquet files from the internet, and files used by other tests.
+
+# userdata{1..5}.parquet are from:
+# wget https://github.com/Teradata/kylo/raw/master/samples/sample-data/parquet/userdata1.parquet
+# ...
+# wget https://github.com/Teradata/kylo/raw/master/samples/sample-data/parquet/userdata5.parquet
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+DATA_DIR=$CUR_DIR/data_parquet
+
+# TODO [parquet]: Known issues to investigate:
+
+# ClickHouse Parquet reader doesn't support such complex types, so I didn't burrow into the issue.
+# There is failure due parsing nested arrays or nested maps with NULLs:
+# ../contrib/arrow/cpp/src/arrow/array/array_nested.cc:192:  Check failed: (self->list_type_->value_type()->id()) == (data->child_data[0]->type->id())
+
+# Strange behaviour for repeated_no_annotation.parquet around __buitin_expect, so this file was disabled:
+# debug:
+#   ../contrib/arrow/cpp/src/arrow/array/array_nested.cc:193:  Check failed: self->list_type_->value_type()->Equals(data->child_data[0]->type)
+# release:
+#   Code: 349. DB::Ex---tion: Can not insert NULL data into non-nullable column "phoneNumbers": data for INSERT was parsed from stdin
+
+EXCLUDE=(
+    # These have extremely long strings and blow up the output.
+    list_monotonically_increasing_offsets.parquet
+    string_int_list_inconsistent_offset_multiple_batches.parquet
+    # Date out of range.
+    02716_data.parquet
+)
+
+for NAME in $(find "$DATA_DIR" -type f \( -iname '*.parquet' -o -iname '*.parquet.gz' \) -print0 | xargs -0 -n 1 basename | LC_ALL=C sort | grep -vFf <(printf '%s\n' "${EXCLUDE[@]}")); do
+    echo "=== Try load data from $NAME"
+
+    # We want to read the file once and get both a hash of the whole data and a sample of a few
+    # pseudorandomly chosen rows. We use a dummy GROUP BY WITH TOTALS for that.
+    # (Maybe the unnecessary GROUP BY could be expensive if there are lots of rows, but these test
+    #  files don't have lots of rows or they would be too big to check into git.)
+    # TODO [parquet]: Delete the input_format_parquet_enable_json_parsing=0 when cityHash64
+    #                 supports JSON: https://github.com/ClickHouse/ClickHouse/issues/87734
+    # TODO [parquet]: Delete the session_timezone='UTC' after https://github.com/ClickHouse/ClickHouse/pull/87872
+    ${CLICKHOUSE_LOCAL} --query="
+        SELECT _row_number, *, count(), sum(cityHash64(_row_number, *)) FROM file('$DATA_DIR/$NAME') GROUP BY all WITH TOTALS ORDER BY cityHash64(_row_number) LIMIT 20 SETTINGS input_format_parquet_enable_json_parsing=0, session_timezone='UTC';" 2>&1
+done
diff --git a/tests/queries/0_stateless/00906_low_cardinality_cache.sql b/tests/queries/0_stateless/00906_low_cardinality_cache.sql
index d34550dd5ac3..81574ac6f0c1 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_cache.sql
+++ b/tests/queries/0_stateless/00906_low_cardinality_cache.sql
@@ -2,7 +2,7 @@
 
 SET max_rows_to_read = '100M', max_execution_time = 600;
 drop table if exists lc_00906;
-create table lc_00906 (b LowCardinality(String)) engine=MergeTree order by b SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-insert into lc_00906 select '0123456789' from numbers(100000000);
+create table lc_00906 (b LowCardinality(String)) engine=MergeTree order by b SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi', vertical_merge_algorithm_min_rows_to_activate=100000000;
+insert into lc_00906 select '0123456789' from numbers(100000000) SETTINGS max_insert_threads=6, max_threads=4;
 select count(), b from lc_00906 group by b;
 drop table if exists lc_00906;
diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index c510c0a534f7..1f2a21ad3c54 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -28,11 +28,11 @@ function thread_rename {
     local TIMELIMIT=$((SECONDS+20))
     while [ $SECONDS -lt "$TIMELIMIT" ]
     do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521|741)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521|741|159)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521|741)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521|741|159)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521|741)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521|741|159)'
         sleep 0.0$RANDOM
     done
 }
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index 716d0cd00634..a4b9d2dafd9d 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -43,6 +43,8 @@ ALTER TTL	['ALTER MODIFY TTL','MODIFY TTL']	TABLE	ALTER TABLE
 ALTER MATERIALIZE TTL	['MATERIALIZE TTL']	TABLE	ALTER TABLE
 ALTER SETTINGS	['ALTER SETTING','ALTER MODIFY SETTING','MODIFY SETTING','RESET SETTING']	TABLE	ALTER TABLE
 ALTER MOVE PARTITION	['ALTER MOVE PART','MOVE PARTITION','MOVE PART']	TABLE	ALTER TABLE
+ALTER EXPORT PART	['ALTER EXPORT PART','EXPORT PART']	TABLE	ALTER TABLE
+ALTER EXPORT PARTITION	['ALTER EXPORT PARTITION','EXPORT PARTITION']	TABLE	ALTER TABLE
 ALTER FETCH PARTITION	['ALTER FETCH PART','FETCH PARTITION']	TABLE	ALTER TABLE
 ALTER FREEZE PARTITION	['FREEZE PARTITION','UNFREEZE']	TABLE	ALTER TABLE
 ALTER UNLOCK SNAPSHOT	['UNLOCK SNAPSHOT']	TABLE	ALTER TABLE
@@ -133,6 +135,8 @@ SYSTEM DROP PAGE CACHE	['SYSTEM DROP PAGE CACHE','DROP PAGE CACHE']	GLOBAL	SYSTE
 SYSTEM DROP SCHEMA CACHE	['SYSTEM DROP SCHEMA CACHE','DROP SCHEMA CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP FORMAT SCHEMA CACHE	['SYSTEM DROP FORMAT SCHEMA CACHE','DROP FORMAT SCHEMA CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP S3 CLIENT CACHE	['SYSTEM DROP S3 CLIENT','DROP S3 CLIENT CACHE']	GLOBAL	SYSTEM DROP CACHE
+SYSTEM DROP OBJECT STORAGE LIST OBJECTS CACHE	['SYSTEM DROP OBJECT STORAGE LIST OBJECTS CACHE']	GLOBAL	SYSTEM DROP CACHE
+SYSTEM DROP PARQUET METADATA CACHE	['SYSTEM DROP PARQUET METADATA CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP CACHE	['DROP CACHE']	\N	SYSTEM
 SYSTEM RELOAD CONFIG	['RELOAD CONFIG']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD USERS	['RELOAD USERS']	GLOBAL	SYSTEM RELOAD
@@ -147,6 +151,7 @@ SYSTEM MERGES	['SYSTEM STOP MERGES','SYSTEM START MERGES','STOP MERGES','START M
 SYSTEM TTL MERGES	['SYSTEM STOP TTL MERGES','SYSTEM START TTL MERGES','STOP TTL MERGES','START TTL MERGES']	TABLE	SYSTEM
 SYSTEM FETCHES	['SYSTEM STOP FETCHES','SYSTEM START FETCHES','STOP FETCHES','START FETCHES']	TABLE	SYSTEM
 SYSTEM MOVES	['SYSTEM STOP MOVES','SYSTEM START MOVES','STOP MOVES','START MOVES']	TABLE	SYSTEM
+SYSTEM SWARM	['SYSTEM STOP SWARM MODE','SYSTEM START SWARM MODE','STOP SWARM MODE','START SWARM MODE']	GLOBAL	SYSTEM
 SYSTEM PULLING REPLICATION LOG	['SYSTEM STOP PULLING REPLICATION LOG','SYSTEM START PULLING REPLICATION LOG']	TABLE	SYSTEM
 SYSTEM CLEANUP	['SYSTEM STOP CLEANUP','SYSTEM START CLEANUP']	TABLE	SYSTEM
 SYSTEM VIEWS	['SYSTEM REFRESH VIEW','SYSTEM START VIEWS','SYSTEM STOP VIEWS','SYSTEM START VIEW','SYSTEM STOP VIEW','SYSTEM CANCEL VIEW','REFRESH VIEW','START VIEWS','STOP VIEWS','START VIEW','STOP VIEW','CANCEL VIEW']	VIEW	SYSTEM
diff --git a/tests/queries/0_stateless/01504_rocksdb.sql b/tests/queries/0_stateless/01504_rocksdb.sql
index 0f2737c8c5c5..868c60192d0c 100644
--- a/tests/queries/0_stateless/01504_rocksdb.sql
+++ b/tests/queries/0_stateless/01504_rocksdb.sql
@@ -1,4 +1,4 @@
--- Tags: no-ordinary-database, no-fasttest
+-- Tags: no-ordinary-database, no-fasttest, use-rocksdb
 -- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
 -- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
 
diff --git a/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.reference b/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.reference
index 2dfc42690fc6..f9366fee0368 100644
--- a/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.reference
+++ b/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.reference
@@ -3,5 +3,5 @@
 1
 1
 1	[]	[]	[]	0
-CREATE TABLE default.defaults_on_defaults\n(\n    `key` UInt64,\n    `Arr.C1` Array(UInt32) DEFAULT emptyArrayUInt32(),\n    `Arr.C2` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(`Arr.C1`)),\n    `Arr.C3` Array(UInt32) ALIAS arrayResize(emptyArrayUInt32(), length(`Arr.C2`)),\n    `Arr.C4` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(`Arr.C3`)),\n    `ArrLen` UInt64 DEFAULT length(`Arr.C4`)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.defaults_on_defaults\n(\n    `key` UInt64,\n    `Arr.C1` Array(UInt32) DEFAULT emptyArrayUInt32(),\n    `Arr.C2` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(Arr.C1)),\n    `Arr.C3` Array(UInt32) ALIAS arrayResize(emptyArrayUInt32(), length(Arr.C2)),\n    `Arr.C4` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(Arr.C3)),\n    `ArrLen` UInt64 DEFAULT length(Arr.C4)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1
diff --git a/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.sql b/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.sql
index 83025b6ccddc..65b7b99f70ba 100644
--- a/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.sql
+++ b/tests/queries/0_stateless/01513_defaults_on_defaults_no_column.sql
@@ -9,19 +9,19 @@ INSERT INTO defaults_on_defaults values (1);
 
 ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C1` Array(UInt32) DEFAULT emptyArrayUInt32();
 
-ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C2` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(`Arr.C1`));
+ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C2` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(Arr.C1));
 
-ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C3` Array(UInt32) ALIAS arrayResize(emptyArrayUInt32(), length(`Arr.C2`));
+ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C3` Array(UInt32) ALIAS arrayResize(emptyArrayUInt32(), length(Arr.C2));
 
 SELECT 1 from defaults_on_defaults where length(`Arr.C2`) = 0;
 
 SELECT 1 from defaults_on_defaults where length(`Arr.C3`) = 0;
 
-ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C4` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(`Arr.C3`));
+ALTER TABLE defaults_on_defaults ADD COLUMN `Arr.C4` Array(UInt32) DEFAULT arrayResize(emptyArrayUInt32(), length(Arr.C3));
 
 SELECT 1 from defaults_on_defaults where length(`Arr.C4`) = 0;
 
-ALTER TABLE defaults_on_defaults ADD COLUMN `ArrLen` UInt64 DEFAULT length(`Arr.C4`);
+ALTER TABLE defaults_on_defaults ADD COLUMN `ArrLen` UInt64 DEFAULT length(Arr.C4);
 
 SELECT 1 from defaults_on_defaults where ArrLen = 0;
 
diff --git a/tests/queries/0_stateless/01528_play.reference b/tests/queries/0_stateless/01528_play.reference
index c379c57890fc..1fa4fc5676d6 100644
--- a/tests/queries/0_stateless/01528_play.reference
+++ b/tests/queries/0_stateless/01528_play.reference
@@ -1 +1 @@
-clickhouse.com
+<link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB
diff --git a/tests/queries/0_stateless/01528_play.sh b/tests/queries/0_stateless/01528_play.sh
index d3c4b7584858..d7277a47384f 100755
--- a/tests/queries/0_stateless/01528_play.sh
+++ b/tests/queries/0_stateless/01528_play.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/play" | grep -o -F 'clickhouse.com'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/play" | grep -o -F '<link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB'
diff --git a/tests/queries/0_stateless/01545_url_file_format_settings.sql b/tests/queries/0_stateless/01545_url_file_format_settings.sql
index 21991db98547..8563f242c3bf 100644
--- a/tests/queries/0_stateless/01545_url_file_format_settings.sql
+++ b/tests/queries/0_stateless/01545_url_file_format_settings.sql
@@ -1,3 +1,7 @@
+-- Tags: no-parallel
+
+set use_hive_partitioning=0; -- required because of "?query=select"
+
 create table file_delim(a int, b int) engine File(CSV, '01545_url_file_format_settings.csv') settings format_csv_delimiter = '|';
 
 truncate table file_delim;
diff --git a/tests/queries/0_stateless/01686_rocksdb.sql b/tests/queries/0_stateless/01686_rocksdb.sql
index b907f8cf9855..6893d3b9e1f1 100644
--- a/tests/queries/0_stateless/01686_rocksdb.sql
+++ b/tests/queries/0_stateless/01686_rocksdb.sql
@@ -1,4 +1,4 @@
--- Tags: no-ordinary-database, no-fasttest
+-- Tags: no-ordinary-database, no-fasttest, use-rocksdb
 -- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
 -- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
 
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.oldanalyzer.reference b/tests/queries/0_stateless/01798_uniq_theta_sketch.oldanalyzer.reference
index 0455a06036f0..744e7977fca7 100644
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.oldanalyzer.reference
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.oldanalyzer.reference
@@ -2,7 +2,7 @@ uniqTheta many agrs
 10	10	100	100	1000	1000
 17	10	10	100	100	610	610	766
 52	10	10	100	100	608	608	766
-5	10	10	100	100	608	608	765
+5	10	10	100	100	609	609	765
 9	10	10	100	100	608	608	765
 13	10	10	100	100	607	607	765
 46	10	10	100	100	607	607	765
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.reference b/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
index e1f77d593d57..4bba5ffb944d 100644
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
@@ -2,7 +2,7 @@ uniqTheta many agrs
 10	10	100	100	1000	1000
 17	10	10	100	100	610	610	766
 52	10	10	100	100	608	608	766
-5	10	10	100	100	608	608	765
+5	10	10	100	100	609	609	765
 9	10	10	100	100	608	608	765
 13	10	10	100	100	607	607	765
 46	10	10	100	100	607	607	765
diff --git a/tests/queries/0_stateless/01821_table_comment.sql b/tests/queries/0_stateless/01821_table_comment.sql
index e24d159e0724..e97871e9d156 100644
--- a/tests/queries/0_stateless/01821_table_comment.sql
+++ b/tests/queries/0_stateless/01821_table_comment.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-fasttest
+-- Tags: no-parallel, no-fasttest, use-rocksdb
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.reference b/tests/queries/0_stateless/01883_subcolumns_distributed.reference
index 459f90ada981..ebf283ad196c 100644
--- a/tests/queries/0_stateless/01883_subcolumns_distributed.reference
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.reference
@@ -1,2 +1,4 @@
 3	0	bbb	ccc
 3	0	bbb	ccc
+3	0	bbb	ccc
+3	0	bbb	ccc
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.sql b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
index 05bab51018f1..72730e796c36 100644
--- a/tests/queries/0_stateless/01883_subcolumns_distributed.sql
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
@@ -17,7 +17,10 @@ DROP TABLE t_subcolumns_local;
 -- StripeLog doesn't support subcolumns.
 CREATE TABLE t_subcolumns_local (arr Array(UInt32), n Nullable(String), t Tuple(s1 String, s2 String)) ENGINE = StripeLog;
 
-SELECT arr.size0, n.null, t.s1, t.s2 FROM t_subcolumns_dist; -- { serverError UNKNOWN_IDENTIFIER }
+INSERT INTO t_subcolumns_local VALUES ([1, 2, 3], 'aaa', ('bbb', 'ccc'));
+
+SELECT arr.size0, n.null, t.s1, t.s2 FROM t_subcolumns_dist SETTINGS enable_analyzer=1;
+SELECT arr.size0, n.null, t.s1, t.s2 FROM t_subcolumns_dist SETTINGS enable_analyzer=0; -- {serverError UNKNOWN_IDENTIFIER}
 
 DROP TABLE t_subcolumns_local;
 DROP TABLE t_subcolumns_dist;
diff --git a/tests/queries/0_stateless/02030_rocksdb_race_long.sh b/tests/queries/0_stateless/02030_rocksdb_race_long.sh
index 7336fbe92ae2..d6b1339b164e 100755
--- a/tests/queries/0_stateless/02030_rocksdb_race_long.sh
+++ b/tests/queries/0_stateless/02030_rocksdb_race_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: race
+# Tags: race, use-rocksdb
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02073_mv_dependency_recreate.reference b/tests/queries/0_stateless/02073_mv_dependency_recreate.reference
new file mode 100644
index 000000000000..1191247b6d9a
--- /dev/null
+++ b/tests/queries/0_stateless/02073_mv_dependency_recreate.reference
@@ -0,0 +1,2 @@
+1
+2
diff --git a/tests/queries/0_stateless/02073_mv_dependency_recreate.sh b/tests/queries/0_stateless/02073_mv_dependency_recreate.sh
new file mode 100755
index 000000000000..e46a59f93bf2
--- /dev/null
+++ b/tests/queries/0_stateless/02073_mv_dependency_recreate.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query "create table src (n int) engine=MergeTree order by n"
+$CLICKHOUSE_CLIENT --query "create table dst (n int) engine=MergeTree order by n"
+$CLICKHOUSE_CLIENT --query "create materialized view mv to dst (n int) as select * from src"
+$CLICKHOUSE_CLIENT --query "insert into src select 1"
+$CLICKHOUSE_CLIENT --query "select sleep(2) from mv format Null" 2> /dev/null &
+sleep 0.$RANDOM
+
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=0 --query "drop table mv"
+$CLICKHOUSE_CLIENT --query "create materialized view mv to dst (n int) as select * from src"
+
+wait
+sleep 1 # increase chance of reproducing the issue
+$CLICKHOUSE_CLIENT --query "insert into src select 2"
+
+$CLICKHOUSE_CLIENT --query "select * from dst order by n"
+
+$CLICKHOUSE_CLIENT --query "drop table mv"
+$CLICKHOUSE_CLIENT --query "drop table src"
+$CLICKHOUSE_CLIENT --query "drop table dst"
diff --git a/tests/queries/0_stateless/02168_avro_bug.sql b/tests/queries/0_stateless/02168_avro_bug.sql
index ac98119845f5..338b5ef8b0b4 100644
--- a/tests/queries/0_stateless/02168_avro_bug.sql
+++ b/tests/queries/0_stateless/02168_avro_bug.sql
@@ -1,5 +1,5 @@
 -- Tags: no-fasttest, no-parallel
-insert into table function file('data.avro', 'Parquet', 'x UInt64') select * from numbers(10);
-insert into table function file('data.avro', 'Parquet', 'x UInt64') select * from numbers(10); -- { serverError CANNOT_APPEND_TO_FILE }
-insert into table function file('data.avro', 'Parquet', 'x UInt64') select * from numbers(10); -- { serverError CANNOT_APPEND_TO_FILE }
+insert into table function file('02168_avro_bug.avro', 'Parquet', 'x UInt64') select * from numbers(10) settings engine_file_truncate_on_insert=1;
+insert into table function file('02168_avro_bug.avro', 'Parquet', 'x UInt64') select * from numbers(10); -- { serverError CANNOT_APPEND_TO_FILE }
+insert into table function file('02168_avro_bug.avro', 'Parquet', 'x UInt64') select * from numbers(10); -- { serverError CANNOT_APPEND_TO_FILE }
 select 'OK';
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
index eea09bd06035..1b4fcf850453 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
@@ -18,6 +18,8 @@ columns
 columns
 creator_info
 creator_info
+exports
+exports
 failed_parts
 failed_parts
 flags
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 0d6c21be132f..9a250fa65580 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
@@ -8,6 +8,7 @@ blocks
 columns
 columns
 creator_info
+exports
 failed_parts
 flags
 host
@@ -49,6 +50,7 @@ blocks
 columns
 columns
 creator_info
+exports
 failed_parts
 flags
 host
diff --git a/tests/queries/0_stateless/02344_describe_cache.reference b/tests/queries/0_stateless/02344_describe_cache.reference
index cee70f9490bd..38b164fae494 100644
--- a/tests/queries/0_stateless/02344_describe_cache.reference
+++ b/tests/queries/0_stateless/02344_describe_cache.reference
@@ -1,2 +1,2 @@
 1
-02344_describe_cache_test	/var/lib/clickhouse/filesystem_caches/02344_describe_cache_test	102400	10000000	33554432	4194304	0	slru	0.6	5	5000	4194304	16	0	0	0	10	0	0	0	268435456	0	0	0	1	0	0
+02344_describe_cache_test	/var/lib/clickhouse/filesystem_caches/02344_describe_cache_test	102400	10000000	33554432	4194304	0	slru	0.6	5	5000	4194304	16	0	0	0	100	0	0	0	268435456	0	0	0	1	0	0
diff --git a/tests/queries/0_stateless/02375_rocksdb_with_filters.sh b/tests/queries/0_stateless/02375_rocksdb_with_filters.sh
index 36fcd0b5f6dd..7153e4abaa31 100755
--- a/tests/queries/0_stateless/02375_rocksdb_with_filters.sh
+++ b/tests/queries/0_stateless/02375_rocksdb_with_filters.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest
+# Tags: no-fasttest, use-rocksdb
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02404_data.CSV b/tests/queries/0_stateless/02404_data.CSV
deleted file mode 100644
index 2d8b5c8daa8f..000000000000
--- a/tests/queries/0_stateless/02404_data.CSV
+++ /dev/null
@@ -1,10 +0,0 @@
-0,"1970-01-01"
-1,"1970-01-02"
-2,"1970-01-03"
-3,"1970-01-04"
-4,"1970-01-05"
-5,"1970-01-06"
-6,"1970-01-07"
-7,"1970-01-08"
-8,"1970-01-09"
-9,"1970-01-10"
diff --git a/tests/queries/0_stateless/02404_data.CSVWithNames b/tests/queries/0_stateless/02404_data.CSVWithNames
deleted file mode 100644
index 346470089162..000000000000
--- a/tests/queries/0_stateless/02404_data.CSVWithNames
+++ /dev/null
@@ -1,11 +0,0 @@
-"number","toDate(number)"
-0,"1970-01-01"
-1,"1970-01-02"
-2,"1970-01-03"
-3,"1970-01-04"
-4,"1970-01-05"
-5,"1970-01-06"
-6,"1970-01-07"
-7,"1970-01-08"
-8,"1970-01-09"
-9,"1970-01-10"
diff --git a/tests/queries/0_stateless/02404_data.CustomSeparated b/tests/queries/0_stateless/02404_data.CustomSeparated
deleted file mode 100644
index f3ae1663536d..000000000000
--- a/tests/queries/0_stateless/02404_data.CustomSeparated
+++ /dev/null
@@ -1,10 +0,0 @@
-0	1970-01-01
-1	1970-01-02
-2	1970-01-03
-3	1970-01-04
-4	1970-01-05
-5	1970-01-06
-6	1970-01-07
-7	1970-01-08
-8	1970-01-09
-9	1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.JSONCompactEachRow b/tests/queries/0_stateless/02404_data.JSONCompactEachRow
deleted file mode 100644
index de2e0986aab5..000000000000
--- a/tests/queries/0_stateless/02404_data.JSONCompactEachRow
+++ /dev/null
@@ -1,10 +0,0 @@
-["0", "1970-01-01"]
-["1", "1970-01-02"]
-["2", "1970-01-03"]
-["3", "1970-01-04"]
-["4", "1970-01-05"]
-["5", "1970-01-06"]
-["6", "1970-01-07"]
-["7", "1970-01-08"]
-["8", "1970-01-09"]
-["9", "1970-01-10"]
diff --git a/tests/queries/0_stateless/02404_data.JSONEachRow b/tests/queries/0_stateless/02404_data.JSONEachRow
deleted file mode 100644
index e77256ac7fc1..000000000000
--- a/tests/queries/0_stateless/02404_data.JSONEachRow
+++ /dev/null
@@ -1,10 +0,0 @@
-{"number":"0","toDate(number)":"1970-01-01"}
-{"number":"1","toDate(number)":"1970-01-02"}
-{"number":"2","toDate(number)":"1970-01-03"}
-{"number":"3","toDate(number)":"1970-01-04"}
-{"number":"4","toDate(number)":"1970-01-05"}
-{"number":"5","toDate(number)":"1970-01-06"}
-{"number":"6","toDate(number)":"1970-01-07"}
-{"number":"7","toDate(number)":"1970-01-08"}
-{"number":"8","toDate(number)":"1970-01-09"}
-{"number":"9","toDate(number)":"1970-01-10"}
diff --git a/tests/queries/0_stateless/02404_data.TSKV b/tests/queries/0_stateless/02404_data.TSKV
deleted file mode 100644
index 70f7ad33c8b7..000000000000
--- a/tests/queries/0_stateless/02404_data.TSKV
+++ /dev/null
@@ -1,10 +0,0 @@
-number=0	toDate(number)=1970-01-01
-number=1	toDate(number)=1970-01-02
-number=2	toDate(number)=1970-01-03
-number=3	toDate(number)=1970-01-04
-number=4	toDate(number)=1970-01-05
-number=5	toDate(number)=1970-01-06
-number=6	toDate(number)=1970-01-07
-number=7	toDate(number)=1970-01-08
-number=8	toDate(number)=1970-01-09
-number=9	toDate(number)=1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.TSV b/tests/queries/0_stateless/02404_data.TSV
deleted file mode 100644
index f3ae1663536d..000000000000
--- a/tests/queries/0_stateless/02404_data.TSV
+++ /dev/null
@@ -1,10 +0,0 @@
-0	1970-01-01
-1	1970-01-02
-2	1970-01-03
-3	1970-01-04
-4	1970-01-05
-5	1970-01-06
-6	1970-01-07
-7	1970-01-08
-8	1970-01-09
-9	1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.TSVWithNames b/tests/queries/0_stateless/02404_data.TSVWithNames
deleted file mode 100644
index 23310234a8cf..000000000000
--- a/tests/queries/0_stateless/02404_data.TSVWithNames
+++ /dev/null
@@ -1,11 +0,0 @@
-number	toDate(number)
-0	1970-01-01
-1	1970-01-02
-2	1970-01-03
-3	1970-01-04
-4	1970-01-05
-5	1970-01-06
-6	1970-01-07
-7	1970-01-08
-8	1970-01-09
-9	1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.Values b/tests/queries/0_stateless/02404_data.Values
deleted file mode 100644
index d9a621d7ec9e..000000000000
--- a/tests/queries/0_stateless/02404_data.Values
+++ /dev/null
@@ -1 +0,0 @@
-(0,'1970-01-01'),(1,'1970-01-02'),(2,'1970-01-03'),(3,'1970-01-04'),(4,'1970-01-05'),(5,'1970-01-06'),(6,'1970-01-07'),(7,'1970-01-08'),(8,'1970-01-09'),(9,'1970-01-10')
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.sql.j2 b/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.sql.j2
index b726321c56dc..909db1f3183d 100644
--- a/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.sql.j2
+++ b/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.sql.j2
@@ -2,6 +2,7 @@
 
 system drop schema cache for file;
 set input_format_json_try_infer_numbers_from_strings=1;
+set session_timezone='UTC';
 {% for format in ['TSV', 'TSVWithNames', 'CSV', 'CSVWithNames', 'TSKV', 'CustomSeparated', 'JSONEachRow', 'JSONCompactEachRow', 'Values'] -%}
 
 select '{{ format }}';
diff --git a/tests/queries/0_stateless/02416_rocksdb_delete_update.sql b/tests/queries/0_stateless/02416_rocksdb_delete_update.sql
index 489788f890c2..0cf23e97f620 100644
--- a/tests/queries/0_stateless/02416_rocksdb_delete_update.sql
+++ b/tests/queries/0_stateless/02416_rocksdb_delete_update.sql
@@ -1,4 +1,4 @@
--- Tags: no-ordinary-database, no-fasttest
+-- Tags: no-ordinary-database, no-fasttest, use-rocksdb
 
 DROP TABLE IF EXISTS 02416_rocksdb;
 
diff --git a/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.reference b/tests/queries/0_stateless/02537_distributed_losing_files_after_exception.reference
similarity index 100%
rename from tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.reference
rename to tests/queries/0_stateless/02537_distributed_losing_files_after_exception.reference
diff --git a/tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.sql.j2 b/tests/queries/0_stateless/02537_distributed_losing_files_after_exception.sql.j2
similarity index 100%
rename from tests/queries/0_stateless/02537_distributed_loosing_files_after_exception.sql.j2
rename to tests/queries/0_stateless/02537_distributed_losing_files_after_exception.sql.j2
diff --git a/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh
index 1e66483b86e9..6456a7f6958f 100755
--- a/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh
+++ b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.sh
@@ -19,6 +19,7 @@ WITH '(\\w+): (\\d+)' AS pattern,
      AND line NOT LIKE '%S3DiskConnections%'
      AND line NOT LIKE '%S3DiskAddresses%'
      AND line NOT LIKE '%RequestThrottlerCount%'
+     AND line NOT LIKE '%RetryableErrors%'
      ) AS pe_map
 SELECT * FROM (
     SELECT untuple(arrayJoin(pe_map) AS pe)
diff --git a/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference b/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference
index 56fa4a9ebea8..6b2fafc27d43 100644
--- a/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference
+++ b/tests/queries/0_stateless/02675_sparse_columns_clear_column.reference
@@ -2,5 +2,4 @@ arr	Default
 v	Sparse
 arr	Default
 arr	Default
-v	Sparse
 0	[]
diff --git a/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference b/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference
index 1898b2c543b7..fbc83e246913 100644
--- a/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference
+++ b/tests/queries/0_stateless/02731_zero_objects_in_metadata.reference
@@ -2,5 +2,9 @@
 1	[]
 []
 1	[]
+[]
+1	[]
+1	[]
+[]
 1	[]
 []
diff --git a/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh b/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh
index 6e40495157b4..369f0334037c 100755
--- a/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh
+++ b/tests/queries/0_stateless/02731_zero_objects_in_metadata.sh
@@ -7,6 +7,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 for DISK in s3_disk s3_cache
 do
+    BACKUP_NAME="test_s3_backup_${CLICKHOUSE_TEST_UNIQUE_NAME}_${DISK}"
+    BACKUP_DB_NAME="test_backup_db_${CLICKHOUSE_DATABASE}"
+
     ${CLICKHOUSE_CLIENT} --query "
     DROP TABLE IF EXISTS test;
     CREATE TABLE test (id Int32, empty Array(Int32))
@@ -15,16 +18,23 @@ do
 
     INSERT INTO test (id) VALUES (1);
     SELECT * FROM test;
-    "
 
-    ${CLICKHOUSE_CLIENT} --query "
-    BACKUP TABLE test TO Disk('backups', 'test_s3_backup');
+    BACKUP TABLE test TO Disk('backups', '${BACKUP_NAME}') FORMAT Null;
     DROP TABLE test;
-    RESTORE TABLE test FROM Disk('backups', 'test_s3_backup');
-    " &>/dev/null
+    RESTORE TABLE test FROM Disk('backups', '${BACKUP_NAME}') FORMAT Null;
 
-    ${CLICKHOUSE_CLIENT} --query "
     SELECT * FROM test;
     SELECT empty FROM test;
+
+    DROP DATABASE IF EXISTS "${BACKUP_DB_NAME}";
+    -- we create a backup db that points to the current test's CLICKHOUSE_DATABASE
+    -- otherwise it will have no tables.
+    CREATE DATABASE "${BACKUP_DB_NAME}"
+        ENGINE=Backup('${CLICKHOUSE_DATABASE}', Disk('backups', '${BACKUP_NAME}'));
+
+    SELECT * FROM "${BACKUP_DB_NAME}".test;
+    SELECT empty FROM "${BACKUP_DB_NAME}".test;
+
+    DROP DATABASE "${BACKUP_DB_NAME}";
     "
 done
diff --git a/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.reference b/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.reference
index 877bb5f390f8..b7211a9f2526 100644
--- a/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.reference
+++ b/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.reference
@@ -1,2 +1,5 @@
 424242424242424242424242424242424242424242424242424242
 22707864971053448441042714569797161695738549521977760418632926980540162388532
+42424242424242424242424242424242
+22707864971053448441042714569797161695738549521977760418632926980540162388532
+42424242424242424242424242424242
diff --git a/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.sh b/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.sh
index 0f590027f194..2c5a79e36430 100755
--- a/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.sh
+++ b/tests/queries/0_stateless/02786_parquet_big_integer_compatibility.sh
@@ -8,5 +8,13 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # This is parsed as text.
 $CLICKHOUSE_LOCAL -q "select toString(424242424242424242424242424242424242424242424242424242::UInt256) as x format Parquet" | $CLICKHOUSE_LOCAL --input-format=Parquet --structure='x UInt256' -q "select * from table"
 
-# But this is parsed as binary because text length happens to be 32 bytes. Not ideal.
-$CLICKHOUSE_LOCAL -q "select toString(42424242424242424242424242424242::UInt256) as x format Parquet" | $CLICKHOUSE_LOCAL --input-format=Parquet --structure='x UInt256' -q "select * from table"
+# FIXED_LEN_BYTE_ARRAY(32) is parsed as binary.
+$CLICKHOUSE_LOCAL -q "select toFixedString(42424242424242424242424242424242::UInt256::String, 32) as x format Parquet" | $CLICKHOUSE_LOCAL --input-format=Parquet --structure='x UInt256' -q "select * from table"
+
+# FIXED_LEN_BYTE_ARRAY(not 32) is parsed as text by the new reader, throws exception in the old reader.
+$CLICKHOUSE_LOCAL -q "select toFixedString(42424242424242424242424242424242::UInt256::String, 50) as x format Parquet" | $CLICKHOUSE_LOCAL --input-format=Parquet --structure='x UInt256' --input_format_parquet_use_native_reader_v3=1 -q "select * from table"
+
+# BYTE_ARRAY of length 32 is interpreted as binary by the old parquet reader, as text by the new one.
+$CLICKHOUSE_LOCAL -q "select toString(42424242424242424242424242424242::UInt256) as x format Parquet" | $CLICKHOUSE_LOCAL --input-format=Parquet --structure='x UInt256' --input_format_parquet_use_native_reader_v3=0 -q "select * from table"
+$CLICKHOUSE_LOCAL -q "select toString(42424242424242424242424242424242::UInt256) as x format Parquet" | $CLICKHOUSE_LOCAL --input-format=Parquet --structure='x UInt256' --input_format_parquet_use_native_reader_v3=1 -q "select * from table"
+
diff --git a/tests/queries/0_stateless/02811_invalid_embedded_rocksdb_create.sql b/tests/queries/0_stateless/02811_invalid_embedded_rocksdb_create.sql
index eca64d3865ae..54e0c2522669 100644
--- a/tests/queries/0_stateless/02811_invalid_embedded_rocksdb_create.sql
+++ b/tests/queries/0_stateless/02811_invalid_embedded_rocksdb_create.sql
@@ -1,2 +1,2 @@
--- Tags: no-fasttest
+-- Tags: no-fasttest, use-rocksdb
 CREATE TABLE dict (`k` String, `v` String) ENGINE = EmbeddedRocksDB(k) PRIMARY KEY k; -- {serverError BAD_ARGUMENTS}
diff --git a/tests/queries/0_stateless/02845_parquet_odd_decimals.reference b/tests/queries/0_stateless/02845_parquet_odd_decimals.reference
index 29d6383b52c1..d932dbb06fef 100644
--- a/tests/queries/0_stateless/02845_parquet_odd_decimals.reference
+++ b/tests/queries/0_stateless/02845_parquet_odd_decimals.reference
@@ -1 +1,5 @@
 100
+col-1de12c05-5dd5-4fa7-9f93-33c43c9a4028	Decimal(20, 0)					
+col-5e1b97f1-dade-4c7d-b71b-e31d789e01a4	String					
+col-1de12c05-5dd5-4fa7-9f93-33c43c9a4028	Decimal(20, 0)					
+col-5e1b97f1-dade-4c7d-b71b-e31d789e01a4	String					
diff --git a/tests/queries/0_stateless/02845_parquet_odd_decimals.sh b/tests/queries/0_stateless/02845_parquet_odd_decimals.sh
index f1e2ec849c45..48e451bfed85 100755
--- a/tests/queries/0_stateless/02845_parquet_odd_decimals.sh
+++ b/tests/queries/0_stateless/02845_parquet_odd_decimals.sh
@@ -11,3 +11,6 @@ ${CLICKHOUSE_CLIENT} --query="drop table if exists 02845_parquet_odd_decimals"
 ${CLICKHOUSE_CLIENT} --query="create table 02845_parquet_odd_decimals (\`col-1de12c05-5dd5-4fa7-9f93-33c43c9a4028\` Decimal(20, 0), \`col-5e1b97f1-dade-4c7d-b71b-e31d789e01a4\` String) engine Memory"
 ${CLICKHOUSE_CLIENT} --query="insert into 02845_parquet_odd_decimals from infile '$CUR_DIR/data_parquet/nine_byte_decimals_from_spark.parquet'"
 ${CLICKHOUSE_CLIENT} --query="select count() from 02845_parquet_odd_decimals"
+
+${CLICKHOUSE_LOCAL} --query="desc file('$CUR_DIR/data_parquet/nine_byte_decimals_from_spark.parquet') settings schema_inference_make_columns_nullable=0, input_format_parquet_use_native_reader_v3=0"
+${CLICKHOUSE_LOCAL} --query="desc file('$CUR_DIR/data_parquet/nine_byte_decimals_from_spark.parquet') settings schema_inference_make_columns_nullable=0, input_format_parquet_use_native_reader_v3=1"
diff --git a/tests/queries/0_stateless/02886_missed_json_subcolumns.reference b/tests/queries/0_stateless/02886_missed_json_subcolumns.reference
deleted file mode 100644
index 263917c002b1..000000000000
--- a/tests/queries/0_stateless/02886_missed_json_subcolumns.reference
+++ /dev/null
@@ -1,7 +0,0 @@
-4	1
-{"id":1,"n":"aaa","obj.k4":null}
-{"id":2,"n":"bbb","obj.k4":null}
-{"id":3,"n":"ccc","obj.k4":null}
-{"id":4,"n":"ddd","obj.k4":null}
-4	1
-4	1
diff --git a/tests/queries/0_stateless/02886_missed_json_subcolumns.sql b/tests/queries/0_stateless/02886_missed_json_subcolumns.sql
deleted file mode 100644
index 9984809ce217..000000000000
--- a/tests/queries/0_stateless/02886_missed_json_subcolumns.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-DROP TABLE IF EXISTS t_missed_subcolumns;
-
-SET allow_experimental_object_type = 1;
-
-CREATE TABLE t_missed_subcolumns (id UInt64, n String, obj Object(Nullable('json')))
-ENGINE = MergeTree ORDER BY id;
-
-INSERT INTO t_missed_subcolumns VALUES (1, 'aaa', '{"k1": {"k2": "foo"}, "k3": 5}');
-INSERT INTO t_missed_subcolumns VALUES (2, 'bbb', '{"k1": {"k2": "fee"}, "k3": 4}');
-INSERT INTO t_missed_subcolumns VALUES (3, 'ccc', '{"k1": {"k2": "foo", "k4": "baz"}, "k3": 4}');
-INSERT INTO t_missed_subcolumns VALUES (4, 'ddd', '{"k1": {"k2": "foo"}, "k3": 4}');
-
-OPTIMIZE TABLE t_missed_subcolumns FINAL;
-
-SELECT count(), min(id) FROM t_missed_subcolumns;
-
-SELECT * FROM t_missed_subcolumns WHERE obj.k4 = 5 ORDER BY id FORMAT JSONEachRow;
-
-SELECT * FROM t_missed_subcolumns WHERE obj.k1.k3 = 'fee' ORDER BY id FORMAT JSONEachRow;
-
-SELECT id, n, obj.k4 FROM t_missed_subcolumns ORDER BY id FORMAT JSONEachRow;
-
-ALTER TABLE t_missed_subcolumns DELETE WHERE obj.k4 = 5;
-SELECT count(), min(id) FROM t_missed_subcolumns;
-
-DELETE FROM t_missed_subcolumns WHERE obj.k1.k3 = 'fee';
-SELECT count(), min(id) FROM t_missed_subcolumns;
-
-DROP TABLE IF EXISTS t_missed_subcolumns;
diff --git a/tests/queries/0_stateless/02931_max_num_to_warn.reference b/tests/queries/0_stateless/02931_max_num_to_warn.reference
index ff78ddef793c..2b363fb177b9 100644
--- a/tests/queries/0_stateless/02931_max_num_to_warn.reference
+++ b/tests/queries/0_stateless/02931_max_num_to_warn.reference
@@ -1,5 +1,5 @@
-The number of active parts is more than 10.	The number of active parts is more than {}.
-The number of attached databases is more than 2.	The number of attached databases is more than {}.
-The number of attached dictionaries is more than 5.	The number of attached dictionaries is more than {}.
-The number of attached tables is more than 5.	The number of attached tables is more than {}.
-The number of attached views is more than 5.	The number of attached views is more than {}.
+The number of active parts _ exceeds the warning limit of 10.	The number of active parts ({}) exceeds the warning limit of {}.
+The number of attached databases _ exceeds the warning limit of 2.	The number of attached databases ({}) exceeds the warning limit of {}.
+The number of attached dictionaries _ exceeds the warning limit of 5.	The number of attached dictionaries ({}) exceeds the warning limit of {}.
+The number of attached tables _ exceeds the warning limit of 5.	The number of attached tables ({}) exceeds the warning limit of {}.
+The number of attached views _ exceeds the warning limit of 5.	The number of attached views ({}) exceeds the warning limit of {}.
diff --git a/tests/queries/0_stateless/02931_max_num_to_warn.sql b/tests/queries/0_stateless/02931_max_num_to_warn.sql
index 4f2ab59fffd1..ed2c0a99f3a2 100644
--- a/tests/queries/0_stateless/02931_max_num_to_warn.sql
+++ b/tests/queries/0_stateless/02931_max_num_to_warn.sql
@@ -70,13 +70,7 @@ INSERT INTO test_max_num_to_warn_02931.test_max_num_to_warn_9 VALUES (1, 'Hello'
 INSERT INTO test_max_num_to_warn_02931.test_max_num_to_warn_10 VALUES (1, 'Hello');
 INSERT INTO test_max_num_to_warn_02931.test_max_num_to_warn_11 VALUES (1, 'Hello');
 
-SELECT * FROM system.warnings where message in (
-    'The number of attached tables is more than 5.',
-    'The number of attached views is more than 5.',
-    'The number of attached dictionaries is more than 5.',
-    'The number of attached databases is more than 2.',
-    'The number of active parts is more than 10.'
-) ORDER BY message;
+SELECT replaceRegexpAll(message, '\(\d+\)', '_'), message_format_string FROM system.warnings WHERE message LIKE 'The number of%' ORDER BY message;
 
 DROP DATABASE IF EXISTS test_max_num_to_warn_02931;
 DROP DATABASE IF EXISTS test_max_num_to_warn_1;
diff --git a/tests/queries/0_stateless/02981_nested_bad_types.sql b/tests/queries/0_stateless/02981_nested_bad_types.sql
index 1620eca590dd..affd4eacd140 100644
--- a/tests/queries/0_stateless/02981_nested_bad_types.sql
+++ b/tests/queries/0_stateless/02981_nested_bad_types.sql
@@ -1,7 +1,5 @@
 set allow_suspicious_low_cardinality_types=0;
 set allow_suspicious_fixed_string_types=0;
-set allow_experimental_variant_type=0;
-
 
 select [42]::Array(LowCardinality(UInt64)); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 select [[[42]]]::Array(Array(Array(LowCardinality(UInt64)))); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
@@ -33,21 +31,6 @@ create table test (x Map(String, Map(String, FixedString(1000000)))) engine=Memo
 create table test (x Tuple(String, FixedString(1000000))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
 create table test (x Tuple(String, Array(Map(String, FixedString(1000000))))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
 
-select [42]::Array(Variant(String, UInt64)); -- {serverError ILLEGAL_COLUMN}
-select [[[42]]]::Array(Array(Array(Variant(String, UInt64)))); -- {serverError ILLEGAL_COLUMN}
-select map('a', 42)::Map(String, Variant(String, UInt64)); -- {serverError ILLEGAL_COLUMN}
-select map('a', map('b', [42]))::Map(String, Map(String, Array(Variant(String, UInt64)))); -- {serverError ILLEGAL_COLUMN}
-select tuple('a', 42)::Tuple(String, Variant(String, UInt64)); -- {serverError ILLEGAL_COLUMN}
-select tuple('a', [map('b', 42)])::Tuple(String, Array(Map(String, Variant(String, UInt64)))); -- {serverError ILLEGAL_COLUMN}
-
-create table test (x Array(Variant(String, UInt64))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
-create table test (x Array(Array(Variant(String, UInt64)))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
-create table test (x Map(String, Variant(String, UInt64))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
-create table test (x Map(String, Map(String, Variant(String, UInt64)))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
-create table test (x Tuple(String, Variant(String, UInt64))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
-create table test (x Tuple(String, Array(Map(String, Variant(String, UInt64))))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
-
-set allow_experimental_variant_type=1;
 select 42::Variant(String, LowCardinality(UInt64)) settings allow_experimental_variant_type=1; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 select tuple('a', [map('b', 42)])::Tuple(String, Array(Map(String, Variant(LowCardinality(UInt64), String)))); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 create table test (x Variant(LowCardinality(UInt64), String)) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
index 9f04c64d47f8..2bd57cec35b3 100755
--- a/tests/queries/0_stateless/02995_new_settings_history.sh
+++ b/tests/queries/0_stateless/02995_new_settings_history.sh
@@ -23,8 +23,8 @@ fi
 
 # Note that this is a broad check. A per version check is done in the upgrade test
 # Baselines generated with v25.7.1 (pre-release)
-# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_settings_25_7_1.tsv
-# clickhouse local --query "select name, value from system.merge_tree_settings order by name format TSV" > 02995_merge_tree_settings_settings_25_7_1.tsv
+# clickhouse local --query "select name, default from system.settings WHERE NOT has((select flatten(groupArray(changes.name)) from system.settings_changes where version >= '25.8'), name) order by name format TSV" > 02995_settings_25_7_1.tsv
+# clickhouse local --query "select name, value from system.merge_tree_settings WHERE NOT has((select flatten(groupArray(changes.name)) from system.settings_changes where version >= '25.8'), name) order by name format TSV" > 02995_merge_tree_settings_settings_25_7_1.tsv
 $CLICKHOUSE_LOCAL --query "
     WITH old_settings AS
     (
diff --git a/tests/queries/0_stateless/02995_settings_25_7_1.tsv b/tests/queries/0_stateless/02995_settings_25_7_1.tsv
index 490c9e15bc53..23f8a414e3d2 100644
--- a/tests/queries/0_stateless/02995_settings_25_7_1.tsv
+++ b/tests/queries/0_stateless/02995_settings_25_7_1.tsv
@@ -26,15 +26,16 @@ allow_experimental_bigint_types	1
 allow_experimental_codecs	0
 allow_experimental_correlated_subqueries	0
 allow_experimental_database_atomic	1
-allow_experimental_database_glue_catalog	0
+allow_experimental_database_glue_catalog	1
 allow_experimental_database_hms_catalog	0
-allow_experimental_database_iceberg	0
+allow_experimental_database_iceberg	1
 allow_experimental_database_materialized_mysql	0
 allow_experimental_database_materialized_postgresql	0
 allow_experimental_database_replicated	1
-allow_experimental_database_unity_catalog	0
+allow_experimental_database_unity_catalog	1
 allow_experimental_delta_kernel_rs	1
 allow_experimental_dynamic_type	1
+allow_experimental_export_merge_tree_part	0
 allow_experimental_full_text_index	0
 allow_experimental_funnel_functions	0
 allow_experimental_geo_types	1
@@ -360,6 +361,7 @@ engine_url_skip_empty_files	0
 errors_output_format	CSV
 exact_rows_before_limit	0
 except_default_mode	ALL
+export_merge_tree_part_overwrite_file_if_exists	0
 external_storage_connect_timeout_sec	10
 external_storage_max_read_bytes	0
 external_storage_max_read_rows	0
@@ -590,6 +592,7 @@ input_format_parquet_max_block_size	65409
 input_format_parquet_prefer_block_bytes	16744704
 input_format_parquet_preserve_order	0
 input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference	0
+input_format_parquet_use_metadata_cache	1
 input_format_parquet_use_native_reader	0
 input_format_protobuf_flatten_google_wrappers	0
 input_format_protobuf_skip_fields_with_unsupported_types_in_schema_inference	0
@@ -862,6 +865,8 @@ network_zstd_compression_level	1
 normalize_function_names	1
 number_of_mutations_to_delay	0
 number_of_mutations_to_throw	0
+object_storage_cluster	
+object_storage_max_nodes	0
 odbc_bridge_connection_pool_size	16
 odbc_bridge_use_connection_pooling	1
 odbc_max_field_size	0
diff --git a/tests/queries/0_stateless/03036_test_parquet_bloom_filter_push_down.sh b/tests/queries/0_stateless/03036_test_parquet_bloom_filter_push_down.sh
index e206e6a6f84e..204f849db91c 100755
--- a/tests/queries/0_stateless/03036_test_parquet_bloom_filter_push_down.sh
+++ b/tests/queries/0_stateless/03036_test_parquet_bloom_filter_push_down.sh
@@ -18,100 +18,102 @@ DATA_FILE_USER_PATH="${WORKING_DIR}/multi_column_bf.gz.parquet"
 
 cp ${DATA_FILE} ${DATA_FILE_USER_PATH}
 
+CLICKHOUSE_CLIENT="${CLICKHOUSE_CLIENT} --input_format_parquet_filter_push_down=false --input_format_parquet_page_filter_push_down=false --optimize_move_to_prewhere=false --input_format_parquet_enable_row_group_prefetch=false"
+
 ${CLICKHOUSE_CLIENT} --query="select count(*) from file('${DATA_FILE_USER_PATH}', Parquet) SETTINGS use_cache_for_count_from_files=false;"
 
 echo "bloom filter is off, all row groups should be read"
 echo "expect rows_read = select count()"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or flba='WNMM' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or flba='WNMM' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "bloom filter is on, some row groups should be skipped"
 echo "expect rows_read much less than select count()"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or flba='WNMM' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or flba='WNMM' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "bloom filter is on, but where predicate contains data from 2 row groups out of 3."
 echo "Rows read should be less than select count, but greater than previous selects"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or string='ZHZK' order by uint16_logical asc Format JSON SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;" | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or string='ZHZK' order by uint16_logical asc Format JSON SETTINGS input_format_parquet_bloom_filter_push_down=true;" | jq 'del(.meta,.statistics.elapsed)'
 
 echo "bloom filter is on, but where predicate contains data from all row groups"
 echo "expect rows_read = select count()"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or string='ZHZK' or uint64_logical=18441251162536403933 order by uint16_logical asc Format JSON SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;" | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string='PFJH' or string='ZHZK' or uint64_logical=18441251162536403933 order by uint16_logical asc Format JSON SETTINGS input_format_parquet_bloom_filter_push_down=true;" | jq 'del(.meta,.statistics.elapsed)'
 
 echo "IN check"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string in ('PFJH', 'ZHZK') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where string in ('PFJH', 'ZHZK') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "tuple in case, bf is off."
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in ('PFJH', 'GKJC') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in ('PFJH', 'GKJC') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "tuple in case, bf is on."
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in ('PFJH', 'GKJC') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in ('PFJH', 'GKJC') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "complex tuple in case, bf is off"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in (('NON1', 'NON1'), ('PFJH', 'GKJC'), ('NON2', 'NON2')) order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in (('NON1', 'NON1'), ('PFJH', 'GKJC'), ('NON2', 'NON2')) order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "complex tuple in case, bf is on"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in (('NON1', 'NON1'), ('PFJH', 'GKJC'), ('NON2', 'NON2')) order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in (('NON1', 'NON1'), ('PFJH', 'GKJC'), ('NON2', 'NON2')) order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "complex tuple in case, bf is on. Non existent"
-${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in (('NON1', 'NON1'), ('NON2', 'NON2'), ('NON3', 'NON3')) order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select string, flba from file('${DATA_FILE_USER_PATH}', Parquet) where (string, flba) in (('NON1', 'NON1'), ('NON2', 'NON2'), ('NON3', 'NON3')) order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Bloom filter for json column. BF is off"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}'::JSON order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}'::JSON order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Bloom filter for json column. BF is on"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}' order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}'::JSON order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where json = '{\"key\":38, \"value\":\"NXONM\"}'::JSON order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Bloom filter for ipv4 column. BF is off"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Bloom filter for ipv4 column. BF is on"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where ipv4 = IPv4StringToNum('0.0.1.143') order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Bloom filter for ipv4 column. BF is on. Specified in the schema"
-${CLICKHOUSE_CLIENT} --query="select ipv4 from file('${DATA_FILE_USER_PATH}', Parquet, 'ipv4 IPv4') where ipv4 = toIPv4('0.0.1.143') order by ipv4 asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select ipv4 from file('${DATA_FILE_USER_PATH}', Parquet, 'ipv4 IPv4') where ipv4 = toIPv4('0.0.1.143') order by ipv4 asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Bloom filter on 64 bit column read as ipv4. We explicitly deny it, should read all rg"
-${CLICKHOUSE_CLIENT} --query="select uint64_logical from file ('${DATA_FILE_USER_PATH}', Parquet, 'uint64_logical IPv4') where uint64_logical = toIPv4(5552715629697883300) order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;" | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select uint64_logical from file ('${DATA_FILE_USER_PATH}', Parquet, 'uint64_logical IPv4') where uint64_logical = toIPv4(5552715629697883300) order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;" | jq 'del(.meta,.statistics.elapsed)'
 
 echo "BF off for parquet uint64 logical type. Should read everything"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "BF on for parquet uint64 logical type. Uint64 is stored as a signed int 64, but with logical annotation. Make sure a value greater than int64 can be queried"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint64_logical=18441251162536403933 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Uint16 is stored as physical type int32 with bidwidth = 16  and sign = false. Make sure a value greater than int16 can be queried. BF is on."
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint16_logical=65528 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint16_logical=65528 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint16_logical=65528 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where uint16_logical=65528 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "BF off for parquet int8 logical type. Should read everything"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "BF on for parquet int8 logical type. Should skip row groups"
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=false;"  | jq 'del(.meta,.statistics.elapsed)'
 
-${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select json from file('${DATA_FILE_USER_PATH}', Parquet) where int8_logical=-126 order by uint16_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_enable_json_parsing=true;"  | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Invalid column conversion with in operation. String type can not be hashed against parquet int64 physical type. Should read everything"
-${CLICKHOUSE_CLIENT} --query="select uint64_logical from file('${DATA_FILE_USER_PATH}', Parquet, 'uint64_logical String') where uint64_logical in ('5') order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;" | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select uint64_logical from file('${DATA_FILE_USER_PATH}', Parquet, 'uint64_logical String') where uint64_logical in ('5') order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;" | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Transformations on key column shall not be allowed (=). Should read everything"
-${CLICKHOUSE_CLIENT} --query="select uint64_logical from file('${DATA_FILE_USER_PATH}', Parquet) where negate(uint64_logical) = -7711695863945021976 order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;" | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select uint64_logical from file('${DATA_FILE_USER_PATH}', Parquet) where negate(uint64_logical) = -7711695863945021976 order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;" | jq 'del(.meta,.statistics.elapsed)'
 
 echo "Transformations on key column shall not be allowed (IN). Should read everything"
-${CLICKHOUSE_CLIENT} --query="select uint64_logical from file('${DATA_FILE_USER_PATH}', Parquet) where negate(uint64_logical) in (-7711695863945021976) order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true, input_format_parquet_filter_push_down=false, input_format_parquet_enable_row_group_prefetch=false;" | jq 'del(.meta,.statistics.elapsed)'
+${CLICKHOUSE_CLIENT} --query="select uint64_logical from file('${DATA_FILE_USER_PATH}', Parquet) where negate(uint64_logical) in (-7711695863945021976) order by uint64_logical asc FORMAT Json SETTINGS input_format_parquet_bloom_filter_push_down=true;" | jq 'del(.meta,.statistics.elapsed)'
 
 rm -rf ${USER_FILES_PATH}/${CLICKHOUSE_TEST_UNIQUE_NAME:?}/*
diff --git a/tests/queries/0_stateless/03100_lwu_43_subquery_from_rmt.reference b/tests/queries/0_stateless/03100_lwu_43_subquery_from_rmt.reference
new file mode 100644
index 000000000000..ffad07c4a653
--- /dev/null
+++ b/tests/queries/0_stateless/03100_lwu_43_subquery_from_rmt.reference
@@ -0,0 +1,2 @@
+key	val
+key	UPDATED-1
diff --git a/tests/queries/0_stateless/03100_lwu_43_subquery_from_rmt.sql b/tests/queries/0_stateless/03100_lwu_43_subquery_from_rmt.sql
new file mode 100644
index 000000000000..04502e8a02a3
--- /dev/null
+++ b/tests/queries/0_stateless/03100_lwu_43_subquery_from_rmt.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS lightweight_test SYNC;
+DROP TABLE IF EXISTS keys SYNC;
+
+CREATE TABLE lightweight_test
+(
+    ts DateTime,
+    value String,
+    key String
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/lightweight_test', '1')
+PARTITION BY toYYYYMMDD(ts)
+ORDER BY (key)
+SETTINGS enable_block_number_column = 1, enable_block_offset_column = 1;
+
+CREATE TABLE keys
+(
+    key String
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/keys', '1')
+ORDER BY (key);
+
+INSERT INTO lightweight_test VALUES (now(), 'val', 'key');
+
+INSERT INTO keys VALUES ('key');
+
+SELECT key, value FROM lightweight_test ORDER BY key;
+
+UPDATE lightweight_test
+SET value = 'UPDATED-1'
+WHERE key IN (SELECT key FROM keys);
+
+SELECT key, value FROM lightweight_test ORDER BY key;
+
+DROP TABLE IF EXISTS lightweight_test SYNC;
+DROP TABLE IF EXISTS keys SYNC;
diff --git a/tests/queries/0_stateless/03100_lwu_44_missing_default.reference b/tests/queries/0_stateless/03100_lwu_44_missing_default.reference
new file mode 100644
index 000000000000..cd1d2b6c02c3
--- /dev/null
+++ b/tests/queries/0_stateless/03100_lwu_44_missing_default.reference
@@ -0,0 +1,40 @@
+0	999
+1	1000
+2	1000
+3	1000
+4	1000
+5	1000
+6	1000
+7	1000
+8	1000
+9	1000
+0	999
+1	1000
+2	1000
+3	1000
+4	1000
+5	1000
+6	1000
+7	1000
+8	1000
+9	1000
+110	999
+111	1000
+112	1000
+113	1000
+114	1000
+115	1000
+116	1000
+117	1000
+118	1000
+119	1000
+110	999
+111	1000
+112	1000
+113	1000
+114	1000
+115	1000
+116	1000
+117	1000
+118	1000
+119	1000
diff --git a/tests/queries/0_stateless/03100_lwu_44_missing_default.sql b/tests/queries/0_stateless/03100_lwu_44_missing_default.sql
new file mode 100644
index 000000000000..abdc59d7c1be
--- /dev/null
+++ b/tests/queries/0_stateless/03100_lwu_44_missing_default.sql
@@ -0,0 +1,61 @@
+DROP TABLE IF EXISTS t_lwu_defaults;
+DROP TABLE IF EXISTS t_mutation_defaults;
+
+CREATE TABLE t_lwu_defaults
+(
+    x UInt32,
+    y UInt32
+)
+ENGINE = MergeTree ORDER BY x
+SETTINGS enable_block_offset_column = 1, enable_block_number_column = 1;
+
+CREATE TABLE t_mutation_defaults
+(
+    x UInt32,
+    y UInt32
+)
+ENGINE = MergeTree ORDER BY x;
+
+INSERT INTO t_lwu_defaults (x, y) SELECT (number + 1) AS x, (x % 1000) AS y FROM numbers(9999);
+INSERT INTO t_mutation_defaults (x, y) SELECT (number + 1) AS x, (x % 1000) AS y FROM numbers(9999);
+
+ALTER TABLE t_lwu_defaults ADD COLUMN z UInt32 DEFAULT 0 AFTER y;
+ALTER TABLE t_mutation_defaults ADD COLUMN z UInt32 DEFAULT 0 AFTER y;
+
+UPDATE t_lwu_defaults SET z = y WHERE x > 0;
+ALTER TABLE t_mutation_defaults UPDATE z = y WHERE x > 0 SETTINGS mutations_sync = 2;
+
+SELECT intDiv(z, 100) AS a, COUNT() AS b FROM t_lwu_defaults GROUP BY a ORDER BY a LIMIT 10;
+SELECT intDiv(z, 100) AS a, COUNT() AS b FROM t_mutation_defaults GROUP BY a ORDER BY a LIMIT 10;
+
+DROP TABLE IF EXISTS t_lwu_defaults;
+DROP TABLE IF EXISTS t_mutation_defaults;
+
+CREATE TABLE t_lwu_defaults
+(
+    x UInt32,
+    y UInt32
+)
+ENGINE = MergeTree ORDER BY x
+SETTINGS enable_block_offset_column = 1, enable_block_number_column = 1;
+
+CREATE TABLE t_mutation_defaults
+(
+    x UInt32,
+    y UInt32
+)
+ENGINE = MergeTree ORDER BY x;
+
+INSERT INTO t_lwu_defaults  (x, y) SELECT (number + 1) AS x, (x % 1000) AS y FROM numbers(9999);
+INSERT INTO t_mutation_defaults (x, y) SELECT (number + 1) AS x, (x % 1000) AS y FROM numbers(9999);
+
+ALTER TABLE t_lwu_defaults ADD COLUMN z UInt32 DEFAULT y + 1000 AFTER y;
+ALTER TABLE t_mutation_defaults ADD COLUMN z UInt32 DEFAULT y + 1000 AFTER y;
+
+UPDATE t_lwu_defaults SET y = y + 10000 WHERE x > 0;
+ALTER TABLE t_mutation_defaults UPDATE y = y + 10000 WHERE x > 0 SETTINGS mutations_sync = 2;
+
+SELECT intDiv(z, 100) AS a, COUNT() AS b FROM t_lwu_defaults GROUP BY a ORDER BY a LIMIT 10;
+SELECT intDiv(z, 100) AS a, COUNT() AS b FROM t_mutation_defaults GROUP BY a ORDER BY a LIMIT 10;
+
+DROP TABLE IF EXISTS t_lwu_defaults;
diff --git a/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.reference b/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.reference
index ef9b07ba955f..8db1c1f7db07 100644
--- a/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.reference
+++ b/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.reference
@@ -1,4 +1,7 @@
-65409
-16
+25000
+25000
+64
 128
-2363
+2048
+1024
+2048
diff --git a/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql b/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql
index e6b13510301e..402deba4f8ff 100644
--- a/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql
+++ b/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql
@@ -1,25 +1,25 @@
--- Tags: no-fasttest, no-random-settings
+-- Tags: no-fasttest, no-random-settings, no-parallel
 
 set max_insert_threads=1;
+set schema_inference_make_columns_nullable=0;
+set engine_file_truncate_on_insert=1;
 
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 String, col2 String, col3 String, col4 String, col5 String, col6 String, col7 String) ENGINE=File(Parquet);
-INSERT INTO test_parquet SELECT rand(),rand(),rand(),rand(),rand(),rand(),rand() FROM numbers(100000);
-SELECT max(blockSize()) FROM test_parquet;
+-- Average string lengths, approximately: 2, 200, 200, 200
+INSERT INTO FUNCTION file('03164_adapting_parquet_reader_output_size.parquet', Parquet, 'short String, long1 String, long2 String, long_low_cardinality String') SELECT number%100, range(cityHash64(number), cityHash64(number)+10), repeat(cityHash64(number)::String, 6+number%10), repeat((number%10)::String, 200+number%10) FROM numbers(25000);
 
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 String, col2 String, col3 String, col4 String, col5 String, col6 String, col7 String) ENGINE=File(Parquet) settings input_format_parquet_max_block_size=16;
-INSERT INTO test_parquet SELECT rand(),rand(),rand(),rand(),rand(),rand(),rand() FROM numbers(100000);
-SELECT max(blockSize()) FROM test_parquet;
+-- Default limits are high, everything goes in one block.
+SELECT max(blockSize())+sum(ignore(short, long2)) FROM file('03164_adapting_parquet_reader_output_size.parquet');
+-- Small column doesn't take a lot of bytes, everything goes in one block.
+SELECT max(blockSize())+sum(ignore(short)) FROM file('03164_adapting_parquet_reader_output_size.parquet') settings input_format_parquet_prefer_block_bytes=100000;
+-- Specific number of rows requested.
+SELECT max(blockSize())+sum(ignore(short, long2)) FROM file('03164_adapting_parquet_reader_output_size.parquet') settings input_format_parquet_max_block_size=64;
+-- Tiny byte limit, reader bumps block size to 128 rows instead of 1 row.
+SELECT max(blockSize())+sum(ignore(short, long2)) FROM file('03164_adapting_parquet_reader_output_size.parquet') settings input_format_parquet_prefer_block_bytes=30;
 
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 String, col2 String, col3 String, col4 String, col5 String, col6 String, col7 String) ENGINE=File(Parquet) settings input_format_parquet_prefer_block_bytes=30;
-INSERT INTO test_parquet SELECT rand(),rand(),rand(),rand(),rand(),rand(),rand() FROM numbers(100000);
-SELECT max(blockSize()) FROM test_parquet;
+-- Intermediate byte limit. The two parquet reader implementations estimate row byte sizes slightly
+-- differently it slightly differently and don't match exactly, so we round the result.
+SELECT roundToExp2(max(blockSize())+sum(ignore(short, long2))) FROM file('03164_adapting_parquet_reader_output_size.parquet') settings input_format_parquet_prefer_block_bytes=700000;
+SELECT roundToExp2(max(blockSize())+sum(ignore(short, long1, long2))) FROM file('03164_adapting_parquet_reader_output_size.parquet') settings input_format_parquet_prefer_block_bytes=700000;
 
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 String, col2 String, col3 String, col4 String, col5 String, col6 String, col7 String) ENGINE=File(Parquet) settings input_format_parquet_prefer_block_bytes=30720;
-INSERT INTO test_parquet SELECT rand(),rand(),rand(),rand(),rand(),rand(),rand() FROM numbers(100000);
-SELECT max(blockSize()) FROM test_parquet;
-
-DROP TABLE IF EXISTS test_parquet;
+-- Only the new parquet reader uses correct length estimate for dictionary-encoded strings.
+SELECT roundToExp2(max(blockSize())+sum(ignore(short, long_low_cardinality))) FROM file('03164_adapting_parquet_reader_output_size.parquet') settings input_format_parquet_prefer_block_bytes=700000, input_format_parquet_use_native_reader_v3=1;
diff --git a/tests/queries/0_stateless/03173_set_transformed_partition_pruning.sql b/tests/queries/0_stateless/03173_set_transformed_partition_pruning.sql
index c49aafab237c..4d7b12bf5651 100644
--- a/tests/queries/0_stateless/03173_set_transformed_partition_pruning.sql
+++ b/tests/queries/0_stateless/03173_set_transformed_partition_pruning.sql
@@ -1,4 +1,4 @@
--- Tags: no-msan
+-- Tags: no-msan, long
 -- msan: too slow
 
 SELECT '-- Single partition by function';
@@ -234,7 +234,7 @@ SELECT toString(toDate('2000-01-01') + 10 * number) FROM numbers(50)
 UNION ALL
 SELECT toString(toDate('2100-01-01') + 10 * number) FROM numbers(50);
 
-SELECT count() FROM 03173_nested_date_parsing WHERE id IN ('2000-01-21', '2023-05-02') SETTINGS log_comment='03173_nested_date_parsing';
+SELECT count() FROM 03173_nested_date_parsing WHERE id IN ('2000-01-21', '2023-05-02') SETTINGS log_comment='03173_nested_date_parsing', session_timezone = '';
 SYSTEM FLUSH LOGS query_log;
 SELECT ProfileEvents['SelectedParts'] FROM system.query_log WHERE type = 'QueryFinish' AND current_database = currentDatabase() AND log_comment = '03173_nested_date_parsing';
 SELECT count() FROM 03173_nested_date_parsing WHERE id IN ('not a date');
diff --git a/tests/queries/0_stateless/03201_variant_null_map_subcolumn.reference b/tests/queries/0_stateless/03201_variant_null_map_subcolumn.reference
index 8565fe3d0fa1..629957c24411 100644
--- a/tests/queries/0_stateless/03201_variant_null_map_subcolumn.reference
+++ b/tests/queries/0_stateless/03201_variant_null_map_subcolumn.reference
@@ -1,113 +1,113 @@
 Memory
 test
-[]	1	0	0	[]
-1	0	1	0	[]
-\N	1	1	0	[]
-['str_3','str_3','str_3']	1	0	3	[1,1,1]
-4	0	1	0	[]
-\N	1	1	0	[]
-[6,6,6,6,6,6]	1	0	6	[0,0,0,0,0,0]
-7	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	9	[1,1,1,1,1,1,1,1,1]
-10	0	1	0	[]
-\N	1	1	0	[]
-['str_12','str_12']	1	0	2	[1,1]
-13	0	1	0	[]
-\N	1	1	0	[]
-[15,15,15,15,15]	1	0	5	[0,0,0,0,0]
-16	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	8	[1,1,1,1,1,1,1,1]
-19	0	1	0	[]
-\N	1	1	0	[]
-['str_21']	1	0	1	[1]
-22	0	1	0	[]
-\N	1	1	0	[]
-[24,24,24,24]	1	0	4	[0,0,0,0]
-25	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	7	[1,1,1,1,1,1,1]
-28	0	1	0	[]
-\N	1	1	0	[]
-[]	1	0	0	[]
-31	0	1	0	[]
-\N	1	1	0	[]
-[33,33,33]	1	0	3	[0,0,0]
-34	0	1	0	[]
-\N	1	1	0	[]
+[]	1	0	[]
 1	0	0	[]
-0	1	0	[]
-1	1	0	[]
-1	0	3	[1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	6	[0,0,0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	9	[1,1,1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	2	[1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	5	[0,0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	8	[1,1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	1	[1]
-0	1	0	[]
-1	1	0	[]
-1	0	4	[0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	7	[1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	0	[]
-0	1	0	[]
-1	1	0	[]
-1	0	3	[0,0,0]
-0	1	0	[]
-1	1	0	[]
-0	0	[]	[]
-1	0	[]	[]
-1	0	[]	[]
-0	3	[1,1,1]	[0,0,0]
-1	0	[]	[]
-1	0	[]	[]
-0	6	[0,0,0,0,0,0]	[1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	9	[1,1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	2	[1,1]	[0,0]
-1	0	[]	[]
-1	0	[]	[]
-0	5	[0,0,0,0,0]	[1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	8	[1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	1	[1]	[0]
-1	0	[]	[]
-1	0	[]	[]
-0	4	[0,0,0,0]	[1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	7	[1,1,1,1,1,1,1]	[1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	0	[]	[]
-1	0	[]	[]
-1	0	[]	[]
-0	3	[0,0,0]	[1,1,1]
-1	0	[]	[]
-1	0	[]	[]
+\N	1	0	[]
+['str_3','str_3','str_3']	1	3	[1,1,1]
+4	0	0	[]
+\N	1	0	[]
+[6,6,6,6,6,6]	1	6	[0,0,0,0,0,0]
+7	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	9	[1,1,1,1,1,1,1,1,1]
+10	0	0	[]
+\N	1	0	[]
+['str_12','str_12']	1	2	[1,1]
+13	0	0	[]
+\N	1	0	[]
+[15,15,15,15,15]	1	5	[0,0,0,0,0]
+16	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	8	[1,1,1,1,1,1,1,1]
+19	0	0	[]
+\N	1	0	[]
+['str_21']	1	1	[1]
+22	0	0	[]
+\N	1	0	[]
+[24,24,24,24]	1	4	[0,0,0,0]
+25	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	7	[1,1,1,1,1,1,1]
+28	0	0	[]
+\N	1	0	[]
+[]	1	0	[]
+31	0	0	[]
+\N	1	0	[]
+[33,33,33]	1	3	[0,0,0]
+34	0	0	[]
+\N	1	0	[]
+1	0	[]
+0	0	[]
+1	0	[]
+1	3	[1,1,1]
+0	0	[]
+1	0	[]
+1	6	[0,0,0,0,0,0]
+0	0	[]
+1	0	[]
+1	9	[1,1,1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	2	[1,1]
+0	0	[]
+1	0	[]
+1	5	[0,0,0,0,0]
+0	0	[]
+1	0	[]
+1	8	[1,1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	1	[1]
+0	0	[]
+1	0	[]
+1	4	[0,0,0,0]
+0	0	[]
+1	0	[]
+1	7	[1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	0	[]
+0	0	[]
+1	0	[]
+1	3	[0,0,0]
+0	0	[]
+1	0	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+3	[1,1,1]	[0,0,0]
+0	[]	[]
+0	[]	[]
+6	[0,0,0,0,0,0]	[1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+9	[1,1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+2	[1,1]	[0,0]
+0	[]	[]
+0	[]	[]
+5	[0,0,0,0,0]	[1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+8	[1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+1	[1]	[0]
+0	[]	[]
+0	[]	[]
+4	[0,0,0,0]	[1,1,1,1]
+0	[]	[]
+0	[]	[]
+7	[1,1,1,1,1,1,1]	[1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+3	[0,0,0]	[1,1,1]
+0	[]	[]
+0	[]	[]
 0
 2
 3
@@ -134,114 +134,114 @@ test
 35
 MergeTree compact
 test
-[]	1	0	0	[]
-1	0	1	0	[]
-\N	1	1	0	[]
-['str_3','str_3','str_3']	1	0	3	[1,1,1]
-4	0	1	0	[]
-\N	1	1	0	[]
-[6,6,6,6,6,6]	1	0	6	[0,0,0,0,0,0]
-7	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	9	[1,1,1,1,1,1,1,1,1]
-10	0	1	0	[]
-\N	1	1	0	[]
-['str_12','str_12']	1	0	2	[1,1]
-13	0	1	0	[]
-\N	1	1	0	[]
-[15,15,15,15,15]	1	0	5	[0,0,0,0,0]
-16	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	8	[1,1,1,1,1,1,1,1]
-19	0	1	0	[]
-\N	1	1	0	[]
-['str_21']	1	0	1	[1]
-22	0	1	0	[]
-\N	1	1	0	[]
-[24,24,24,24]	1	0	4	[0,0,0,0]
-25	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	7	[1,1,1,1,1,1,1]
-28	0	1	0	[]
-\N	1	1	0	[]
-[]	1	0	0	[]
-31	0	1	0	[]
-\N	1	1	0	[]
-[33,33,33]	1	0	3	[0,0,0]
-34	0	1	0	[]
-\N	1	1	0	[]
-1	0	0	[]
-0	1	0	[]
-1	1	0	[]
-1	0	3	[1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	6	[0,0,0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	9	[1,1,1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	2	[1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	5	[0,0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	8	[1,1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	1	[1]
-0	1	0	[]
-1	1	0	[]
-1	0	4	[0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	7	[1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
+[]	1	0	[]
 1	0	0	[]
-0	1	0	[]
-1	1	0	[]
-1	0	3	[0,0,0]
-0	1	0	[]
-1	1	0	[]
-0	0	[]	[]
-1	0	[]	[]
-1	0	[]	[]
-0	3	[1,1,1]	[0,0,0]
-1	0	[]	[]
-1	0	[]	[]
-0	6	[0,0,0,0,0,0]	[1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	9	[1,1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	2	[1,1]	[0,0]
-1	0	[]	[]
-1	0	[]	[]
-0	5	[0,0,0,0,0]	[1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	8	[1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	1	[1]	[0]
-1	0	[]	[]
-1	0	[]	[]
-0	4	[0,0,0,0]	[1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	7	[1,1,1,1,1,1,1]	[1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	0	[]	[]
-1	0	[]	[]
-1	0	[]	[]
-0	3	[0,0,0]	[1,1,1]
-1	0	[]	[]
-1	0	[]	[]
+\N	1	0	[]
+['str_3','str_3','str_3']	1	3	[1,1,1]
+4	0	0	[]
+\N	1	0	[]
+[6,6,6,6,6,6]	1	6	[0,0,0,0,0,0]
+7	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	9	[1,1,1,1,1,1,1,1,1]
+10	0	0	[]
+\N	1	0	[]
+['str_12','str_12']	1	2	[1,1]
+13	0	0	[]
+\N	1	0	[]
+[15,15,15,15,15]	1	5	[0,0,0,0,0]
+16	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	8	[1,1,1,1,1,1,1,1]
+19	0	0	[]
+\N	1	0	[]
+['str_21']	1	1	[1]
+22	0	0	[]
+\N	1	0	[]
+[24,24,24,24]	1	4	[0,0,0,0]
+25	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	7	[1,1,1,1,1,1,1]
+28	0	0	[]
+\N	1	0	[]
+[]	1	0	[]
+31	0	0	[]
+\N	1	0	[]
+[33,33,33]	1	3	[0,0,0]
+34	0	0	[]
+\N	1	0	[]
+1	0	[]
+0	0	[]
+1	0	[]
+1	3	[1,1,1]
+0	0	[]
+1	0	[]
+1	6	[0,0,0,0,0,0]
+0	0	[]
+1	0	[]
+1	9	[1,1,1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	2	[1,1]
+0	0	[]
+1	0	[]
+1	5	[0,0,0,0,0]
+0	0	[]
+1	0	[]
+1	8	[1,1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	1	[1]
+0	0	[]
+1	0	[]
+1	4	[0,0,0,0]
+0	0	[]
+1	0	[]
+1	7	[1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	0	[]
+0	0	[]
+1	0	[]
+1	3	[0,0,0]
+0	0	[]
+1	0	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+3	[1,1,1]	[0,0,0]
+0	[]	[]
+0	[]	[]
+6	[0,0,0,0,0,0]	[1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+9	[1,1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+2	[1,1]	[0,0]
+0	[]	[]
+0	[]	[]
+5	[0,0,0,0,0]	[1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+8	[1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+1	[1]	[0]
+0	[]	[]
+0	[]	[]
+4	[0,0,0,0]	[1,1,1,1]
+0	[]	[]
+0	[]	[]
+7	[1,1,1,1,1,1,1]	[1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+3	[0,0,0]	[1,1,1]
+0	[]	[]
+0	[]	[]
 0
 2
 3
@@ -268,114 +268,114 @@ test
 35
 MergeTree wide
 test
-[]	1	0	0	[]
-1	0	1	0	[]
-\N	1	1	0	[]
-['str_3','str_3','str_3']	1	0	3	[1,1,1]
-4	0	1	0	[]
-\N	1	1	0	[]
-[6,6,6,6,6,6]	1	0	6	[0,0,0,0,0,0]
-7	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	9	[1,1,1,1,1,1,1,1,1]
-10	0	1	0	[]
-\N	1	1	0	[]
-['str_12','str_12']	1	0	2	[1,1]
-13	0	1	0	[]
-\N	1	1	0	[]
-[15,15,15,15,15]	1	0	5	[0,0,0,0,0]
-16	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	8	[1,1,1,1,1,1,1,1]
-19	0	1	0	[]
-\N	1	1	0	[]
-['str_21']	1	0	1	[1]
-22	0	1	0	[]
-\N	1	1	0	[]
-[24,24,24,24]	1	0	4	[0,0,0,0]
-25	0	1	0	[]
-\N	1	1	0	[]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	0	7	[1,1,1,1,1,1,1]
-28	0	1	0	[]
-\N	1	1	0	[]
-[]	1	0	0	[]
-31	0	1	0	[]
-\N	1	1	0	[]
-[33,33,33]	1	0	3	[0,0,0]
-34	0	1	0	[]
-\N	1	1	0	[]
-1	0	0	[]
-0	1	0	[]
-1	1	0	[]
-1	0	3	[1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	6	[0,0,0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	9	[1,1,1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	2	[1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	5	[0,0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	8	[1,1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
-1	0	1	[1]
-0	1	0	[]
-1	1	0	[]
-1	0	4	[0,0,0,0]
-0	1	0	[]
-1	1	0	[]
-1	0	7	[1,1,1,1,1,1,1]
-0	1	0	[]
-1	1	0	[]
+[]	1	0	[]
 1	0	0	[]
-0	1	0	[]
-1	1	0	[]
-1	0	3	[0,0,0]
-0	1	0	[]
-1	1	0	[]
-0	0	[]	[]
-1	0	[]	[]
-1	0	[]	[]
-0	3	[1,1,1]	[0,0,0]
-1	0	[]	[]
-1	0	[]	[]
-0	6	[0,0,0,0,0,0]	[1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	9	[1,1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	2	[1,1]	[0,0]
-1	0	[]	[]
-1	0	[]	[]
-0	5	[0,0,0,0,0]	[1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	8	[1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	1	[1]	[0]
-1	0	[]	[]
-1	0	[]	[]
-0	4	[0,0,0,0]	[1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	7	[1,1,1,1,1,1,1]	[1,1,1,1,1,1,1]
-1	0	[]	[]
-1	0	[]	[]
-0	0	[]	[]
-1	0	[]	[]
-1	0	[]	[]
-0	3	[0,0,0]	[1,1,1]
-1	0	[]	[]
-1	0	[]	[]
+\N	1	0	[]
+['str_3','str_3','str_3']	1	3	[1,1,1]
+4	0	0	[]
+\N	1	0	[]
+[6,6,6,6,6,6]	1	6	[0,0,0,0,0,0]
+7	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	9	[1,1,1,1,1,1,1,1,1]
+10	0	0	[]
+\N	1	0	[]
+['str_12','str_12']	1	2	[1,1]
+13	0	0	[]
+\N	1	0	[]
+[15,15,15,15,15]	1	5	[0,0,0,0,0]
+16	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	8	[1,1,1,1,1,1,1,1]
+19	0	0	[]
+\N	1	0	[]
+['str_21']	1	1	[1]
+22	0	0	[]
+\N	1	0	[]
+[24,24,24,24]	1	4	[0,0,0,0]
+25	0	0	[]
+\N	1	0	[]
+[NULL,NULL,NULL,NULL,NULL,NULL,NULL]	1	7	[1,1,1,1,1,1,1]
+28	0	0	[]
+\N	1	0	[]
+[]	1	0	[]
+31	0	0	[]
+\N	1	0	[]
+[33,33,33]	1	3	[0,0,0]
+34	0	0	[]
+\N	1	0	[]
+1	0	[]
+0	0	[]
+1	0	[]
+1	3	[1,1,1]
+0	0	[]
+1	0	[]
+1	6	[0,0,0,0,0,0]
+0	0	[]
+1	0	[]
+1	9	[1,1,1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	2	[1,1]
+0	0	[]
+1	0	[]
+1	5	[0,0,0,0,0]
+0	0	[]
+1	0	[]
+1	8	[1,1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	1	[1]
+0	0	[]
+1	0	[]
+1	4	[0,0,0,0]
+0	0	[]
+1	0	[]
+1	7	[1,1,1,1,1,1,1]
+0	0	[]
+1	0	[]
+1	0	[]
+0	0	[]
+1	0	[]
+1	3	[0,0,0]
+0	0	[]
+1	0	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+3	[1,1,1]	[0,0,0]
+0	[]	[]
+0	[]	[]
+6	[0,0,0,0,0,0]	[1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+9	[1,1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+2	[1,1]	[0,0]
+0	[]	[]
+0	[]	[]
+5	[0,0,0,0,0]	[1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+8	[1,1,1,1,1,1,1,1]	[1,1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+1	[1]	[0]
+0	[]	[]
+0	[]	[]
+4	[0,0,0,0]	[1,1,1,1]
+0	[]	[]
+0	[]	[]
+7	[1,1,1,1,1,1,1]	[1,1,1,1,1,1,1]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+0	[]	[]
+3	[0,0,0]	[1,1,1]
+0	[]	[]
+0	[]	[]
 0
 2
 3
diff --git a/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh b/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh
index c9dca46f41ed..3795d4423204 100755
--- a/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh
+++ b/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh
@@ -11,14 +11,14 @@ function test()
 {
     echo "test"
     $CH_CLIENT -q "insert into test select number, multiIf(number % 3 == 2, NULL, number % 3 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10))) from numbers(36)"
-    $CH_CLIENT -q "select v, v.UInt64.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id"
-    $CH_CLIENT -q "select v.UInt64.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id"
-    $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null, v.\`Array(Variant(String, UInt64))\`.String.null from test order by id"
+    $CH_CLIENT -q "select v, v.UInt64.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id"
+    $CH_CLIENT -q "select v.UInt64.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id"
+    $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null, v.\`Array(Variant(String, UInt64))\`.String.null from test order by id"
     $CH_CLIENT -q "select id from test where v.UInt64 is null order by id"
     $CH_CLIENT -q "insert into test select number, multiIf(number % 3 == 2, NULL, number % 3 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10))) from numbers(250000) settings min_insert_block_size_rows=100000, min_insert_block_size_bytes=0"
-    $CH_CLIENT -q "select v, v.UInt64.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id format Null"
-    $CH_CLIENT -q "select v.UInt64.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id format Null"
-    $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null, v.\`Array(Variant(String, UInt64))\`.String.null from test order by id format Null"
+    $CH_CLIENT -q "select v, v.UInt64.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id format Null"
+    $CH_CLIENT -q "select v.UInt64.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id format Null"
+    $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null, v.\`Array(Variant(String, UInt64))\`.String.null from test order by id format Null"
     $CH_CLIENT -q "select id from test where v.UInt64 is null order by id format Null"
 }
 
diff --git a/tests/queries/0_stateless/03202_dynamic_null_map_subcolumn.sql.j2 b/tests/queries/0_stateless/03202_dynamic_null_map_subcolumn.sql.j2
index 21bf738dccb2..323de80588bf 100644
--- a/tests/queries/0_stateless/03202_dynamic_null_map_subcolumn.sql.j2
+++ b/tests/queries/0_stateless/03202_dynamic_null_map_subcolumn.sql.j2
@@ -35,11 +35,11 @@ select count() from test where not empty(d.`Array(Array(Dynamic))`);
 select count() from test where d is NULL;
 select count() from test where not empty(d.`Tuple(a Array(Dynamic))`.a.String);
 
-select d, d.UInt64.null, d.String.null, d.`Array(Variant(String, UInt64))`.null from test format Null;
-select d.UInt64.null, d.String.null, d.`Array(Variant(String, UInt64))`.null from test format Null;
-select d.Int8.null, d.Date.null, d.`Array(String)`.null from test format Null;
-select d, d.UInt64.null, d.Date.null, d.`Array(Variant(String, UInt64))`.null, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64.null from test format Null;
-select d.UInt64.null, d.Date.null, d.`Array(Variant(String, UInt64))`.null, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64.null, d.`Array(Variant(String, UInt64))`.String.null from test format Null;
+select d, d.UInt64.null, d.String.null from test format Null;
+select d.UInt64.null, d.String.null from test format Null;
+select d.Int8.null, d.Date.null from test format Null;
+select d, d.UInt64.null, d.Date.null, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64.null from test format Null;
+select d.UInt64.null, d.Date.null, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64.null, d.`Array(Variant(String, UInt64))`.String.null from test format Null;
 select d, d.`Tuple(a UInt64, b String)`.a, d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64.null, d.`Array(Variant(String, UInt64))`.UInt64.null from test format Null;
 select d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64.null, d.`Array(Dynamic)`.size0, d.`Array(Variant(String, UInt64))`.UInt64.null from test format Null;
 select d.`Array(Array(Dynamic))`.size1, d.`Array(Array(Dynamic))`.UInt64.null, d.`Array(Array(Dynamic))`.`Map(String, Tuple(a UInt64))`.values.a from test format Null;
diff --git a/tests/queries/0_stateless/03203_hive_style_partitioning.sh b/tests/queries/0_stateless/03203_hive_style_partitioning.sh
index 56ac4406818a..4df12fba994f 100755
--- a/tests/queries/0_stateless/03203_hive_style_partitioning.sh
+++ b/tests/queries/0_stateless/03203_hive_style_partitioning.sh
@@ -13,7 +13,6 @@ $CLICKHOUSE_CLIENT -q "SELECT 'TESTING THE FILE HIVE PARTITIONING'"
 
 $CLICKHOUSE_CLIENT -q """
 set use_hive_partitioning = 1;
-set parallel_replicas_for_cluster_engines=0; -- FIXME
 
 SELECT column0, column1 FROM file('$DATA_DIR/data_hive/partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
 
@@ -28,7 +27,6 @@ SELECT count(*) FROM file('$DATA_DIR/data_hive/partitioning/number=42/date=2020-
 
 $CLICKHOUSE_CLIENT -q """
 set use_hive_partitioning = 1;
-set parallel_replicas_for_cluster_engines=0; -- FIXME
 
 SELECT identifier FROM file('$DATA_DIR/data_hive/partitioning/identifier=*/email.csv') ORDER BY identifier DESC LIMIT 2;
 SELECT a FROM file('$DATA_DIR/data_hive/partitioning/a=b/a=b/sample.parquet') LIMIT 1;
@@ -54,7 +52,6 @@ $CLICKHOUSE_CLIENT -q "SELECT 'TESTING THE URL PARTITIONING'"
 
 $CLICKHOUSE_CLIENT -q """
 set use_hive_partitioning = 1;
-set parallel_replicas_for_cluster_engines=0; -- FIXME
 
 SELECT * FROM url('http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
 
@@ -73,7 +70,6 @@ $CLICKHOUSE_CLIENT -q "SELECT 'TESTING THE S3 PARTITIONING'"
 
 $CLICKHOUSE_CLIENT -q """
 set use_hive_partitioning = 1;
-set parallel_replicas_for_cluster_engines=0; -- FIXME
 
 SELECT * FROM s3('http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
 
diff --git a/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql b/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql
index 0fc5f072da5c..bfaf69c14f55 100644
--- a/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql
+++ b/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql
@@ -1 +1 @@
-SELECT tuple() IN tuple(1) SETTINGS allow_experimental_map_type = 1; -- { serverError INCORRECT_ELEMENT_OF_SET }
+SELECT tuple() IN tuple(1) SETTINGS allow_experimental_map_type = 1; -- { serverError TYPE_MISMATCH }
diff --git a/tests/queries/0_stateless/03215_validate_type_in_alter_add_modify_column.sql b/tests/queries/0_stateless/03215_validate_type_in_alter_add_modify_column.sql
index 267bc7111f4f..a8c7e326c966 100644
--- a/tests/queries/0_stateless/03215_validate_type_in_alter_add_modify_column.sql
+++ b/tests/queries/0_stateless/03215_validate_type_in_alter_add_modify_column.sql
@@ -1,17 +1,11 @@
-set allow_experimental_variant_type = 0;
-set allow_experimental_dynamic_type = 0;
 set allow_suspicious_low_cardinality_types = 0;
 set allow_suspicious_fixed_string_types = 0;
 
 drop table if exists test;
 create table test (id UInt64) engine=MergeTree order by id;
-alter table test add column bad Variant(UInt32, String); -- {serverError ILLEGAL_COLUMN}
-alter table test add column bad Dynamic; -- {serverError ILLEGAL_COLUMN}
 alter table test add column bad LowCardinality(UInt8); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 alter table test add column bad FixedString(10000); -- {serverError ILLEGAL_COLUMN}
 
-alter table test modify column id Variant(UInt32, String); -- {serverError ILLEGAL_COLUMN}
-alter table test modify column id Dynamic; -- {serverError ILLEGAL_COLUMN}
 alter table test modify column id LowCardinality(UInt8); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 alter table test modify column id FixedString(10000); -- {serverError ILLEGAL_COLUMN}
 
diff --git a/tests/queries/0_stateless/03221_merge_profile_events.reference b/tests/queries/0_stateless/03221_merge_profile_events.reference
index 6da168ce064a..c0fdf2217462 100644
--- a/tests/queries/0_stateless/03221_merge_profile_events.reference
+++ b/tests/queries/0_stateless/03221_merge_profile_events.reference
@@ -1,3 +1,3 @@
-Horizontal	1	20000	3	0	480000	1	1	1	1	1	1
-Vertical	1	20000	1	2	480000	1	1	1	1	1	1	1	1
-Vertical	2	400000	2	6	12800000	1	1	1	1	1	1	1	1	1	1	1	1
+Horizontal	1	20000	3	0	480000	1	1	1	1	1
+Vertical	1	20000	1	2	480000	1	1	1	1	1	1	1
+Vertical	2	400000	2	3	8000000	1	1	1	1	1	1	1	1	1	1	1
diff --git a/tests/queries/0_stateless/03221_merge_profile_events.sql b/tests/queries/0_stateless/03221_merge_profile_events.sql
index 8ebaf7121904..ad9702844def 100644
--- a/tests/queries/0_stateless/03221_merge_profile_events.sql
+++ b/tests/queries/0_stateless/03221_merge_profile_events.sql
@@ -23,7 +23,6 @@ SELECT
     ProfileEvents['MergeExecuteMilliseconds'] > 0,
     ProfileEvents['MergeHorizontalStageTotalMilliseconds'] > 0,
     ProfileEvents['MergeHorizontalStageExecuteMilliseconds'] > 0,
-    ProfileEvents['UserTimeMicroseconds'] > 0,
     ProfileEvents['OSCPUVirtualTimeMicroseconds'] > 0,
 FROM system.part_log WHERE database = currentDatabase() AND table = 't_merge_profile_events_1' AND event_type = 'MergeParts' AND part_name = 'all_1_2_1';
 
@@ -54,7 +53,6 @@ SELECT
     ProfileEvents['MergeHorizontalStageExecuteMilliseconds'] > 0,
     ProfileEvents['MergeVerticalStageTotalMilliseconds'] > 0,
     ProfileEvents['MergeVerticalStageExecuteMilliseconds'] > 0,
-    ProfileEvents['UserTimeMicroseconds'] > 0,
     ProfileEvents['OSCPUVirtualTimeMicroseconds'] > 0,
 FROM system.part_log WHERE database = currentDatabase() AND table = 't_merge_profile_events_2' AND event_type = 'MergeParts' AND part_name = 'all_1_2_1';
 
@@ -89,7 +87,6 @@ SELECT
     ProfileEvents['MergeProjectionStageExecuteMilliseconds'] > 0,
     ProfileEvents['MergeExecuteMilliseconds'] <= duration_ms,
     ProfileEvents['MergeTotalMilliseconds'] <= duration_ms,
-    ProfileEvents['UserTimeMicroseconds'] > 0,
     ProfileEvents['OSCPUVirtualTimeMicroseconds'] > 0,
 FROM system.part_log WHERE database = currentDatabase() AND table = 't_merge_profile_events_3' AND event_type = 'MergeParts' AND part_name = 'all_1_2_1';
 
diff --git a/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql b/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql
index 2cbc0286f4c8..f90286e709d9 100644
--- a/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql
+++ b/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest, no-shared-merge-tree
+-- Tags: no-fasttest, no-shared-merge-tree, use-rocksdb
 -- Tag no-fasttest -- due to EmbeddedRocksDB
 -- Tag no-shared-merge-tree -- due to system.replication_queue
 
diff --git a/tests/queries/0_stateless/03244_skip_index_in_final_query_with_pk_rescan_no_final_mark.reference b/tests/queries/0_stateless/03244_skip_index_in_final_query_with_pk_rescan_no_final_mark.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03244_skip_index_in_final_query_with_pk_rescan_no_final_mark.sql b/tests/queries/0_stateless/03244_skip_index_in_final_query_with_pk_rescan_no_final_mark.sql
new file mode 100644
index 000000000000..31856376062b
--- /dev/null
+++ b/tests/queries/0_stateless/03244_skip_index_in_final_query_with_pk_rescan_no_final_mark.sql
@@ -0,0 +1,38 @@
+-- More tests for use_skip_index_if_final_exact_mode optimization
+-- Test when part does not have final mark, optimization will just expand to all ranges
+
+SET use_skip_indexes = 1;
+SET use_skip_indexes_if_final = 1;
+SET use_skip_indexes_if_final_exact_mode = 1;
+
+DROP TABLE IF EXISTS tab1;
+
+-- The CREATE TABLE raises a warning due to index_granularity_bytes = 0
+SET send_logs_level = 'fatal';
+
+CREATE TABLE tab1
+(
+ `valueDate` Date,
+ `bb_ticker` String,
+ `ric` String,
+ `update_timestamp` DateTime,
+ INDEX tab1_bb_ticker_idx bb_ticker TYPE bloom_filter GRANULARITY 4,
+ INDEX tab1_ric_idx ric TYPE bloom_filter GRANULARITY 4
+)
+ENGINE = ReplacingMergeTree(update_timestamp)
+PRIMARY KEY (valueDate, bb_ticker, ric)
+ORDER BY (valueDate, bb_ticker, ric)
+SETTINGS index_granularity = 111, index_granularity_bytes = 0, compress_primary_key = 0;
+
+SET send_logs_level = 'warning';
+
+SYSTEM STOP MERGES tab1;
+
+INSERT INTO tab1(valueDate, bb_ticker, ric)
+    SELECT today(), number%1111, number%111111
+    FROM numbers(1e4);
+
+-- No exception/assert & no rows.
+SELECT * FROM tab1 FINAL WHERE ric = 'BOWNU.O';
+
+DROP TABLE tab1;
diff --git a/tests/queries/0_stateless/03246_skipping_index_70108.reference b/tests/queries/0_stateless/03246_skipping_index_70108.reference
index 463ab3429c62..f5dce59ab91a 100644
--- a/tests/queries/0_stateless/03246_skipping_index_70108.reference
+++ b/tests/queries/0_stateless/03246_skipping_index_70108.reference
@@ -1,2 +1,3 @@
 22
 22
+22
diff --git a/tests/queries/0_stateless/03246_skipping_index_70108.sh b/tests/queries/0_stateless/03246_skipping_index_70108.sh
index 1a5a66318254..f8ab65e36007 100755
--- a/tests/queries/0_stateless/03246_skipping_index_70108.sh
+++ b/tests/queries/0_stateless/03246_skipping_index_70108.sh
@@ -14,6 +14,7 @@ $CLICKHOUSE_LOCAL -m "
     ORDER BY c0;
     INSERT INTO t SELECT * FROM file('$CURDIR/data_i70108/repro.tsv.zstd');
 
-SELECT count() FROM t WHERE c1 = 'dedenk1d4q' SETTINGS use_skip_indexes=1;
+SELECT count() FROM t WHERE c1 = 'dedenk1d4q' SETTINGS use_skip_indexes=1, secondary_indices_enable_bulk_filtering=0;
+SELECT count() FROM t WHERE c1 = 'dedenk1d4q' SETTINGS use_skip_indexes=1, secondary_indices_enable_bulk_filtering=1;
 SELECT count() FROM t WHERE c1 = 'dedenk1d4q' SETTINGS use_skip_indexes=0;
 "
diff --git a/tests/queries/0_stateless/03261_json_hints_types_check.sql b/tests/queries/0_stateless/03261_json_hints_types_check.sql
index 9ef160a01064..2dd01813e794 100644
--- a/tests/queries/0_stateless/03261_json_hints_types_check.sql
+++ b/tests/queries/0_stateless/03261_json_hints_types_check.sql
@@ -1,8 +1,2 @@
-set enable_json_type=1;
-set allow_experimental_variant_type=0;
-set allow_experimental_object_type=0;
-
 select '{}'::JSON(a LowCardinality(Int128)); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
 select '{}'::JSON(a FixedString(100000)); -- {serverError ILLEGAL_COLUMN}
-select '{}'::JSON(a Variant(Int32)); -- {serverError ILLEGAL_COLUMN}
-select '{}'::JSON(a Object('json')); -- {serverError ILLEGAL_COLUMN}
diff --git a/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.reference b/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.reference
index e60ede2aeaab..f634f7f3bce2 100644
--- a/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.reference
+++ b/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.reference
@@ -6,9 +6,6 @@ CreatingSets (Create sets before main query execution)
   Expression ((Project names + Projection))
     Filter ((WHERE + Change column names to column identifiers))
       ReadFromObjectStorage
-  CreatingSet (Create set for subquery)
-    Expression ((Project names + (Projection + Change column names to column identifiers)))
-      ReadFromObjectStorage
 Expression ((Project names + Projection))
   Aggregating
     Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))
@@ -33,6 +30,7 @@ Expression ((Project names + Projection))
           ReadFromObjectStorage
 4
 4
+4
 Expression ((Project names + (Projection + Change column names to column identifiers)))
   ReadFromURL
 Expression ((Project names + (Projection + Change column names to column identifiers)))
diff --git a/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.sql b/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.sql
index 0814052a3811..92e0e112625c 100644
--- a/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.sql
+++ b/tests/queries/0_stateless/03275_auto_cluster_functions_with_parallel_replicas.sql
@@ -20,10 +20,15 @@ EXPLAIN SELECT number FROM system.numbers n JOIN (SELECT * FROM s3('http://local
 SELECT count() FROM s3('http://localhost:11111/test/a.tsv', 'TSV');
 
 DROP TABLE IF EXISTS dupe_test_with_auto_functions;
-CREATE TABLE dupe_test_with_auto_functions (c1 String, c2 String, c3 String) ENGINE = MergeTree ORDER BY c1;
+CREATE TABLE dupe_test_with_auto_functions (n1 String, n2 String, n3 String) ENGINE = MergeTree ORDER BY n1;
 INSERT INTO dupe_test_with_auto_functions SELECT * FROM s3('http://localhost:11111/test/a.tsv', 'TSV');
 SELECT count() FROM dupe_test_with_auto_functions;
 
+DROP TABLE IF EXISTS insert_with_url_function;
+CREATE TABLE insert_with_url_function (n1 String, n2 String, n3 String) ENGINE = MergeTree ORDER BY n1;
+INSERT INTO insert_with_url_function SELECT * FROM url('http://localhost:11111/test/a.tsv', 'TSV');
+SELECT count() FROM insert_with_url_function;
+
 
 SET parallel_replicas_for_cluster_engines=false;
 
@@ -33,11 +38,11 @@ EXPLAIN SELECT * FROM s3('http://localhost:11111/test/a.tsv', 'TSV');
 SELECT count() FROM s3('http://localhost:11111/test/a.tsv', 'TSV');
 
 DROP TABLE IF EXISTS dupe_test_without_cluster_functions;
-CREATE TABLE dupe_test_without_cluster_functions (c1 String, c2 String, c3 String) ENGINE = MergeTree ORDER BY c1;
+CREATE TABLE dupe_test_without_cluster_functions (n1 String, n2 String, n3 String) ENGINE = MergeTree ORDER BY n1;
 INSERT INTO dupe_test_without_cluster_functions SELECT * FROM s3('http://localhost:11111/test/a.tsv', 'TSV');
 SELECT count() FROM dupe_test_without_cluster_functions;
 
 DROP TABLE IF EXISTS dupe_test_with_cluster_function;
-CREATE TABLE dupe_test_with_cluster_function (c1 String, c2 String, c3 String) ENGINE = MergeTree ORDER BY c1;
+CREATE TABLE dupe_test_with_cluster_function (n1 String, n2 String, n3 String) ENGINE = MergeTree ORDER BY n1;
 INSERT INTO dupe_test_with_cluster_function SELECT * FROM s3Cluster('test_cluster_two_shards', 'http://localhost:11111/test/a.tsv', 'TSV');
 SELECT count() FROM dupe_test_with_cluster_function;
diff --git a/tests/queries/0_stateless/03277_empty_tuple_formats.reference b/tests/queries/0_stateless/03277_empty_tuple_formats.reference
index 2e92ec780b2a..1b32131f054f 100644
--- a/tests/queries/0_stateless/03277_empty_tuple_formats.reference
+++ b/tests/queries/0_stateless/03277_empty_tuple_formats.reference
@@ -32,7 +32,9 @@ RowBinary
 Values
 ()
 BSONEachRow
+()
 MsgPack
+()
 Native
 ()
 TSV
diff --git a/tests/queries/0_stateless/03299_parquet_object_storage_metadata_cache.reference b/tests/queries/0_stateless/03299_parquet_object_storage_metadata_cache.reference
new file mode 100644
index 000000000000..c87ad9008b60
--- /dev/null
+++ b/tests/queries/0_stateless/03299_parquet_object_storage_metadata_cache.reference
@@ -0,0 +1,8 @@
+10
+10
+10
+10
+10
+10
+0
+10
diff --git a/tests/queries/0_stateless/03299_parquet_object_storage_metadata_cache.sql b/tests/queries/0_stateless/03299_parquet_object_storage_metadata_cache.sql
new file mode 100644
index 000000000000..c82b3f4dc0e3
--- /dev/null
+++ b/tests/queries/0_stateless/03299_parquet_object_storage_metadata_cache.sql
@@ -0,0 +1,63 @@
+-- Tags: no-parallel, no-fasttest, no-parallel-replicas
+
+SET input_format_parquet_use_native_reader_v3=0;
+
+DROP TABLE IF EXISTS t_parquet_03262;
+
+CREATE TABLE t_parquet_03262 (a UInt64)
+ENGINE = S3(s3_conn, filename = 'test_03262_{_partition_id}', format = Parquet)
+PARTITION BY a;
+
+INSERT INTO t_parquet_03262 SELECT number FROM numbers(10) SETTINGS s3_truncate_on_insert=1;
+
+SELECT COUNT(*)
+FROM s3(s3_conn, filename = 'test_03262_*', format = Parquet)
+SETTINGS input_format_parquet_use_metadata_cache=1, use_query_condition_cache=0,optimize_count_from_files=0;
+
+SELECT COUNT(*)
+FROM s3(s3_conn, filename = 'test_03262_*', format = Parquet)
+SETTINGS input_format_parquet_use_metadata_cache=1, use_query_condition_cache=0, optimize_count_from_files=0, log_comment='test_03262_parquet_metadata_cache';
+
+SELECT COUNT(*)
+FROM s3(s3_conn, filename = 'test_03262_*', format = ParquetMetadata)
+SETTINGS input_format_parquet_use_metadata_cache=1, use_query_condition_cache=0, optimize_count_from_files=0, log_comment='test_03262_parquet_metadata_format_metadata_cache';
+
+SYSTEM FLUSH LOGS;
+
+SELECT ProfileEvents['ParquetMetaDataCacheHits']
+FROM system.query_log
+where log_comment = 'test_03262_parquet_metadata_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1 SETTINGS use_query_condition_cache=0;
+
+SELECT ProfileEvents['ParquetMetaDataCacheHits']
+FROM system.query_log
+where log_comment = 'test_03262_parquet_metadata_format_metadata_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1 SETTINGS use_query_condition_cache=0;
+
+SYSTEM DROP PARQUET METADATA CACHE;
+
+SELECT COUNT(*)
+FROM s3(s3_conn, filename = 'test_03262_*', format = Parquet)
+SETTINGS input_format_parquet_use_metadata_cache=1, use_query_condition_cache=0, optimize_count_from_files=0, log_comment='test_03262_parquet_metadata_cache_cache_empty';
+
+SYSTEM FLUSH LOGS;
+
+SELECT ProfileEvents['ParquetMetaDataCacheHits']
+FROM system.query_log
+where log_comment = 'test_03262_parquet_metadata_cache_cache_empty'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1 SETTINGS use_query_condition_cache=0;
+
+SELECT ProfileEvents['ParquetMetaDataCacheMisses']
+FROM system.query_log
+where log_comment = 'test_03262_parquet_metadata_cache_cache_empty'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1 SETTINGS use_query_condition_cache=0;
+
+DROP TABLE t_parquet_03262;
diff --git a/tests/queries/0_stateless/03300_generate_random_const_expr_params.reference b/tests/queries/0_stateless/03300_generate_random_const_expr_params.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03300_generate_random_const_expr_params.sql b/tests/queries/0_stateless/03300_generate_random_const_expr_params.sql
new file mode 100644
index 000000000000..ff910ee409fb
--- /dev/null
+++ b/tests/queries/0_stateless/03300_generate_random_const_expr_params.sql
@@ -0,0 +1,4 @@
+CREATE TABLE t0 (c0 Int32) ENGINE = GenerateRandom(rand()); -- { serverError BAD_ARGUMENTS }
+CREATE TABLE t1 (c0 Int32) ENGINE = GenerateRandom(now() % 1073741824);
+CREATE TABLE t2 (c0 Int32) ENGINE = GenerateRandom(1 + 1);
+CREATE TABLE t4 (c0 Int32) ENGINE = GenerateRandom(now() % 1073741824, 1+1, '123'::UInt64);
diff --git a/tests/queries/0_stateless/03363_hive_style_partition.reference b/tests/queries/0_stateless/03363_hive_style_partition.reference
index a340a0866d52..26299c33c0a1 100644
--- a/tests/queries/0_stateless/03363_hive_style_partition.reference
+++ b/tests/queries/0_stateless/03363_hive_style_partition.reference
@@ -34,3 +34,4 @@ test/t_03363_function/year=2025/country=/<snowflakeid>.parquet	11
 1
 3
 USA	2022	1
+1
diff --git a/tests/queries/0_stateless/03363_hive_style_partition.sql b/tests/queries/0_stateless/03363_hive_style_partition.sql
index e701fdba0681..425a12d7d2e4 100644
--- a/tests/queries/0_stateless/03363_hive_style_partition.sql
+++ b/tests/queries/0_stateless/03363_hive_style_partition.sql
@@ -1,6 +1,8 @@
 -- Tags: no-parallel, no-fasttest, no-random-settings
 
-DROP TABLE IF EXISTS t_03363_parquet, t_03363_csv;
+SET allow_suspicious_low_cardinality_types=1;
+
+DROP TABLE IF EXISTS t_03363_parquet, t_03363_csv, s3_table_half_schema_with_format;
 
 CREATE TABLE t_03363_parquet (year UInt16, country String, counter UInt8)
 ENGINE = S3(s3_conn, filename = 't_03363_parquet', format = Parquet, partition_strategy='hive')
@@ -71,6 +73,21 @@ select * from s3(s3_conn, filename='t_03363_function_write_down_partition_column
 -- only partition columns
 INSERT INTO FUNCTION s3(s3_conn, filename='t_03363_parquet', format=Parquet, partition_strategy='hive') PARTITION BY (year, country) SELECT 2020 as year, 'Brazil' as country; -- {serverError INCORRECT_DATA};
 
+-- Schema specified, but the hive partition column is missing in the schema (present in the data tho)
+INSERT INTO FUNCTION s3(s3_conn, filename='half_baked', format=Parquet, partition_strategy='hive') PARTITION BY year SELECT 1 AS key, 2020 AS year;
+
+-- Should fail because schema does not match since it is lacking the partition columns and `use_hive_partitioning=1`
+CREATE TABLE s3_table_half_schema_with_format (key UInt64) engine=S3(s3_conn, filename='half_baked/**.parquet', format=Parquet) SETTINGS use_hive_partitioning=1; -- {serverError BAD_ARGUMENTS}
+
+-- Should succeed because hive is off
+CREATE TABLE s3_table_half_schema_with_format (key UInt64) engine=S3(s3_conn, filename='half_baked/**.parquet', format=Parquet) SETTINGS use_hive_partitioning=0;
+
+-- Should succeed and not return hive columns. Distinct because maybe MinIO isn't cleaned up
+SELECT DISTINCT * FROM s3_table_half_schema_with_format;
+
+-- Should fail because the column year does not exist
+SELECT year, * FROM s3_table_half_schema_with_format; -- {serverError UNKNOWN_IDENTIFIER}
+
 -- hive with partition id placeholder
 CREATE TABLE t_03363_s3_sink (year UInt16, country String, counter UInt8)
 ENGINE = S3(s3_conn, filename = 't_03363_parquet/{_partition_id}', format = Parquet, partition_strategy='hive')
@@ -121,4 +138,10 @@ CREATE TABLE t_invalid_expression (year UInt16, country String, counter Float64)
 CREATE TABLE t_03363_iceberg ENGINE=IcebergS3(s3_conn, filename = 'iceberg_data/default/t_iceberg/', format='parquet', url = 'http://minio1:9001/bucket/', partition_strategy='WILDCARD'); -- {serverError BAD_ARGUMENTS}
 CREATE TABLE t_03363_iceberg ENGINE=IcebergS3(s3_conn, filename = 'iceberg_data/default/t_iceberg/', format='parquet', url = 'http://minio1:9001/bucket/', partition_strategy='HIVE'); -- {serverError BAD_ARGUMENTS}
 
-DROP TABLE IF EXISTS t_03363_parquet, t_03363_csv;
+-- Should throw because format is not present and it is mandatory for hive strategy and it should not be a LOGICAL_ERROR
+CREATE TABLE t_03363_hive_requires_format (c0 Int) ENGINE = S3(s3_conn, partition_strategy = 'hive') PARTITION BY (c0); -- {serverError BAD_ARGUMENTS}
+
+-- Should throw because hive strategy does not allow partition columns to be the only columns
+CREATE TABLE t_03363_hive_only_partition_columns (country String, year UInt16) ENGINE = S3(s3_conn, partition_strategy='hive') PARTITION BY (year, country); -- {serverError BAD_ARGUMENTS};
+
+DROP TABLE IF EXISTS t_03363_parquet, t_03363_csv, s3_table_half_schema_with_format;
diff --git a/tests/queries/0_stateless/03370_rocks_db_engine_subcolumn_in_pk.sql b/tests/queries/0_stateless/03370_rocks_db_engine_subcolumn_in_pk.sql
index b5c9f9cef57d..9ede2d4ca7c2 100644
--- a/tests/queries/0_stateless/03370_rocks_db_engine_subcolumn_in_pk.sql
+++ b/tests/queries/0_stateless/03370_rocks_db_engine_subcolumn_in_pk.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest
+-- Tags: no-fasttest, use-rocksdb
 
 CREATE TABLE test (t Tuple(a Int32)) ENGINE = EmbeddedRocksDB() PRIMARY KEY (t.a); -- {serverError BAD_ARGUMENTS}
 
diff --git a/tests/queries/0_stateless/03377_object_storage_list_objects_cache.reference b/tests/queries/0_stateless/03377_object_storage_list_objects_cache.reference
new file mode 100644
index 000000000000..657d2e082516
--- /dev/null
+++ b/tests/queries/0_stateless/03377_object_storage_list_objects_cache.reference
@@ -0,0 +1,103 @@
+-- { echoOn }
+
+-- The cached key should be `dir_`, and that includes all three files: 1, 2 and 3. Cache should return all three, but ClickHouse should filter out the third.
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{1..2}.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+test/dir_a/dir_b/t_03377_sample_1.parquet	1
+test/dir_a/dir_b/t_03377_sample_2.parquet	2
+-- Make sure the filtering did not interfere with the cached values
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_*.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+test/dir_a/dir_b/t_03377_sample_1.parquet	1
+test/dir_a/dir_b/t_03377_sample_2.parquet	2
+test/dir_a/dir_b/t_03377_sample_3.parquet	3
+SYSTEM FLUSH LOGS;
+SELECT  ProfileEvents['ObjectStorageListObjectsCacheMisses'] > 0 as miss
+FROM system.query_log
+where log_comment = 'cold_list_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'warm_list_exact_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheExactMatchHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'warm_list_exact_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCachePrefixMatchHits'] > 0 as prefix_match_hit
+FROM system.query_log
+where log_comment = 'warm_list_exact_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+0
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'warm_list_prefix_match_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheExactMatchHits'] > 0 as exact_match_hit
+FROM system.query_log
+where log_comment = 'warm_list_prefix_match_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+0
+SELECT ProfileEvents['ObjectStorageListObjectsCachePrefixMatchHits'] > 0 as prefix_match_hit
+FROM system.query_log
+where log_comment = 'warm_list_prefix_match_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'even_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+0
+SELECT ProfileEvents['ObjectStorageListObjectsCacheMisses'] > 0 as miss
+FROM system.query_log
+where log_comment = 'even_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'still_exact_match_after_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheExactMatchHits'] > 0 as exact_match_hit
+FROM system.query_log
+where log_comment = 'still_exact_match_after_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'after_drop'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+0
+SELECT ProfileEvents['ObjectStorageListObjectsCacheMisses'] > 0 as miss
+FROM system.query_log
+where log_comment = 'after_drop'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+1
diff --git a/tests/queries/0_stateless/03377_object_storage_list_objects_cache.sql b/tests/queries/0_stateless/03377_object_storage_list_objects_cache.sql
new file mode 100644
index 000000000000..9cd8fe2794b7
--- /dev/null
+++ b/tests/queries/0_stateless/03377_object_storage_list_objects_cache.sql
@@ -0,0 +1,115 @@
+-- Tags: no-parallel, no-fasttest
+
+SYSTEM DROP OBJECT STORAGE LIST OBJECTS CACHE;
+
+INSERT INTO TABLE FUNCTION s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{_partition_id}.parquet', format='Parquet', structure='id UInt64') PARTITION BY id SETTINGS s3_truncate_on_insert=1 VALUES (1), (2), (3);
+
+SELECT * FROM s3(s3_conn, filename='dir_**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='cold_list_cache';
+SELECT * FROM s3(s3_conn, filename='dir_**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='warm_list_exact_cache';
+SELECT * FROM s3(s3_conn, filename='dir_a/dir_b**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='warm_list_prefix_match_cache';
+SELECT * FROM s3(s3_conn, filename='dirr_**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='warm_list_cache_miss'; -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
+SELECT * FROM s3(s3_conn, filename='d**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='even_shorter_prefix';
+SELECT * FROM s3(s3_conn, filename='dir_**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='still_exact_match_after_shorter_prefix';
+SYSTEM DROP OBJECT STORAGE LIST OBJECTS CACHE;
+SELECT * FROM s3(s3_conn, filename='dir_**.parquet') Format Null SETTINGS use_object_storage_list_objects_cache=1, log_comment='after_drop';
+
+-- { echoOn }
+
+-- The cached key should be `dir_`, and that includes all three files: 1, 2 and 3. Cache should return all three, but ClickHouse should filter out the third.
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{1..2}.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+
+-- Make sure the filtering did not interfere with the cached values
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_*.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+
+SYSTEM FLUSH LOGS;
+
+SELECT  ProfileEvents['ObjectStorageListObjectsCacheMisses'] > 0 as miss
+FROM system.query_log
+where log_comment = 'cold_list_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'warm_list_exact_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheExactMatchHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'warm_list_exact_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCachePrefixMatchHits'] > 0 as prefix_match_hit
+FROM system.query_log
+where log_comment = 'warm_list_exact_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'warm_list_prefix_match_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheExactMatchHits'] > 0 as exact_match_hit
+FROM system.query_log
+where log_comment = 'warm_list_prefix_match_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCachePrefixMatchHits'] > 0 as prefix_match_hit
+FROM system.query_log
+where log_comment = 'warm_list_prefix_match_cache'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'even_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheMisses'] > 0 as miss
+FROM system.query_log
+where log_comment = 'even_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'still_exact_match_after_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheExactMatchHits'] > 0 as exact_match_hit
+FROM system.query_log
+where log_comment = 'still_exact_match_after_shorter_prefix'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheHits'] > 0 as hit
+FROM system.query_log
+where log_comment = 'after_drop'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
+
+SELECT ProfileEvents['ObjectStorageListObjectsCacheMisses'] > 0 as miss
+FROM system.query_log
+where log_comment = 'after_drop'
+AND type = 'QueryFinish'
+ORDER BY event_time desc
+LIMIT 1;
diff --git a/tests/queries/0_stateless/03390_non_constant_case.sql b/tests/queries/0_stateless/03390_non_constant_case.sql
index c1248c44dc26..f79a7e5a7483 100644
--- a/tests/queries/0_stateless/03390_non_constant_case.sql
+++ b/tests/queries/0_stateless/03390_non_constant_case.sql
@@ -59,4 +59,10 @@ SELECT caseWithExpression(
     materialize(NULL),
     NULL,
     NULL
-); -- { serverError ILLEGAL_COLUMN }
+); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT caseWithExpression('C', 'A', true, 'B', false); -- { serverError BAD_ARGUMENTS }
+
+SELECT caseWithExpression(1, assumeNotNull(materialize(NULL)), 1, 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT count() WHERE caseWithExpression(1, assumeNotNull(materialize(NULL)), 1, 1); -- { serverError ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER }
diff --git a/tests/queries/0_stateless/03401_several_iceberg_tables_in_one_dir.sql b/tests/queries/0_stateless/03401_several_iceberg_tables_in_one_dir.sql
index 2f73135fcfe6..bb537a9f5f07 100644
--- a/tests/queries/0_stateless/03401_several_iceberg_tables_in_one_dir.sql
+++ b/tests/queries/0_stateless/03401_several_iceberg_tables_in_one_dir.sql
@@ -4,6 +4,7 @@
 SELECT * FROM icebergS3(s3_conn, filename='merged_several_tables_test', SETTINGS iceberg_metadata_table_uuid = 'ea8d1178-7756-4b89-b21f-00e9f31fe03e') ORDER BY id;
 SELECT * FROM icebergS3(s3_conn, filename='merged_several_tables_test', SETTINGS iceberg_metadata_table_uuid = 'A90EED4CF74B4E5BB630096FB9D09021') ORDER BY id;
 SELECT * FROM icebergS3(s3_conn, filename='merged_several_tables_test', SETTINGS iceberg_metadata_table_uuid = '6f6f6407_c6A5465f_A808ea8900_e35a38') ORDER BY id;
+SELECT * FROM icebergS3(s3_conn, filename='merged_several_tables_test', SETTINGS iceberg_metadata_table_uuid = '88005553-5352-8222-8993-abacaba01010') ORDER BY id; -- { serverError FILE_DOESNT_EXIST }
 
 SELECT count() FROM icebergS3(s3_conn, filename='merged_several_tables_test', SETTINGS iceberg_metadata_file_path = 'metadata/00001-aec4e034-3f73-48f7-87ad-51b7b42a8db7.metadata.json');
 SELECT count() FROM icebergS3(s3_conn, filename='merged_several_tables_test', SETTINGS iceberg_metadata_file_path = 'metadata/00001-2aad93a8-a893-4943-8504-f6021f83ecab.metadata.json');
diff --git a/tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.reference b/tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.reference
new file mode 100644
index 000000000000..f19a0f66156c
--- /dev/null
+++ b/tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.reference
@@ -0,0 +1,21 @@
+(Expression)
+ExpressionTransform × 4
+  (MergingAggregated)
+  Resize 1 → 4
+    SortingAggregatedTransform 4 → 1
+      MergingAggregatedBucketTransform × 4
+        Resize 1 → 4
+          GroupingAggregatedTransform 2 → 1
+            (Union)
+              (MergingAggregated)
+              SortingAggregatedTransform 4 → 1
+                MergingAggregatedBucketTransform × 4
+                  Resize 1 → 4
+                    GroupingAggregatedTransform 60 → 1
+                      (ReadFromMerge)
+              (MergingAggregated)
+              SortingAggregatedTransform 4 → 1
+                MergingAggregatedBucketTransform × 4
+                  Resize 1 → 4
+                    GroupingAggregatedTransform 60 → 1
+                      (ReadFromMerge)
diff --git a/tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.sql b/tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.sql
new file mode 100644
index 000000000000..641d7aba793e
--- /dev/null
+++ b/tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.sql
@@ -0,0 +1,42 @@
+-- Tags: no-fasttest, long
+
+DROP TABLE IF EXISTS test_table_1;
+CREATE TABLE test_table_1(number UInt64) ENGINE = MergeTree ORDER BY number;
+SYSTEM STOP MERGES test_table_1;
+
+DROP TABLE IF EXISTS dist_test_table_1;
+CREATE TABLE dist_test_table_1(number UInt64) ENGINE = Distributed('test_cluster_thirty_shards_localhost', currentDatabase(), test_table_1, rand());
+INSERT INTO dist_test_table_1 SELECT number from numbers_mt(10000) SETTINGS distributed_foreground_insert = 1;
+
+DROP TABLE IF EXISTS test_table_2;
+CREATE TABLE test_table_2(number UInt64) ENGINE = MergeTree ORDER BY number;
+SYSTEM STOP MERGES test_table_2;
+
+DROP TABLE IF EXISTS dist_test_table_2;
+CREATE TABLE dist_test_table_2(number UInt64) ENGINE = Distributed('test_cluster_thirty_shards_localhost', currentDatabase(), test_table_2, rand());
+INSERT INTO dist_test_table_2 SELECT number from numbers_mt(10000) SETTINGS distributed_foreground_insert = 1;
+
+DROP TABLE IF EXISTS merge_test_table;
+CREATE TABLE merge_test_table ENGINE = Merge(currentDatabase(), '^dist_test_table_(1|2)$');
+
+EXPLAIN PIPELINE
+SELECT
+    cityHash64(number),
+    sum(1)
+FROM remote('127.0.0.{1,1}', currentDatabase(), merge_test_table)
+GROUP BY 1
+SETTINGS distributed_aggregation_memory_efficient = 1, max_threads = 4, optimize_aggregation_in_order = 0, prefer_localhost_replica = 1, async_socket_for_remote = 1, enable_analyzer = 0, enable_memory_bound_merging_of_aggregation_results = 0;
+
+SELECT
+    cityHash64(number),
+    sum(1)
+FROM remote('127.0.0.{1,1}', currentDatabase(), merge_test_table)
+GROUP BY 1
+FORMAT Null
+SETTINGS distributed_aggregation_memory_efficient = 1, max_threads = 4, optimize_aggregation_in_order = 0, prefer_localhost_replica = 1, async_socket_for_remote = 1, enable_analyzer = 0, enable_memory_bound_merging_of_aggregation_results = 0, max_memory_usage='500Mi', group_by_two_level_threshold=1e6, group_by_two_level_threshold_bytes='500Mi';
+
+DROP TABLE merge_test_table;
+DROP TABLE dist_test_table_1;
+DROP TABLE dist_test_table_2;
+DROP TABLE test_table_1;
+DROP TABLE test_table_2;
diff --git a/tests/queries/0_stateless/03408_parquet_checksums.reference b/tests/queries/0_stateless/03408_parquet_checksums.reference
new file mode 100644
index 000000000000..8b5e17823f09
--- /dev/null
+++ b/tests/queries/0_stateless/03408_parquet_checksums.reference
@@ -0,0 +1,5 @@
+1234567890123456
+CRC checksum verification failed
+no checksum error, as expected
+1234567890123456
+no checksum error, as expected
diff --git a/tests/queries/0_stateless/03408_parquet_checksums.sh b/tests/queries/0_stateless/03408_parquet_checksums.sh
new file mode 100755
index 000000000000..d527e606252f
--- /dev/null
+++ b/tests/queries/0_stateless/03408_parquet_checksums.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+F="${CLICKHOUSE_TMP}/03408_parquet_checksums.parquet"
+
+corrupt_file() {
+    # Get column chunk offset and length.
+    r=`${CLICKHOUSE_LOCAL} -q "select row_groups[1].file_offset, row_groups[1].total_compressed_size from file('$F', ParquetMetadata)"`
+
+    # Split the two tab-separated tokens.
+    IFS=$'\t' read -r offset length <<< "$r"
+
+    # Overwrite the last byte of column chunk (outside page header) with garbage.
+    printf '\x42' | dd of="$F" bs=1 seek=$(( offset + length - 1 )) count=1 conv=notrunc status=none
+}
+
+# Write file with checksums.
+${CLICKHOUSE_LOCAL} -q "
+    insert into function file('$F') select 1234567890123456 as x settings engine_file_truncate_on_insert=1, output_format_parquet_compression_method='none', output_format_parquet_write_checksums=1;
+    select * from file('$F');"
+
+corrupt_file
+
+${CLICKHOUSE_LOCAL} -q "
+    select * from file('$F') settings input_format_parquet_verify_checksums=1
+" 2>&1 | grep -o 'CRC checksum verification failed' || echo 'got no checksum error, unexpected'
+
+${CLICKHOUSE_LOCAL} -q "
+    select * from file('$F') settings input_format_parquet_verify_checksums=0
+" 2>&1 | grep -o 'CRC checksum verification failed' || echo 'no checksum error, as expected'
+
+
+# Write file without checksums.
+${CLICKHOUSE_LOCAL} -q "
+    insert into function file('$F') select 1234567890123456 as x settings engine_file_truncate_on_insert=1, output_format_parquet_compression_method='none', output_format_parquet_write_checksums=0;
+    select * from file('$F');"
+
+corrupt_file
+
+${CLICKHOUSE_LOCAL} -q "
+    select * from file('$F') settings input_format_parquet_verify_checksums=1
+" 2>&1 | grep -o 'CRC checksum verification failed' || echo 'no checksum error, as expected'
diff --git a/tests/queries/0_stateless/03411_dynamic_resize_filesystem_cache_3.sh b/tests/queries/0_stateless/03411_dynamic_resize_filesystem_cache_3.sh
index 057bea0f4789..f5a4401d4981 100755
--- a/tests/queries/0_stateless/03411_dynamic_resize_filesystem_cache_3.sh
+++ b/tests/queries/0_stateless/03411_dynamic_resize_filesystem_cache_3.sh
@@ -34,7 +34,7 @@ function select_func {
     local TIMELIMIT=$((SECONDS+TIMEOUT))
     while [ $SECONDS -lt "$TIMELIMIT" ]
     do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM ${table_name} FORMAT Null"
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM ${table_name} FORMAT Null SETTINGS filesystem_cache_segments_batch_size=1, max_read_buffer_size_remote_fs=50000"
     done
 }
 
diff --git a/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql b/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql
index 718eb63ad923..d1d165e25d57 100644
--- a/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql
+++ b/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql
@@ -4,5 +4,10 @@
 
 -- However, some settings in the experimental tier are meant to control another experimental feature, and then they can be enabled as long as the feature itself is disabled.
 -- These are in the exceptions list inside NOT IN.
-SELECT name, value FROM system.settings WHERE tier = 'Experimental' AND type = 'Bool' AND value != '0' AND name NOT IN ('throw_on_unsupported_query_inside_transaction');
+SELECT name, value FROM system.settings WHERE tier = 'Experimental' AND type = 'Bool' AND value != '0' AND name NOT IN (
+  'throw_on_unsupported_query_inside_transaction',
+-- turned ON for Altinity Antalya builds specifically
+  'allow_experimental_iceberg_read_optimization',
+  'allow_experimental_export_merge_tree_part',
+);
 SELECT name, value FROM system.merge_tree_settings WHERE tier = 'Experimental' AND type = 'Bool' AND value != '0' AND name NOT IN ('remove_rolled_back_parts_immediately');
diff --git a/tests/queries/0_stateless/03444_case_with_expression_exception.sql b/tests/queries/0_stateless/03444_case_with_expression_exception.sql
deleted file mode 100644
index 6a1fb051df82..000000000000
--- a/tests/queries/0_stateless/03444_case_with_expression_exception.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT caseWithExpression('C', 'A', true, 'B', false); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03522_function_first_non_default.reference b/tests/queries/0_stateless/03522_function_first_non_default.reference
new file mode 100644
index 000000000000..dce4625c562e
--- /dev/null
+++ b/tests/queries/0_stateless/03522_function_first_non_default.reference
@@ -0,0 +1,70 @@
+43
+0
+0
+\N
+true
+[1,2,3]
+foo	Nullable(String)
+42	UInt32
+42	Int32
+42	UInt128
+42	Int128
+42	Int16
+42	Int64
+42.5	Float64
+42	Float64
+0	Nullable(Int32)
+42	Nullable(Int32)
+0	String
+0	String
+[0]	Array(Int32)
+['']	Array(String)
+42	Nullable(UInt8)
+0	Nullable(String)
+\N	Nullable(Nothing)
+0	UInt8
+	String
+[]	Array(UInt8)
+0
+1
+2
+0	0	0	Nullable(Int32)
+0	0	0	Nullable(Int32)
+0	0	0	Nullable(Int32)
+0	2	0	Nullable(Int32)
+0	\N	0	Nullable(Int32)
+1	0	1	Nullable(Int32)
+\N	0	0	Nullable(Int32)
+\N	\N	\N	Nullable(Int32)
+		Nullable(String)
+		Nullable(String)
+		Nullable(String)
+		Nullable(String)
+		Nullable(String)
+hello	hello	Nullable(String)
+\N	default	Nullable(String)
+\N	default	Nullable(String)
+[]	[99,100]	Array(Int32)
+[]	[99,100]	Array(Int32)
+[]	[99,100]	Array(Int32)
+[]	[99,100]	Array(Int32)
+[]	[99,100]	Array(Int32)
+[]	[99,100]	Array(Int32)
+[]	[99,100]	Array(Int32)
+[1,2,3]	[1,2,3]	Array(Int32)
+0	0	0	Nullable(Int64)
+0	0	0	Nullable(Int64)
+0	0	0	Nullable(Int64)
+0	2	2	Nullable(Int64)
+0	\N	\N	Nullable(Int64)
+1	0	1	Nullable(Int64)
+\N	0	\N	Nullable(Int64)
+\N	\N	\N	Nullable(Int64)
+0	0	42	0	0
+0	0	42	0	0
+0	0	42	0	0
+0	2	42	0	0
+0	\N	42	0	0
+1	0	42	1	1
+\N	0	42	0	0
+\N	\N	42	\N	\N
diff --git a/tests/queries/0_stateless/03522_function_first_non_default.sql b/tests/queries/0_stateless/03522_function_first_non_default.sql
new file mode 100644
index 000000000000..525801df5e52
--- /dev/null
+++ b/tests/queries/0_stateless/03522_function_first_non_default.sql
@@ -0,0 +1,105 @@
+SELECT firstNonDefault(NULL, 0, 43, 256) AS result;
+SELECT firstNonDefault(NULL :: Nullable(UInt8), 0 :: Nullable(UInt8), 42 :: UInt8) AS result;
+SELECT firstNonDefault('', '0', 'hello') AS result;
+SELECT firstNonDefault(NULL::Nullable(UInt8), 0::UInt8) AS result;
+SELECT firstNonDefault(false, true) AS result;
+
+SELECT firstNonDefault([] :: Array(UInt8), [1, 2, 3] :: Array(UInt8)) AS result;
+SELECT firstNonDefault(NULL::Nullable(String), ''::String, 'foo') as result, toTypeName(result);
+
+SELECT firstNonDefault(0::UInt8, 0::UInt16, 42::UInt32) AS result, toTypeName(result);
+SELECT firstNonDefault(0::Int8, 0::Int16, 42::Int32) AS result, toTypeName(result);
+SELECT firstNonDefault(0::UInt32, 0::UInt64, 42::UInt128) AS result, toTypeName(result);
+SELECT firstNonDefault(0::Int128, 0::Int128, 42::Int128) AS result, toTypeName(result);
+SELECT firstNonDefault(0::UInt8, 0::Int8, 42::Int16) AS result, toTypeName(result);
+SELECT firstNonDefault(0::Int64, 0::Int64, 42::Int64) AS result, toTypeName(result);
+SELECT firstNonDefault(0.0::Float32, 0.0::Float64, 42.5::Float64) AS result, toTypeName(result);
+SELECT firstNonDefault(0::Float64, 0.0::Float64, 42.0::Float64) AS result, toTypeName(result);
+SELECT firstNonDefault(NULL::Nullable(Int32), 0::Nullable(Int32), 42::Nullable(Int32)) AS result, toTypeName(result);
+SELECT firstNonDefault(NULL, 0::Int32, 42::Nullable(Int32)) AS result, toTypeName(result);
+SELECT firstNonDefault(''::String, '0'::String, 'hello'::String) AS result, toTypeName(result);
+SELECT firstNonDefault(''::FixedString(5), '0'::String, 'hello'::String) AS result, toTypeName(result);
+SELECT firstNonDefault([]::Array(Int32), [0]::Array(Int32), [1, 2, 3]::Array(Int32)) AS result, toTypeName(result);
+SELECT firstNonDefault([]::Array(String), ['']::Array(String), ['hello']::Array(String)) AS result, toTypeName(result);
+SELECT firstNonDefault(NULL::Nullable(UInt8), 0::UInt8, 42::UInt8, 100::UInt8) AS result, toTypeName(result);
+SELECT firstNonDefault(NULL::Nullable(String), ''::String, '0'::String, 'hello'::String) AS result, toTypeName(result);
+
+SELECT firstNonDefault(NULL) AS result, toTypeName(result);
+SELECT firstNonDefault(0) AS result, toTypeName(result);
+SELECT firstNonDefault(''::String) AS result, toTypeName(result);
+SELECT firstNonDefault([]::Array(UInt8)) AS result, toTypeName(result);
+
+SELECT firstNonDefault(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+SELECT firstNonDefault(0, 'hello'); -- { serverError NO_COMMON_TYPE }
+SELECT firstNonDefault([]::Array(UInt8), 42); -- { serverError NO_COMMON_TYPE }
+SELECT firstNonDefault([]::Array(UInt8), 'hello');  -- { serverError NO_COMMON_TYPE }
+SELECT firstNonDefault(0::UInt64, 1::Int64);  -- { serverError NO_COMMON_TYPE }
+SELECT firstNonDefault(NULL::Nullable(Array(UInt8)), []::Array(UInt8)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT firstNonDefault(
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    number
+) FROM numbers(3);
+
+DROP TABLE IF EXISTS test_first_truthy;
+
+CREATE TABLE test_first_truthy
+(
+    a Nullable(Int32),
+    b Nullable(Int32),
+    c Nullable(String),
+    d Array(Int32)
+) ENGINE = Memory;
+
+INSERT INTO test_first_truthy VALUES
+(NULL, 0, NULL, []),
+(0, NULL, '', []),
+(NULL, NULL, NULL, []),
+(0, 0, '', []),
+(1, 0, '', []),
+(0, 2, '', []),
+(0, 0, 'hello', []),
+(0, 0, '', [1, 2, 3]);
+
+SELECT
+    a, b,
+    firstNonDefault(a, b) AS result,
+    toTypeName(firstNonDefault(a, b)) AS type
+FROM test_first_truthy
+ORDER BY ALL;
+
+SELECT
+    c,
+    firstNonDefault(c, 'default'::String) AS result,
+    toTypeName(firstNonDefault(c, 'default'::String)) AS type
+FROM test_first_truthy
+ORDER BY ALL;
+
+SELECT
+    d,
+    firstNonDefault(d, [99, 100]::Array(Int32)) AS result,
+    toTypeName(firstNonDefault(d, [99, 100]::Array(Int32))) AS type
+FROM test_first_truthy
+ORDER BY length(result);
+
+SELECT
+    a, b,
+    firstNonDefault(a + b, a * b, a - b) AS result,
+    toTypeName(firstNonDefault(a + b, a * b, a - b)) AS type
+FROM test_first_truthy
+ORDER BY ALL;
+
+SELECT
+    a, b,
+    firstNonDefault(42, a, b) AS result1,
+    firstNonDefault(0, a, b) AS result2,
+    firstNonDefault(NULL, a, b) AS result3
+FROM test_first_truthy
+ORDER BY ALL;
+
+DROP TABLE test_first_truthy;
diff --git a/tests/queries/0_stateless/03526_columns_substreams_in_wide_parts.reference b/tests/queries/0_stateless/03526_columns_substreams_in_wide_parts.reference
index d76b2a9cc700..b16d596ad0ad 100644
--- a/tests/queries/0_stateless/03526_columns_substreams_in_wide_parts.reference
+++ b/tests/queries/0_stateless/03526_columns_substreams_in_wide_parts.reference
@@ -36,7 +36,6 @@ t	Tuple(a UInt32, b Array(UInt32))	['t%2Ea','t%2Eb.size0','t%2Eb']	['t%2Ea','t%2
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.a	Array(UInt32)	['nested.size0','nested%2Ea']	['nested.size0','nested%2Ea']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-x	Array(UInt32)	['x.size0','x']	['x.size0','x']
 -------------------------------------------------------------------------
 Alter drop column
 str	String	['str']	['str']
@@ -44,7 +43,6 @@ t	Tuple(a UInt32, b Array(UInt32))	['t%2Ea','t%2Eb.size0','t%2Eb']	['t%2Ea','t%2
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.a	Array(UInt32)	['nested.size0','nested%2Ea']	['nested.size0','nested%2Ea']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-x	Array(UInt32)	['x.size0','x']	['x.size0','x']
 -------------------------------------------------------------------------
 Alter rename column
 str	String	['str']	['str']
@@ -52,40 +50,34 @@ tt	Tuple(a UInt32, b Array(UInt32))	['tt%2Ea','tt%2Eb.size0','tt%2Eb']	['tt%2Ea'
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.a	Array(UInt32)	['nested.size0','nested%2Ea']	['nested.size0','nested%2Ea']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-x	Array(UInt32)	['x.size0','x']	['x.size0','x']
 -------------------------------------------------------------------------
 Alter drop and rename column
 tt	Tuple(a UInt32, b Array(UInt32))	['tt%2Ea','tt%2Eb.size0','tt%2Eb']	['tt%2Ea','tt%2Eb.size0','tt%2Eb']
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.a	Array(UInt32)	['nested.size0','nested%2Ea']	['nested.size0','nested%2Ea']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-str	Array(UInt32)	['str.size0','str']	['str.size0','str']
 -------------------------------------------------------------------------
 Alter modify column
 tt	Tuple(a UInt32, b Array(String), c UInt32)	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.a	Array(UInt32)	['nested.size0','nested%2Ea']	['nested.size0','nested%2Ea']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-str	Array(UInt32)	['str.size0','str']	['str.size0','str']
 -------------------------------------------------------------------------
 Alter update column
 tt	Tuple(a UInt32, b Array(String), c UInt32)	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.a	Array(UInt32)	['nested.size0','nested%2Ea']	['nested.size0','nested%2Ea']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-str	Array(UInt32)	['str.size0','str']	['str.size0','str']
 -------------------------------------------------------------------------
 Alter rename nested column
 tt	Tuple(a UInt32, b Array(String), c UInt32)	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.aa	Array(UInt32)	['nested.size0','nested%2Eaa']	['nested.size0','nested%2Eaa']
 nested.b	Array(UInt32)	['nested.size0','nested%2Eb']	['nested.size0','nested%2Eb']
-str	Array(UInt32)	['str.size0','str']	['str.size0','str']
 -------------------------------------------------------------------------
 Alter rename all nested column
 tt	Tuple(a UInt32, b Array(String), c UInt32)	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']	['tt%2Ea','tt%2Eb.size0','tt%2Eb','tt%2Ec']
 json	JSON(a UInt32, b Array(String))	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']	['json.object_structure','json.d.dynamic_structure','json.d.variant_discr','json.e.dynamic_structure','json.e.variant_discr','json.f.dynamic_structure','json.f.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.variant_discr','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.dynamic_structure','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.variant_discr','json.a','json.b.size0','json.b','json.d.SharedVariant','json.d.String','json.e.Int64','json.e.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).size0','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.Int64','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).g.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64)).null','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.Array(Nullable(Int64))','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).k.SharedVariant','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data.size1','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Epaths','json.f.Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)).object_shared_data%2Evalues','json.f.SharedVariant','json.object_shared_data.size0','json.object_shared_data%2Epaths','json.object_shared_data%2Evalues']
 nested.aaa	Array(UInt32)	['nested.size0','nested%2Eaaa']	['nested.size0','nested%2Eaaa']
 nested.bbb	Array(UInt32)	['nested.size0','nested%2Ebbb']	['nested.size0','nested%2Ebbb']
-str	Array(UInt32)	['str.size0','str']	['str.size0','str']
 -------------------------------------------------------------------------
diff --git a/tests/queries/0_stateless/03547_s3_partition_by_require_partition_wildcard.sql b/tests/queries/0_stateless/03547_s3_partition_by_require_partition_wildcard.sql
deleted file mode 100644
index 7d089bd6181a..000000000000
--- a/tests/queries/0_stateless/03547_s3_partition_by_require_partition_wildcard.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Tags: no-parallel, no-fasttest, no-random-settings
-
-CREATE TABLE s3_03547 (id UInt64) ENGINE=S3(s3_conn, format=Parquet) PARTITION BY id; -- {serverError BAD_ARGUMENTS}
diff --git a/tests/queries/0_stateless/03550_analyzer_remote_view_columns.sql b/tests/queries/0_stateless/03550_analyzer_remote_view_columns.sql
index 044e34d68b5d..7eb3f2e9b67d 100644
--- a/tests/queries/0_stateless/03550_analyzer_remote_view_columns.sql
+++ b/tests/queries/0_stateless/03550_analyzer_remote_view_columns.sql
@@ -39,4 +39,4 @@ WHERE
             AND log_comment = 'THIS IS A COMMENT TO MARK THE INITIAL QUERY'
         LIMIT 1)
     AND type = 'QueryFinish'
-    AND NOT is_initial_query;
+    AND query_id != initial_query_id;
diff --git a/tests/queries/0_stateless/03560_new_analyzer_default_expression.reference b/tests/queries/0_stateless/03560_new_analyzer_default_expression.reference
deleted file mode 100644
index 328fa9b10f5f..000000000000
--- a/tests/queries/0_stateless/03560_new_analyzer_default_expression.reference
+++ /dev/null
@@ -1,13 +0,0 @@
--- { echoOn }
-SELECT * FROM default ORDER BY ALL;
-1
-SELECT * FROM clashing_name ORDER BY ALL;
-7
-SELECT * FROM dependent_defaults ORDER BY ALL;
-7	14	98
-SELECT * FROM regular_column ORDER BY ALL;
-2	7	14
-SELECT * FROM complex_name_backward_compat ORDER BY ALL;
-3	7	21
-SELECT * FROM compound_id ORDER BY ALL;
-(1,2)	8
diff --git a/tests/queries/0_stateless/03560_new_analyzer_default_expression.sql b/tests/queries/0_stateless/03560_new_analyzer_default_expression.sql
deleted file mode 100644
index 281680330b9c..000000000000
--- a/tests/queries/0_stateless/03560_new_analyzer_default_expression.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-SET enable_analyzer=1;
-
-CREATE TABLE default (a Int64 DEFAULT 1) Engine=Memory();
--- This case is failing with old analyzer, because "_subquery" name prefix has a special treatment.
-CREATE TABLE clashing_name (_subquery_test Int64 DEFAULT 7) Engine=Memory();
-CREATE TABLE dependent_defaults (a Int64 DEFAULT 7, b Int64 DEFAULT a + 7, c Int64 DEFAULT a * b) Engine=Memory();
-CREATE TABLE regular_column (a Int64, b Int64 DEFAULT 7, c Int64 DEFAULT a * b) Engine=Memory();
-CREATE TABLE complex_name_backward_compat (a Int64, `b.b` Int64 DEFAULT 7, c Int64 DEFAULT a * `b.b`) Engine=Memory();
-CREATE TABLE compound_id (a Tuple(x Int64, y Int64), b Int64 DEFAULT a.x + 7) Engine=Memory();
-
-SET insert_null_as_default=1;
-
-INSERT INTO default SELECT NULL FROM system.one;
-INSERT INTO clashing_name SELECT NULL FROM system.one;
-INSERT INTO dependent_defaults SELECT NULL, NULL, NULL FROM system.one;
-INSERT INTO regular_column SELECT 2, NULL, NULL FROM system.one;
-INSERT INTO complex_name_backward_compat SELECT 3, NULL, NULL FROM system.one;
-INSERT INTO compound_id (a) VALUES ((1, 2));
-
--- { echoOn }
-SELECT * FROM default ORDER BY ALL;
-SELECT * FROM clashing_name ORDER BY ALL;
-SELECT * FROM dependent_defaults ORDER BY ALL;
-SELECT * FROM regular_column ORDER BY ALL;
-SELECT * FROM complex_name_backward_compat ORDER BY ALL;
-SELECT * FROM compound_id ORDER BY ALL;
diff --git a/tests/queries/0_stateless/03568_ddsketch_merge.reference b/tests/queries/0_stateless/03568_ddsketch_merge.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03568_ddsketch_merge.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03568_ddsketch_merge.sql b/tests/queries/0_stateless/03568_ddsketch_merge.sql
new file mode 100644
index 000000000000..ccb81882809e
--- /dev/null
+++ b/tests/queries/0_stateless/03568_ddsketch_merge.sql
@@ -0,0 +1,8 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on base64Decode
+
+SELECT quantileDDMerge(0.01)(state) != 0 FROM format(
+    RowBinary,
+    'state AggregateFunction(quantileDD(0.01), Float64)',
+    base64Decode('AgAAAAAAAABAAAAAAAAAAAABDAEPAgAAAAAAAPA/AwwA/v///w8CBAAAAAAAAAAAAs07f2aeoPY/AAAAAAAAAAABDAEjAgAAAAAAAPA/AwwA/v///w8CBAAAAAAAAAAA')
+)
diff --git a/tests/queries/0_stateless/03571_geoparquet_nullable_bug.reference b/tests/queries/0_stateless/03571_geoparquet_nullable_bug.reference
new file mode 100644
index 000000000000..2e671099daed
--- /dev/null
+++ b/tests/queries/0_stateless/03571_geoparquet_nullable_bug.reference
@@ -0,0 +1,2 @@
+(10,20)	[(0,0),(10,0),(10,10),(0,10)]	[[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]]	[[(0,0),(10,0),(10,10),(0,10)],[(1,1),(2,2),(3,3)]]	[[[(0,0),(10,0),(10,10),(0,10)]],[[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]]]
+(30,40)	[(1,1),(11,1),(11,11),(1,11)]	[[(21,21),(51,21),(51,51),(21,51)],[(31,31),(51,51),(51,31)]]	[[(1,1),(11,1),(11,11),(1,11)],[(2,2),(3,3),(4,4)]]	[[[(1,1),(11,1),(11,11),(1,11)]],[[(21,21),(51,21),(51,51),(21,51)],[(31,31),(51,51),(51,31)]]]
diff --git a/tests/queries/0_stateless/03571_geoparquet_nullable_bug.sh b/tests/queries/0_stateless/03571_geoparquet_nullable_bug.sh
new file mode 100755
index 000000000000..99439256a350
--- /dev/null
+++ b/tests/queries/0_stateless/03571_geoparquet_nullable_bug.sh
@@ -0,0 +1,24 @@
+#!/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="
+    insert into function file('${CLICKHOUSE_TEST_UNIQUE_NAME}.parquet', Parquet, 'point Point, linestring LineString, polygon Polygon, multilinestring MultiLineString, multipolygon MultiPolygon') values (
+            (10, 20),
+            [(0, 0), (10, 0), (10, 10), (0, 10)],
+            [[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]],
+            [[(0, 0), (10, 0), (10, 10), (0, 10)], [(1, 1), (2, 2), (3, 3)]],
+            [[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]
+        ), (
+            (30, 40),
+            [(1, 1), (11, 1), (11, 11), (1, 11)],
+            [[(21, 21), (51, 21), (51, 51), (21, 51)], [(31, 31), (51, 51), (51, 31)]],
+            [[(1, 1), (11, 1), (11, 11), (1, 11)], [(2, 2), (3, 3), (4, 4)]],
+            [[[(1, 1), (11, 1), (11, 11), (1, 11)]], [[(21, 21), (51, 21), (51, 51), (21, 51)],[(31, 31), (51, 51), (51, 31)]]]
+        );
+    select * from file('${CLICKHOUSE_TEST_UNIQUE_NAME}.parquet');"
+
+rm "${CLICKHOUSE_USER_FILES}/${CLICKHOUSE_TEST_UNIQUE_NAME}.parquet"
diff --git a/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.reference b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.reference
new file mode 100644
index 000000000000..883191745d91
--- /dev/null
+++ b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.reference
@@ -0,0 +1,90 @@
+---- Export 2020_1_1_0 and 2021_2_2_0
+---- Both data parts should appear
+1	2020
+2	2020
+3	2020
+4	2021
+---- Export the same part again, it should be idempotent
+1	2020
+2	2020
+3	2020
+4	2021
+---- Data in roundtrip MergeTree table (should match s3_table)
+1	2020
+2	2020
+3	2020
+4	2021
+---- Export 2020_1_1_0 and 2021_2_2_0 to wildcard table
+---- Both data parts should appear
+1	2020
+2	2020
+3	2020
+4	2021
+---- Export the same part again, it should be idempotent
+1	2020
+2	2020
+3	2020
+4	2021
+---- Export 2020_1_1_0 and 2021_2_2_0 to wildcard table with partition expression with function
+---- Both data parts should appear
+1	2020
+2	2020
+3	2020
+4	2021
+---- Test max_bytes and max_rows per file
+---- Count files in big_destination_max_bytes, should be 5 (4 parquet, 1 commit)
+5
+---- Count rows in big_table and big_destination_max_bytes
+4194304
+4194304
+---- Count files in big_destination_max_rows, should be 5 (4 parquet, 1 commit)
+5
+---- Count rows in big_table and big_destination_max_rows
+4194304
+4194304
+---- Table function with schema inheritance (no schema specified)
+---- Data should be exported with inherited schema
+100	test1	2022
+101	test2	2022
+---- Table function with explicit compatible schema
+---- Data should be exported with explicit schema
+102	test3	2023
+---- Test ALIAS columns export
+---- Verify ALIAS column data in source table (arr_1 computed from arr[1])
+1	[1,2,3]	1
+1	[10,20,30]	10
+---- Verify ALIAS column data exported to S3 (should match source)
+1	[1,2,3]	1
+1	[10,20,30]	10
+---- Test MATERIALIZED columns export
+---- Verify MATERIALIZED column data in source table (arr_1 computed from arr[1])
+1	[1,2,3]	1
+1	[10,20,30]	10
+---- Verify MATERIALIZED column data exported to S3 (should match source)
+1	[1,2,3]	1
+1	[10,20,30]	10
+---- Test EPHEMERAL column (not stored, ignored during export)
+---- Verify data in source
+1	ALICE
+1	BOB
+---- Verify exported data
+1	ALICE
+1	BOB
+---- Test Mixed ALIAS, MATERIALIZED, and EPHEMERAL in same table
+---- Verify mixed columns in source table
+1	5	10	15	TEST
+1	10	20	30	PROD
+---- Verify mixed columns exported to S3 (should match source)
+1	5	10	15	TEST
+1	10	20	30	PROD
+---- Test Export to Table Function with mixed columns
+---- Verify mixed columns exported to S3
+1	5	10	15	TEST
+1	10	20	30	PROD
+---- Test Complex Expressions in computed columns
+---- Verify complex expressions in source table
+1	alice	ALICE	alice-1
+1	bob	BOB	bob-1
+---- Verify complex expressions exported to S3 (should match source)
+1	alice	ALICE	alice-1
+1	bob	BOB	bob-1
diff --git a/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh
new file mode 100755
index 000000000000..21e8fed0d2d9
--- /dev/null
+++ b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh
@@ -0,0 +1,287 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: requires s3 storage
+
+
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+mt_table="mt_table_${RANDOM}"
+mt_table_partition_expression_with_function="mt_table_partition_expression_with_function_${RANDOM}"
+s3_table="s3_table_${RANDOM}"
+s3_table_wildcard="s3_table_wildcard_${RANDOM}"
+s3_table_wildcard_partition_expression_with_function="s3_table_wildcard_partition_expression_with_function_${RANDOM}"
+mt_table_roundtrip="mt_table_roundtrip_${RANDOM}"
+big_table="big_table_${RANDOM}"
+big_destination_max_bytes="big_destination_max_bytes_${RANDOM}"
+big_destination_max_rows="big_destination_max_rows_${RANDOM}"
+tf_schema_inherit="tf_schema_inherit_${RANDOM}"
+tf_schema_explicit="tf_schema_explicit_${RANDOM}"
+mt_table_tf="mt_table_tf_${RANDOM}"
+mt_alias="mt_alias_${RANDOM}"
+mt_materialized="mt_materialized_${RANDOM}"
+s3_alias_export="s3_alias_export_${RANDOM}"
+s3_materialized_export="s3_materialized_export_${RANDOM}"
+mt_mixed="mt_mixed_${RANDOM}"
+s3_mixed_export="s3_mixed_export_${RANDOM}"
+mt_complex_expr="mt_complex_expr_${RANDOM}"
+s3_complex_expr_export="s3_complex_expr_export_${RANDOM}"
+mt_ephemeral="mt_ephemeral_${RANDOM}"
+s3_ephemeral_export="s3_ephemeral_export_${RANDOM}"
+s3_mixed_export_table_function="s3_mixed_export_table_function_${RANDOM}"
+
+query() {
+    $CLICKHOUSE_CLIENT --query "$1"
+}
+
+query "DROP TABLE IF EXISTS $mt_table, $s3_table, $mt_table_roundtrip, $s3_table_wildcard, $s3_table_wildcard_partition_expression_with_function, $mt_table_partition_expression_with_function, $mt_alias, $mt_materialized, $s3_alias_export, $s3_materialized_export, $mt_mixed, $s3_mixed_export, $mt_complex_expr, $s3_complex_expr_export, $mt_ephemeral, $s3_ephemeral_export"
+
+query "CREATE TABLE $mt_table (id UInt64, year UInt16) ENGINE = MergeTree() PARTITION BY year ORDER BY tuple()"
+query "CREATE TABLE $s3_table (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table', format=Parquet, partition_strategy='hive') PARTITION BY year"
+
+query "INSERT INTO $mt_table VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021)"
+echo "---- Export 2020_1_1_0 and 2021_2_2_0"
+query "ALTER TABLE $mt_table EXPORT PART '2020_1_1_0' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+query "ALTER TABLE $mt_table EXPORT PART '2021_2_2_0' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Both data parts should appear"
+query "SELECT * FROM $s3_table ORDER BY id"
+
+echo "---- Export the same part again, it should be idempotent"
+query "ALTER TABLE $mt_table EXPORT PART '2020_1_1_0' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+query "SELECT * FROM $s3_table ORDER BY id"
+
+query "CREATE TABLE $mt_table_roundtrip ENGINE = MergeTree() PARTITION BY year ORDER BY tuple() AS SELECT * FROM $s3_table"
+
+echo "---- Data in roundtrip MergeTree table (should match s3_table)"
+query "SELECT * FROM $s3_table ORDER BY id"
+
+query "CREATE TABLE $s3_table_wildcard (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table_wildcard/{_partition_id}/{_file}.parquet', format=Parquet, partition_strategy='wildcard') PARTITION BY year"
+
+echo "---- Export 2020_1_1_0 and 2021_2_2_0 to wildcard table"
+query "ALTER TABLE $mt_table EXPORT PART '2020_1_1_0' TO TABLE $s3_table_wildcard SETTINGS allow_experimental_export_merge_tree_part = 1"
+query "ALTER TABLE $mt_table EXPORT PART '2021_2_2_0' TO TABLE $s3_table_wildcard SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Both data parts should appear"
+query "SELECT * FROM s3(s3_conn, filename='$s3_table_wildcard/**.parquet') ORDER BY id"
+
+echo "---- Export the same part again, it should be idempotent"
+query "ALTER TABLE $mt_table EXPORT PART '2020_1_1_0' TO TABLE $s3_table_wildcard SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+query "SELECT * FROM s3(s3_conn, filename='$s3_table_wildcard/**.parquet') ORDER BY id"
+
+query "CREATE TABLE $mt_table_partition_expression_with_function (id UInt64, year UInt16) ENGINE = MergeTree() PARTITION BY toString(year) ORDER BY tuple()"
+query "CREATE TABLE $s3_table_wildcard_partition_expression_with_function (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table_wildcard_partition_expression_with_function/{_partition_id}/{_file}.parquet', format=Parquet, partition_strategy='wildcard') PARTITION BY toString(year)"
+
+query "INSERT INTO $mt_table_partition_expression_with_function VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021)"
+
+echo "---- Export 2020_1_1_0 and 2021_2_2_0 to wildcard table with partition expression with function"
+query "ALTER TABLE $mt_table_partition_expression_with_function EXPORT PART 'cb217c742dc7d143b61583011996a160_1_1_0' TO TABLE $s3_table_wildcard_partition_expression_with_function SETTINGS allow_experimental_export_merge_tree_part = 1"
+query "ALTER TABLE $mt_table_partition_expression_with_function EXPORT PART '3be6d49ecf9749a383964bc6fab22d10_2_2_0' TO TABLE $s3_table_wildcard_partition_expression_with_function SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 1
+
+echo "---- Both data parts should appear"
+query "SELECT * FROM s3(s3_conn, filename='$s3_table_wildcard_partition_expression_with_function/**.parquet') ORDER BY id"
+
+echo "---- Test max_bytes and max_rows per file"
+
+query "CREATE TABLE $big_table (id UInt64, data String, year UInt16) Engine=MergeTree() order by id partition by year"
+
+query "CREATE TABLE $big_destination_max_bytes(id UInt64, data String, year UInt16) engine=S3(s3_conn, filename='$big_destination_max_bytes', partition_strategy='hive', format=Parquet) partition by year"
+
+query "CREATE TABLE $big_destination_max_rows(id UInt64, data String, year UInt16) engine=S3(s3_conn, filename='$big_destination_max_rows', partition_strategy='hive', format=Parquet) partition by year"
+
+# 4194304 is a number that came up during multiple iterations, it does not really mean anything (aside from the fact that the below numbers depend on it)
+query "INSERT INTO $big_table SELECT number AS id, repeat('x', 100) AS data, 2025 AS year FROM numbers(4194304)"
+
+query "INSERT INTO $big_table SELECT number AS id, repeat('x', 100) AS data, 2026 AS year FROM numbers(4194304)"
+
+# make sure we have only one part
+query "OPTIMIZE TABLE $big_table FINAL"
+
+big_part_max_bytes=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$big_table' AND partition_id = '2025' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+big_part_max_rows=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$big_table' AND partition_id = '2026' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+
+# this should generate ~4 files
+query "ALTER TABLE $big_table EXPORT PART '$big_part_max_bytes' TO TABLE $big_destination_max_bytes SETTINGS allow_experimental_export_merge_tree_part = 1, export_merge_tree_part_max_bytes_per_file=3500000, output_format_parquet_row_group_size_bytes=1000000"
+# export_merge_tree_part_max_rows_per_file = 1048576 (which is 4194304/4) to generate 4 files
+query "ALTER TABLE $big_table EXPORT PART '$big_part_max_rows' TO TABLE $big_destination_max_rows SETTINGS allow_experimental_export_merge_tree_part = 1, export_merge_tree_part_max_rows_per_file=1048576"
+
+# sleeping a little longer because it will write multiple files, trying not be flaky
+sleep 20
+
+echo "---- Count files in big_destination_max_bytes, should be 5 (4 parquet, 1 commit)"
+query "SELECT count(_file) FROM s3(s3_conn, filename='$big_destination_max_bytes/**', format='One')"
+
+echo "---- Count rows in big_table and big_destination_max_bytes"
+query "SELECT COUNT() from $big_table WHERE year = 2025"
+query "SELECT COUNT() from $big_destination_max_bytes"
+
+echo "---- Count files in big_destination_max_rows, should be 5 (4 parquet, 1 commit)"
+query "SELECT count(_file) FROM s3(s3_conn, filename='$big_destination_max_rows/**', format='One')"
+
+echo "---- Count rows in big_table and big_destination_max_rows"
+query "SELECT COUNT() from $big_table WHERE year = 2026"
+query "SELECT COUNT() from $big_destination_max_rows"
+
+echo "---- Table function with schema inheritance (no schema specified)"
+query "CREATE TABLE $mt_table_tf (id UInt64, value String, year UInt16) ENGINE = MergeTree() PARTITION BY year ORDER BY tuple()"
+query "INSERT INTO $mt_table_tf VALUES (100, 'test1', 2022), (101, 'test2', 2022), (102, 'test3', 2023)"
+
+query "ALTER TABLE $mt_table_tf EXPORT PART '2022_1_1_0' TO TABLE FUNCTION s3(s3_conn, filename='$tf_schema_inherit', format='Parquet', partition_strategy='hive') PARTITION BY year SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Data should be exported with inherited schema"
+query "SELECT * FROM s3(s3_conn, filename='$tf_schema_inherit/**.parquet') ORDER BY id"
+
+echo "---- Table function with explicit compatible schema"
+query "ALTER TABLE $mt_table_tf EXPORT PART '2023_2_2_0' TO TABLE FUNCTION s3(s3_conn, filename='$tf_schema_explicit', format='Parquet', structure='id UInt64, value String, year UInt16', partition_strategy='hive') PARTITION BY year SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Data should be exported with explicit schema"
+query "SELECT * FROM s3(s3_conn, filename='$tf_schema_explicit/**.parquet') ORDER BY id"
+
+echo "---- Test ALIAS columns export"
+query "CREATE TABLE $mt_alias (a UInt32, arr Array(UInt64), arr_1 UInt64 ALIAS arr[1]) ENGINE = MergeTree() PARTITION BY a ORDER BY (a, arr[1]) SETTINGS index_granularity = 1"
+query "CREATE TABLE $s3_alias_export (a UInt32, arr Array(UInt64), arr_1 UInt64) ENGINE = S3(s3_conn, filename='$s3_alias_export', format=Parquet, partition_strategy='hive') PARTITION BY a"
+
+query "INSERT INTO $mt_alias VALUES (1, [1, 2, 3]), (1, [10, 20, 30])"
+
+alias_part=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$mt_alias' AND partition_id = '1' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+
+query "ALTER TABLE $mt_alias EXPORT PART '$alias_part' TO TABLE $s3_alias_export SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Verify ALIAS column data in source table (arr_1 computed from arr[1])"
+query "SELECT a, arr, arr_1 FROM $mt_alias ORDER BY arr"
+
+echo "---- Verify ALIAS column data exported to S3 (should match source)"
+query "SELECT a, arr, arr_1 FROM $s3_alias_export ORDER BY arr"
+
+echo "---- Test MATERIALIZED columns export"
+query "CREATE TABLE $mt_materialized (a UInt32, arr Array(UInt64), arr_1 UInt64 MATERIALIZED arr[1]) ENGINE = MergeTree() PARTITION BY a ORDER BY (a, arr_1) SETTINGS index_granularity = 1"
+query "CREATE TABLE $s3_materialized_export (a UInt32, arr Array(UInt64), arr_1 UInt64) ENGINE = S3(s3_conn, filename='$s3_materialized_export', format=Parquet, partition_strategy='hive') PARTITION BY a"
+
+query "INSERT INTO $mt_materialized VALUES (1, [1, 2, 3]), (1, [10, 20, 30])"
+
+materialized_part=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$mt_materialized' AND partition_id = '1' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+
+query "ALTER TABLE $mt_materialized EXPORT PART '$materialized_part' TO TABLE $s3_materialized_export SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Verify MATERIALIZED column data in source table (arr_1 computed from arr[1])"
+query "SELECT a, arr, arr_1 FROM $mt_materialized ORDER BY arr"
+
+echo "---- Verify MATERIALIZED column data exported to S3 (should match source)"
+query "SELECT a, arr, arr_1 FROM $s3_materialized_export ORDER BY arr"
+
+echo "---- Test EPHEMERAL column (not stored, ignored during export)"
+query "CREATE TABLE $mt_ephemeral (
+    id UInt32,
+    name_input String EPHEMERAL,
+    name_upper String DEFAULT upper(name_input)
+) ENGINE = MergeTree() PARTITION BY id ORDER BY id SETTINGS index_granularity = 1"
+
+query "CREATE TABLE $s3_ephemeral_export (
+    id UInt32,
+    name_upper String
+) ENGINE = S3(s3_conn, filename='$s3_ephemeral_export', format=Parquet, partition_strategy='hive') PARTITION BY id"
+
+query "INSERT INTO $mt_ephemeral (id, name_input) VALUES (1, 'alice'), (1, 'bob')"
+
+ephemeral_part=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$mt_ephemeral' AND partition_id = '1' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+
+query "ALTER TABLE $mt_ephemeral EXPORT PART '$ephemeral_part' TO TABLE $s3_ephemeral_export SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Verify data in source"
+query "SELECT id, name_upper FROM $mt_ephemeral ORDER BY name_upper"
+
+echo "---- Verify exported data"
+query "SELECT id, name_upper FROM $s3_ephemeral_export ORDER BY name_upper"
+
+echo "---- Test Mixed ALIAS, MATERIALIZED, and EPHEMERAL in same table"
+query "CREATE TABLE $mt_mixed (
+    id UInt32,
+    value UInt32,
+    tag_input String EPHEMERAL,
+    doubled UInt64 ALIAS value * 2,
+    tripled UInt64 MATERIALIZED value * 3,
+    tag String DEFAULT upper(tag_input)
+) ENGINE = MergeTree() PARTITION BY id ORDER BY id SETTINGS index_granularity = 1"
+
+query "CREATE TABLE $s3_mixed_export (
+    id UInt32,
+    value UInt32,
+    doubled UInt64,
+    tripled UInt64,
+    tag String
+) ENGINE = S3(s3_conn, filename='$s3_mixed_export', format=Parquet, partition_strategy='hive') PARTITION BY id"
+
+query "INSERT INTO $mt_mixed (id, value, tag_input) VALUES (1, 5, 'test'), (1, 10, 'prod')"
+
+mixed_part=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$mt_mixed' AND partition_id = '1' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+
+query "ALTER TABLE $mt_mixed EXPORT PART '$mixed_part' TO TABLE $s3_mixed_export SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Verify mixed columns in source table"
+query "SELECT id, value, doubled, tripled, tag FROM $mt_mixed ORDER BY value"
+
+echo "---- Verify mixed columns exported to S3 (should match source)"
+query "SELECT id, value, doubled, tripled, tag FROM $s3_mixed_export ORDER BY value"
+
+echo "---- Test Export to Table Function with mixed columns"
+
+query "ALTER TABLE $mt_mixed EXPORT PART '$mixed_part' TO TABLE FUNCTION s3(s3_conn, filename='$s3_mixed_export_table_function', format=Parquet, partition_strategy='hive') PARTITION BY id SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Verify mixed columns exported to S3"
+query "SELECT * FROM s3(s3_conn, filename='$s3_mixed_export_table_function/**.parquet', format=Parquet) ORDER BY value"
+
+echo "---- Test Complex Expressions in computed columns"
+query "CREATE TABLE $mt_complex_expr (
+    id UInt32,
+    name String,
+    upper_name String ALIAS upper(name),
+    concat_result String MATERIALIZED concat(name, '-', toString(id))
+) ENGINE = MergeTree() PARTITION BY id ORDER BY id SETTINGS index_granularity = 1"
+
+query "CREATE TABLE $s3_complex_expr_export (
+    id UInt32,
+    name String,
+    upper_name String,
+    concat_result String
+) ENGINE = S3(s3_conn, filename='$s3_complex_expr_export', format=Parquet, partition_strategy='hive') PARTITION BY id"
+
+query "INSERT INTO $mt_complex_expr (id, name) VALUES (1, 'alice'), (1, 'bob')"
+
+complex_expr_part=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$mt_complex_expr' AND partition_id = '1' AND active = 1 ORDER BY name LIMIT 1" | tr -d '\n')
+
+query "ALTER TABLE $mt_complex_expr EXPORT PART '$complex_expr_part' TO TABLE $s3_complex_expr_export SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+sleep 3
+
+echo "---- Verify complex expressions in source table"
+query "SELECT id, name, upper_name, concat_result FROM $mt_complex_expr ORDER BY name"
+
+echo "---- Verify complex expressions exported to S3 (should match source)"
+query "SELECT id, name, upper_name, concat_result FROM $s3_complex_expr_export ORDER BY name"
+
+query "DROP TABLE IF EXISTS $mt_table, $s3_table, $mt_table_roundtrip, $mt_table_tf, $s3_table_wildcard, $s3_table_wildcard_partition_expression_with_function, $mt_table_partition_expression_with_function, $big_table, $big_destination_max_bytes, $big_destination_max_rows, $mt_alias, $mt_materialized, $s3_alias_export, $s3_materialized_export, $mt_ephemeral, $s3_ephemeral_export, $mt_mixed, $s3_mixed_export, $mt_complex_expr, $s3_complex_expr_export"
diff --git a/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage_simple.reference b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage_simple.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage_simple.sql b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage_simple.sql
new file mode 100644
index 000000000000..4b235b3b8372
--- /dev/null
+++ b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage_simple.sql
@@ -0,0 +1,37 @@
+-- Tags: no-parallel, no-fasttest
+
+DROP TABLE IF EXISTS 03572_mt_table, 03572_invalid_schema_table, 03572_ephemeral_mt_table, 03572_matching_ephemeral_s3_table;
+
+CREATE TABLE 03572_mt_table (id UInt64, year UInt16) ENGINE = MergeTree() PARTITION BY year ORDER BY tuple();
+
+INSERT INTO 03572_mt_table VALUES (1, 2020);
+
+-- Create a table with a different partition key and export a partition to it. It should throw
+CREATE TABLE 03572_invalid_schema_table (id UInt64, x UInt16) ENGINE = S3(s3_conn, filename='03572_invalid_schema_table', format='Parquet', partition_strategy='hive') PARTITION BY x;
+
+ALTER TABLE 03572_mt_table EXPORT PART '2020_1_1_0' TO TABLE 03572_invalid_schema_table
+SETTINGS allow_experimental_export_merge_tree_part = 1; -- {serverError INCOMPATIBLE_COLUMNS}
+
+DROP TABLE 03572_invalid_schema_table;
+
+-- The only partition strategy that supports exports is hive. Wildcard should throw
+CREATE TABLE 03572_invalid_schema_table (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='03572_invalid_schema_table/{_partition_id}', format='Parquet', partition_strategy='wildcard') PARTITION BY (id, year);
+
+ALTER TABLE 03572_mt_table EXPORT PART '2020_1_1_0' TO TABLE 03572_invalid_schema_table SETTINGS allow_experimental_export_merge_tree_part = 1; -- {serverError NOT_IMPLEMENTED}
+
+-- Not a table function, should throw
+ALTER TABLE 03572_mt_table EXPORT PART '2020_1_1_0' TO TABLE FUNCTION extractKeyValuePairs('name:ronaldo'); -- {serverError UNKNOWN_FUNCTION}
+
+-- It is a table function, but the engine does not support exports/imports, should throw
+ALTER TABLE 03572_mt_table EXPORT PART '2020_1_1_0' TO TABLE FUNCTION url('a.parquet'); -- {serverError NOT_IMPLEMENTED}
+
+-- Test that destination table can not have a column that matches the source ephemeral
+CREATE TABLE 03572_ephemeral_mt_table (id UInt64, year UInt16, name String EPHEMERAL) ENGINE = MergeTree() PARTITION BY year ORDER BY tuple();
+
+CREATE TABLE 03572_matching_ephemeral_s3_table (id UInt64, year UInt16, name String) ENGINE = S3(s3_conn, filename='03572_matching_ephemeral_s3_table', format='Parquet', partition_strategy='hive') PARTITION BY year;
+
+INSERT INTO 03572_ephemeral_mt_table (id, year, name) VALUES (1, 2020, 'alice');
+
+ALTER TABLE 03572_ephemeral_mt_table EXPORT PART '2020_1_1_0' TO TABLE 03572_matching_ephemeral_s3_table SETTINGS allow_experimental_export_merge_tree_part = 1; -- {serverError INCOMPATIBLE_COLUMNS}
+
+DROP TABLE IF EXISTS 03572_mt_table, 03572_invalid_schema_table, 03572_ephemeral_mt_table, 03572_matching_ephemeral_s3_table;
diff --git a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference
new file mode 100644
index 000000000000..991a5901ae6e
--- /dev/null
+++ b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference
@@ -0,0 +1,11 @@
+---- Get actual part names and export them
+---- Both data parts should appear
+1	2020
+2	2020
+3	2020
+4	2021
+---- Export the same part again, it should be idempotent
+1	2020
+2	2020
+3	2020
+4	2021
diff --git a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh
new file mode 100755
index 000000000000..142664954bff
--- /dev/null
+++ b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Tags: replica, no-parallel, no-replicated-database, no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+rmt_table="rmt_table_${RANDOM}"
+s3_table="s3_table_${RANDOM}"
+
+query() {
+    $CLICKHOUSE_CLIENT --query "$1"
+}
+
+query "DROP TABLE IF EXISTS $rmt_table, $s3_table"
+
+query "CREATE TABLE $rmt_table (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table', 'replica1') PARTITION BY year ORDER BY tuple()"
+query "CREATE TABLE $s3_table (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table', format=Parquet, partition_strategy='hive') PARTITION BY year"
+
+query "INSERT INTO $rmt_table VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021)"
+
+echo "---- Get actual part names and export them"
+part_2020=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$rmt_table' AND partition = '2020' ORDER BY name LIMIT 1" | tr -d '\n')
+part_2021=$(query "SELECT name FROM system.parts WHERE database = currentDatabase() AND table = '$rmt_table' AND partition = '2021' ORDER BY name LIMIT 1" | tr -d '\n')
+
+query "ALTER TABLE $rmt_table EXPORT PART '$part_2020' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+query "ALTER TABLE $rmt_table EXPORT PART '$part_2021' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+echo "---- Both data parts should appear"
+query "SELECT * FROM $s3_table ORDER BY id"
+
+echo "---- Export the same part again, it should be idempotent"
+query "ALTER TABLE $rmt_table EXPORT PART '$part_2020' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+query "SELECT * FROM $s3_table ORDER BY id"
+
+query "DROP TABLE IF EXISTS $rmt_table, $s3_table"
diff --git a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage_simple.reference b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage_simple.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage_simple.sql b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage_simple.sql
new file mode 100644
index 000000000000..f8f23532f0a7
--- /dev/null
+++ b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage_simple.sql
@@ -0,0 +1,22 @@
+-- Tags: no-parallel, no-fasttest
+
+DROP TABLE IF EXISTS 03572_rmt_table, 03572_invalid_schema_table;
+
+CREATE TABLE 03572_rmt_table (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_03572_rmt/03572_rmt_table', 'replica1') PARTITION BY year ORDER BY tuple();
+
+INSERT INTO 03572_rmt_table VALUES (1, 2020);
+
+-- Create a table with a different partition key and export a partition to it. It should throw
+CREATE TABLE 03572_invalid_schema_table (id UInt64, x UInt16) ENGINE = S3(s3_conn, filename='03572_invalid_schema_table', format='Parquet', partition_strategy='hive') PARTITION BY x;
+
+ALTER TABLE 03572_rmt_table EXPORT PART '2020_0_0_0' TO TABLE 03572_invalid_schema_table
+SETTINGS allow_experimental_export_merge_tree_part = 1; -- {serverError INCOMPATIBLE_COLUMNS}
+
+DROP TABLE 03572_invalid_schema_table;
+
+-- The only partition strategy that supports exports is hive. Wildcard should throw
+CREATE TABLE 03572_invalid_schema_table (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='03572_invalid_schema_table/{_partition_id}', format='Parquet', partition_strategy='wildcard') PARTITION BY (id, year);
+
+ALTER TABLE 03572_rmt_table EXPORT PART '2020_0_0_0' TO TABLE 03572_invalid_schema_table SETTINGS allow_experimental_export_merge_tree_part = 1; -- {serverError NOT_IMPLEMENTED}
+
+DROP TABLE IF EXISTS 03572_rmt_table, 03572_invalid_schema_table;
diff --git a/tests/queries/0_stateless/03578_distributed_kv_global_in.sql b/tests/queries/0_stateless/03578_distributed_kv_global_in.sql
index a855ad66d976..79bfd3a28925 100644
--- a/tests/queries/0_stateless/03578_distributed_kv_global_in.sql
+++ b/tests/queries/0_stateless/03578_distributed_kv_global_in.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest
+-- Tags: no-fasttest, use-rocksdb
 
 SET prefer_localhost_replica = 0;
 
diff --git a/tests/queries/0_stateless/03578_kv_in_type_casts.sql b/tests/queries/0_stateless/03578_kv_in_type_casts.sql
index c319ce75fc59..f8166d46572d 100644
--- a/tests/queries/0_stateless/03578_kv_in_type_casts.sql
+++ b/tests/queries/0_stateless/03578_kv_in_type_casts.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest
+-- Tags: no-fasttest, use-rocksdb
 
 DROP TABLE IF EXISTS 03578_rocksdb;
 
diff --git a/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.reference b/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.reference
index 0283ddd53b10..51ed709c3c10 100644
--- a/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.reference
+++ b/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.reference
@@ -1 +1,2 @@
 2025-06-04	('100022','2025-06-04 18:40:56.000000','2025-06-09 21:19:00.364000')	100022
+[1,2,3]	{1:'Pavel',2:'Ivanov'}	[(1,'pudge'),(2,'1000-7')]
diff --git a/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.sql b/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.sql
index 4ea430189cda..c41db770b3a8 100644
--- a/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.sql
+++ b/tests/queries/0_stateless/03581_iceberg_struct_fields_ids.sql
@@ -4,3 +4,4 @@
 -- This table was created by spark, but with changed column names in parquet
 -- The purpose of this test is to verify that a column with a structured type with different names in Parquet and Iceberg metadata will be read correctly.
 SELECT * FROM icebergS3(s3_conn, filename='field_ids_struct_test', SETTINGS iceberg_metadata_table_uuid = '149ecc15-7afc-4311-86b3-3a4c8d4ec08e') ORDER BY ALL;
+SELECT * FROM icebergS3(s3_conn, filename='field_ids_complex_test', SETTINGS iceberg_metadata_table_uuid = 'd4b695ca-ceeb-4537-8a2a-eee90dc6e313') ORDER BY ALL;
diff --git a/tests/queries/0_stateless/03595_analyzer_lateral_join.reference b/tests/queries/0_stateless/03595_analyzer_lateral_join.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03595_analyzer_lateral_join.sql b/tests/queries/0_stateless/03595_analyzer_lateral_join.sql
new file mode 100644
index 000000000000..1bf42956ca71
--- /dev/null
+++ b/tests/queries/0_stateless/03595_analyzer_lateral_join.sql
@@ -0,0 +1,82 @@
+SET enable_analyzer = 1;
+SET allow_experimental_correlated_subqueries = 1;
+
+SELECT
+    t.a,
+    u.a
+FROM
+    (
+        SELECT
+            1 AS a
+    ) AS t,
+    (
+        SELECT 1 AS a
+        QUALIFY 0 = (t.a AS alias668)
+    ) AS u; -- { serverError NOT_IMPLEMENTED }
+
+SELECT
+    t.a,
+    u.a
+FROM
+    (
+        SELECT
+            1 AS a
+    ) AS t,
+    (
+        SELECT
+            DISTINCT *,
+            *,
+            27,
+            '======Before Truncate======',
+            materialize(27),
+            27,
+            *,
+            isZeroOrNull(27),
+            27,
+            materialize(27),
+            *,
+            * IS NOT NULL,
+            *,
+            27,
+            *,
+            toFixedString('======Before Truncate======', 27),
+            27,
+            27,
+            27,
+            27,
+            toLowCardinality(27),
+            toNullable(materialize(27)),
+            * IS NOT NULL,
+            1 AS a QUALIFY (
+                (
+                    *,
+                    27,
+                    materialize(27),
+                    27,
+                    '======Before Truncate======',
+                    27,
+                    27,
+                    (27 IS NOT NULL),
+                    * IS NOT NULL
+                ) IS NULL
+            ) = (t.a AS alias668)
+    ) AS u; -- { serverError NOT_IMPLEMENTED }
+
+SELECT
+    c,
+    a c
+FROM
+    (
+        SELECT
+            1 a
+    ) X
+    CROSS JOIN (
+        SELECT
+            1
+        WHERE
+            c = 1
+    ) Y
+    CROSS JOIN (
+        SELECT
+            1 c
+    ) Z; -- { serverError NOT_IMPLEMENTED }
diff --git a/tests/queries/0_stateless/03595_exists_as_scalar_subquery.reference b/tests/queries/0_stateless/03595_exists_as_scalar_subquery.reference
index 40106ae1406f..d11e205f5fa7 100644
--- a/tests/queries/0_stateless/03595_exists_as_scalar_subquery.reference
+++ b/tests/queries/0_stateless/03595_exists_as_scalar_subquery.reference
@@ -1,2 +1,3 @@
 3
 ScalarSubqueriesGlobalCacheHit 1
+1
diff --git a/tests/queries/0_stateless/03595_exists_as_scalar_subquery.sql b/tests/queries/0_stateless/03595_exists_as_scalar_subquery.sql
index 6bef95e19dd8..2d59db4c7af4 100644
--- a/tests/queries/0_stateless/03595_exists_as_scalar_subquery.sql
+++ b/tests/queries/0_stateless/03595_exists_as_scalar_subquery.sql
@@ -13,3 +13,5 @@ set force_primary_key = 0;
 system flush logs query_log;
 SELECT 'ScalarSubqueriesGlobalCacheHit ' || ProfileEvents['ScalarSubqueriesGlobalCacheHit'] FROM system.query_log
 WHERE type != 'QueryStart' AND current_database = currentDatabase() AND query like 'select%' AND Settings['execute_exists_as_scalar_subquery']='1';
+
+SELECT EXISTS(SELECT 1 from numbers(2) where number != 0) settings execute_exists_as_scalar_subquery = 1;
diff --git a/tests/queries/0_stateless/03596_alter_update_column_with_subcolumn_used_in_materialized_expression.reference b/tests/queries/0_stateless/03596_alter_update_column_with_subcolumn_used_in_materialized_expression.reference
new file mode 100644
index 000000000000..cb708004318f
--- /dev/null
+++ b/tests/queries/0_stateless/03596_alter_update_column_with_subcolumn_used_in_materialized_expression.reference
@@ -0,0 +1,14 @@
+(1)	1
+(2)	2
+(3)	3
+(1)	43
+(2)	44
+(3)	45
+(1)	1
+{"a":1}	1
+{"a":2}	2
+{"a":3}	3
+{"a":1}	43
+{"a":2}	44
+{"a":3}	45
+{"a":1}	1
diff --git a/tests/queries/0_stateless/03596_alter_update_column_with_subcolumn_used_in_materialized_expression.sql b/tests/queries/0_stateless/03596_alter_update_column_with_subcolumn_used_in_materialized_expression.sql
new file mode 100644
index 000000000000..36434e468a92
--- /dev/null
+++ b/tests/queries/0_stateless/03596_alter_update_column_with_subcolumn_used_in_materialized_expression.sql
@@ -0,0 +1,55 @@
+drop table if exists test;
+create table test (t Tuple(a UInt32), a UInt32 materialized t.a) engine=MergeTree() order by tuple();
+insert into test select tuple(1);
+select t, a from test;
+alter table test update t = tuple(2) where 1 settings mutations_sync=1;
+select t, a from test;
+alter table test update t = tuple(3) where 1 settings mutations_sync=1;
+select t, a from test;
+drop table test;
+
+drop table if exists test;
+create table test (t Tuple(a UInt32), a UInt32 materialized t.a + 42) engine=MergeTree() order by tuple();
+insert into test select tuple(1);
+select t, a from test;
+alter table test update t = tuple(2) where 1 settings mutations_sync=1;
+select t, a from test;
+alter table test update t = tuple(3) where 1 settings mutations_sync=1;
+select t, a from test;
+drop table test;
+
+
+create table test (t Tuple(a UInt32), a UInt32 materialized t.a) engine=MergeTree() order by a;
+insert into test select tuple(1);
+select t, a from test;
+alter table test update t = tuple(2) where 1 settings mutations_sync=1; -- {serverError CANNOT_UPDATE_COLUMN}
+drop table test;
+
+drop table if exists test;
+create table test (json JSON, a UInt32 materialized json.a::UInt32) engine=MergeTree() order by tuple();
+insert into test select '{"a" : 1}';
+select json, a from test;
+alter table test update json = '{"a" : 2}' where 1 settings mutations_sync=1;
+select json, a from test;
+alter table test update json = '{"a" : 3}' where 1 settings mutations_sync=1;
+select json, a from test;
+drop table test;
+
+drop table if exists test;
+create table test (json JSON, a UInt32 materialized json.a::UInt32 + 42) engine=MergeTree() order by tuple();
+insert into test select '{"a" : 1}';
+select json, a from test;
+alter table test update json = '{"a" : 2}' where 1 settings mutations_sync=1;
+select json, a from test;
+alter table test update json = '{"a" : 3}' where 1 settings mutations_sync=1;
+select json, a from test;
+drop table test;
+
+
+
+create table test (json JSON, a UInt32 materialized json.a::UInt32) engine=MergeTree() order by a;
+insert into test select '{"a" : 1}';
+select json, a from test;
+alter table test update json = '{"a" : 2}' where 1 settings mutations_sync=1; -- {serverError CANNOT_UPDATE_COLUMN}
+drop table test;
+
diff --git a/tests/queries/0_stateless/03596_parquet_prewhere_page_skip_bug.reference b/tests/queries/0_stateless/03596_parquet_prewhere_page_skip_bug.reference
new file mode 100644
index 000000000000..29b4cd63f6a9
--- /dev/null
+++ b/tests/queries/0_stateless/03596_parquet_prewhere_page_skip_bug.reference
@@ -0,0 +1,4 @@
+1310
+1740
+1750
+1760
diff --git a/tests/queries/0_stateless/03596_parquet_prewhere_page_skip_bug.sql b/tests/queries/0_stateless/03596_parquet_prewhere_page_skip_bug.sql
new file mode 100644
index 000000000000..79cac73b12b7
--- /dev/null
+++ b/tests/queries/0_stateless/03596_parquet_prewhere_page_skip_bug.sql
@@ -0,0 +1,9 @@
+-- Tags: no-fasttest, no-parallel
+
+set output_format_parquet_use_custom_encoder = 1;
+set input_format_parquet_use_native_reader_v3 = 1;
+set engine_file_truncate_on_insert = 1;
+
+insert into function file('03596_parquet_prewhere_page_skip_bug.parquet') select number as n, number*10 as n10 from numbers(200) settings output_format_parquet_data_page_size=100, output_format_parquet_batch_size=10, output_format_parquet_row_group_size=100, output_format_parquet_write_page_index=0;
+
+select n10 from file('03596_parquet_prewhere_page_skip_bug.parquet') prewhere n in (131, 174, 175, 176) order by all settings input_format_parquet_page_filter_push_down=0, input_format_parquet_filter_push_down=0, input_format_parquet_bloom_filter_push_down=0, input_format_parquet_max_block_size=10;
diff --git a/tests/queries/0_stateless/03597_alter_column_with_subcolumn_in_key.reference b/tests/queries/0_stateless/03597_alter_column_with_subcolumn_in_key.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03597_alter_column_with_subcolumn_in_key.sql b/tests/queries/0_stateless/03597_alter_column_with_subcolumn_in_key.sql
new file mode 100644
index 000000000000..3eae3b63b23c
--- /dev/null
+++ b/tests/queries/0_stateless/03597_alter_column_with_subcolumn_in_key.sql
@@ -0,0 +1,14 @@
+drop table if exists test;
+create table test (id UInt32, t Tuple(a UInt32)) engine=MergeTree order by t.a;
+insert into test select 1, tuple(1);
+alter table test update t = tuple(2) where 1; -- {serverError CANNOT_UPDATE_COLUMN}
+alter table test modify column t Tuple(a String); -- {serverError ALTER_OF_COLUMN_IS_FORBIDDEN}
+drop table test;
+
+drop table if exists test;
+create table test (id UInt32, json JSON) engine=MergeTree order by json.a::Int64;
+insert into test select 1, '{"a" : 42}';
+alter table test update json = '{}' where 1; -- {serverError CANNOT_UPDATE_COLUMN}
+alter table test modify column json JSON(a String); -- {serverError ALTER_OF_COLUMN_IS_FORBIDDEN}
+drop table test;
+
diff --git a/tests/queries/0_stateless/03598_json_enum_default_value_in_typed_path.reference b/tests/queries/0_stateless/03598_json_enum_default_value_in_typed_path.reference
new file mode 100644
index 000000000000..ccdd9d15b667
--- /dev/null
+++ b/tests/queries/0_stateless/03598_json_enum_default_value_in_typed_path.reference
@@ -0,0 +1,8 @@
+{"e":"a"}
+{"e":"b"}
+{"e":"a"}
+{"e":"a"}
+a
+b
+a
+a
diff --git a/tests/queries/0_stateless/03598_json_enum_default_value_in_typed_path.sql b/tests/queries/0_stateless/03598_json_enum_default_value_in_typed_path.sql
new file mode 100644
index 000000000000..b5e5fb745deb
--- /dev/null
+++ b/tests/queries/0_stateless/03598_json_enum_default_value_in_typed_path.sql
@@ -0,0 +1,7 @@
+drop table if exists test;
+create table test (json JSON(e Enum('a' = 1, 'b' = 2))) engine=MergeTree order by tuple();
+insert into test values ('{"e" : "a"}'), ('{"e" : "b"}'), ('{"e" : null}'), ('{}');
+select json from test;
+select json.e from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03599_bad_date_and_datetimes_inference.reference b/tests/queries/0_stateless/03599_bad_date_and_datetimes_inference.reference
new file mode 100644
index 000000000000..3b2c8b2bd33f
--- /dev/null
+++ b/tests/queries/0_stateless/03599_bad_date_and_datetimes_inference.reference
@@ -0,0 +1,49 @@
+1800-01-01	Nullable(String)
+1800-01-01	Nullable(String)
+1969-12-31 00:00:00.000000000	Nullable(DateTime64(9))
+1969-12-31 00:00:00.000000000	Nullable(DateTime64(9))
+1800-01-01 00:00:00	Nullable(String)
+1800-01-01 00:00:00	Nullable(String)
+1969-12-31 23:59:59.000000000	Nullable(DateTime64(9))
+1969-12-31 23:59:59.000000000	Nullable(DateTime64(9))
+3000-01-01	Nullable(String)
+3000-01-01	Nullable(String)
+2149-06-07 00:00:00.000000000	Nullable(DateTime64(9))
+2149-06-07 00:00:00.000000000	Nullable(DateTime64(9))
+3000-01-01 00:00:00	Nullable(String)
+3000-01-01 00:00:00	Nullable(String)
+2106-02-07 06:28:16.000000000	Nullable(DateTime64(9))
+2106-02-07 06:28:16.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1899-12-31 23:59:59	Nullable(String)
+1899-12-31 23:59:59	Nullable(String)
+2300-01-01 00:00:00.000000000	Nullable(String)
+2300-01-01 00:00:00.000000000	Nullable(String)
+----------------------------------------------
+1800-01-01	Nullable(String)
+1800-01-01	Nullable(String)
+1969-12-31 00:00:00.000000000	Nullable(DateTime64(9))
+1969-12-31 00:00:00.000000000	Nullable(DateTime64(9))
+1800-01-01 00:00:00	Nullable(String)
+1800-01-01 00:00:00	Nullable(String)
+1969-12-31 23:59:59.000000000	Nullable(DateTime64(9))
+1969-12-31 23:59:59.000000000	Nullable(DateTime64(9))
+3000-01-01	Nullable(String)
+3000-01-01	Nullable(String)
+2149-06-07 00:00:00.000000000	Nullable(DateTime64(9))
+2149-06-07 00:00:00.000000000	Nullable(DateTime64(9))
+3000-01-01 00:00:00	Nullable(String)
+3000-01-01 00:00:00	Nullable(String)
+2106-02-07 06:28:16.000000000	Nullable(DateTime64(9))
+2106-02-07 06:28:16.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1900-01-01 00:00:00.000000000	Nullable(DateTime64(9))
+1899-12-31 23:59:59	Nullable(String)
+1899-12-31 23:59:59	Nullable(String)
+2300-01-01 00:00:00.000000000	Nullable(String)
+2300-01-01 00:00:00.000000000	Nullable(String)
diff --git a/tests/queries/0_stateless/03599_bad_date_and_datetimes_inference.sql b/tests/queries/0_stateless/03599_bad_date_and_datetimes_inference.sql
new file mode 100644
index 000000000000..94da1e2a1d9c
--- /dev/null
+++ b/tests/queries/0_stateless/03599_bad_date_and_datetimes_inference.sql
@@ -0,0 +1,58 @@
+set date_time_input_format='basic';
+set session_timezone='UTC';
+
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01 00:00:00"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01 00:00:00", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31 23:59:59"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31 23:59:59", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2149-06-07"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2149-06-07", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01 00:00:00"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01 00:00:00", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2106-02-07 06:28:16"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2106-02-07 06:28:16", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01 00:00:00"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01 00:00:00", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1899-12-31 23:59:59"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1899-12-31 23:59:59", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2300-01-01 00:00:00.000000000"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2300-01-01 00:00:00.000000000", "s" : "some string"}');
+
+select '----------------------------------------------';
+
+set date_time_input_format='best_effort';
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01 00:00:00"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1800-01-01 00:00:00", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31 23:59:59"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1969-12-31 23:59:59", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2149-06-07"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2149-06-07", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01 00:00:00"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "3000-01-01 00:00:00", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2106-02-07 06:28:16"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2106-02-07 06:28:16", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01 00:00:00"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1900-01-01 00:00:00", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1899-12-31 23:59:59"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "1899-12-31 23:59:59", "s" : "some string"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2300-01-01 00:00:00.000000000"}');
+select d, toTypeName(d) from format(JSONEachRow, '{"d" : "2300-01-01 00:00:00.000000000", "s" : "some string"}');
+
+
+
diff --git a/tests/queries/0_stateless/03600_replace_fixed_string_bug.reference b/tests/queries/0_stateless/03600_replace_fixed_string_bug.reference
new file mode 100644
index 000000000000..78981922613b
--- /dev/null
+++ b/tests/queries/0_stateless/03600_replace_fixed_string_bug.reference
@@ -0,0 +1 @@
+a
diff --git a/tests/queries/0_stateless/03600_replace_fixed_string_bug.sql b/tests/queries/0_stateless/03600_replace_fixed_string_bug.sql
new file mode 100644
index 000000000000..e7d24e5ee44f
--- /dev/null
+++ b/tests/queries/0_stateless/03600_replace_fixed_string_bug.sql
@@ -0,0 +1,2 @@
+SELECT replace(materialize(toFixedString('a', 1)), '', '');
+
diff --git a/tests/queries/0_stateless/03601_insert_squashing_remove_const.reference b/tests/queries/0_stateless/03601_insert_squashing_remove_const.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03601_insert_squashing_remove_const.sql b/tests/queries/0_stateless/03601_insert_squashing_remove_const.sql
new file mode 100644
index 000000000000..e2a02499fb35
--- /dev/null
+++ b/tests/queries/0_stateless/03601_insert_squashing_remove_const.sql
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS tbl_x;
+
+CREATE TABLE tbl_x (col2  String) ENGINE = Memory;
+
+-- Produce Const and non-Const block in various SELECTs that may lead to UB w/o removing constness while squashing
+INSERT INTO tbl_x
+WITH
+    c4 AS
+    (
+        SELECT 'aaa' AS col2
+        UNION ALL
+        SELECT 'bbb'
+    ),
+    c6 AS
+    (
+        SELECT r.col2 AS col2
+        FROM (SELECT 'ccc' AS col2) AS r
+        LEFT JOIN (SELECT 'foo' AS col2) AS rt
+        USING col2
+    )
+SELECT
+    *
+FROM
+(
+    SELECT * FROM c4
+    UNION ALL
+    SELECT * FROM c6
+);
diff --git a/tests/queries/0_stateless/03601_replace_regex_fixedstring_empty_needle.reference b/tests/queries/0_stateless/03601_replace_regex_fixedstring_empty_needle.reference
new file mode 100644
index 000000000000..3e9bc4d8cc36
--- /dev/null
+++ b/tests/queries/0_stateless/03601_replace_regex_fixedstring_empty_needle.reference
@@ -0,0 +1,10 @@
+z0
+z1
+z2
+z3
+z4
+z5
+z6
+z7
+z8
+z9
diff --git a/tests/queries/0_stateless/03601_replace_regex_fixedstring_empty_needle.sql b/tests/queries/0_stateless/03601_replace_regex_fixedstring_empty_needle.sql
new file mode 100644
index 000000000000..95babe2f4c3b
--- /dev/null
+++ b/tests/queries/0_stateless/03601_replace_regex_fixedstring_empty_needle.sql
@@ -0,0 +1,3 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/86261
+SELECT replaceRegexpAll(materialize(toFixedString(toLowCardinality(concat('z', number)), 2)), '', 'aazzqa')
+FROM numbers(10);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03602_alter_update_nullable_json.reference b/tests/queries/0_stateless/03602_alter_update_nullable_json.reference
new file mode 100644
index 000000000000..88f53991dfff
--- /dev/null
+++ b/tests/queries/0_stateless/03602_alter_update_nullable_json.reference
@@ -0,0 +1,8 @@
+Dynamic paths
+a
+Shared data paths
+b
+Dynamic paths
+a
+Shared data paths
+b
diff --git a/tests/queries/0_stateless/03602_alter_update_nullable_json.sql b/tests/queries/0_stateless/03602_alter_update_nullable_json.sql
new file mode 100644
index 000000000000..98b6b791089e
--- /dev/null
+++ b/tests/queries/0_stateless/03602_alter_update_nullable_json.sql
@@ -0,0 +1,24 @@
+set mutations_sync=1;
+
+drop table if exists test;
+create table test (id UInt32, json Nullable(JSON(max_dynamic_paths=1))) engine=MergeTree order by tuple() settings min_bytes_for_wide_part='200G';
+insert into test select number, '{"a" : 1}' from numbers(1000000);
+alter table test update json='{"b" : 1}' where id > 900000;
+select 'Dynamic paths';
+select distinct arrayJoin(JSONDynamicPaths(assumeNotNull(json))) from test;
+select 'Shared data paths';
+select distinct arrayJoin(JSONSharedDataPaths(assumeNotNull(json))) from test;
+
+drop table test;
+
+create table test (id UInt32, json Nullable(JSON(max_dynamic_paths=1))) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1;
+insert into test select number, '{"a" : 1}' from numbers(1000000);
+alter table test update json='{"b" : 1}' where id > 900000;
+select 'Dynamic paths';
+select distinct arrayJoin(JSONDynamicPaths(assumeNotNull(json))) from test;
+select 'Shared data paths';
+select distinct arrayJoin(JSONSharedDataPaths(assumeNotNull(json))) from test;
+
+drop table test;
+
+
diff --git a/tests/queries/0_stateless/03602_embeddedrock_path.reference b/tests/queries/0_stateless/03602_embeddedrock_path.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03602_embeddedrock_path.sql b/tests/queries/0_stateless/03602_embeddedrock_path.sql
new file mode 100644
index 000000000000..43236a77aae0
--- /dev/null
+++ b/tests/queries/0_stateless/03602_embeddedrock_path.sql
@@ -0,0 +1,11 @@
+-- Tags: no-fasttest, use-rocksdb
+-- no-fasttest: EmbeddedRocksDB requires libraries
+CREATE TABLE embeddedrock_exploit
+(
+    `key` String,
+    `v1` UInt32,
+    `v2` String,
+    `v3` Float32
+)
+ENGINE = EmbeddedRocksDB(150,'/tmp/exploit')
+PRIMARY KEY key; -- { serverError BAD_ARGUMENTS }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03602_query_system_tables_definer.reference b/tests/queries/0_stateless/03602_query_system_tables_definer.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03602_query_system_tables_definer.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03602_query_system_tables_definer.sql b/tests/queries/0_stateless/03602_query_system_tables_definer.sql
new file mode 100644
index 000000000000..96687363c3b8
--- /dev/null
+++ b/tests/queries/0_stateless/03602_query_system_tables_definer.sql
@@ -0,0 +1,2 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/85973#issuecomment-3228974538
+SELECT count() != 0 FROM (Select definer FROM `system`.`tables`);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03603_getSubcolumnType_msan.reference b/tests/queries/0_stateless/03603_getSubcolumnType_msan.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03603_getSubcolumnType_msan.sql b/tests/queries/0_stateless/03603_getSubcolumnType_msan.sql
new file mode 100644
index 000000000000..a9d8e3282ccc
--- /dev/null
+++ b/tests/queries/0_stateless/03603_getSubcolumnType_msan.sql
@@ -0,0 +1,2 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/86279
+SELECT '{}'::JSON x QUALIFY x.^c0 = 1; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT, UNKNOWN_IDENTIFIER }
diff --git a/tests/queries/0_stateless/03603_reading_s3_cluster_all_nodes_unavailable.reference b/tests/queries/0_stateless/03603_reading_s3_cluster_all_nodes_unavailable.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03603_reading_s3_cluster_all_nodes_unavailable.sql b/tests/queries/0_stateless/03603_reading_s3_cluster_all_nodes_unavailable.sql
new file mode 100644
index 000000000000..80da21ffacf8
--- /dev/null
+++ b/tests/queries/0_stateless/03603_reading_s3_cluster_all_nodes_unavailable.sql
@@ -0,0 +1,4 @@
+-- Tags: no-fasttest
+-- s3Cluster is not used in fast tests
+
+SELECT * FROM s3Cluster('test_cluster_multiple_nodes_all_unavailable', 'http://localhost:11111/test/a.tsv'); -- { serverError ALL_CONNECTION_TRIES_FAILED }
diff --git a/tests/queries/0_stateless/03604_export_merge_tree_partition.reference b/tests/queries/0_stateless/03604_export_merge_tree_partition.reference
new file mode 100644
index 000000000000..d48023362b99
--- /dev/null
+++ b/tests/queries/0_stateless/03604_export_merge_tree_partition.reference
@@ -0,0 +1,31 @@
+Select from source table
+1	2020
+2	2020
+3	2020
+4	2021
+5	2021
+6	2022
+7	2022
+Select from destination table
+1	2020
+2	2020
+3	2020
+4	2021
+5	2021
+Export partition 2022
+Select from destination table again
+1	2020
+2	2020
+3	2020
+4	2021
+5	2021
+6	2022
+7	2022
+---- Data in roundtrip ReplicatedMergeTree table (should match s3_table)
+1	2020
+2	2020
+3	2020
+4	2021
+5	2021
+6	2022
+7	2022
diff --git a/tests/queries/0_stateless/03604_export_merge_tree_partition.sh b/tests/queries/0_stateless/03604_export_merge_tree_partition.sh
new file mode 100755
index 000000000000..87503112aadb
--- /dev/null
+++ b/tests/queries/0_stateless/03604_export_merge_tree_partition.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, replica, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+rmt_table="rmt_table_${RANDOM}"
+s3_table="s3_table_${RANDOM}"
+rmt_table_roundtrip="rmt_table_roundtrip_${RANDOM}"
+
+query() {
+    $CLICKHOUSE_CLIENT --query "$1"
+}
+
+query "DROP TABLE IF EXISTS $rmt_table, $s3_table, $rmt_table_roundtrip"
+
+query "CREATE TABLE $rmt_table (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table', 'replica1') PARTITION BY year ORDER BY tuple()"
+query "CREATE TABLE $s3_table (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table', format=Parquet, partition_strategy='hive') PARTITION BY year"
+
+query "INSERT INTO $rmt_table VALUES (1, 2020), (2, 2020), (4, 2021)"
+
+query "INSERT INTO $rmt_table VALUES (3, 2020), (5, 2021)"
+
+query "INSERT INTO $rmt_table VALUES (6, 2022), (7, 2022)"
+
+# sync replicas
+query "SYSTEM SYNC REPLICA $rmt_table"
+
+query "ALTER TABLE $rmt_table EXPORT PARTITION ID '2020' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+query "ALTER TABLE $rmt_table EXPORT PARTITION ID '2021' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+# todo poll some kind of status
+sleep 15
+
+echo "Select from source table"
+query "SELECT * FROM $rmt_table ORDER BY id"
+
+echo "Select from destination table"
+query "SELECT * FROM $s3_table ORDER BY id"
+
+echo "Export partition 2022"
+query "ALTER TABLE $rmt_table EXPORT PARTITION ID '2022' TO TABLE $s3_table SETTINGS allow_experimental_export_merge_tree_part = 1"
+
+# todo poll some kind of status
+sleep 5
+
+echo "Select from destination table again"
+query "SELECT * FROM $s3_table ORDER BY id"
+
+query "CREATE TABLE $rmt_table_roundtrip ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table_roundtrip', 'replica1') PARTITION BY year ORDER BY tuple() AS SELECT * FROM $s3_table"
+
+echo "---- Data in roundtrip ReplicatedMergeTree table (should match s3_table)"
+query "SELECT * FROM $rmt_table_roundtrip ORDER BY id"
+
+query "DROP TABLE IF EXISTS $rmt_table, $s3_table, $rmt_table_roundtrip"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03604_key_condition_set_tuple_bug.reference b/tests/queries/0_stateless/03604_key_condition_set_tuple_bug.reference
new file mode 100644
index 000000000000..fd3c81a4d763
--- /dev/null
+++ b/tests/queries/0_stateless/03604_key_condition_set_tuple_bug.reference
@@ -0,0 +1,2 @@
+5
+5
diff --git a/tests/queries/0_stateless/03604_key_condition_set_tuple_bug.sql b/tests/queries/0_stateless/03604_key_condition_set_tuple_bug.sql
new file mode 100644
index 000000000000..d5c9a28b3a4b
--- /dev/null
+++ b/tests/queries/0_stateless/03604_key_condition_set_tuple_bug.sql
@@ -0,0 +1,4 @@
+create table t (a String, b String, c String, d String) order by (a, b, c, d) settings index_granularity=10;
+insert into t select intDiv(number, 50), intDiv(number, 50), 0, number % 10 from numbers(50 + 10);
+select count() from t where a = '0' and b = '0' and (c, d) in ('0', '5');
+select count() from t where a = '0' and b = '0' and (c, d) in ('0', '5') settings optimize_use_implicit_projections=0;
diff --git a/tests/queries/0_stateless/03604_parquet_many_files.reference b/tests/queries/0_stateless/03604_parquet_many_files.reference
new file mode 100644
index 000000000000..15c4c9a2c654
--- /dev/null
+++ b/tests/queries/0_stateless/03604_parquet_many_files.reference
@@ -0,0 +1 @@
+4500
diff --git a/tests/queries/0_stateless/03604_parquet_many_files.sh b/tests/queries/0_stateless/03604_parquet_many_files.sh
new file mode 100755
index 000000000000..86321407d164
--- /dev/null
+++ b/tests/queries/0_stateless/03604_parquet_many_files.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_LOCAL} -q "insert into function file('${CLICKHOUSE_TMP}/t0.parquet') select * from numbers(10)"
+for i in {1..99}
+do
+    cp "${CLICKHOUSE_TMP}/t0.parquet" "${CLICKHOUSE_TMP}/t${i}.parquet"
+done
+
+${CLICKHOUSE_LOCAL} -q "select sum(number) from file('${CLICKHOUSE_TMP}/t{0..99}.parquet') settings input_format_parquet_preserve_order=1, input_format_parquet_use_native_reader_v3=1"
+
+rm "${CLICKHOUSE_TMP}"/t{0..99}.parquet
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03605_dynamic_to_nullable_low_cardinality_bug.reference b/tests/queries/0_stateless/03605_dynamic_to_nullable_low_cardinality_bug.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03605_dynamic_to_nullable_low_cardinality_bug.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03605_dynamic_to_nullable_low_cardinality_bug.sql b/tests/queries/0_stateless/03605_dynamic_to_nullable_low_cardinality_bug.sql
new file mode 100644
index 000000000000..6626d481536f
--- /dev/null
+++ b/tests/queries/0_stateless/03605_dynamic_to_nullable_low_cardinality_bug.sql
@@ -0,0 +1,15 @@
+SET allow_suspicious_low_cardinality_types = 1, allow_experimental_dynamic_type = 1;
+
+DROP TABLE IF EXISTS t0;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t0 (c0 Dynamic) ENGINE = MergeTree() ORDER BY tuple();
+CREATE TABLE t1 (c0 LowCardinality(Nullable(Int))) ENGINE = MergeTree() ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO TABLE t0 (c0) VALUES (1::LowCardinality(Int));
+INSERT INTO TABLE t1 (c0) VALUES (1);
+
+SELECT 1 FROM t0 JOIN t1 ON t0.c0 = t1.c0;
+
+DROP TABLE t0;
+DROP TABLE t1;
+
diff --git a/tests/queries/0_stateless/03606_nullable_json_group_by.reference b/tests/queries/0_stateless/03606_nullable_json_group_by.reference
new file mode 100644
index 000000000000..1db1832c4064
--- /dev/null
+++ b/tests/queries/0_stateless/03606_nullable_json_group_by.reference
@@ -0,0 +1,6 @@
+{"a":42}
+{"a":42}
+\N
+\N
+\N
+{"a":42}
diff --git a/tests/queries/0_stateless/03606_nullable_json_group_by.sql b/tests/queries/0_stateless/03606_nullable_json_group_by.sql
new file mode 100644
index 000000000000..8ef984ce72fe
--- /dev/null
+++ b/tests/queries/0_stateless/03606_nullable_json_group_by.sql
@@ -0,0 +1,6 @@
+select '{"a" : 42}'::Nullable(JSON) group by 1;
+select materialize('{"a" : 42}')::Nullable(JSON) group by 1;
+select null::Nullable(JSON) group by 1;
+select materialize(null)::Nullable(JSON) group by 1;
+select (number % 2 ? null : '{"a" : 42}')::Nullable(JSON) from numbers(4) group by 1;
+
diff --git a/tests/queries/0_stateless/03611_cte_deterministic.reference b/tests/queries/0_stateless/03611_cte_deterministic.reference
new file mode 100644
index 000000000000..101131ff84f9
--- /dev/null
+++ b/tests/queries/0_stateless/03611_cte_deterministic.reference
@@ -0,0 +1,3 @@
+1
+1
+1	1	1
diff --git a/tests/queries/0_stateless/03611_cte_deterministic.sql b/tests/queries/0_stateless/03611_cte_deterministic.sql
new file mode 100644
index 000000000000..ce8ed7342bc4
--- /dev/null
+++ b/tests/queries/0_stateless/03611_cte_deterministic.sql
@@ -0,0 +1,5 @@
+set enable_analyzer = 1;
+
+with (select randConstant()) as a select a = a;
+with (select now() + sleep(1)) as a select a = a;
+with (select randConstant()) as b select b = b, a = b, `a=a` from (with (select randConstant()) as a select a, a = a as `a=a`);
diff --git a/tests/queries/0_stateless/03611_uniqExact_bug.reference b/tests/queries/0_stateless/03611_uniqExact_bug.reference
new file mode 100644
index 000000000000..4f43b361c515
--- /dev/null
+++ b/tests/queries/0_stateless/03611_uniqExact_bug.reference
@@ -0,0 +1,17 @@
+--- ROLLUP ---
+1071106	999994
+1071102	999994
+0	1999988
+--- CUBE ---
+1071106	999994
+1071102	999994
+0	1999988
+--- totals ---
+1071106	999994
+1071102	999994
+
+0	1999988
+--- grouping sets ---
+1071106	999994
+1071102	999994
+0	1999988
diff --git a/tests/queries/0_stateless/03611_uniqExact_bug.sql b/tests/queries/0_stateless/03611_uniqExact_bug.sql
new file mode 100644
index 000000000000..8113693133e2
--- /dev/null
+++ b/tests/queries/0_stateless/03611_uniqExact_bug.sql
@@ -0,0 +1,59 @@
+set max_threads=4;
+
+create table test(c1 Int64, c2 Int64)
+Engine=MergeTree ORDER BY c2 AS  
+WITH gen as 
+  (SELECT xxHash32(number)   % 1000000 AS u1,
+          xxHash32(number+12345) % 1000000 AS u2
+   FROM numbers(1e6))
+SELECT
+    1071106,
+    5+(1 + 151703 * ((2 * u1) * (2 * u2)))
+FROM gen
+union all
+SELECT
+    1071102,
+    8+(1 + 151693 * ((2 * u1) * (2 * u2)))
+FROM gen;
+
+select '--- ROLLUP ---' format TSVRaw;
+SELECT
+    c1,
+    uniqExact(c2)
+FROM test
+GROUP BY c1
+    WITH ROLLUP
+ORDER BY c1 DESC;
+
+select '--- CUBE ---' format TSVRaw;
+
+SELECT
+    c1,
+    uniqExact(c2)
+FROM test
+GROUP BY c1
+    WITH CUBE
+ORDER BY c1 DESC;
+
+select '--- totals ---' format TSVRaw;
+
+SELECT
+    c1,
+    uniqExact(c2)
+FROM test
+GROUP BY c1
+    WITH TOTALS
+ORDER BY c1 DESC;
+
+select '--- grouping sets ---' format TSVRaw;
+
+SELECT
+    c1,
+    uniqExact(c2)
+FROM test
+GROUP BY 
+    GROUPING SETS(
+      (c1),
+      ()
+    )
+ORDER BY c1 DESC;
diff --git a/tests/queries/0_stateless/03611_verify_exception_in_iceberg_iterator.reference b/tests/queries/0_stateless/03611_verify_exception_in_iceberg_iterator.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03611_verify_exception_in_iceberg_iterator.sql b/tests/queries/0_stateless/03611_verify_exception_in_iceberg_iterator.sql
new file mode 100644
index 000000000000..8b14337d49c2
--- /dev/null
+++ b/tests/queries/0_stateless/03611_verify_exception_in_iceberg_iterator.sql
@@ -0,0 +1,9 @@
+
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+-- Verify that exception is thrown when Iceberg table contains corrupted Avro manifest files.
+-- This test verifies not so much thrown error during avro files parsing but rather
+-- that we correctly process exceptions thrown from iceberg iterator in background execution.
+
+SELECT * FROM icebergS3('http://localhost:11111/test/corrupted_avro_files_test/', 'clickhouse', 'clickhouse') SETTINGS use_iceberg_metadata_files_cache = False; -- { serverError INCORRECT_DATA}
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03620_json_advanced_shared_data_seek_bug.reference b/tests/queries/0_stateless/03620_json_advanced_shared_data_seek_bug.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03620_json_advanced_shared_data_seek_bug.sql b/tests/queries/0_stateless/03620_json_advanced_shared_data_seek_bug.sql
new file mode 100644
index 000000000000..cf98500ccab8
--- /dev/null
+++ b/tests/queries/0_stateless/03620_json_advanced_shared_data_seek_bug.sql
@@ -0,0 +1,9 @@
+set use_variant_as_common_type = 1;
+
+drop table if exists test;
+create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, index_granularity = 39547, object_serialization_version = 'v3', object_shared_data_serialization_version = 'advanced', object_shared_data_serialization_version_for_zero_level_parts = 'advanced', object_shared_data_buckets_for_compact_part = 3, object_shared_data_buckets_for_wide_part = 1, dynamic_serialization_version = 'v3';
+
+insert into test select number, number < 500000 ? toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) :  toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number % 5), number::UInt32)) from numbers(400000, 200000);
+
+select json.b.b.`_1`.:String from test format Null settings max_threads=1;
+drop table test;
diff --git a/tests/queries/0_stateless/03621_json_null_in_shared_data.reference b/tests/queries/0_stateless/03621_json_null_in_shared_data.reference
new file mode 100644
index 000000000000..df1d387363e1
--- /dev/null
+++ b/tests/queries/0_stateless/03621_json_null_in_shared_data.reference
@@ -0,0 +1,2 @@
+00000000  00                                                |.|
+00000001
diff --git a/tests/queries/0_stateless/03621_json_null_in_shared_data.sh b/tests/queries/0_stateless/03621_json_null_in_shared_data.sh
new file mode 100755
index 000000000000..86f7c07a3471
--- /dev/null
+++ b/tests/queries/0_stateless/03621_json_null_in_shared_data.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_LOCAL -q "select '{\"a\" : null}'::JSON(a Dynamic) format RowBinary" | $CLICKHOUSE_LOCAL -q "select * from table format RowBinary" --input-format RowBinary --structure "json JSON(max_dynamic_paths=0)" | hexdump -C
diff --git a/tests/queries/0_stateless/03622_generic_aggregate_functions__state_compatibility.reference b/tests/queries/0_stateless/03622_generic_aggregate_functions__state_compatibility.reference
new file mode 100644
index 000000000000..3d852264f3e8
--- /dev/null
+++ b/tests/queries/0_stateless/03622_generic_aggregate_functions__state_compatibility.reference
@@ -0,0 +1,53 @@
+011401000000000000000400000000000000737472000100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+011401000000000000000400000000000000737472000100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0114010000000000000004000000000000007374720001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0114010000000000000004000000000000007374720001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+01140100000000000000040000000000000073747200
+012801000000000000000400000000000000737472000100000000000000040000000000000073747200
+01140100000000000000040000000000000073747200
+01010C040000000000000073747200
+010D04000000000000007374720001
+010D0400000000000000737472002A
+010D0400000000000000737472002A
+010E0400000000000000737472002A00
+010E0400000000000000737472002A00
+01100400000000000000737472002A000000
+01100400000000000000737472002A000000
+01140400000000000000737472002A00000000000000
+01140400000000000000737472002A00000000000000
+011C0400000000000000737472002A000000000000000000000000000000
+011C0400000000000000737472002A000000000000000000000000000000
+012C0400000000000000737472002A00000000000000000000000000000000000000000000000000000000000000
+012C0400000000000000737472002A00000000000000000000000000000000000000000000000000000000000000
+010E0400000000000000737472002942
+011004000000000000007374720014AE2942
+0114040000000000000073747200F6285C8FC2354540
+011004000000000000007374720092100000
+01140400000000000000737472009210000000000000
+011C04000000000000007374720092100000000000000000000000000000
+012C0400000000000000737472009210000000000000000000000000000000000000000000000000000000000000
+011904000000000000007374720000040000000000000073747200
+010F040000000000000073747200737472
+011004000000000000007374720000737472
+0118040000000000000073747200040000000000000073747200
+011904000000000000007374720000040000000000000073747200
+010F040000000000000073747200737472
+011004000000000000007374720000737472
+01200400000000000000737472000100000000000000040000000000000073747200
+012C0400000000000000737472000100000000000000040000000000000073747200040000000000000073747200
+0118040000000000000073747200040000000000000073747200
+012C0400000000000000737472000100000000000000030000000000000073747205000000000000001503737472
+012C0400000000000000737472000100000000000000030000000000000073747205000000000000001503737472
+01200400000000000000737472000400000000000000737472000000000000000000
+011904000000000000007374720000040000000000000073747200
+011A0400000000000000737472000005000000000000001503737472
+011A0400000000000000737472000005000000000000001503737472
+011C0400000000000000737472004C4430871490CD596842C567ED40D095
+01100400000000000000737472000100007F
+011C04000000000000007374720000000000000000000000FFFF7F000001
+010E0400000000000000737472005647
+011004000000000000007374720056470000
+011004000000000000007374720000E10B5E
+011404000000000000007374720000E8665E6F010000
+010D04000000000000007374720001
+010E0400000000000000737472000100
diff --git a/tests/queries/0_stateless/03622_generic_aggregate_functions__state_compatibility.sql b/tests/queries/0_stateless/03622_generic_aggregate_functions__state_compatibility.sql
new file mode 100644
index 000000000000..844b93126595
--- /dev/null
+++ b/tests/queries/0_stateless/03622_generic_aggregate_functions__state_compatibility.sql
@@ -0,0 +1,62 @@
+--- Some aggregate functions use IColumn::serializeAggregationStateValueIntoArena
+--- method for values serialization into aggregation states.
+--- Aggregation states should not be changed for compatibility,
+--- and this test should fail if something is changed in serializeAggregationStateValueIntoArena method.
+
+set session_timezone='UTC';
+
+select hex(approx_top_sumState(3)(['str'], 1));
+select hex(approx_top_kState(3)(['str']));
+select hex(topKState(3)(['str']));
+select hex(topKWeightedState(3)(['str'], 1));
+select hex(maxDistinctState(['str']));
+select hex(argMaxDistinctState(['str'], ['str']));
+select hex(groupUniqArrayState(['str']));
+select hex(groupArrayIntersectState(['str']));
+
+--- Check different data types
+select hex(maxDistinctState(tuple('str', true)));
+select hex(maxDistinctState(tuple('str', 42::Int8)));
+select hex(maxDistinctState(tuple('str', 42::UInt8)));
+select hex(maxDistinctState(tuple('str', 42::Int16)));
+select hex(maxDistinctState(tuple('str', 42::UInt16)));
+select hex(maxDistinctState(tuple('str', 42::Int32)));
+select hex(maxDistinctState(tuple('str', 42::UInt32)));
+select hex(maxDistinctState(tuple('str', 42::Int64)));
+select hex(maxDistinctState(tuple('str', 42::UInt64)));
+select hex(maxDistinctState(tuple('str', 42::Int128)));
+select hex(maxDistinctState(tuple('str', 42::UInt128)));
+select hex(maxDistinctState(tuple('str', 42::Int256)));
+select hex(maxDistinctState(tuple('str', 42::UInt256)));
+select hex(maxDistinctState(tuple('str', 42.42::BFloat16)));
+select hex(maxDistinctState(tuple('str', 42.42::Float32)));
+select hex(maxDistinctState(tuple('str', 42.42::Float64)));
+select hex(maxDistinctState(tuple('str', 42.42::Decimal32(2))));
+select hex(maxDistinctState(tuple('str', 42.42::Decimal64(2))));
+select hex(maxDistinctState(tuple('str', 42.42::Decimal128(2))));
+select hex(maxDistinctState(tuple('str', 42.42::Decimal256(2))));
+select hex(maxDistinctState(tuple('str', 'str'::Nullable(String))));
+select hex(maxDistinctState(tuple('str', 'str'::FixedString(3))));
+select hex(maxDistinctState(tuple('str', 'str'::Nullable(FixedString(3)))));
+select hex(maxDistinctState(tuple('str', 'str'::LowCardinality(String))));
+select hex(maxDistinctState(tuple('str', 'str'::LowCardinality(Nullable(String)))));
+select hex(maxDistinctState(tuple('str', 'str'::LowCardinality(FixedString(3)))));
+select hex(maxDistinctState(tuple('str', 'str'::LowCardinality(Nullable(FixedString(3))))));
+select hex(maxDistinctState(tuple('str', ['str'])));
+select hex(maxDistinctState(tuple('str', map('str', 'str'))));
+select hex(maxDistinctState(tuple('str', tuple('str'))));
+select hex(maxDistinctState(tuple('str', '{"str" : "str"}'::JSON)));
+select hex(maxDistinctState(tuple('str', '{"str" : "str"}'::JSON(max_dynamic_paths=0))));
+select hex(maxDistinctState(tuple('str', '{"str" : "str"}'::JSON(str String))));
+select hex(maxDistinctState(tuple('str', 'str'::Variant(String))));
+select hex(maxDistinctState(tuple('str', 'str'::Dynamic)));
+select hex(maxDistinctState(tuple('str', 'str'::Dynamic(max_types=0))));
+select hex(maxDistinctState(tuple('str', '59cd9014-8730-444c-95d0-40ed67c54268'::UUID)));
+select hex(maxDistinctState(tuple('str', '127.0.0.1'::IPv4)));
+select hex(maxDistinctState(tuple('str', '127.0.0.1'::IPv6)));
+select hex(maxDistinctState(tuple('str', '2020-01-01'::Date)));
+select hex(maxDistinctState(tuple('str', '2020-01-01'::Date32)));
+select hex(maxDistinctState(tuple('str', '2020-01-01'::DateTime)));
+select hex(maxDistinctState(tuple('str', '2020-01-01'::DateTime64)));
+select hex(maxDistinctState(tuple('str', 'a'::Enum8('a' = 1))));
+select hex(maxDistinctState(tuple('str', 'a'::Enum16('a' = 1))));
diff --git a/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.config.xml b/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.config.xml
new file mode 100644
index 000000000000..87f41835245e
--- /dev/null
+++ b/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.config.xml
@@ -0,0 +1,35 @@
+<clickhouse>
+    <max_temporary_data_on_disk_size>10240</max_temporary_data_on_disk_size>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <tcp_port>9000</tcp_port>
+
+    <path>./</path>
+
+    <mark_cache_size>0</mark_cache_size>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</clickhouse>
diff --git a/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.reference b/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.sh b/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.sh
new file mode 100755
index 000000000000..b2d38142725c
--- /dev/null
+++ b/tests/queries/0_stateless/03622_max_temporary_data_size_on_disk.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+# Tags: long, no-parallel
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+server_opts=(
+    "--config-file=$CUR_DIR/03622_max_temporary_data_size_on_disk.config.xml"
+    "--"
+    # to avoid multiple listen sockets (complexity for port discovering)
+    "--listen_host=127.1"
+    # we will discover the real port later.
+    "--tcp_port=0"
+    "--shutdown_wait_unfinished=0"
+)
+CLICKHOUSE_WATCHDOG_ENABLE=0 $CLICKHOUSE_SERVER_BINARY "${server_opts[@]}" >& clickhouse-server.log &
+server_pid=$!
+
+trap cleanup EXIT
+# Shellcheck wrongly process "trap" https://www.shellcheck.net/wiki/SC2317
+# shellcheck disable=SC2317
+function cleanup()
+{
+    kill -9 "$server_pid"
+    kill -9 "$client_pid"
+
+    echo "Test failed. Server log:"
+    cat clickhouse-server.log
+    rm -f clickhouse-server.log
+
+    exit 1
+}
+
+server_port=
+i=0 retries=300
+# wait until server will start to listen (max 30 seconds)
+while [[ -z $server_port ]] && [[ $i -lt $retries ]]; do
+    server_port=$(lsof -n -a -P -i tcp -s tcp:LISTEN -p $server_pid 2>/dev/null | awk -F'[ :]' '/LISTEN/ { print $(NF-1) }')
+    ((++i))
+    sleep 0.1
+done
+if [[ -z $server_port ]]; then
+    echo "Cannot wait for LISTEN socket" >&2
+    exit 1
+fi
+
+# wait for the server to start accepting tcp connections (max 30 seconds)
+i=0 retries=300
+while ! $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'select 1' 2>/dev/null && [[ $i -lt $retries ]]; do
+    sleep 0.1
+done
+if ! $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'select 1'; then
+    echo "Cannot wait until server will start accepting connections on <tcp_port>" >&2
+    exit 1
+fi
+
+$CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'DROP TABLE IF EXISTS default.t_proj_external'
+$CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'CREATE TABLE default.t_proj_external ( `k1` UInt32, `k2` UInt32, `k3` UInt32, `value` UInt32 ) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192'
+$CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'INSERT INTO t_proj_external SELECT 1, number%2, number%4, number FROM numbers(50000)'
+
+for i in {1..10}
+do
+    $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'SELECT k1, k2, k3, sum(value) v FROM t_proj_external GROUP BY k1, k2, k3 ORDER BY k1, k2, k3 SETTINGS optimize_aggregation_in_order = 0, max_bytes_before_external_group_by = 1, max_bytes_ratio_before_external_group_by = 0, group_by_two_level_threshold = 1'
+done
+$CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'DROP TABLE IF EXISTS default.t_proj_external'
+
+# send TERM and save the error code to ensure that it is 0 (EXIT_SUCCESS)
+kill $server_pid
+wait $server_pid
+
+trap '' EXIT
diff --git a/tests/queries/0_stateless/03623_header_filtering.reference b/tests/queries/0_stateless/03623_header_filtering.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03623_header_filtering.sql b/tests/queries/0_stateless/03623_header_filtering.sql
new file mode 100644
index 000000000000..3f7f6d276845
--- /dev/null
+++ b/tests/queries/0_stateless/03623_header_filtering.sql
@@ -0,0 +1,13 @@
+SELECT * FROM url(
+    'http://google.com',
+    'RawBLOB',
+    'data String',
+    headers('exact_header'='true')
+); -- {serverError BAD_ARGUMENTS}
+
+SELECT * FROM url(
+    'http://google.com',
+    'RawBLOB',
+    'data String',
+    headers('exact_header	' = 'true', 'exact_header	' = 'true')
+); -- {serverError BAD_ARGUMENTS}
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03623_lazy_materialization_array_sizes_bug.reference b/tests/queries/0_stateless/03623_lazy_materialization_array_sizes_bug.reference
new file mode 100644
index 000000000000..abc9faa9e890
--- /dev/null
+++ b/tests/queries/0_stateless/03623_lazy_materialization_array_sizes_bug.reference
@@ -0,0 +1,4 @@
+6	[0,1,2,3,4,5]
+7	[0,1,2,3,4,5,6]
+[0,1,2,3,4,5]	6
+[0,1,2,3,4,5,6]	7
diff --git a/tests/queries/0_stateless/03623_lazy_materialization_array_sizes_bug.sql b/tests/queries/0_stateless/03623_lazy_materialization_array_sizes_bug.sql
new file mode 100644
index 000000000000..f2fa7ee376f1
--- /dev/null
+++ b/tests/queries/0_stateless/03623_lazy_materialization_array_sizes_bug.sql
@@ -0,0 +1,9 @@
+set query_plan_optimize_lazy_materialization=1;
+set query_plan_max_limit_for_lazy_materialization=10;
+
+drop table if exists test;
+create table test (x UInt64, y UInt64, a Array(UInt64)) engine=MergeTree order by x settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
+insert into test select number, number, range(number) from numbers(10);
+select a.size0, a from test where y > 5 order by y limit 2;
+select a, a.size0 from test where y > 5 order by y limit 2;
+
diff --git a/tests/queries/0_stateless/03623_parquet_bool.reference b/tests/queries/0_stateless/03623_parquet_bool.reference
new file mode 100644
index 000000000000..27ba77ddaf61
--- /dev/null
+++ b/tests/queries/0_stateless/03623_parquet_bool.reference
@@ -0,0 +1 @@
+true
diff --git a/tests/queries/0_stateless/03623_parquet_bool.sql b/tests/queries/0_stateless/03623_parquet_bool.sql
new file mode 100644
index 000000000000..654caa5ff53d
--- /dev/null
+++ b/tests/queries/0_stateless/03623_parquet_bool.sql
@@ -0,0 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
+insert into function file('03626_parquet_bool.parquet') select true as x settings engine_file_truncate_on_insert=1;
+select * from file('03626_parquet_bool.parquet') where x=1 settings input_format_parquet_use_native_reader_v3=1;
diff --git a/tests/queries/0_stateless/03624_parquet_row_number.reference b/tests/queries/0_stateless/03624_parquet_row_number.reference
new file mode 100644
index 000000000000..41750ad34aa3
--- /dev/null
+++ b/tests/queries/0_stateless/03624_parquet_row_number.reference
@@ -0,0 +1,9 @@
+7	70
+8	80
+10	100
+11	110
+13	130
+14	140
+16	160
+17	170
+19	190
diff --git a/tests/queries/0_stateless/03624_parquet_row_number.sql b/tests/queries/0_stateless/03624_parquet_row_number.sql
new file mode 100644
index 000000000000..b2dcab18716c
--- /dev/null
+++ b/tests/queries/0_stateless/03624_parquet_row_number.sql
@@ -0,0 +1,7 @@
+-- Tags: no-fasttest, no-parallel
+
+set engine_file_truncate_on_insert = 1;
+
+insert into function file('03624_parquet_row_number.parquet') select number*10 as x from numbers(20) settings max_threads=1, output_format_parquet_row_group_size=5;
+
+select _row_number, x from file('03624_parquet_row_number.parquet') where x % 3 != 0 and x > 60 order by _row_number;
diff --git a/tests/queries/0_stateless/03624_proper_path_starts_with.reference b/tests/queries/0_stateless/03624_proper_path_starts_with.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03624_proper_path_starts_with.sh b/tests/queries/0_stateless/03624_proper_path_starts_with.sh
new file mode 100755
index 000000000000..9ee0040bf738
--- /dev/null
+++ b/tests/queries/0_stateless/03624_proper_path_starts_with.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+BAD_PATH_PARENT=$(echo "${USER_FILES_PATH}" | sed 's:/*$::')/../BAD
+# Remove the trailing slashes and add extra characters to the folder name
+BAD_PATH_EXTRA=$(echo "${USER_FILES_PATH}" | sed 's:/*$::')_BAD
+
+$CLICKHOUSE_CLIENT --query "CREATE TABLE t (a UInt64) ENGINE=File('CSV', '${BAD_PATH_PARENT}') -- { serverError DATABASE_ACCESS_DENIED }"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE t (a UInt64) ENGINE=File('CSV', '${BAD_PATH_EXTRA}') -- { serverError DATABASE_ACCESS_DENIED }"
+
+# Check the behaviour with dots in the path
+# We allow paths like ./file or .file or ..file or a/../s.csv
+# But not paths that go to the parent directory like ../BAD or dir/../../BAD
+
+GOOD_PATH_WITH_DOT=$(echo "${USER_FILES_PATH}/.file_that_does_not_exist_but_is_in_a_valid_path.csv")
+GOOD_PATH_WITH_DOTS=$(echo "${USER_FILES_PATH}/..file_that_does_not_exist_but_is_in_a_valid_path.csv")
+GOOD_PATH_WITH_DOTS_BUT_INSIDE=$(echo "${USER_FILES_PATH}/..a/../s.csv")
+BAD_PATH_PARENT_AFTER_SOME_DOTS=$(echo "${USER_FILES_PATH}" | sed 's:/*$::')/.DIR/../../BAD
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tdot, tdotdot, tdotdotin"
+
+$CLICKHOUSE_CLIENT --query "CREATE TABLE tdot (a UInt64) ENGINE=File('CSV', '${GOOD_PATH_WITH_DOT}')"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE tdotdot (a UInt64) ENGINE=File('CSV', '${GOOD_PATH_WITH_DOTS}')"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE tdotdotin (a UInt64) ENGINE=File('CSV', '${GOOD_PATH_WITH_DOTS_BUT_INSIDE}')"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE t (a UInt64) ENGINE=File('CSV', '${BAD_PATH_PARENT_AFTER_SOME_DOTS}') -- { serverError DATABASE_ACCESS_DENIED }"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03625_prewhere-and-default-bug.reference b/tests/queries/0_stateless/03625_prewhere-and-default-bug.reference
new file mode 100644
index 000000000000..6de8fb35c2e4
--- /dev/null
+++ b/tests/queries/0_stateless/03625_prewhere-and-default-bug.reference
@@ -0,0 +1,49 @@
+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
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/03625_prewhere-and-default-bug.sql b/tests/queries/0_stateless/03625_prewhere-and-default-bug.sql
new file mode 100644
index 000000000000..92d1abb7d6ca
--- /dev/null
+++ b/tests/queries/0_stateless/03625_prewhere-and-default-bug.sql
@@ -0,0 +1,7 @@
+drop table if exists tab;
+create table tab (d DateTime64(3), p LowCardinality(String)) engine = MergeTree order by toDate(d);
+insert into tab select toDateTime(toDate('2000-01-01')) + number, if(bitAnd(number, 1) = 0, 'a', 'b') from numbers(100);
+
+alter table tab add column t String default '' settings alter_sync = 2;
+
+select 1 from tab where d > toDateTime(toDate('2000-01-01')) and p in ('a') and 1 = 1 group by d, t, p;
diff --git a/tests/queries/0_stateless/03628_subcolumns_of_columns_with_dot_in_name.reference b/tests/queries/0_stateless/03628_subcolumns_of_columns_with_dot_in_name.reference
new file mode 100644
index 000000000000..872d8bf4e09c
--- /dev/null
+++ b/tests/queries/0_stateless/03628_subcolumns_of_columns_with_dot_in_name.reference
@@ -0,0 +1,20 @@
+42
+42
+42
+42
+42
+{"a":42,"b":42}	42	42
+{"a":42,"b":42}	42	42
+{"a":42,"b":42}	42	42
+{"a":42,"b":42}	42	42
+{"a":43,"b":43}	43	43
+{"a":42,"b":42}	42	42
+{"a":43,"b":43}	43	43
+{"a":42,"b":42}	42	42
+{"a":43,"b":43}	43	43
+(42)	42
+(42)	42
+(42)	42
+(43)	43
+(42)	42
+(43)	43
diff --git a/tests/queries/0_stateless/03628_subcolumns_of_columns_with_dot_in_name.sql b/tests/queries/0_stateless/03628_subcolumns_of_columns_with_dot_in_name.sql
new file mode 100644
index 000000000000..d4564159ba7e
--- /dev/null
+++ b/tests/queries/0_stateless/03628_subcolumns_of_columns_with_dot_in_name.sql
@@ -0,0 +1,57 @@
+drop table if exists test;
+create table test (`my.json` JSON) engine=Memory;
+insert into test select '{"a" : 42}';
+select my.json.a from test settings enable_analyzer=1;
+select `my.json`.a from test settings enable_analyzer=1;
+select my.json.a from test settings enable_analyzer=0;
+select `my.json`.a from test settings enable_analyzer=0;
+drop table test;
+
+select `t.t`.a from format(JSONEachRow, '`t.t` Tuple(a UInt32)', '{"t.t" : {"a" : 42}}');
+
+create table test
+(
+    `my.json` JSON(a UInt32),
+    a1 UInt32 materialized my.json.a,
+    a2 UInt32 default my.json.a,
+    b1 UInt32 materialized my.json.b,
+    b2 UInt32 default my.json.b,
+    index idx1 my.json.a type minmax,
+    index idx2 my.json.b::Int64 type minmax,
+    projection prj1 (select my.json, my.json.a, my.json.b order by my.json.a, my.json.b::Int32)
+) engine=MergeTree order by (my.json.a, my.json.b::Int32, my.json.a + 42, my.json.b::Int32 + 42);
+insert into test (my.json) select '{"a" : 42, "b" : 42}';
+select * from test;
+select * from test order by my.json.a;
+select * from test order by my.json.b::Int32;
+insert into test (my.json) select '{"a" : 43, "b" : 43}';
+optimize table test final;
+select * from test;
+select * from test order by my.json.a;
+select * from test order by my.json.b::Int32;
+
+alter table test modify column my.json JSON(a UInt32, b UInt32); -- {serverError ALTER_OF_COLUMN_IS_FORBIDDEN}
+alter table test update `my.json` = '{}' where 1; -- {serverError CANNOT_UPDATE_COLUMN}
+
+drop table test;
+
+create table test
+(
+    `my.tuple` Tuple(a UInt32),
+    a1 UInt32 materialized my.tuple.a,
+    a2 UInt32 default my.tuple.a,
+    index idx1 my.tuple.a type minmax,
+    projection prj1 (select my.tuple, my.tuple.a order by my.tuple.a)
+) engine=MergeTree order by (my.tuple.a, my.tuple.a + 42);
+insert into test (my.tuple) select tuple(42);
+select * from test;
+select * from test order by my.tuple.a;
+insert into test (my.tuple) select tuple(43);
+optimize table test final;
+select * from test;
+select * from test order by my.tuple.a;
+
+alter table test modify column my.tuple Tuple(a UInt32, b UInt32); -- {serverError ALTER_OF_COLUMN_IS_FORBIDDEN}
+alter table test update `my.tuple` = tuple(0, 0) where 1; -- {serverError CANNOT_UPDATE_COLUMN}
+
+drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03629_storage_s3_disallow_index_alter.reference b/tests/queries/0_stateless/03629_storage_s3_disallow_index_alter.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03629_storage_s3_disallow_index_alter.sql b/tests/queries/0_stateless/03629_storage_s3_disallow_index_alter.sql
new file mode 100644
index 000000000000..fb0384aa8d39
--- /dev/null
+++ b/tests/queries/0_stateless/03629_storage_s3_disallow_index_alter.sql
@@ -0,0 +1,10 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on S3
+-- Issue: https://github.com/ClickHouse/ClickHouse/issues/87059
+
+DROP TABLE IF EXISTS test_03629;
+CREATE TABLE test_03629 (a UInt64) ENGINE = S3(s3_conn, filename='test_03629_{_partition_id}', format='Native') PARTITION BY a;
+ALTER TABLE test_03629 ADD INDEX a_idx a TYPE set(0); -- { serverError NOT_IMPLEMENTED }
+ALTER TABLE test_03629 ADD PROJECTION a_proj (SELECT a + 1 ORDER BY a); -- { serverError NOT_IMPLEMENTED }
+
+DROP TABLE test_03629;
diff --git a/tests/queries/0_stateless/03630_hash_join_max_block_size.reference b/tests/queries/0_stateless/03630_hash_join_max_block_size.reference
new file mode 100644
index 000000000000..9afa70953334
--- /dev/null
+++ b/tests/queries/0_stateless/03630_hash_join_max_block_size.reference
@@ -0,0 +1 @@
+100002
diff --git a/tests/queries/0_stateless/03630_hash_join_max_block_size.sql b/tests/queries/0_stateless/03630_hash_join_max_block_size.sql
new file mode 100644
index 000000000000..a2547d0e401d
--- /dev/null
+++ b/tests/queries/0_stateless/03630_hash_join_max_block_size.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS b_customers;
+CREATE TABLE b_customers (customer_id Int64, first_order_id Int64) ENGINE = MergeTree ORDER BY customer_id;
+INSERT INTO b_customers SELECT number, number * 20000000 FROM system.numbers LIMIT 2,100000; -- will work with LIMIT 10000
+INSERT INTO b_customers SELECT number * -1, -1 FROM system.numbers LIMIT 2; -- will work without this line or LIMIT 1
+
+DROP TABLE IF EXISTS b_orders;
+CREATE TABLE b_orders (order_id Int64, address_id String) ENGINE = MergeTree ORDER BY order_id;
+INSERT INTO b_orders SELECT number, 'fake' FROM system.numbers LIMIT 80000; -- will work with LIMIT 70000
+INSERT INTO b_orders SELECT first_order_id, 'fake' FROM b_customers GROUP BY first_order_id;
+
+DROP TABLE IF EXISTS b_addresses;
+CREATE TABLE b_addresses (address_id String) ENGINE = MergeTree ORDER BY address_id;
+
+set query_plan_join_swap_table = 0;
+
+select count() from
+(
+  SELECT customers.customer_id AS dim_customers_id
+  FROM
+      b_orders AS orders
+    ANY RIGHT JOIN
+      b_customers AS customers
+    ON orders.order_id = customers.first_order_id
+    ANY LEFT JOIN
+      b_addresses AS shipping_addresses
+    ON shipping_addresses.address_id = orders.address_id
+);
diff --git a/tests/queries/0_stateless/03630_join_blocks_with_different_constness.reference b/tests/queries/0_stateless/03630_join_blocks_with_different_constness.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03630_join_blocks_with_different_constness.sql b/tests/queries/0_stateless/03630_join_blocks_with_different_constness.sql
new file mode 100644
index 000000000000..8a0133273e98
--- /dev/null
+++ b/tests/queries/0_stateless/03630_join_blocks_with_different_constness.sql
@@ -0,0 +1,36 @@
+-- Regression for the case when the JOIN contains const and non-const blocks, which leads to UB:
+--
+--   Too large size (18446603496615682040) passed to allocator. It indicates an error
+WITH
+    input_1 AS (SELECT number::String AS parent_id, number::String as id, number::String as value FROM numbers_mt(1e6)),
+    dimensions_1 AS (SELECT number::String AS value_id FROM numbers_mt(1e6)),
+    dimensions_2 AS (SELECT number::String AS value_id FROM numbers_mt(1e6)),
+    parents AS
+    (
+        SELECT 'foo' AS type, parent_id
+        FROM input_1
+        GROUP BY parent_id
+    ),
+    parents_with_value AS
+    (
+        SELECT type, parent_id, t.value
+        FROM parents
+        LEFT JOIN input_1 AS t ON t.id = parents.parent_id
+    ),
+    values AS
+    (
+        SELECT 'foo' AS type, '' AS parent_id, value
+        FROM input_1
+    ),
+    all AS
+    (
+        SELECT * FROM parents_with_value
+        UNION ALL
+        SELECT * FROM values
+    )
+SELECT type, value
+FROM all
+INNER JOIN dimensions_1 AS dim1 ON all.value = dim1.value_id
+INNER JOIN dimensions_2 AS dim2 ON all.value = dim2.value_id
+FORMAT `Null`
+SETTINGS max_block_size=65535, max_joined_block_size_rows=65535, max_threads=32;
diff --git a/tests/queries/0_stateless/03630_parquet_bool_bug.reference b/tests/queries/0_stateless/03630_parquet_bool_bug.reference
new file mode 100644
index 000000000000..0404dc20010c
--- /dev/null
+++ b/tests/queries/0_stateless/03630_parquet_bool_bug.reference
@@ -0,0 +1,2 @@
+8
+256
diff --git a/tests/queries/0_stateless/03630_parquet_bool_bug.sql b/tests/queries/0_stateless/03630_parquet_bool_bug.sql
new file mode 100644
index 000000000000..e80f1dc30b5a
--- /dev/null
+++ b/tests/queries/0_stateless/03630_parquet_bool_bug.sql
@@ -0,0 +1,8 @@
+-- Tags: no-parallel, no-fasttest
+
+insert into function file('03630_parquet_bool_bug.parquet', Parquet, 'tags Array(Bool)') settings engine_file_truncate_on_insert=1 values ([false,false,false,false,false,false,false,false]), ([true,true,true,true,true,true,true,true]);
+select sum(tags) from file('03630_parquet_bool_bug.parquet') array join tags settings input_format_parquet_use_native_reader_v3=1;
+
+-- Try all 256 1-byte masks to verify the bit shifting nonsense in PlainBooleanDecoder.
+insert into function file('03630_parquet_bool_bug.parquet') select number as n, arrayMap(i -> toBool(bitShiftRight(number, i) % 2 = 1), range(8)) as bits from numbers(256) settings engine_file_truncate_on_insert=1;
+select sum(n = arraySum(arrayMap(i -> bitShiftLeft(bits[i+1], i), range(8)))) as ok from file('03630_parquet_bool_bug.parquet') settings input_format_parquet_use_native_reader_v3=1, schema_inference_make_columns_nullable=0;
diff --git a/tests/queries/0_stateless/03631_array_of_empty_tuples.reference b/tests/queries/0_stateless/03631_array_of_empty_tuples.reference
new file mode 100644
index 000000000000..b04f46cd04aa
--- /dev/null
+++ b/tests/queries/0_stateless/03631_array_of_empty_tuples.reference
@@ -0,0 +1,2 @@
+[(),()]
+[(),()]
diff --git a/tests/queries/0_stateless/03631_array_of_empty_tuples.sql b/tests/queries/0_stateless/03631_array_of_empty_tuples.sql
new file mode 100644
index 000000000000..c1cd37ebcbfb
--- /dev/null
+++ b/tests/queries/0_stateless/03631_array_of_empty_tuples.sql
@@ -0,0 +1,2 @@
+select [(), ()] from numbers(2);
+
diff --git a/tests/queries/0_stateless/03631_buffer_access_check.reference b/tests/queries/0_stateless/03631_buffer_access_check.reference
new file mode 100644
index 000000000000..ded446896014
--- /dev/null
+++ b/tests/queries/0_stateless/03631_buffer_access_check.reference
@@ -0,0 +1,3 @@
+OK
+OK
+foo
diff --git a/tests/queries/0_stateless/03631_buffer_access_check.sh b/tests/queries/0_stateless/03631_buffer_access_check.sh
new file mode 100755
index 000000000000..ffd0032c39ad
--- /dev/null
+++ b/tests/queries/0_stateless/03631_buffer_access_check.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Tags: long, no-replicated-database, no-async-insert
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+user="user03631_${CLICKHOUSE_DATABASE}_$RANDOM"
+db=${CLICKHOUSE_DATABASE}
+
+${CLICKHOUSE_CLIENT} <<EOF
+CREATE TABLE $db.test_table (s String) ENGINE = MergeTree ORDER BY s;
+INSERT INTO $db.test_table VALUES ('foo');
+
+DROP USER IF EXISTS $user;
+CREATE USER $user;
+GRANT SELECT, CREATE, INSERT ON $db.test_buffer TO $user;
+GRANT TABLE ENGINE ON Buffer TO $user;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user --query "CREATE TABLE $db.test_buffer ENGINE = Buffer($db, test_table, 1, 10, 100, 10000, 1000000, 10000000, 100000000)"
+(( $(${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM $db.test_buffer" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+(( $(${CLICKHOUSE_CLIENT} --user $user --query "INSERT INTO $db.test_buffer VALUES ('bar')" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_table TO $user"
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM $db.test_buffer"
+
+${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS $user"
diff --git a/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.reference b/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.reference
new file mode 100644
index 000000000000..231eebbbb627
--- /dev/null
+++ b/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.reference
@@ -0,0 +1,2 @@
+1
+raw_blob	String					
diff --git a/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.sql b/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.sql
new file mode 100644
index 000000000000..895f7aa4dfc0
--- /dev/null
+++ b/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.sql
@@ -0,0 +1,13 @@
+-- Tags: no-parallel, no-fasttest, no-random-settings
+
+INSERT INTO FUNCTION s3(
+    s3_conn,
+    filename='03631',
+    format=Parquet,
+    partition_strategy='hive',
+    partition_columns_in_data_file=1) PARTITION BY (year, country) SELECT 'Brazil' as country, 2025 as year, 1 as id;
+
+-- distinct because minio isn't cleaned up
+SELECT count(distinct year) FROM s3(s3_conn, filename='03631/**.parquet', format=RawBLOB) SETTINGS use_hive_partitioning=1;
+
+DESCRIBE s3(s3_conn, filename='03631/**.parquet', format=RawBLOB) SETTINGS use_hive_partitioning=1;
diff --git a/tests/queries/0_stateless/03632_insert_select_cte_bug.reference b/tests/queries/0_stateless/03632_insert_select_cte_bug.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03632_insert_select_cte_bug.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03632_insert_select_cte_bug.sql b/tests/queries/0_stateless/03632_insert_select_cte_bug.sql
new file mode 100644
index 000000000000..0692f5d6b375
--- /dev/null
+++ b/tests/queries/0_stateless/03632_insert_select_cte_bug.sql
@@ -0,0 +1,17 @@
+SET enable_analyzer=1; -- parallel distributed insert select for replicated tables works only with analyzer
+SET parallel_distributed_insert_select=2;
+SET enable_global_with_statement=1;
+
+DROP TABLE IF EXISTS test_insert SYNC;
+
+CREATE TABLE test_insert (c1 String, c2 UInt8)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_03632/tables/test_insert', '{replica}')
+ORDER BY ();
+
+INSERT INTO test_insert
+WITH cte_test AS (SELECT '1234', 1)
+SELECT * FROM cte_test;
+
+SELECT count() FROM test_insert;
+
+DROP TABLE test_insert;
diff --git a/tests/queries/0_stateless/03633_set_index_bulk_filtering.reference b/tests/queries/0_stateless/03633_set_index_bulk_filtering.reference
new file mode 100644
index 000000000000..aa47d0d46d47
--- /dev/null
+++ b/tests/queries/0_stateless/03633_set_index_bulk_filtering.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/03633_set_index_bulk_filtering.sql b/tests/queries/0_stateless/03633_set_index_bulk_filtering.sql
new file mode 100644
index 000000000000..d3502a152739
--- /dev/null
+++ b/tests/queries/0_stateless/03633_set_index_bulk_filtering.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS tbulk;
+CREATE TABLE tbulk (
+    g UInt64, s Int32, k Int64, x UInt64,
+    INDEX gset g TYPE set (0) GRANULARITY 100
+)
+engine=MergeTree
+order by (x, k, s)
+as select number%3, 1, 4, number%10 from numbers(1e6);
+
+select count(x) from tbulk where g = 1 and k = 1 settings secondary_indices_enable_bulk_filtering=0;
+select count(x) from tbulk where g = 1 and k = 1 settings secondary_indices_enable_bulk_filtering=1;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03636_empty_projection_block.reference b/tests/queries/0_stateless/03636_empty_projection_block.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03636_empty_projection_block.sql b/tests/queries/0_stateless/03636_empty_projection_block.sql
new file mode 100644
index 000000000000..a734c0c7dc63
--- /dev/null
+++ b/tests/queries/0_stateless/03636_empty_projection_block.sql
@@ -0,0 +1,26 @@
+-- This test would hit a LOGICAL_ERROR during merge
+CREATE TABLE post_state
+(
+    `ts` DateTime,
+    `id` Int64,
+    `state` Nullable(UInt8) TTL ts + INTERVAL 1 MONTH,
+    PROJECTION p_digest_posts_state
+    (
+        SELECT
+            id,
+            argMax(state, ts) AS state
+        GROUP BY id
+    )
+)
+ENGINE = MergeTree()
+ORDER BY id
+TTL ts + toIntervalSecond(0) WHERE state IS NULL
+SETTINGS index_granularity = 8192, deduplicate_merge_projection_mode='rebuild';
+
+SYSTEM STOP MERGES post_state;
+INSERT INTO post_state VALUES ('2024-01-01 00:00:00', 1, NULL);
+INSERT INTO post_state VALUES ('2024-01-01 00:00:00', 1, NULL);
+INSERT INTO post_state VALUES ('2024-01-01 00:00:00', 1, 1);
+INSERT INTO post_state VALUES ('2024-01-01 00:00:00', 1, NULL);
+SYSTEM START MERGES post_state;
+OPTIMIZE TABLE post_state;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03636_index_analysis_with_session_tz.reference b/tests/queries/0_stateless/03636_index_analysis_with_session_tz.reference
new file mode 100644
index 000000000000..e3b96109a27d
--- /dev/null
+++ b/tests/queries/0_stateless/03636_index_analysis_with_session_tz.reference
@@ -0,0 +1,41 @@
+-- PK UTC timezone
+1
+Condition: (toStartOfDay(ts) in [1756857600, 1756857600])
+Parts: 1/1
+Granules: 1/1
+
+-- PK EST timezone
+1
+Condition: (toStartOfDay(ts) in [1756857600, 1756857600])
+Parts: 1/1
+Granules: 1/1
+
+-- Partitions UTC timezone
+1
+Condition: (ts in [1756882680, 1756882680])
+Parts: 1/1
+Granules: 1/1
+Condition: (toStartOfDay(ts) in [1756857600, 1756857600])
+Parts: 1/1
+Granules: 1/1
+
+-- Partitions EST timezone
+1
+Condition: (ts in [1756882680, 1756882680])
+Parts: 1/1
+Granules: 1/1
+Condition: (toStartOfDay(ts) in [1756857600, 1756857600])
+Parts: 1/1
+Granules: 1/1
+
+-- Partitions UTC timezone
+1
+Condition: true
+Parts: 1/1
+Granules: 1/1
+
+-- Partitions EST timezone
+1
+Condition: true
+Parts: 1/1
+Granules: 1/1
diff --git a/tests/queries/0_stateless/03636_index_analysis_with_session_tz.sql b/tests/queries/0_stateless/03636_index_analysis_with_session_tz.sql
new file mode 100644
index 000000000000..c897ab523dae
--- /dev/null
+++ b/tests/queries/0_stateless/03636_index_analysis_with_session_tz.sql
@@ -0,0 +1,103 @@
+SET session_timezone = 'UTC';
+-- For explain with indexes and key condition values verification
+SET parallel_replicas_local_plan = 1;
+
+DROP TABLE IF EXISTS 03636_data_pk, 03636_data_partitions, 03636_data_parsed;
+
+CREATE TABLE 03636_data_pk (ts DateTime) ENGINE = MergeTree ORDER BY toStartOfDay(ts)
+AS
+SELECT 1756882680;
+
+SELECT '-- PK UTC timezone';
+
+SELECT count() FROM 03636_data_pk WHERE ts = 1756882680;
+
+SELECT trim(explain)
+FROM (
+    EXPLAIN indexes = 1 SELECT count() FROM 03636_data_pk WHERE ts = 1756882680
+)
+WHERE trim(explain) ilike 'condition: %'
+   OR trim(explain) ilike 'parts: %'
+   OR trim(explain) ilike 'granules: %';
+
+SELECT '';
+SELECT '-- PK EST timezone';
+
+SELECT count() FROM 03636_data_pk WHERE ts = 1756882680 SETTINGS session_timezone = 'EST';
+
+SELECT trim(explain)
+FROM (
+    EXPLAIN indexes = 1 SELECT count() FROM 03636_data_pk WHERE ts = 1756882680
+)
+WHERE trim(explain) ilike 'condition: %'
+   OR trim(explain) ilike 'parts: %'
+   OR trim(explain) ilike 'granules: %'
+SETTINGS session_timezone = 'EST';
+
+DROP TABLE 03636_data_pk;
+
+CREATE TABLE 03636_data_partitions (ts DateTime) ENGINE = MergeTree ORDER BY tuple() PARTITION BY toStartOfDay(ts)
+AS
+SELECT 1756882680;
+
+SELECT '';
+SELECT '-- Partitions UTC timezone';
+
+SELECT count() FROM 03636_data_partitions WHERE ts = 1756882680;
+
+SELECT trim(explain)
+FROM (
+    EXPLAIN indexes = 1 SELECT count() FROM 03636_data_partitions WHERE ts = 1756882680
+)
+WHERE trim(explain) ilike 'condition: %'
+   OR trim(explain) ilike 'parts: %'
+   OR trim(explain) ilike 'granules: %';
+
+SELECT '';
+SELECT '-- Partitions EST timezone';
+
+SELECT count() FROM 03636_data_partitions WHERE ts = 1756882680 SETTINGS session_timezone = 'EST';
+
+SELECT trim(explain)
+FROM (
+    EXPLAIN indexes = 1 SELECT count() FROM 03636_data_partitions WHERE ts = 1756882680
+)
+WHERE trim(explain) ilike 'condition: %'
+   OR trim(explain) ilike 'parts: %'
+   OR trim(explain) ilike 'granules: %'
+SETTINGS session_timezone = 'EST';
+
+DROP TABLE 03636_data_partitions;
+
+CREATE TABLE 03636_data_parsed (ts String) ENGINE = MergeTree ORDER BY toStartOfDay(toDateTime(ts))
+AS
+SELECT '2025-09-02 19:00:00';
+
+SELECT '';
+SELECT '-- Partitions UTC timezone';
+
+SELECT count() FROM 03636_data_parsed WHERE ts = '2025-09-02 19:00:00';
+
+SELECT trim(explain)
+FROM (
+    EXPLAIN indexes = 1 SELECT count() FROM 03636_data_parsed WHERE ts = '2025-09-02 19:00:00'
+)
+WHERE trim(explain) ilike 'condition: %'
+   OR trim(explain) ilike 'parts: %'
+   OR trim(explain) ilike 'granules: %';
+
+SELECT '';
+SELECT '-- Partitions EST timezone';
+
+SELECT count() FROM 03636_data_parsed WHERE ts = '2025-09-02 19:00:00' SETTINGS session_timezone = 'EST';
+
+SELECT trim(explain)
+FROM (
+    EXPLAIN indexes = 1 SELECT count() FROM 03636_data_parsed WHERE ts = '2025-09-02 19:00:00'
+)
+WHERE trim(explain) ilike 'condition: %'
+   OR trim(explain) ilike 'parts: %'
+   OR trim(explain) ilike 'granules: %'
+SETTINGS session_timezone = 'EST';
+
+DROP TABLE 03636_data_parsed;
diff --git a/tests/queries/0_stateless/03636_normalize_url_in_source_grants.reference b/tests/queries/0_stateless/03636_normalize_url_in_source_grants.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03636_normalize_url_in_source_grants.sh b/tests/queries/0_stateless/03636_normalize_url_in_source_grants.sh
new file mode 100755
index 000000000000..f1a55f14f28e
--- /dev/null
+++ b/tests/queries/0_stateless/03636_normalize_url_in_source_grants.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+user="user03636_${CLICKHOUSE_DATABASE}_$RANDOM"
+
+${CLICKHOUSE_CLIENT} <<EOF
+-- Cleanup
+DROP USER IF EXISTS $user;
+CREATE USER $user;
+GRANT CREATE TEMPORARY TABLE ON *.* TO $user;
+EOF
+
+${CLICKHOUSE_CLIENT} --query "GRANT READ ON S3('http://localhost:11111/test/.*') TO $user WITH GRANT OPTION";
+
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM s3('http://localhost:11111/test/a.tsv', 'TSV') FORMAT Null;";
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM s3('http://localhost:11111/a.tsv', 'TSV') FORMAT Null; -- { serverError ACCESS_DENIED }";
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM s3('http://localhost:11111/test/../a.tsv', 'TSV') FORMAT Null; -- { serverError ACCESS_DENIED }";
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM s3('http://localhost:11111/test/%2e%2e/a.tsv', 'TSV') FORMAT Null; -- { serverError ACCESS_DENIED }";
+
+${CLICKHOUSE_CLIENT} <<EOF
+DROP USER IF EXISTS $user;
+EOF
diff --git a/tests/queries/0_stateless/03638_merge_max_dynamic_subcolumns_in_wide_part.reference b/tests/queries/0_stateless/03638_merge_max_dynamic_subcolumns_in_wide_part.reference
new file mode 100644
index 000000000000..be6bf773c679
--- /dev/null
+++ b/tests/queries/0_stateless/03638_merge_max_dynamic_subcolumns_in_wide_part.reference
@@ -0,0 +1,4 @@
+['a','b','c','d']	['e','f']
+['a','b']	['c','d','e','f']
+['a','b','c','d']	['e','f']
+['a','b']	['c','d','e','f']
diff --git a/tests/queries/0_stateless/03638_merge_max_dynamic_subcolumns_in_wide_part.sql b/tests/queries/0_stateless/03638_merge_max_dynamic_subcolumns_in_wide_part.sql
new file mode 100644
index 000000000000..ad39526501bc
--- /dev/null
+++ b/tests/queries/0_stateless/03638_merge_max_dynamic_subcolumns_in_wide_part.sql
@@ -0,0 +1,16 @@
+drop table if exists test;
+create table test (json JSON(max_dynamic_paths=4)) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1, merge_max_dynamic_subcolumns_in_wide_part=2;
+insert into test select '{"a" : 42, "b" : 42, "c" : 42, "d" : 42, "e" : 42, "f" : 42}';
+select JSONDynamicPaths(json), JSONSharedDataPaths(json) from test;
+insert into test select '{"a" : 42, "b" : 42, "c" : 42, "d" : 42, "e" : 42, "f" : 42}';
+optimize table test final;
+select JSONDynamicPaths(json), JSONSharedDataPaths(json) from test limit 1;
+drop table test;
+
+create table test (x UInt32, json JSON(max_dynamic_paths=4)) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1, merge_max_dynamic_subcolumns_in_wide_part=2, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+insert into test select 42,  '{"a" : 42, "b" : 42, "c" : 42, "d" : 42, "e" : 42, "f" : 42}';
+select JSONDynamicPaths(json), JSONSharedDataPaths(json) from test;
+insert into test select 42, '{"a" : 42, "b" : 42, "c" : 42, "d" : 42, "e" : 42, "f" : 42}';
+optimize table test final;
+select JSONDynamicPaths(json), JSONSharedDataPaths(json) from test limit 1;
+drop table test
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03640_variant_array_null_map_subcolumn.reference b/tests/queries/0_stateless/03640_variant_array_null_map_subcolumn.reference
new file mode 100644
index 000000000000..c386f99e34af
--- /dev/null
+++ b/tests/queries/0_stateless/03640_variant_array_null_map_subcolumn.reference
@@ -0,0 +1 @@
+[0,1,0]
diff --git a/tests/queries/0_stateless/03640_variant_array_null_map_subcolumn.sql b/tests/queries/0_stateless/03640_variant_array_null_map_subcolumn.sql
new file mode 100644
index 000000000000..6afb40336005
--- /dev/null
+++ b/tests/queries/0_stateless/03640_variant_array_null_map_subcolumn.sql
@@ -0,0 +1,6 @@
+drop table if exists test;
+create table test (v Variant(Array(Nullable(String)))) engine=MergeTree order by tuple();
+insert into test select ['hello', null, 'world'];
+select v.`Array(Nullable(String))`.null from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.reference b/tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.reference
new file mode 100644
index 000000000000..ce06cf372beb
--- /dev/null
+++ b/tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.reference
@@ -0,0 +1,22 @@
+1	str
+1	str
+QUERY id: 0
+  PROJECTION COLUMNS
+    count() UInt64
+    toString(json.a) String
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
+      FUNCTION id: 3, function_name: toString, function_type: ordinary, result_type: String
+        ARGUMENTS
+          LIST id: 4, nodes: 1
+            COLUMN id: 5, column_name: json.a, result_type: Dynamic, source_id: 6
+  JOIN TREE
+    TABLE id: 6, alias: __table1, table_name: default.test
+  GROUP BY
+    LIST id: 7, nodes: 1
+      FUNCTION id: 8, function_name: toString, function_type: ordinary, result_type: String
+        ARGUMENTS
+          LIST id: 9, nodes: 1
+            COLUMN id: 10, column_name: json.a, result_type: Dynamic, source_id: 6
+  SETTINGS enable_analyzer=1 optimize_injective_functions_in_group_by=1
diff --git a/tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.sql b/tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.sql
new file mode 100644
index 000000000000..79e52c4a57f6
--- /dev/null
+++ b/tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.sql
@@ -0,0 +1,11 @@
+create table test (json JSON) engine=MergeTree order by tuple();
+insert into test select '{"a" : "str"}';
+
+-- This won't work, see https://github.com/ClickHouse/ClickHouse/issues/89854
+-- select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=0, optimize_injective_functions_in_group_by=0;
+
+select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=1, optimize_injective_functions_in_group_by=0;
+select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=1, optimize_injective_functions_in_group_by=1;
+explain query tree select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=1, optimize_injective_functions_in_group_by=1;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03641_json_array_of_float_and_bool.reference b/tests/queries/0_stateless/03641_json_array_of_float_and_bool.reference
new file mode 100644
index 000000000000..29b67df6b8a9
--- /dev/null
+++ b/tests/queries/0_stateless/03641_json_array_of_float_and_bool.reference
@@ -0,0 +1,2 @@
+{"a":[42.42,0]}	Array(Nullable(Float64))
+{"a":[42.42,false]}	Array(Dynamic)
diff --git a/tests/queries/0_stateless/03641_json_array_of_float_and_bool.sql b/tests/queries/0_stateless/03641_json_array_of_float_and_bool.sql
new file mode 100644
index 000000000000..65966d619dcd
--- /dev/null
+++ b/tests/queries/0_stateless/03641_json_array_of_float_and_bool.sql
@@ -0,0 +1,4 @@
+set enable_analyzer=1;
+
+select '{"a" : [42.42, false]}'::JSON as json, dynamicType(json.a) settings input_format_json_read_bools_as_numbers=1;
+select '{"a" : [42.42, false]}'::JSON as json, dynamicType(json.a) settings input_format_json_read_bools_as_numbers=0;
diff --git a/tests/queries/0_stateless/03642_column_ttl_sparse.reference b/tests/queries/0_stateless/03642_column_ttl_sparse.reference
new file mode 100644
index 000000000000..2b97fda246a0
--- /dev/null
+++ b/tests/queries/0_stateless/03642_column_ttl_sparse.reference
@@ -0,0 +1,4 @@
+435
+435
+435
+435
diff --git a/tests/queries/0_stateless/03642_column_ttl_sparse.sql b/tests/queries/0_stateless/03642_column_ttl_sparse.sql
new file mode 100644
index 000000000000..ef2f3164ed24
--- /dev/null
+++ b/tests/queries/0_stateless/03642_column_ttl_sparse.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS ttl_sparse_repro;
+
+CREATE TABLE ttl_sparse_repro
+(
+    a UInt64,
+    dt DateTime,
+    b UInt64 TTL dt + INTERVAL 2 SECOND, c UInt64
+)
+ENGINE = MergeTree ORDER BY a SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO ttl_sparse_repro SELECT number, now(), 1, if (number % 23 = 0, 1, 0) FROM numbers(10000);
+
+SELECT sum(c) FROM ttl_sparse_repro;
+
+SELECT sleep(3) FORMAT Null;
+
+OPTIMIZE TABLE ttl_sparse_repro FINAL;
+SELECT sum(c) FROM ttl_sparse_repro;
+
+OPTIMIZE TABLE ttl_sparse_repro FINAL;
+SELECT sum(c) FROM ttl_sparse_repro;
+
+OPTIMIZE TABLE ttl_sparse_repro FINAL;
+SELECT sum(c) FROM ttl_sparse_repro;
+
+DROP TABLE IF EXISTS ttl_sparse_repro;
diff --git a/tests/queries/0_stateless/03643_hybrid.reference b/tests/queries/0_stateless/03643_hybrid.reference
new file mode 100644
index 000000000000..1954c097b478
--- /dev/null
+++ b/tests/queries/0_stateless/03643_hybrid.reference
@@ -0,0 +1,225 @@
+Hybrid creation requires allow_experimental_hybrid_table
+Check Hybrid engine is registered
+Hybrid
+Ensure no leftovers before validation checks
+Expect error when Hybrid has no arguments
+Expect error when Hybrid has a single literal argument
+Expect error when Hybrid arguments are literals only
+Expect error when first argument is a table function of the wrong subtype (can not construct Distributed from file)
+Expect error when first argument is not a table function (scalar expression)
+Expect error when first argument is a table function of the wrong subtype (can not construct Distributed from url)
+Expect error when predicate references a missing column
+Missing column + schema inference
+Create Hybrid table with remote() and constant predicate (explicit column list)
+CREATE TABLE default.test_tiered_distributed\n(\n    `dummy` UInt8\n)\nENGINE = Hybrid(remote(\'localhost:9000\'), 1)
+dummy	UInt8					
+0
+Row 1:
+──────
+database:           default
+name:               test_tiered_distributed
+engine:             Hybrid
+create_table_query: CREATE TABLE default.test_tiered_distributed (`dummy` UInt8) ENGINE = Hybrid(remote('localhost:9000'), 1)
+engine_full:        Hybrid(remote('localhost:9000'), 1)
+Create Hybrid table with remote table function and predicate (inference)
+CREATE TABLE default.test_tiered_distributed_numbers_range\n(\n    `number` UInt64\n)\nENGINE = Hybrid(remote(\'localhost:9000\', \'system.numbers\'), number < 5)
+0
+1
+2
+3
+4
+Create Hybrid table with two remote segments as table
+CREATE TABLE default.test_tiered_distributed_numbers_dual\n(\n    `number` UInt64\n)\nENGINE = Hybrid(remote(\'localhost:9000\', \'system.numbers\'), number < 5, remote(\'localhost:9000\', system.numbers), (number >= 10) AND (number <= 15))\nCOMMENT \'Generates all natural numbers, starting from 0 (to 2^64 - 1, and then again) in sorted order.\'
+0
+1
+2
+3
+4
+10
+11
+12
+13
+14
+15
+0
+1
+2
+3
+4
+10
+11
+12
+13
+14
+15
+Create Hybrid table combining remote function and local table
+0
+1
+2
+3
+4
+10
+11
+12
+13
+14
+15
+Verify Hybrid skips segment with always false predicate on the first segment
+10
+11
+12
+13
+14
+15
+Verify Hybrid skips segment with always false predicate on the second segment
+0
+1
+2
+Hybrid raises when a segment is missing a column used by the base schema
+Prepare local MergeTree table for multi-segment tests
+Populate local table with sample data
+Create Hybrid table with three segment pairs
+Count rows across all segments
+6
+Count rows from segments with id > 4
+1
+Count rows where value > 200
+3
+Count rows named Alice
+1
+Select rows ordered by value descending (id > 2)
+4	David	300.2
+5	Eve	250.1
+3	Charlie	150.7
+Limit results ordered by id
+0	Invalid	2022-01-01 10:00:00	0.5
+1	Alice	2022-01-01 10:00:00	100.5
+2	Bob	2022-01-02 11:00:00	200.3
+Explain plan for filter on value
+Union (Hybrid)
+  ReadFromRemote (Read from remote replica)
+  ReadFromRemote (Read from remote replica)
+  ReadFromRemote (Read from remote replica)
+Union (Hybrid)
+  ReadFromRemote (Read from remote replica)
+  ReadFromRemote (Read from remote replica)
+  ReadFromRemote (Read from remote replica)
+Union (Hybrid)
+  ReadFromRemote (Read from remote replica)
+  Expression ((Projection + Before ORDER BY))
+    Expression (WHERE)
+      ReadFromMergeTree (default.test_tiered_local_data)
+  Expression ((Projection + Before ORDER BY))
+    Expression (WHERE)
+      ReadFromMergeTree (default.test_tiered_local_data)
+Union (Hybrid)
+  ReadFromRemote (Read from remote replica)
+  Expression ((Project names + Projection))
+    Expression ((WHERE + Change column names to column identifiers))
+      ReadFromMergeTree (default.test_tiered_local_data)
+  Expression ((Project names + Projection))
+    Expression ((WHERE + Change column names to column identifiers))
+      ReadFromMergeTree (default.test_tiered_local_data)
+Aggregate values across name when filtering by event_time
+David	1	300.2
+Eve	1	250.1
+Bob	1	200.3
+Charlie	1	150.7
+Verify additional_table_filters works consistently (legacy analyser)
+2	Bob	200.3
+Verify additional_table_filters works consistently (new analyser)
+2	Bob	200.3
+Clean up Hybrid table with three segment pairs
+Clean up local helper table
+Drop predicate filtering fixtures if they exist
+Create local tables representing before/after watermark partitions
+Create second local table with different value type
+Insert rows before watermark into both tables
+Insert rows after watermark into both tables
+Create Hybrid table with analyzer disabled during reads
+Insert row via Hybrid table (should go to first segment)
+Verify that inserted row landed in first table
+17	John	2025-09-25	400
+Verify that second table did not receive the inserted row
+0
+Read predicate-filtered data with analyzer disabled and no localhost preference
+14	David	2025-09-05	400
+15	Eve	2025-09-10	500
+16	Frank	2025-09-15	600
+17	John	2025-09-25	400
+21	Alice	2025-08-15	100
+22	Bob	2025-08-20	200
+23	Charlie	2025-08-25	300
+Read predicate-filtered data with analyzer enabled and no localhost preference
+14	David	2025-09-05	400
+15	Eve	2025-09-10	500
+16	Frank	2025-09-15	600
+17	John	2025-09-25	400
+21	Alice	2025-08-15	100
+22	Bob	2025-08-20	200
+23	Charlie	2025-08-25	300
+Read predicate-filtered data with analyzer disabled and prefer localhost replica
+14	David	2025-09-05	400
+15	Eve	2025-09-10	500
+16	Frank	2025-09-15	600
+17	John	2025-09-25	400
+21	Alice	2025-08-15	100
+22	Bob	2025-08-20	200
+23	Charlie	2025-08-25	300
+Read predicate-filtered data with analyzer enabled and prefer localhost replica
+14	David	2025-09-05	400
+15	Eve	2025-09-10	500
+16	Frank	2025-09-15	600
+17	John	2025-09-25	400
+21	Alice	2025-08-15	100
+22	Bob	2025-08-20	200
+23	Charlie	2025-08-25	300
+Check if the subqueries were recorded in query_log (hybrid_table_auto_cast_columns = 0)
+Row 1:
+──────
+type:              QueryFinish
+is_initial_query2: 1
+tbl:               ['_table_function.remote','db.test_tiered_watermark']
+qry:               SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1,  hybrid_table_auto_cast_columns = 0, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark1', max_threads=1 FORMAT Null;
+log_comment:       test_tiered_watermark1
+
+Row 2:
+──────
+type:              QueryFinish
+is_initial_query2: 0
+tbl:               ['db.test_tiered_watermark_after']
+qry:               SELECT `__table1`.`id` AS `id`, `__table1`.`name` AS `name`, `__table1`.`date` AS `date`, `__table1`.`value` AS `value` FROM `db`.`test_tiered_watermark_after` AS `__table1` WHERE `__table1`.`date` >= '2025-09-01' ORDER BY `__table1`.`id` DESC
+log_comment:       test_tiered_watermark1
+
+Row 3:
+──────
+type:              QueryFinish
+is_initial_query2: 0
+tbl:               ['db.test_tiered_watermark_before']
+qry:               SELECT `__table1`.`id` AS `id`, `__table1`.`name` AS `name`, `__table1`.`date` AS `date`, `__table1`.`value` AS `value` FROM `db`.`test_tiered_watermark_before` AS `__table1` WHERE `__table1`.`date` < '2025-09-01' ORDER BY `__table1`.`id` DESC
+log_comment:       test_tiered_watermark1
+Check if the subqueries were recorded in query_log (hybrid_table_auto_cast_columns = 1)
+Row 1:
+──────
+type:              QueryFinish
+is_initial_query2: 1
+tbl:               ['_table_function.remote','db.test_tiered_watermark']
+qry:               SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1, hybrid_table_auto_cast_columns = 1, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark2', max_threads=1 FORMAT Null;
+log_comment:       test_tiered_watermark2
+
+Row 2:
+──────
+type:              QueryFinish
+is_initial_query2: 0
+tbl:               ['db.test_tiered_watermark_after']
+qry:               SELECT _CAST(`__table1`.`id`, 'UInt32') AS `id`, _CAST(`__table1`.`name`, 'String') AS `name`, `__table1`.`date` AS `date`, _CAST(`__table1`.`value`, 'UInt32') AS `value` FROM `db`.`test_tiered_watermark_after` AS `__table1` WHERE `__table1`.`date` >= '2025-09-01' ORDER BY `id` DESC
+log_comment:       test_tiered_watermark2
+
+Row 3:
+──────
+type:              QueryFinish
+is_initial_query2: 0
+tbl:               ['db.test_tiered_watermark_before']
+qry:               SELECT _CAST(`__table1`.`id`, 'UInt32') AS `id`, _CAST(`__table1`.`name`, 'String') AS `name`, `__table1`.`date` AS `date`, _CAST(`__table1`.`value`, 'UInt32') AS `value` FROM `db`.`test_tiered_watermark_before` AS `__table1` WHERE `__table1`.`date` < '2025-09-01' ORDER BY _CAST(`__table1`.`id`, 'UInt32') DESC
+log_comment:       test_tiered_watermark2
+Clean up predicate filtering tables
diff --git a/tests/queries/0_stateless/03643_hybrid.sql b/tests/queries/0_stateless/03643_hybrid.sql
new file mode 100644
index 000000000000..851045aafcfa
--- /dev/null
+++ b/tests/queries/0_stateless/03643_hybrid.sql
@@ -0,0 +1,407 @@
+SELECT 'Hybrid creation requires allow_experimental_hybrid_table';
+SET allow_experimental_hybrid_table = 0;
+CREATE TABLE test_hybrid_requires_setting (`dummy` UInt8) ENGINE = Hybrid(remote('localhost:9000'), 1); -- { serverError SUPPORT_IS_DISABLED }
+DROP TABLE IF EXISTS test_hybrid_requires_setting SYNC;
+
+SET allow_experimental_hybrid_table = 1;
+
+SELECT 'Check Hybrid engine is registered';
+SELECT name FROM system.table_engines WHERE name = 'Hybrid';
+
+SELECT 'Ensure no leftovers before validation checks';
+DROP TABLE IF EXISTS test_tiered_distributed SYNC;
+DROP TABLE IF EXISTS test_tiered_distributed_bad_args SYNC;
+DROP TABLE IF EXISTS test_tiered_distributed_invalid_first_arg SYNC;
+
+SELECT 'Expect error when Hybrid has no arguments';
+CREATE TABLE test_tiered_distributed_bad_args (`id` UInt32,`name` String) ENGINE = Hybrid(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+SELECT 'Expect error when Hybrid has a single literal argument';
+CREATE TABLE test_tiered_distributed_bad_args (`id` UInt32,`name` String) ENGINE = Hybrid(1); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+SELECT 'Expect error when Hybrid arguments are literals only';
+CREATE TABLE test_tiered_distributed_bad_args (`id` UInt32,`name` String) ENGINE = Hybrid(1, 1); -- { serverError BAD_ARGUMENTS }
+
+SELECT 'Expect error when first argument is a table function of the wrong subtype (can not construct Distributed from file)';
+CREATE TABLE test_tiered_distributed_invalid_first_arg (`id` UInt32, `name` String) ENGINE = Hybrid(file('foo.x'), 1); -- { serverError BAD_ARGUMENTS }
+
+SELECT 'Expect error when first argument is not a table function (scalar expression)';
+CREATE TABLE test_tiered_distributed_invalid_first_arg (`id` UInt32, `name` String) ENGINE = Hybrid(sin(3), 1); -- { serverError BAD_ARGUMENTS }
+
+SELECT 'Expect error when first argument is a table function of the wrong subtype (can not construct Distributed from url)';
+CREATE TABLE test_tiered_distributed_invalid_first_arg (`id` UInt32, `name` String) ENGINE = Hybrid(url('http://google.com', 'RawBLOB'), 1); -- { serverError BAD_ARGUMENTS }
+
+SELECT 'Expect error when predicate references a missing column';
+CREATE TABLE test_tiered_distributed_bad_args(`number` UInt64) ENGINE = Hybrid(remote('localhost:9000', system.numbers), number2 < 5); -- { serverError BAD_ARGUMENTS }
+
+SELECT 'Missing column + schema inference';
+CREATE TABLE test_tiered_distributed_bad_args ENGINE = Hybrid(remote('localhost:9000', system.numbers), number2 < 5); -- { serverError BAD_ARGUMENTS }
+
+DROP TABLE IF EXISTS test_tiered_distributed_bad_args SYNC;
+
+SELECT 'Create Hybrid table with remote() and constant predicate (explicit column list)';
+DROP TABLE IF EXISTS test_tiered_distributed SYNC;
+CREATE TABLE test_tiered_distributed(`dummy` UInt8) ENGINE = Hybrid(remote('localhost:9000'), 1);
+SHOW CREATE TABLE test_tiered_distributed;
+DESCRIBE TABLE test_tiered_distributed;
+SELECT * FROM test_tiered_distributed;
+SELECT database, name, engine, create_table_query, engine_full FROM system.tables WHERE table = 'test_tiered_distributed' FORMAT Vertical;
+DROP TABLE IF EXISTS test_tiered_distributed SYNC;
+
+SELECT 'Create Hybrid table with remote table function and predicate (inference)';
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_range SYNC;
+CREATE TABLE test_tiered_distributed_numbers_range ENGINE = Hybrid(remote('localhost:9000', system.numbers), number < 5);
+SHOW CREATE TABLE test_tiered_distributed_numbers_range;
+SELECT * FROM test_tiered_distributed_numbers_range ORDER BY number;
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_range SYNC;
+
+SELECT 'Create Hybrid table with two remote segments as table';
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_dual SYNC;
+CREATE TABLE test_tiered_distributed_numbers_dual ENGINE = Hybrid(
+    remote('localhost:9000', system.numbers), number < 5,
+    remote('localhost:9000', system.numbers), number BETWEEN 10 AND 15
+) AS system.numbers;
+
+SHOW CREATE TABLE test_tiered_distributed_numbers_dual;
+SELECT * FROM test_tiered_distributed_numbers_dual ORDER BY number SETTINGS enable_analyzer = 0;
+SELECT * FROM test_tiered_distributed_numbers_dual ORDER BY number SETTINGS enable_analyzer = 1;
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_dual SYNC;
+
+SELECT 'Create Hybrid table combining remote function and local table';
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_mixed SYNC;
+CREATE TABLE test_tiered_distributed_numbers_mixed
+(
+    `number` UInt64
+) ENGINE = Hybrid(
+    remote('localhost:9000', system.numbers), number < 5,
+    system.numbers, number BETWEEN 10 AND 15
+);
+SELECT * FROM test_tiered_distributed_numbers_mixed ORDER BY number;
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_mixed SYNC;
+
+SELECT 'Verify Hybrid skips segment with always false predicate on the first segment';
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_skip_first SYNC;
+CREATE TABLE test_tiered_distributed_numbers_skip_first
+(
+    `number` UInt64
+) ENGINE = Hybrid(
+    remote('localhost:9000', system.numbers), 0,
+    system.numbers, number BETWEEN 10 AND 15
+);
+SELECT * FROM test_tiered_distributed_numbers_skip_first ORDER BY number;
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_skip_first SYNC;
+
+SELECT 'Verify Hybrid skips segment with always false predicate on the second segment';
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_skip_second SYNC;
+CREATE TABLE test_tiered_distributed_numbers_skip_second
+(
+    `number` UInt64
+) ENGINE = Hybrid(
+    remote('localhost:9000', system.numbers), number < 3,
+    system.numbers, 0
+);
+SELECT * FROM test_tiered_distributed_numbers_skip_second ORDER BY number;
+DROP TABLE IF EXISTS test_tiered_distributed_numbers_skip_second SYNC;
+
+SELECT 'Hybrid raises when a segment is missing a column used by the base schema';
+DROP TABLE IF EXISTS test_hybrid_segment_full SYNC;
+DROP TABLE IF EXISTS test_hybrid_segment_partial SYNC;
+DROP TABLE IF EXISTS test_hybrid_missing_column SYNC;
+
+CREATE TABLE test_hybrid_segment_full
+(
+    `id` UInt32,
+    `value` UInt32
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+CREATE TABLE test_hybrid_segment_partial
+(
+    `id` UInt32
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_hybrid_segment_full VALUES (1, 10), (2, 20);
+INSERT INTO test_hybrid_segment_partial VALUES (3), (4);
+
+CREATE TABLE test_hybrid_missing_column ENGINE = Hybrid(
+    remote('localhost:9000', currentDatabase(), 'test_hybrid_segment_full'), id < 3,
+    remote('localhost:9000', currentDatabase(), 'test_hybrid_segment_partial'), id >= 3
+); -- { serverError BAD_ARGUMENTS }
+
+DROP TABLE IF EXISTS test_hybrid_missing_column SYNC;
+DROP TABLE IF EXISTS test_hybrid_segment_partial SYNC;
+DROP TABLE IF EXISTS test_hybrid_segment_full SYNC;
+
+-----------------------------
+
+SELECT 'Prepare local MergeTree table for multi-segment tests';
+DROP TABLE IF EXISTS test_tiered_local_data SYNC;
+CREATE TABLE test_tiered_local_data
+(
+    `id` UInt32,
+    `name` String,
+    `event_time` DateTime,
+    `value` Float64
+) ENGINE = MergeTree()
+ORDER BY id;
+
+SELECT 'Populate local table with sample data';
+INSERT INTO test_tiered_local_data VALUES
+    (0, 'Invalid', '2022-01-01 10:00:00', 0.5),
+    (1, 'Alice', '2022-01-01 10:00:00', 100.5),
+    (2, 'Bob', '2022-01-02 11:00:00', 200.3),
+    (3, 'Charlie', '2022-01-03 12:00:00', 150.7),
+    (4, 'David', '2022-01-04 13:00:00', 300.2),
+    (5, 'Eve', '2022-01-05 14:00:00', 250.1);
+
+SELECT 'Create Hybrid table with three segment pairs';
+DROP TABLE IF EXISTS test_tiered_multi_segment SYNC;
+
+CREATE TABLE test_tiered_multi_segment
+(
+    `id` UInt32,
+    `name` String,
+    `event_time` DateTime,
+    `value` Float64
+)
+ENGINE = Hybrid(
+    remote('127.0.0.2:9000', currentDatabase(), 'test_tiered_local_data'),
+    id <= 2,
+    cluster('test_shard_localhost', currentDatabase(), 'test_tiered_local_data'),
+    id = 3,
+    remoteSecure('127.0.0.1:9440', currentDatabase(), 'test_tiered_local_data'),
+    id > 3
+);
+
+SELECT 'Count rows across all segments';
+SELECT count() FROM test_tiered_multi_segment;
+SELECT 'Count rows from segments with id > 4';
+SELECT count() FROM test_tiered_multi_segment WHERE id > 4;
+SELECT 'Count rows where value > 200';
+SELECT count() FROM test_tiered_multi_segment WHERE value > 200;
+SELECT 'Count rows named Alice';
+SELECT count() AS alice_rows FROM test_tiered_multi_segment WHERE name = 'Alice';
+
+SELECT 'Select rows ordered by value descending (id > 2)';
+SELECT id, name, value FROM test_tiered_multi_segment WHERE id > 2 ORDER BY value DESC;
+SELECT 'Limit results ordered by id';
+SELECT * FROM test_tiered_multi_segment ORDER BY id LIMIT 3;
+SELECT 'Explain plan for filter on value';
+EXPLAIN SELECT * FROM test_tiered_multi_segment WHERE value > 150 SETTINGS prefer_localhost_replica=0, enable_analyzer=0;
+EXPLAIN SELECT * FROM test_tiered_multi_segment WHERE value > 150 SETTINGS prefer_localhost_replica=0, enable_analyzer=1;
+EXPLAIN SELECT * FROM test_tiered_multi_segment WHERE value > 150 SETTINGS prefer_localhost_replica=1, enable_analyzer=0;
+EXPLAIN SELECT * FROM test_tiered_multi_segment WHERE value > 150 SETTINGS prefer_localhost_replica=1, enable_analyzer=1;
+
+SELECT 'Aggregate values across name when filtering by event_time';
+SELECT
+    name,
+    count() AS count,
+    avg(value) AS avg_value
+FROM test_tiered_multi_segment
+WHERE event_time >= '2022-01-02'
+GROUP BY name
+ORDER BY avg_value DESC;
+
+SELECT 'Verify additional_table_filters works consistently (legacy analyser)';
+SELECT id, name, value
+FROM test_tiered_multi_segment
+WHERE id < 3
+ORDER BY id
+SETTINGS additional_table_filters = {'test_tiered_multi_segment' : 'id > 1'}, allow_experimental_analyzer = 0;
+
+SELECT 'Verify additional_table_filters works consistently (new analyser)';
+SELECT id, name, value
+FROM test_tiered_multi_segment
+WHERE id < 3
+ORDER BY id
+SETTINGS additional_table_filters = {'test_tiered_multi_segment' : 'id > 1'}, allow_experimental_analyzer = 1;
+
+
+SELECT 'Clean up Hybrid table with three segment pairs';
+DROP TABLE IF EXISTS test_tiered_multi_segment SYNC;
+SELECT 'Clean up local helper table';
+DROP TABLE IF EXISTS test_tiered_local_data SYNC;
+
+---------------------------------
+
+-- Test Hybrid engine predicate filtering functionality
+
+SELECT 'Drop predicate filtering fixtures if they exist';
+DROP TABLE IF EXISTS test_tiered_watermark_after SYNC;
+DROP TABLE IF EXISTS test_tiered_watermark_before SYNC;
+DROP TABLE IF EXISTS test_tiered_watermark SYNC;
+
+SELECT 'Create local tables representing before/after watermark partitions';
+CREATE TABLE test_tiered_watermark_after
+(
+    `id` UInt32,
+    `name` String,
+    `date` Date,
+    `value` UInt64
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+SELECT 'Create second local table with different value type';
+CREATE TABLE test_tiered_watermark_before
+(
+    `id` Int32,
+    `name` Nullable(String),
+    `date` Date,
+    `value` Decimal128(0)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+SELECT 'Insert rows before watermark into both tables';
+INSERT INTO test_tiered_watermark_after VALUES
+    (11, 'Alice', '2025-08-15', 100),
+    (12, 'Bob', '2025-08-20', 200),
+    (13, 'Charlie', '2025-08-25', 300);
+INSERT INTO test_tiered_watermark_before VALUES
+    (21, 'Alice', '2025-08-15', 100),
+    (22, 'Bob', '2025-08-20', 200),
+    (23, 'Charlie', '2025-08-25', 300);
+
+SELECT 'Insert rows after watermark into both tables';
+INSERT INTO test_tiered_watermark_after VALUES
+    (14, 'David', '2025-09-05', 400),
+    (15, 'Eve', '2025-09-10', 500),
+    (16, 'Frank', '2025-09-15', 600);
+INSERT INTO test_tiered_watermark_before VALUES
+    (24, 'David', '2025-09-05', 400),
+    (25, 'Eve', '2025-09-10', 500),
+    (26, 'Frank', '2025-09-15', 600);
+
+
+SELECT 'Create Hybrid table with analyzer disabled during reads';
+CREATE TABLE test_tiered_watermark
+(
+    `id` UInt32,
+    `name` String,
+    `date` Date,
+    `value` UInt32
+)
+ENGINE = Hybrid(
+    remote('127.0.0.1:9000', currentDatabase(), 'test_tiered_watermark_after'),
+    date >= '2025-09-01',
+    remote('127.0.0.1:9000', currentDatabase(), 'test_tiered_watermark_before'),
+    date < '2025-09-01'
+);
+
+SELECT 'Insert row via Hybrid table (should go to first segment)';
+INSERT INTO test_tiered_watermark SETTINGS distributed_foreground_insert = 1
+VALUES (17, 'John', '2025-09-25', 400);
+
+SELECT 'Verify that inserted row landed in first table';
+SELECT * FROM test_tiered_watermark_after WHERE id = 17 ORDER BY id;
+SELECT 'Verify that second table did not receive the inserted row';
+SELECT count() FROM test_tiered_watermark_before WHERE id = 17;
+
+
+SELECT 'Read predicate-filtered data with analyzer disabled and no localhost preference';
+SELECT * FROM test_tiered_watermark ORDER BY id SETTINGS enable_analyzer = 0, prefer_localhost_replica = 0;
+SELECT 'Read predicate-filtered data with analyzer enabled and no localhost preference';
+SELECT * FROM test_tiered_watermark ORDER BY id SETTINGS enable_analyzer = 1, prefer_localhost_replica = 0;
+SELECT 'Read predicate-filtered data with analyzer disabled and prefer localhost replica';
+SELECT * FROM test_tiered_watermark ORDER BY id SETTINGS enable_analyzer = 0, prefer_localhost_replica = 1;
+SELECT 'Read predicate-filtered data with analyzer enabled and prefer localhost replica';
+SELECT * FROM test_tiered_watermark ORDER BY id SETTINGS enable_analyzer = 1, prefer_localhost_replica = 1;
+
+-- other combinations of settings work, but give a bit different content in the query_log
+-- See the problem around is_initial_query described in https://github.com/Altinity/ClickHouse/issues/1077
+SELECT 'Check if the subqueries were recorded in query_log (hybrid_table_auto_cast_columns = 0)';
+
+SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1,  hybrid_table_auto_cast_columns = 0, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark1', max_threads=1 FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT
+    type,
+    query_id = initial_query_id AS is_initial_query2,
+    arraySort(arrayMap(x -> replaceAll(x, currentDatabase(), 'db'), tables)) as tbl,
+    replaceAll(query, currentDatabase(), 'db') as qry,
+    log_comment
+FROM system.query_log
+WHERE
+ event_time > now() - 300 AND type = 'QueryFinish' AND
+ initial_query_id IN (
+    SELECT initial_query_id
+    FROM system.query_log
+    WHERE
+        event_time > now() - 300
+        and log_comment = 'test_tiered_watermark1'
+        and current_database = currentDatabase()
+        and query_id = initial_query_id )
+ORDER BY tbl, event_time_microseconds
+FORMAT Vertical;
+
+SELECT 'Check if the subqueries were recorded in query_log (hybrid_table_auto_cast_columns = 1)';
+
+SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1, hybrid_table_auto_cast_columns = 1, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark2', max_threads=1 FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT
+    type,
+    query_id = initial_query_id AS is_initial_query2,
+    arraySort(arrayMap(x -> replaceAll(x, currentDatabase(), 'db'), tables)) as tbl,
+    replaceAll(query, currentDatabase(), 'db') as qry,
+    log_comment
+FROM system.query_log
+WHERE
+ event_time > now() - 300 AND type = 'QueryFinish' AND
+ initial_query_id IN (
+    SELECT initial_query_id
+    FROM system.query_log
+    WHERE
+        event_time > now() - 300
+        and log_comment = 'test_tiered_watermark2'
+        and current_database = currentDatabase()
+        and query_id = initial_query_id )
+ORDER BY tbl, event_time_microseconds
+FORMAT Vertical;
+
+
+SELECT 'Clean up predicate filtering tables';
+DROP TABLE IF EXISTS test_tiered_watermark SYNC;
+DROP TABLE IF EXISTS test_tiered_watermark_after SYNC;
+DROP TABLE IF EXISTS test_tiered_watermark_before SYNC;
+
+-- TODO: - addressed by 03644_hybrid_auto_cast.sql
+-- Code: 70. DB::Exception: Received from localhost:9000. DB::Exception: Conversion from AggregateFunction(sum, Decimal(38, 0)) to AggregateFunction(sum, UInt32) is not supported: while converting source column `sum(__table1.value)` to destination column `sum(__table1.value)`. (CANNOT_CONVERT_TYPE)
+-- SELECT sum(value) FROM test_tiered_watermark;
+
+-- TODO:
+-- Code: 47. DB::Exception: Received from localhost:9000. DB::Exception: Received from 127.0.0.2:9000. DB::Exception: Identifier '__table1._database' cannot be resolved from table with name __table1. In scope SELECT __table1._database AS _database, __table1._table AS row_count FROM default.test_tiered_watermark_after AS __table1 WHERE __table1.date >= '2025-09-01'. Maybe you meant: ['__table1._table']. (UNKNOWN_IDENTIFIER)
+-- SELECT _database, _table, count() AS row_count FROM test_tiered_watermark GROUP BY _database, _table ORDER BY _database, _table;
+
+-- Other things which may need attention:
+-- complex combinations? (overview / over Merge)
+-- prefer_localhost_replica
+-- threads versus local subquery pipeline part
+-- ALTER support
+
+-- TODO
+-- SELECT _table_index, count() AS row_count FROM test_debug_tiered GROUP BY _table_index ORDER BY _table_index;
+
+-- TODO
+--   1. Integration tests (similar to tests/queries/0_stateless)
+--   - Base SELECT with date split: part in Distributed, part in S3 -> results should match a manual UNION ALL (with correct ORDER BY/aggregation).
+--   - GROUP BY / ORDER BY / LIMIT: confirm the stage is selected correctly, finalization happens at the top, rows_before_limit_at_least is correct (createLocalPlan already keeps LIMIT).
+--   - JOIN: with a small table on the initiator; check GLOBAL JOIN scenarios. Ensure remote segments behave the same as remote shard subqueries created through createLocalPlan.
+--   - skipUnusedShards: with analyzer ensure segment conditions are respected (where FILTER DAG is available).
+--   - Constants: hostName()/now() in SELECT across several segments -> ensure no discrepancies.
+--   - EXPLAIN PLAN/PIPELINE: show child plans for segments and remote plans.
+--   - Subqueries in logs.
+-- - Different column sets/types: supertype in snapshot, converting actions on read.
+--   - Object columns: same as Distributed — use ColumnsDescriptionByShardNum for segments if needed (optional for local segments; already implemented for Distributed).
+
+-- Condition with dictGet('a1_watermarks_dict', ...)
+
+-- access rights check
+
+
+-- TODO:
+-- test for distributed_aggregation_memory_efficient & enable_memory_bound_merging_of_aggregation_results
+-- to avoid UNKNOWN_AGGREGATED_DATA_VARIANT when mixing different aggregation variants
+-- from remote shards (with memory_bound) and local segments (without memory_bound)
diff --git a/tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.reference b/tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.reference
new file mode 100644
index 000000000000..1444d39d9578
--- /dev/null
+++ b/tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.reference
@@ -0,0 +1,2 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
diff --git a/tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.sh b/tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.sh
new file mode 100755
index 000000000000..8f40316ac5d1
--- /dev/null
+++ b/tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-object-storage, no-random-settings
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+disk_name="${CLICKHOUSE_TEST_UNIQUE_NAME}"
+$CLICKHOUSE_CLIENT -m --query """
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Int32, b String)
+ENGINE = MergeTree() ORDER BY tuple()
+SETTINGS disk = disk(name = '$disk_name', type = cache, max_size = '100Ki', path = ${CLICKHOUSE_TEST_UNIQUE_NAME}, disk = s3_disk);
+
+INSERT INTO test SELECT 1, 'test';
+"""
+
+$CLICKHOUSE_CLIENT --query """
+SYSTEM SYNC FILESYSTEM CACHE '$disk_name' ON CLUSTER 'test_shard_localhost';
+"""
+
+$CLICKHOUSE_CLIENT --query """
+SYSTEM DROP FILESYSTEM CACHE '$disk_name' ON CLUSTER 'test_shard_localhost';
+"""
+
+$CLICKHOUSE_CLIENT --query """
+DROP TABLE IF EXISTS test;
+"""
diff --git a/tests/queries/0_stateless/03644_hybrid_auto_cast.reference b/tests/queries/0_stateless/03644_hybrid_auto_cast.reference
new file mode 100644
index 000000000000..869ac32216b6
--- /dev/null
+++ b/tests/queries/0_stateless/03644_hybrid_auto_cast.reference
@@ -0,0 +1,13 @@
+hybrid_table_auto_cast_columns = 0, enable_analyzer = 1 (headers mismatch)
+hybrid_table_auto_cast_columns = 0, enable_analyzer = 0 (headers mismatch)
+1
+hybrid_table_auto_cast_columns = 0, enable_analyzer = 1 manual cast
+600
+1
+hybrid_table_auto_cast_columns = 0, enable_analyzer = 0 manual cast
+600
+1
+hybrid_table_auto_cast_columns = 1, enable_analyzer = 1
+600
+1
+hybrid_table_auto_cast_columns = 1, enable_analyzer = 0 (analizer required)
diff --git a/tests/queries/0_stateless/03644_hybrid_auto_cast.sql b/tests/queries/0_stateless/03644_hybrid_auto_cast.sql
new file mode 100644
index 000000000000..7248dd9a55ef
--- /dev/null
+++ b/tests/queries/0_stateless/03644_hybrid_auto_cast.sql
@@ -0,0 +1,85 @@
+SET allow_experimental_hybrid_table = 1,
+    prefer_localhost_replica = 0;
+
+DROP TABLE IF EXISTS test_tiered_watermark_after;
+DROP TABLE IF EXISTS test_tiered_watermark_before;
+DROP TABLE IF EXISTS test_tiered_watermark;
+
+CREATE TABLE test_tiered_watermark_after
+(
+    `id` UInt32,
+    `name` String,
+    `date` Date,
+    `value` UInt64,
+    `categories` Array(UInt32)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+CREATE TABLE test_tiered_watermark_before
+(
+    `id` Int32,
+    `name` Nullable(String),
+    `date` Date,
+    `value` Decimal128(0),
+    `categories` Array(Int64)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_tiered_watermark_after VALUES
+    (11, 'Alice', '2025-08-15', 100, [100, 10]),
+    (12, 'Bob', '2025-08-20', 200, [200, 20]),
+    (13, 'Charlie', '2025-08-25', 300, [300, 30]),
+    (14, 'David', '2025-09-05', 400, [400, 40]),
+    (15, 'Eve', '2025-09-10', 500, [500, 50]),
+    (16, 'Frank', '2025-09-15', 600, [600, 60]);
+
+INSERT INTO test_tiered_watermark_before VALUES
+    (21, 'Alice', '2025-08-15', 100, [100, 10]),
+    (22, 'Bob', '2025-08-20', 200, [200, 20]),
+    (23, 'Charlie', '2025-08-25', 300, [300, 30]),
+    (24, 'David', '2025-09-05', 400, [400, 40]),
+    (25, 'Eve', '2025-09-10', 500, [500, 50]),
+    (26, 'Frank', '2025-09-15', 600, [600, 60]);
+
+CREATE TABLE test_tiered_watermark
+ENGINE = Hybrid(
+    remote('127.0.0.1:9000', currentDatabase(), 'test_tiered_watermark_after'),
+    date >= '2025-09-01',
+    remote('127.0.0.1:9000', currentDatabase(), 'test_tiered_watermark_before'),
+    date < '2025-09-01'
+);
+
+-- the problem
+SELECT 'hybrid_table_auto_cast_columns = 0, enable_analyzer = 1 (headers mismatch)';
+SET hybrid_table_auto_cast_columns = 0, enable_analyzer = 1;
+SELECT max(value) FROM test_tiered_watermark; -- { serverError CANNOT_CONVERT_TYPE }
+SELECT sum(if(arrayExists(x -> (x IN (10)), categories), 1, 0)) AS x FROM test_tiered_watermark; -- { serverError THERE_IS_NO_COLUMN }
+
+SELECT 'hybrid_table_auto_cast_columns = 0, enable_analyzer = 0 (headers mismatch)';
+SET hybrid_table_auto_cast_columns = 0, enable_analyzer = 0;
+SELECT max(value) FROM test_tiered_watermark; -- { serverError CANNOT_CONVERT_TYPE }
+SELECT sum(if(arrayExists(x -> (x IN (10)), categories), 1, 0)) AS x FROM test_tiered_watermark; -- works w/o analyzer
+
+-- workaround - explicit cast
+SELECT 'hybrid_table_auto_cast_columns = 0, enable_analyzer = 1 manual cast';
+SET hybrid_table_auto_cast_columns = 0, enable_analyzer = 1;
+SELECT max(value::UInt32) FROM test_tiered_watermark;
+SELECT sum(if(arrayExists(x -> (x IN (10)), categories::Array(UInt32)), 1, 0)) AS x FROM test_tiered_watermark;
+
+SELECT 'hybrid_table_auto_cast_columns = 0, enable_analyzer = 0 manual cast';
+SET hybrid_table_auto_cast_columns = 0, enable_analyzer = 0;
+SELECT max(value::UInt32) FROM test_tiered_watermark;
+SELECT sum(if(arrayExists(x -> (x IN (10)), categories::Array(UInt32)), 1, 0)) AS x FROM test_tiered_watermark;
+
+-- feature to add casts automatically
+SELECT 'hybrid_table_auto_cast_columns = 1, enable_analyzer = 1';
+SET hybrid_table_auto_cast_columns = 1, enable_analyzer = 1;
+SELECT max(value) FROM test_tiered_watermark;
+SELECT sum(if(arrayExists(x -> (x IN (10)), categories), 1, 0)) AS x FROM test_tiered_watermark;
+
+SELECT 'hybrid_table_auto_cast_columns = 1, enable_analyzer = 0 (analizer required)';
+SET hybrid_table_auto_cast_columns = 1, enable_analyzer = 0;
+SELECT max(value) FROM test_tiered_watermark; -- { serverError CANNOT_CONVERT_TYPE }
+
diff --git a/tests/queries/0_stateless/03644_hybrid_unqualified_table.reference b/tests/queries/0_stateless/03644_hybrid_unqualified_table.reference
new file mode 100644
index 000000000000..98bae7afae05
--- /dev/null
+++ b/tests/queries/0_stateless/03644_hybrid_unqualified_table.reference
@@ -0,0 +1,3 @@
+Hybrid allows unqualified local tables by default
+3
+1
diff --git a/tests/queries/0_stateless/03644_hybrid_unqualified_table.sql b/tests/queries/0_stateless/03644_hybrid_unqualified_table.sql
new file mode 100644
index 000000000000..672beea1afc3
--- /dev/null
+++ b/tests/queries/0_stateless/03644_hybrid_unqualified_table.sql
@@ -0,0 +1,33 @@
+SET allow_experimental_hybrid_table = 1;
+
+SELECT 'Hybrid allows unqualified local tables by default';
+
+DROP TABLE IF EXISTS test_hybrid_unqualified_segment SYNC;
+DROP TABLE IF EXISTS test_hybrid_unqualified SYNC;
+
+CREATE TABLE test_hybrid_unqualified_segment
+(
+    `number` UInt64
+)
+ENGINE = MergeTree()
+ORDER BY tuple();
+
+INSERT INTO test_hybrid_unqualified_segment VALUES (10), (20);
+
+CREATE TABLE test_hybrid_unqualified
+(
+    `number` UInt64
+)
+ENGINE = Hybrid(
+    remote('localhost:9000', system.numbers), number = 0,
+    test_hybrid_unqualified_segment, number >= 10
+);
+
+SELECT count() FROM test_hybrid_unqualified;
+
+SELECT positionCaseInsensitive(engine_full, concat(currentDatabase(), '.test_hybrid_unqualified_segment')) > 0
+FROM system.tables
+WHERE database = currentDatabase() AND name = 'test_hybrid_unqualified';
+
+DROP TABLE IF EXISTS test_hybrid_unqualified SYNC;
+DROP TABLE IF EXISTS test_hybrid_unqualified_segment SYNC;
diff --git a/tests/queries/0_stateless/03644_object_storage_correlated_subqueries.reference b/tests/queries/0_stateless/03644_object_storage_correlated_subqueries.reference
new file mode 100644
index 000000000000..07193989308c
--- /dev/null
+++ b/tests/queries/0_stateless/03644_object_storage_correlated_subqueries.reference
@@ -0,0 +1,9 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/03644_object_storage_correlated_subqueries.sql b/tests/queries/0_stateless/03644_object_storage_correlated_subqueries.sql
new file mode 100644
index 000000000000..a178bf7cd63a
--- /dev/null
+++ b/tests/queries/0_stateless/03644_object_storage_correlated_subqueries.sql
@@ -0,0 +1,17 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s3
+
+-- Use correlated subqueries which are supported only by the new analyzer.
+set enable_analyzer = 1;
+
+INSERT INTO TABLE FUNCTION s3('http://localhost:11111/test/test-data-03644_object_storage.csv', 'test', 'testtest', 'CSV', 'number UInt64') SELECT number FROM numbers(10) SETTINGS s3_truncate_on_insert = 1;
+
+SELECT n1.c1
+FROM s3('http://localhost:11111/test/test-data-03644_object_storage.csv', 'test', 'testtest') AS n1
+WHERE n1.c1 > (
+    SELECT AVG(n2.c1)
+    FROM s3('http://localhost:11111/test/test-data-03644_object_storage.csv', 'test', 'testtest') AS n2
+    WHERE n2.c1 < n1.c1
+)
+ORDER BY n1.c1
+SETTINGS allow_experimental_correlated_subqueries = 1;
diff --git a/tests/queries/0_stateless/03645_hybrid_alias_columns.reference b/tests/queries/0_stateless/03645_hybrid_alias_columns.reference
new file mode 100644
index 000000000000..22bfe3702822
--- /dev/null
+++ b/tests/queries/0_stateless/03645_hybrid_alias_columns.reference
@@ -0,0 +1,11 @@
+test1
+1	['foo1','bar1_before']	foo1
+2	['foo2','bar2_after']	foo2
+Hybrid segment predicates with alias columns
+3	30	60	33
+Insert into Hybrid with EPHEMERAL column
+2	0A0B0C0D
+Select from Hybrid with EPHEMERAL column
+1	5A90B714
+2	0A0B0C0D
+10	01020304
diff --git a/tests/queries/0_stateless/03645_hybrid_alias_columns.sql b/tests/queries/0_stateless/03645_hybrid_alias_columns.sql
new file mode 100644
index 000000000000..5f1eec5866b0
--- /dev/null
+++ b/tests/queries/0_stateless/03645_hybrid_alias_columns.sql
@@ -0,0 +1,157 @@
+SET allow_experimental_hybrid_table = 1,
+    prefer_localhost_replica = 0;
+
+DROP TABLE IF EXISTS test_hybrid_alias_cast;
+DROP TABLE IF EXISTS test_hybrid_alias_after;
+DROP TABLE IF EXISTS test_hybrid_alias_before;
+
+CREATE TABLE test_hybrid_alias_after
+(
+    a UInt32,
+    arr Array(String),
+    arr_1 ALIAS arr[1]
+)
+ENGINE = MergeTree()
+ORDER BY (a, arr[1])
+SETTINGS index_granularity = 1;
+
+CREATE TABLE test_hybrid_alias_before
+(
+    a UInt32,
+    arr Array(String),
+    arr_1 MATERIALIZED arr[1]
+)
+ENGINE = MergeTree()
+ORDER BY (a, arr_1)
+SETTINGS index_granularity = 1;
+
+INSERT INTO test_hybrid_alias_after VALUES (1, ['foo1', 'bar1_after']), (2, ['foo2', 'bar2_after']);
+INSERT INTO test_hybrid_alias_before VALUES (1, ['foo1', 'bar1_before']), (2, ['foo2', 'bar2_before']);
+
+CREATE TABLE test_hybrid_alias_cast
+(
+    a UInt32,
+    arr Array(String),
+    arr_1 String
+)
+ENGINE = Hybrid(
+    remote('127.0.0.1:9000', currentDatabase(), 'test_hybrid_alias_after'),
+    a >= 2,
+    remote('127.0.0.1:9000', currentDatabase(), 'test_hybrid_alias_before'),
+    a < 2
+);
+
+SELECT 'test1';
+SELECT * FROM test_hybrid_alias_cast WHERE arr_1 like 'foo%' ORDER BY a;
+
+DROP TABLE test_hybrid_alias_cast;
+DROP TABLE test_hybrid_alias_after;
+DROP TABLE test_hybrid_alias_before;
+
+DROP TABLE IF EXISTS test_hybrid_alias_predicate;
+DROP TABLE IF EXISTS test_hybrid_alias_predicate_left;
+DROP TABLE IF EXISTS test_hybrid_alias_predicate_right;
+
+CREATE TABLE test_hybrid_alias_predicate_left
+(
+    id Int32,
+    value Int32,
+    date_col Date,
+    computed ALIAS value * 2,
+    sum_alias ALIAS id + value
+)
+ENGINE = MergeTree()
+ORDER BY (date_col, id)
+PARTITION BY toYYYYMM(date_col);
+
+CREATE TABLE test_hybrid_alias_predicate_right
+(
+    id Int32,
+    value Int32,
+    date_col Date,
+    computed ALIAS value * 2,
+    sum_alias ALIAS id + value
+)
+ENGINE = MergeTree()
+ORDER BY (date_col, id)
+PARTITION BY toYYYYMM(date_col);
+
+INSERT INTO test_hybrid_alias_predicate_left (id, value, date_col) VALUES
+    (1, 10, '2025-01-15'),
+    (2, 20, '2025-01-16'),
+    (3, 30, '2025-01-17');
+
+INSERT INTO test_hybrid_alias_predicate_right (id, value, date_col) VALUES
+    (4, 40, '2025-01-10'),
+    (5, 50, '2025-01-11'),
+    (6, 60, '2025-01-12');
+
+CREATE TABLE test_hybrid_alias_predicate
+(
+    id Int32,
+    value Int32,
+    date_col Date,
+    computed Int64,
+    sum_alias Int64
+)
+ENGINE = Hybrid(
+    remote('127.0.0.1:9000', currentDatabase(), 'test_hybrid_alias_predicate_left'),
+    computed >= 60,
+    remote('127.0.0.1:9000', currentDatabase(), 'test_hybrid_alias_predicate_right'),
+    computed < 60
+);
+
+SELECT 'Hybrid segment predicates with alias columns';
+SELECT id, value, computed, sum_alias FROM test_hybrid_alias_predicate;
+
+DROP TABLE test_hybrid_alias_predicate;
+DROP TABLE test_hybrid_alias_predicate_left;
+DROP TABLE test_hybrid_alias_predicate_right;
+
+DROP TABLE IF EXISTS test_hybrid_ephem;
+DROP TABLE IF EXISTS test_hybrid_ephem_after;
+DROP TABLE IF EXISTS test_hybrid_ephem_before;
+
+CREATE TABLE test_hybrid_ephem_after
+(
+    id UInt64,
+    unhexed String EPHEMERAL,
+    hexed FixedString(4) DEFAULT unhex(unhexed)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+CREATE TABLE test_hybrid_ephem_before
+(
+    id UInt64,
+    hexed FixedString(4)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_hybrid_ephem_after (id, unhexed) VALUES (1, '5a90b714');
+INSERT INTO test_hybrid_ephem_before (id, hexed) VALUES (10, unhex('01020304'));
+
+CREATE TABLE test_hybrid_ephem
+(
+    id UInt64,
+    unhexed String EPHEMERAL,
+    hexed FixedString(4) DEFAULT unhex(unhexed)
+)
+ENGINE = Hybrid(
+    remote('127.0.0.1:9000', currentDatabase(), 'test_hybrid_ephem_after'),
+    id < 10,
+    remote('127.0.0.1:9000', currentDatabase(), 'test_hybrid_ephem_before'),
+    id >= 10
+);
+
+SELECT 'Insert into Hybrid with EPHEMERAL column';
+INSERT INTO test_hybrid_ephem (id, unhexed) VALUES (2, '0a0b0c0d');
+SELECT id, hex(hexed) FROM test_hybrid_ephem_after WHERE id = 2;
+
+SELECT 'Select from Hybrid with EPHEMERAL column';
+SELECT id, hex(hexed) FROM test_hybrid_ephem ORDER BY id;
+
+DROP TABLE test_hybrid_ephem;
+DROP TABLE test_hybrid_ephem_after;
+DROP TABLE test_hybrid_ephem_before;
diff --git a/tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.reference b/tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.reference
new file mode 100644
index 000000000000..58bf6a7ec74b
--- /dev/null
+++ b/tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.reference
@@ -0,0 +1,15 @@
+---- stage: with_mergeable_state (analyzer=1, setting=enable_alias_marker=1) ----
+Header: sum(foo) AggregateFunction(sum, Int64)
+---- stage: with_mergeable_state (analyzer=0) ----
+Expected error: Function __aliasMarker is internal and supported only with the analyzer
+---- stage: complete (analyzer=1) ----
+Header: x Int64
+---- stage: fetch_columns (analyzer=1) ----
+Header: __table1.number UInt64
+---- stage: with_mergeable_state (analyzer=1) ----
+Header: sum(foo) AggregateFunction(sum, Int64)
+---- stage: with_mergeable_state_after_aggregation (analyzer=1) ----
+Header: sum(foo) Int64
+---- stage: with_mergeable_state_after_aggregation_and_limit (analyzer=1) ----
+Header: intDiv(__table1.number, 10_UInt8) UInt64
+        sum(foo) Int64
diff --git a/tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.sh b/tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.sh
new file mode 100755
index 000000000000..66974be38517
--- /dev/null
+++ b/tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "---- stage: with_mergeable_state (analyzer=1, setting=enable_alias_marker=1) ----"
+$CLICKHOUSE_CLIENT --enable_analyzer=1 --stage with_mergeable_state --multiquery 2>&1 <<'EOF' | sed -n '/^Header:/,/^  [^ ]/p' | sed '$d'
+SET enable_alias_marker=1;
+EXPLAIN header=1
+SELECT sum(__aliasMarker(number*2-3,'foo')) AS x
+FROM numbers(10);
+EOF
+
+echo "---- stage: with_mergeable_state (analyzer=0) ----"
+alias_marker_error_output=$($CLICKHOUSE_CLIENT --enable_analyzer=0 --stage with_mergeable_state --query \
+  "EXPLAIN header=1 SELECT sum(__aliasMarker(number*2-3,'foo')) AS x FROM numbers(10)" 2>&1)
+if grep -q "Function __aliasMarker is internal and supported only with the analyzer" <<<"${alias_marker_error_output}"
+then
+  echo "Expected error: Function __aliasMarker is internal and supported only with the analyzer"
+else
+  echo "${alias_marker_error_output}"
+fi
+
+echo "---- stage: complete (analyzer=1) ----"
+$CLICKHOUSE_CLIENT --enable_analyzer=1 --stage complete --query \
+  "EXPLAIN header=1 SELECT sum(__aliasMarker(number*2-3,'foo')) AS x FROM numbers(10)" \
+  2>&1 | sed -n '/^Header:/,/^  [^ ]/p' | sed '$d'
+
+echo "---- stage: fetch_columns (analyzer=1) ----"
+$CLICKHOUSE_CLIENT --enable_analyzer=1 --stage fetch_columns --query \
+  "EXPLAIN header=1 SELECT sum(__aliasMarker(number*2-3,'foo')) AS x FROM numbers(10)" \
+  2>&1 | sed -n '/^Header:/,/^  [^ ]/p' | sed '$d'
+
+echo "---- stage: with_mergeable_state (analyzer=1) ----"
+$CLICKHOUSE_CLIENT --enable_analyzer=1 --stage with_mergeable_state --query \
+  "EXPLAIN header=1 SELECT sum(__aliasMarker(number*2-3,'foo')) AS x FROM numbers(10)" \
+  2>&1 | sed -n '/^Header:/,/^  [^ ]/p' | sed '$d'
+
+echo "---- stage: with_mergeable_state_after_aggregation (analyzer=1) ----"
+$CLICKHOUSE_CLIENT --enable_analyzer=1 --stage with_mergeable_state_after_aggregation --query \
+  "EXPLAIN header=1 SELECT sum(__aliasMarker(number*2-3,'foo')) AS x FROM numbers(10)" \
+  2>&1 | sed -n '/^Header:/,/^  [^ ]/p' | sed '$d'
+
+echo "---- stage: with_mergeable_state_after_aggregation_and_limit (analyzer=1) ----"
+$CLICKHOUSE_CLIENT --enable_analyzer=1 --stage with_mergeable_state_after_aggregation_and_limit --query \
+  "EXPLAIN header=1 SELECT sum(__aliasMarker(number*2-3,'foo')) AS x FROM numbers(10) GROUP BY intDiv(number,10) AS y ORDER BY y LIMIT 10" \
+  2>&1 | sed -n '/^Header:/,/^  [^ ]/p' | sed '$d'
diff --git a/tests/queries/0_stateless/03652_coalescing_merge_tree_fix_empty_tuple.reference b/tests/queries/0_stateless/03652_coalescing_merge_tree_fix_empty_tuple.reference
new file mode 100644
index 000000000000..3764512c34d8
--- /dev/null
+++ b/tests/queries/0_stateless/03652_coalescing_merge_tree_fix_empty_tuple.reference
@@ -0,0 +1,6 @@
+(1,2)
+(3,4)
+[1,2]
+[3,4]
+()
+()
diff --git a/tests/queries/0_stateless/03652_coalescing_merge_tree_fix_empty_tuple.sql b/tests/queries/0_stateless/03652_coalescing_merge_tree_fix_empty_tuple.sql
new file mode 100644
index 000000000000..775ee528dfd2
--- /dev/null
+++ b/tests/queries/0_stateless/03652_coalescing_merge_tree_fix_empty_tuple.sql
@@ -0,0 +1,40 @@
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0 (c0 Tuple(a Int32, b Nullable(Int32)), c1 Int32) ENGINE = SummingMergeTree() ORDER BY c1;
+INSERT INTO t0 VALUES ((1,2), 0);
+INSERT INTO t0 VALUES ((3,4), 0);
+SELECT c0 FROM t0 FINAL;
+
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0 (c0 Tuple(a Int32, b Nullable(Int32)), c1 Int32) ENGINE = CoalescingMergeTree() ORDER BY c1;
+INSERT INTO t0 VALUES ((1,2), 0); -- return this one because tuple has not a nullable type so we can not aggregate by tuple columns
+INSERT INTO t0 VALUES ((3,4), 0);
+SELECT c0 FROM t0 FINAL;
+
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0 (c0 Array(Nullable(Int32)), c1 Int32) ENGINE = SummingMergeTree() ORDER BY c1;
+INSERT INTO t0 VALUES ([1,2], 0);
+INSERT INTO t0 VALUES ([3,4], 0);
+SELECT c0 FROM t0 FINAL;
+
+
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0 (c0 Array(Nullable(Int32)), c1 Int32) ENGINE = CoalescingMergeTree() ORDER BY c1;
+INSERT INTO t0 VALUES ([1,2], 0); -- return this one because array has not a nullable type so we can not aggregate by tuple columns
+INSERT INTO t0 VALUES ([3,4], 0);
+SELECT c0 FROM t0 FINAL;
+
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0 (c0 Tuple) ENGINE = CoalescingMergeTree() ORDER BY tuple();
+INSERT INTO t0 (c0) VALUES (());
+SELECT c0 FROM t0 FINAL;
+
+DROP TABLE IF EXISTS t0;
+
+CREATE TABLE t0 (c0 Tuple) ENGINE = SummingMergeTree() ORDER BY tuple();
+INSERT INTO t0 (c0) VALUES (());
+SELECT c0 FROM t0 FINAL;
diff --git a/tests/queries/0_stateless/03652_threads_count_insert.reference b/tests/queries/0_stateless/03652_threads_count_insert.reference
new file mode 100644
index 000000000000..2681d6258e98
--- /dev/null
+++ b/tests/queries/0_stateless/03652_threads_count_insert.reference
@@ -0,0 +1,8 @@
+max_threads: 1 max_insert_threads: 1
+1
+max_threads: 1 max_insert_threads: 5
+1
+max_threads: 10 max_insert_threads: 1
+10
+max_threads: 10 max_insert_threads: 5
+10
diff --git a/tests/queries/0_stateless/03652_threads_count_insert.sh b/tests/queries/0_stateless/03652_threads_count_insert.sh
new file mode 100755
index 000000000000..7a95b4ea833a
--- /dev/null
+++ b/tests/queries/0_stateless/03652_threads_count_insert.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# Tags: no-object-storage, no-parallel, no-fasttest
+
+# no-object-storage: s3 has 20 more threads
+# no-parallel: it checks the number of threads, which can be lowered in presence of other queries
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+cat <<EOF | $CLICKHOUSE_CLIENT -n $SETTINGS
+drop table if exists testX;
+drop table if exists testXA;
+drop table if exists testXB;
+drop table if exists testXC;
+
+create table testX (A Int64) engine=MergeTree order by tuple();
+
+create materialized view testXA engine=MergeTree order by tuple() as select sleep(0.1) from testX;
+create materialized view testXB engine=MergeTree order by tuple() as select sleep(0.2), throwIf(A=1) from testX;
+create materialized view testXC engine=MergeTree order by tuple() as select sleep(0.1) from testX;
+EOF
+
+for max_threads in 1 10; do
+    for max_insert_threads in 1 5; do
+        echo "max_threads: $max_threads max_insert_threads: $max_insert_threads"
+
+        QUERY_ID="03652_query_id_$RANDOM"
+        SETTINGS="--query_id=$QUERY_ID "
+        SETTINGS="$SETTINGS --max_threads=$max_threads "
+        SETTINGS="$SETTINGS --max_insert_threads=$max_insert_threads "
+
+        SETTINGS="$SETTINGS --max_block_size=10 "
+        SETTINGS="$SETTINGS --min_insert_block_size_rows=10 "
+        SETTINGS="$SETTINGS --materialized_views_ignore_errors=1 "
+        SETTINGS="$SETTINGS --parallel_view_processing=1 "
+        SETTINGS="$SETTINGS --log_queries=1 "
+        SETTINGS="$SETTINGS --send_logs_level=error "
+
+        $CLICKHOUSE_CLIENT -q 'select * from numbers(50) format TSV' | $CLICKHOUSE_CLIENT $SETTINGS -q 'insert into testX FORMAT TSV'
+
+        $CLICKHOUSE_CLIENT -q 'system flush logs system.query_log;'
+
+        cat <<EOF | $CLICKHOUSE_CLIENT
+select
+    if(peak_threads_usage >= 10, 10, peak_threads_usage),
+from system.query_log where
+    current_database = currentDatabase() and
+    type != 'QueryStart' and
+    query_id = '$QUERY_ID'
+order by ALL;
+EOF
+
+    done
+done
diff --git a/tests/queries/0_stateless/03652_union_columns_2.reference b/tests/queries/0_stateless/03652_union_columns_2.reference
new file mode 100644
index 000000000000..0bda99fa6081
--- /dev/null
+++ b/tests/queries/0_stateless/03652_union_columns_2.reference
@@ -0,0 +1,8 @@
+run enable-analyzer=1
+0	5
+1	1
+2	1
+run enable-analyzer=1 ignore
+0	5
+1	1
+2	1
diff --git a/tests/queries/0_stateless/03652_union_columns_2.sql b/tests/queries/0_stateless/03652_union_columns_2.sql
new file mode 100644
index 000000000000..3594aea23d21
--- /dev/null
+++ b/tests/queries/0_stateless/03652_union_columns_2.sql
@@ -0,0 +1,65 @@
+CREATE TABLE left (g UInt32, i UInt32)
+  ORDER BY (g, i);
+
+INSERT INTO left VALUES
+(0, 1), (0, 2), (0, 3), (0, 4), (0, 5), (2, 0);
+
+CREATE TABLE right (g UInt32, i UInt32)
+  ORDER BY (g, i);
+
+INSERT INTO right VALUES
+(0,0), (0, 3), (0, 4), (0, 6), (1, 0);
+
+SET enable_analyzer = 1;
+
+SELECT 'run enable-analyzer=1';
+with differences as
+    (
+        (
+            select g, i from left
+            where g BETWEEN 0 and 10
+            EXCEPT ALL
+            select g, i from right
+            where g BETWEEN 0 and 10
+        )
+        UNION ALL
+        (
+            select g, i from right
+            where g BETWEEN 0 and 10
+            EXCEPT ALL
+            select g, i from left
+            where g BETWEEN 0 and 10
+        )
+    ),
+diff_counts as
+    (
+        select g, count(*) from differences group by g
+    )
+select * from diff_counts
+ORDER BY g;
+
+SELECT 'run enable-analyzer=1 ignore';
+with differences as
+    (
+        (
+            select g, i from left
+            where g BETWEEN 0 and 10
+            EXCEPT ALL
+            select g, i from right
+            where g BETWEEN 0 and 10
+        )
+        UNION ALL
+        (
+            select g, i from right
+            where g BETWEEN 0 and 10
+            EXCEPT ALL
+            select g, i from left
+            where g BETWEEN 0 and 10
+        )
+    ),
+diff_counts as
+    (
+        select g, count(ignore(*)) from differences group by g
+    )
+select * from diff_counts
+ORDER BY g;
diff --git a/tests/queries/0_stateless/03657_merge_tree_disk_support_transaction.reference b/tests/queries/0_stateless/03657_merge_tree_disk_support_transaction.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03657_merge_tree_disk_support_transaction.sql b/tests/queries/0_stateless/03657_merge_tree_disk_support_transaction.sql
new file mode 100644
index 000000000000..65d2330b1bd3
--- /dev/null
+++ b/tests/queries/0_stateless/03657_merge_tree_disk_support_transaction.sql
@@ -0,0 +1,65 @@
+-- Tags: no-ordinary-database, no-fasttest, no-encrypted-storage, no-async-insert
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x;
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='local_disk';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='local_disk_2';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='local_disk_3';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='s3_disk';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='s3_plain_rewritable';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1); -- { serverError NOT_IMPLEMENTED }
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t  (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='s3_cache';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t  (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='local_plain_rewritable';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1); -- { serverError NOT_IMPLEMENTED }
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='s3_plain_rewritable_cache';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1); -- { serverError NOT_IMPLEMENTED }
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='s3_plain_rewritable_cache_multi';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1); -- { serverError NOT_IMPLEMENTED }
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='local_cache';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='local_cache_multi';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1);
+SET implicit_transaction=False;
+
+CREATE OR REPLACE TABLE t (x INT) ENGINE=MergeTree ORDER BY x SETTINGS disk='encrypted_s3_plain_rewritable_cache';
+SET implicit_transaction=True;
+INSERT INTO TABLE t VALUES (1); -- { serverError NOT_IMPLEMENTED }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03666_count_matches_complexity.reference b/tests/queries/0_stateless/03666_count_matches_complexity.reference
new file mode 100644
index 000000000000..32aa8df235fb
--- /dev/null
+++ b/tests/queries/0_stateless/03666_count_matches_complexity.reference
@@ -0,0 +1,2 @@
+0
+1000000
diff --git a/tests/queries/0_stateless/03666_count_matches_complexity.sql b/tests/queries/0_stateless/03666_count_matches_complexity.sql
new file mode 100644
index 000000000000..d866543b5d8e
--- /dev/null
+++ b/tests/queries/0_stateless/03666_count_matches_complexity.sql
@@ -0,0 +1,2 @@
+SELECT countMatches(repeat('\0\0\0\0\0\0\0\0\0\0', 1000000), 'a');
+SELECT countMatches(repeat('\0\0\0\0\0\0\0\0\0\0a', 1000000), 'a');
diff --git a/tests/queries/0_stateless/03667_drop_inner_table_size_limits.reference b/tests/queries/0_stateless/03667_drop_inner_table_size_limits.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03667_drop_inner_table_size_limits.sql b/tests/queries/0_stateless/03667_drop_inner_table_size_limits.sql
new file mode 100644
index 000000000000..0c9f08e697e0
--- /dev/null
+++ b/tests/queries/0_stateless/03667_drop_inner_table_size_limits.sql
@@ -0,0 +1,7 @@
+CREATE TABLE t (id UInt64) ENGINE = MergeTree ORDER BY id;
+CREATE MATERIALIZED VIEW mv (id UInt64) ENGINE = MergeTree ORDER BY id AS SELECT id FROM t;
+INSERT INTO t SELECT number FROM numbers(1000);
+SET max_table_size_to_drop = 1, max_partition_size_to_drop = 1;
+DROP TABLE mv;  -- { serverError TABLE_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT }
+SET max_table_size_to_drop = 0, max_partition_size_to_drop = 0;
+DROP TABLE mv;
diff --git a/tests/queries/0_stateless/03667_view_with_s3_cluster_and_sql_security_definer.reference b/tests/queries/0_stateless/03667_view_with_s3_cluster_and_sql_security_definer.reference
new file mode 100644
index 000000000000..e785149d264f
--- /dev/null
+++ b/tests/queries/0_stateless/03667_view_with_s3_cluster_and_sql_security_definer.reference
@@ -0,0 +1,4 @@
+4
+4
+4
+4
diff --git a/tests/queries/0_stateless/03667_view_with_s3_cluster_and_sql_security_definer.sh b/tests/queries/0_stateless/03667_view_with_s3_cluster_and_sql_security_definer.sh
new file mode 100755
index 000000000000..f1686991b961
--- /dev/null
+++ b/tests/queries/0_stateless/03667_view_with_s3_cluster_and_sql_security_definer.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Depends on AWS
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+other_user="user03667_${CLICKHOUSE_DATABASE}_$RANDOM"
+db=${CLICKHOUSE_DATABASE}
+
+${CLICKHOUSE_CLIENT} <<EOF
+DROP USER IF EXISTS other_user;
+CREATE USER $other_user;
+GRANT SELECT ON $db.* TO $other_user;
+EOF
+
+${CLICKHOUSE_CLIENT} <<EOF
+CREATE VIEW $db.test_view
+SQL SECURITY DEFINER
+AS SELECT * FROM s3Cluster('test_cluster_two_shards_localhost', 'http://localhost:11111/test/a.tsv');
+EOF
+
+${CLICKHOUSE_CLIENT} --query "SELECT count() FROM $db.test_view"
+${CLICKHOUSE_CLIENT} --user $other_user --query "SELECT count() FROM $db.test_view"
+
+${CLICKHOUSE_CLIENT} --query "SELECT count() FROM $db.test_view SETTINGS enable_analyzer=0"
+${CLICKHOUSE_CLIENT} --user $other_user --query "SELECT count() FROM $db.test_view SETTINGS enable_analyzer=0"
+
+${CLICKHOUSE_CLIENT} <<EOF
+DROP VIEW IF EXISTS $db.test_view;
+DROP USER IF EXISTS $other_user;
+EOF
diff --git a/tests/queries/0_stateless/03671_dict_in_subquery_in_index_analysis_context_expired.reference b/tests/queries/0_stateless/03671_dict_in_subquery_in_index_analysis_context_expired.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03671_dict_in_subquery_in_index_analysis_context_expired.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03671_dict_in_subquery_in_index_analysis_context_expired.sql b/tests/queries/0_stateless/03671_dict_in_subquery_in_index_analysis_context_expired.sql
new file mode 100644
index 000000000000..df9af7c20afa
--- /dev/null
+++ b/tests/queries/0_stateless/03671_dict_in_subquery_in_index_analysis_context_expired.sql
@@ -0,0 +1,28 @@
+-- Tags: no-parallel-replicas
+
+DROP DICTIONARY IF EXISTS dict;
+DROP TABLE IF EXISTS info;
+DROP TABLE IF EXISTS ids;
+
+CREATE TABLE info (iid UInt32) ENGINE = MergeTree() ORDER BY iid;
+INSERT INTO info (iid) VALUES (1);
+
+CREATE TABLE ids (id Int64) ENGINE = MergeTree() ORDER BY ();
+INSERT INTO ids (id) VALUES (1);
+
+CREATE DICTIONARY dict
+(
+    id Int64,
+    children Array(Int64),
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(QUERY 'SELECT 1 id, [1] children'))
+LAYOUT(DIRECT());
+
+SELECT iid IN (SELECT DISTINCT arrayJoin(dictGet(dict, 'children', id)) FROM ids)
+FROM
+(
+    SELECT *
+    FROM info
+    WHERE (iid IN (SELECT DISTINCT arrayJoin(dictGet(dict, 'children', id)) FROM ids))
+);
diff --git a/tests/queries/0_stateless/03671_pk_in_subquery_context_expired.reference b/tests/queries/0_stateless/03671_pk_in_subquery_context_expired.reference
new file mode 100644
index 000000000000..efb476f924b3
--- /dev/null
+++ b/tests/queries/0_stateless/03671_pk_in_subquery_context_expired.reference
@@ -0,0 +1,5 @@
+1
+1
+Testing w/o relying on enable_global_with_statement...
+1
+1
diff --git a/tests/queries/0_stateless/03671_pk_in_subquery_context_expired.sql b/tests/queries/0_stateless/03671_pk_in_subquery_context_expired.sql
new file mode 100644
index 000000000000..d71680ae9576
--- /dev/null
+++ b/tests/queries/0_stateless/03671_pk_in_subquery_context_expired.sql
@@ -0,0 +1,82 @@
+-- Issue: https://github.com/ClickHouse/ClickHouse/issues/89433
+
+DROP TABLE IF EXISTS tbl;
+DROP TABLE IF EXISTS join_engine;
+
+CREATE TABLE tbl
+(
+    `id1` LowCardinality(String),
+    `id2` LowCardinality(String),
+    `v` Int64
+)
+ENGINE = MergeTree
+ORDER BY (id1, id2, v);
+INSERT INTO tbl VALUES ('a', 'b', 1);
+CREATE TABLE join_engine
+(
+    `id1` LowCardinality(String),
+    `id2` LowCardinality(String),
+    `v` Int64
+)
+ENGINE = Join(ANY, LEFT, id1, id2);
+INSERT INTO join_engine VALUES ('a', 'b', 1);
+
+WITH cte AS
+    (
+        SELECT id2
+        FROM tbl
+        WHERE joinGet(currentDatabase() || '.join_engine', 'v', id1, id2) = tbl.v
+    )
+SELECT uniq(id2) AS count
+FROM
+(
+    -- NOTE: the bug is reproduced only because due to
+    -- enable_global_with_statement adds "cte" here, but likely it will be
+    -- fixed one day... so I've added another test below that does not rely
+    -- on this fact
+    SELECT *
+    FROM tbl AS e
+    WHERE joinGet(currentDatabase() || '.join_engine', 'v', id1, id2) = e.v
+)
+WHERE id2 IN (
+    SELECT id2
+    FROM cte
+)
+UNION ALL
+SELECT uniq(id2) AS count
+FROM cte;
+
+SELECT 'Testing w/o relying on enable_global_with_statement...';
+--
+-- The same as before, but without relying on enable_global_with_statement
+--
+SELECT uniq(id2) AS count
+FROM
+(
+    WITH cte AS
+        (
+            SELECT id2
+            FROM tbl
+            WHERE joinGet(currentDatabase() || '.join_engine', 'v', id1, id2) = tbl.v
+        )
+    SELECT *
+    FROM tbl AS e
+    WHERE joinGet(currentDatabase() || '.join_engine', 'v', id1, id2) = e.v
+)
+WHERE id2 IN (
+    SELECT id2
+    FROM
+    (
+        SELECT id2
+        FROM tbl
+        WHERE joinGet(currentDatabase() || '.join_engine', 'v', id1, id2) = tbl.v
+    )
+)
+UNION ALL
+SELECT uniq(id2) AS count
+FROM
+(
+    SELECT id2
+    FROM tbl
+    WHERE joinGet(currentDatabase() || '.join_engine', 'v', id1, id2) = tbl.v
+);
diff --git a/tests/queries/0_stateless/03672_nested_array_nested_tuple.reference b/tests/queries/0_stateless/03672_nested_array_nested_tuple.reference
new file mode 100644
index 000000000000..0e143f4925ce
--- /dev/null
+++ b/tests/queries/0_stateless/03672_nested_array_nested_tuple.reference
@@ -0,0 +1,2 @@
+[1,2,3]	[(0),(0),(0)]
+[1,2,3]	[((0)),((0)),((0))]
diff --git a/tests/queries/0_stateless/03672_nested_array_nested_tuple.sql b/tests/queries/0_stateless/03672_nested_array_nested_tuple.sql
new file mode 100644
index 000000000000..19060b088dff
--- /dev/null
+++ b/tests/queries/0_stateless/03672_nested_array_nested_tuple.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS nest;
+CREATE TABLE nest (nested_field Nested(e1 Int32)) ENGINE = MergeTree() ORDER BY nested_field.e1;
+INSERT INTO nest (nested_field.e1) VALUES ([1, 2, 3]);
+ALTER TABLE nest ADD COLUMN nested_field.e2 Array(Tuple(some_value Int32));
+OPTIMIZE TABLE nest FINAL;
+SELECT * FROM nest;
+
+DROP TABLE IF EXISTS nest_2;
+CREATE TABLE nest_2 (nested_field Nested(e1 Int32)) ENGINE = MergeTree() ORDER BY nested_field.e1;
+INSERT INTO nest_2 (nested_field.e1) VALUES ([1, 2, 3]);
+ALTER TABLE nest_2 ADD COLUMN nested_field.e2 Array(Tuple(some_value Tuple(another_value Int32)));
+OPTIMIZE TABLE nest_2 FINAL;
+SELECT * FROM nest_2;
diff --git a/tests/queries/0_stateless/03680_loop_table_function_access_check.reference b/tests/queries/0_stateless/03680_loop_table_function_access_check.reference
new file mode 100644
index 000000000000..257cc5642cb1
--- /dev/null
+++ b/tests/queries/0_stateless/03680_loop_table_function_access_check.reference
@@ -0,0 +1 @@
+foo
diff --git a/tests/queries/0_stateless/03680_loop_table_function_access_check.sh b/tests/queries/0_stateless/03680_loop_table_function_access_check.sh
new file mode 100755
index 000000000000..cb2f3a08ceaf
--- /dev/null
+++ b/tests/queries/0_stateless/03680_loop_table_function_access_check.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: long, no-replicated-database, no-async-insert
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+user="user03631_${CLICKHOUSE_DATABASE}_$RANDOM"
+db=${CLICKHOUSE_DATABASE}
+
+${CLICKHOUSE_CLIENT} <<EOF
+CREATE TABLE $db.test_table (s String) ENGINE = MergeTree ORDER BY s;
+INSERT INTO $db.test_table VALUES ('foo');
+
+DROP USER IF EXISTS $user;
+CREATE USER $user;
+GRANT CREATE TEMPORARY TABLE ON *.* TO $user;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM loop('$db', 'test_table') LIMIT 1; -- { serverError ACCESS_DENIED }";
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_table TO $user";
+${CLICKHOUSE_CLIENT} --user $user --query "SELECT * FROM loop('$db', 'test_table') LIMIT 1";
+
+${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS $user";
diff --git a/tests/queries/0_stateless/03680_mergetree_shrink_const_from_prewhere.reference b/tests/queries/0_stateless/03680_mergetree_shrink_const_from_prewhere.reference
new file mode 100644
index 000000000000..01e79c32a8c9
--- /dev/null
+++ b/tests/queries/0_stateless/03680_mergetree_shrink_const_from_prewhere.reference
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/tests/queries/0_stateless/03680_mergetree_shrink_const_from_prewhere.sql b/tests/queries/0_stateless/03680_mergetree_shrink_const_from_prewhere.sql
new file mode 100644
index 000000000000..eaf1ee51216a
--- /dev/null
+++ b/tests/queries/0_stateless/03680_mergetree_shrink_const_from_prewhere.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS const_node;
+CREATE TABLE const_node (`v` Nullable(UInt8)) ENGINE = MergeTree ORDER BY tuple();
+SYSTEM STOP MERGES const_node;
+INSERT INTO const_node VALUES (1);
+INSERT INTO const_node VALUES (2);
+INSERT INTO const_node VALUES (3);
+-- Here we have condition with a constant "materialize(255)", for which convertToFullColumnIfConst() will return underlying column w/o copying,
+-- and later shrinkToFit() will be called from multiple threads on this column, and leads to UB
+SELECT v FROM const_node PREWHERE and(materialize(255), *) ORDER BY v;
diff --git a/tests/queries/0_stateless/03681_lazy_materialization_with_read_in_order.reference b/tests/queries/0_stateless/03681_lazy_materialization_with_read_in_order.reference
new file mode 100644
index 000000000000..2e4a49172763
--- /dev/null
+++ b/tests/queries/0_stateless/03681_lazy_materialization_with_read_in_order.reference
@@ -0,0 +1,86 @@
+=== Test 1: ORDER BY a (sorting key) ===
+LazilyRead (Lazily Read)
+Lazily read columns: e, d, b, c
+Prefix sort description: __table1.a ASC
+Result sort description: __table1.a ASC
+ReadType: InOrder
+0	0
+1	2
+2	4
+3	6
+4	8
+=== Test 2: ORDER BY a with WHERE ===
+LazilyRead (Lazily Read)
+Lazily read columns: d, b, c
+Prefix sort description: __table1.a ASC
+Result sort description: __table1.a ASC
+ReadType: InOrder
+51	102
+52	104
+53	106
+54	108
+55	110
+=== Test 3: ORDER BY a with PREWHERE ===
+LazilyRead (Lazily Read)
+Lazily read columns: d, b, c
+Prefix sort description: __table1.a ASC
+Result sort description: __table1.a ASC
+ReadType: InOrder
+51	102
+52	104
+53	106
+54	108
+55	110
+=== Test 4: ORDER BY a, e (e should not be lazy) ===
+LazilyRead (Lazily Read)
+Lazily read columns: d, b, c
+Prefix sort description: __table1.a ASC
+Result sort description: __table1.a ASC, __table1.e ASC
+ReadType: InOrder
+0	0
+1	2
+2	4
+3	6
+4	8
+=== Test 5: ORDER BY a, a+1 ===
+LazilyRead (Lazily Read)
+Lazily read columns: e, d, b, c
+Prefix sort description: __table1.a ASC
+Result sort description: __table1.a ASC, plus(__table1.a, 1_UInt8) ASC
+ReadType: InOrder
+0	0
+1	2
+2	4
+3	6
+4	8
+=== Test 6: Verify ORDER BY ASC correctness ===
+1	one	10
+2	two	20
+3	three	30
+4	four	40
+5	five	50
+=== Test 7: Verify ORDER BY DESC correctness ===
+10	ten	100
+9	nine	90
+8	eight	80
+7	seven	70
+6	six	60
+=== Test 8: Verify filtering with ORDER BY ===
+5	five	50
+6	six	60
+7	seven	70
+8	eight	80
+9	nine	90
+10	ten	100
+=== Test 9: Compare with optimization disabled ===
+1	one	10
+2	two	20
+3	three	30
+4	four	40
+5	five	50
+=== Test 10: Verify EXPLAIN shows both optimizations ===
+LazilyRead (Lazily Read)
+Lazily read columns: data, score, value
+Prefix sort description: __table1.id ASC
+Result sort description: __table1.id ASC
+ReadType: InOrder
diff --git a/tests/queries/0_stateless/03681_lazy_materialization_with_read_in_order.sql b/tests/queries/0_stateless/03681_lazy_materialization_with_read_in_order.sql
new file mode 100644
index 000000000000..608d50257fd2
--- /dev/null
+++ b/tests/queries/0_stateless/03681_lazy_materialization_with_read_in_order.sql
@@ -0,0 +1,226 @@
+-- Test that lazy materialization works together with read-in-order optimization
+-- Tags: no-random-settings
+
+SET query_plan_optimize_lazy_materialization = 1;
+SET query_plan_max_limit_for_lazy_materialization = 10;
+SET optimize_read_in_order = 1;
+SET enable_analyzer = 1;
+SET parallel_replicas_local_plan = 1;
+
+DROP TABLE IF EXISTS test_lazy_read_in_order;
+
+-- Create a table with sorting key on column 'a'
+CREATE TABLE test_lazy_read_in_order
+(
+    a UInt64,
+    b String,
+    c String,
+    d String,
+    e UInt64
+) ENGINE = MergeTree()
+      ORDER BY a;
+
+-- Insert test data
+INSERT INTO test_lazy_read_in_order
+SELECT number,
+       repeat('b', 100),
+       repeat('c', 100),
+       repeat('d', 100),
+       number * 2
+FROM numbers(1000);
+
+-- Test 1: ORDER BY on sorting key column 'a' with LIMIT
+-- Should use both read-in-order AND lazy materialization
+-- Columns b, c, d should be lazily materialized since they're not used in ORDER BY or WHERE
+SELECT '=== Test 1: ORDER BY a (sorting key) ===';
+SELECT trimLeft(explain)
+FROM (
+    EXPLAIN PLAN actions=1
+    SELECT a, b, c, d, e
+    FROM test_lazy_read_in_order
+    ORDER BY a
+    LIMIT 5
+    SETTINGS max_threads=1
+)
+WHERE explain LIKE '%LazilyRead%'
+   OR explain LIKE '%Lazily read columns:%'
+   OR explain LIKE '%ReadType:%'
+   OR explain LIKE '%Prefix sort description:%'
+   OR explain LIKE '%Result sort description:%';
+
+SELECT a, e
+FROM test_lazy_read_in_order
+ORDER BY a
+LIMIT 5;
+
+-- Test 2: ORDER BY on sorting key with WHERE clause
+-- Columns not used in WHERE or ORDER BY should be lazily materialized
+SELECT '=== Test 2: ORDER BY a with WHERE ===';
+SELECT trimLeft(explain)
+FROM (
+    EXPLAIN PLAN actions=1
+    SELECT a, b, c, d, e
+    FROM test_lazy_read_in_order
+    WHERE e > 100
+    ORDER BY a
+    LIMIT 5
+    SETTINGS max_threads=1
+)
+WHERE explain LIKE '%LazilyRead%'
+   OR explain LIKE '%Lazily read columns:%'
+   OR explain LIKE '%ReadType:%'
+   OR explain LIKE '%Prefix sort description:%'
+   OR explain LIKE '%Result sort description:%';
+
+SELECT a, e
+FROM test_lazy_read_in_order
+WHERE e > 100
+ORDER BY a
+LIMIT 5;
+
+-- Test 3: ORDER BY on sorting key with PREWHERE
+-- Similar to Test 2 but with PREWHERE
+SELECT '=== Test 3: ORDER BY a with PREWHERE ===';
+SELECT trimLeft(explain)
+FROM (
+    EXPLAIN PLAN actions=1
+    SELECT a, b, c, d, e
+    FROM test_lazy_read_in_order
+    PREWHERE e > 100
+    ORDER BY a
+    LIMIT 5
+    SETTINGS max_threads=1
+)
+WHERE explain LIKE '%LazilyRead%'
+   OR explain LIKE '%Lazily read columns:%'
+   OR explain LIKE '%ReadType:%'
+   OR explain LIKE '%Prefix sort description:%'
+   OR explain LIKE '%Result sort description:%';
+
+SELECT a, e
+FROM test_lazy_read_in_order PREWHERE e > 100
+ORDER BY a
+LIMIT 5;
+
+-- Test 4: Verify that columns used in ORDER BY are NOT lazily materialized
+-- Column 'e' is used in ORDER BY, so it should not be in LazilyRead
+SELECT '=== Test 4: ORDER BY a, e (e should not be lazy) ===';
+SELECT trimLeft(explain)
+FROM (
+    EXPLAIN PLAN actions=1
+    SELECT a, b, c, d, e
+    FROM test_lazy_read_in_order
+    ORDER BY a, e
+    LIMIT 5
+    SETTINGS max_threads=1
+)
+WHERE explain LIKE '%LazilyRead%'
+   OR explain LIKE '%Lazily read columns:%'
+   OR explain LIKE '%ReadType:%'
+   OR explain LIKE '%Prefix sort description:%'
+   OR explain LIKE '%Result sort description:%';
+
+SELECT a, e
+FROM test_lazy_read_in_order
+ORDER BY a, e
+LIMIT 5;
+
+-- Test 5: ORDER BY with expression on sorting key
+-- Should still use read-in-order for the prefix
+SELECT '=== Test 5: ORDER BY a, a+1 ===';
+SELECT trimLeft(explain)
+FROM (
+    EXPLAIN PLAN actions=1
+    SELECT a, b, c, d, e
+    FROM test_lazy_read_in_order
+    ORDER BY a, a + 1
+    LIMIT 5
+    SETTINGS max_threads=1
+)
+WHERE explain LIKE '%LazilyRead%'
+   OR explain LIKE '%Lazily read columns:%'
+   OR explain LIKE '%ReadType:%'
+   OR explain LIKE '%Prefix sort description:%'
+   OR explain LIKE '%Result sort description:%';
+
+SELECT a, e
+FROM test_lazy_read_in_order
+ORDER BY a, a + 1
+LIMIT 5;
+
+DROP TABLE IF EXISTS test_lazy_read_in_order;
+
+
+-- Additional correctness tests for lazy materialization with read-in-order
+DROP TABLE IF EXISTS test_correctness;
+
+CREATE TABLE test_correctness
+(
+    id    UInt64,
+    value String,
+    score UInt64,
+    data  String
+) ENGINE = MergeTree()
+      ORDER BY id;
+
+-- Insert data in non-sequential order to test sorting
+INSERT INTO test_correctness
+VALUES (5, 'five', 50, 'data5'),
+       (2, 'two', 20, 'data2'),
+       (8, 'eight', 80, 'data8'),
+       (1, 'one', 10, 'data1'),
+       (9, 'nine', 90, 'data9'),
+       (3, 'three', 30, 'data3'),
+       (7, 'seven', 70, 'data7'),
+       (4, 'four', 40, 'data4'),
+       (6, 'six', 60, 'data6'),
+       (10, 'ten', 100, 'data10');
+
+SELECT '=== Test 6: Verify ORDER BY ASC correctness ===';
+-- With both optimizations enabled
+SELECT id, value, score
+FROM test_correctness
+ORDER BY id ASC
+LIMIT 5;
+
+SELECT '=== Test 7: Verify ORDER BY DESC correctness ===';
+-- DESC should also work
+SELECT id, value, score
+FROM test_correctness
+ORDER BY id DESC
+LIMIT 5;
+
+SELECT '=== Test 8: Verify filtering with ORDER BY ===';
+-- Filter and order
+SELECT id, value, score
+FROM test_correctness
+WHERE score >= 50
+ORDER BY id ASC;
+
+SELECT '=== Test 9: Compare with optimization disabled ===';
+-- Same query with optimizations disabled should give same results
+SELECT id, value, score
+FROM test_correctness
+ORDER BY id ASC
+LIMIT 5
+SETTINGS
+optimize_read_in_order = 0,
+query_plan_optimize_lazy_materialization = 0;
+
+SELECT '=== Test 10: Verify EXPLAIN shows both optimizations ===';
+SELECT trimLeft(explain)
+FROM (
+    EXPLAIN PLAN actions=1
+    SELECT id, value, score, data
+    FROM test_correctness
+    ORDER BY id ASC
+    LIMIT 5
+    SETTINGS max_threads=1
+)
+WHERE explain LIKE '%LazilyRead%'
+   OR explain LIKE '%Lazily read columns:%'
+   OR explain LIKE '%ReadType:%'
+   OR explain LIKE '%Prefix sort description:%'
+   OR explain LIKE '%Result sort description:%';
+
+DROP TABLE IF EXISTS test_correctness;
diff --git a/tests/queries/0_stateless/03699_reverse_utf8.reference b/tests/queries/0_stateless/03699_reverse_utf8.reference
new file mode 100644
index 000000000000..3f8ce110699f
--- /dev/null
+++ b/tests/queries/0_stateless/03699_reverse_utf8.reference
@@ -0,0 +1,4 @@
+тівирп
+🌈🇧🇬
+🌈
+ेत्समन
diff --git a/tests/queries/0_stateless/03699_reverse_utf8.sql b/tests/queries/0_stateless/03699_reverse_utf8.sql
new file mode 100644
index 000000000000..9c31b82ef8ac
--- /dev/null
+++ b/tests/queries/0_stateless/03699_reverse_utf8.sql
@@ -0,0 +1,6 @@
+-- The function reverses the sequence of UTF-8 code points (that is different from bytes or full characters):
+
+SELECT reverseUTF8('привіт');
+SELECT reverseUTF8('🇬🇧🌈');
+SELECT reverseUTF8('🌈');
+SELECT reverseUTF8('नमस्ते');
diff --git a/tests/queries/0_stateless/03701_check_ephemeral_set_definer_access.reference b/tests/queries/0_stateless/03701_check_ephemeral_set_definer_access.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03701_check_ephemeral_set_definer_access.sh b/tests/queries/0_stateless/03701_check_ephemeral_set_definer_access.sh
new file mode 100755
index 000000000000..bdf105aba6fe
--- /dev/null
+++ b/tests/queries/0_stateless/03701_check_ephemeral_set_definer_access.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Tags: no-replicated-database, no-async-insert, no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+user="user03701_${CLICKHOUSE_DATABASE}_$RANDOM"
+db=${CLICKHOUSE_DATABASE}
+
+${CLICKHOUSE_CLIENT} <<EOF
+-- Cleanup
+DROP USER IF EXISTS $user;
+CREATE USER $user IN memory;
+GRANT ALL ON *.* TO $user;
+REVOKE SET DEFINER ON * FROM $user;
+
+CREATE TABLE $db.source (x Int64) ENGINE = MergeTree() ORDER BY x;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user <<EOF
+CREATE MATERIALIZED VIEW $db.test_view
+(
+    x Int64
+)
+ENGINE = MergeTree() ORDER BY x
+DEFINER = CURRENT_USER SQL SECURITY DEFINER
+AS SELECT x FROM $db.source;
+EOF
+
+${CLICKHOUSE_CLIENT} <<EOF
+DROP USER IF EXISTS $user;
+EOF
diff --git a/tests/queries/0_stateless/03701_column_ttl_fully_expired.reference b/tests/queries/0_stateless/03701_column_ttl_fully_expired.reference
new file mode 100644
index 000000000000..de7596dc6e98
--- /dev/null
+++ b/tests/queries/0_stateless/03701_column_ttl_fully_expired.reference
@@ -0,0 +1,34 @@
+-- { echo ON }
+
+drop table if exists x;
+create table x (dt DateTime, i Int32 default 42 ttl dt + toIntervalDay(1), index idx(i) type set(100)) engine MergeTree partition by indexHint(dt) order by dt settings index_granularity = 8192, min_bytes_for_wide_part = 0;
+system stop merges x;
+insert into x values (now() - toIntervalDay(30), 1);
+select i from x where i = 1;
+1
+system start merges x;
+optimize table x final;
+-- Run OPTIMIZE twice to ensure the second merge is triggered, as the issue occurs during the second merge phase.
+optimize table x final;
+select i from x where i = 42;
+42
+drop table x;
+create table x (dt DateTime, i Int32 default 42 ttl dt + toIntervalDay(1)) engine ReplacingMergeTree(i) order by dt settings index_granularity = 8192, min_bytes_for_wide_part = 0;
+system stop merges x;
+insert into x values (now() - toIntervalDay(30), 1);
+select i from x where i = 1;
+1
+system start merges x;
+optimize table x final;
+-- Run OPTIMIZE twice to ensure the second merge is triggered, as the "Not found column i in block" issue occurs during the second merge phase.
+optimize table x final;
+drop table x;
+create table x (dt DateTime, i Int32 default 42 ttl dt + toIntervalDay(1)) engine MergeTree order by dt settings index_granularity = 8192, min_bytes_for_wide_part = 0;
+system stop merges x;
+insert into x values (now() - toIntervalDay(30), 1), (now() - toIntervalDay(30), 2);
+system start merges x;
+optimize table x final; -- Ensure that column TTL is applied
+optimize table x final deduplicate by dt, i;
+select i from x;
+42
+drop table x;
diff --git a/tests/queries/0_stateless/03701_column_ttl_fully_expired.sql b/tests/queries/0_stateless/03701_column_ttl_fully_expired.sql
new file mode 100644
index 000000000000..979533ec2d8a
--- /dev/null
+++ b/tests/queries/0_stateless/03701_column_ttl_fully_expired.sql
@@ -0,0 +1,55 @@
+-- { echo ON }
+
+drop table if exists x;
+
+create table x (dt DateTime, i Int32 default 42 ttl dt + toIntervalDay(1), index idx(i) type set(100)) engine MergeTree partition by indexHint(dt) order by dt settings index_granularity = 8192, min_bytes_for_wide_part = 0;
+
+system stop merges x;
+
+insert into x values (now() - toIntervalDay(30), 1);
+
+select i from x where i = 1;
+
+system start merges x;
+
+optimize table x final;
+
+-- Run OPTIMIZE twice to ensure the second merge is triggered, as the issue occurs during the second merge phase.
+optimize table x final;
+
+select i from x where i = 42;
+
+drop table x;
+
+create table x (dt DateTime, i Int32 default 42 ttl dt + toIntervalDay(1)) engine ReplacingMergeTree(i) order by dt settings index_granularity = 8192, min_bytes_for_wide_part = 0;
+
+system stop merges x;
+
+insert into x values (now() - toIntervalDay(30), 1);
+
+select i from x where i = 1;
+
+system start merges x;
+
+optimize table x final;
+
+-- Run OPTIMIZE twice to ensure the second merge is triggered, as the "Not found column i in block" issue occurs during the second merge phase.
+optimize table x final;
+
+drop table x;
+
+create table x (dt DateTime, i Int32 default 42 ttl dt + toIntervalDay(1)) engine MergeTree order by dt settings index_granularity = 8192, min_bytes_for_wide_part = 0;
+
+system stop merges x;
+
+insert into x values (now() - toIntervalDay(30), 1), (now() - toIntervalDay(30), 2);
+
+system start merges x;
+
+optimize table x final; -- Ensure that column TTL is applied
+
+optimize table x final deduplicate by dt, i;
+
+select i from x;
+
+drop table x;
diff --git a/tests/queries/0_stateless/03702_encode_decode_memory_usage.reference b/tests/queries/0_stateless/03702_encode_decode_memory_usage.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03702_encode_decode_memory_usage.sql b/tests/queries/0_stateless/03702_encode_decode_memory_usage.sql
new file mode 100644
index 000000000000..1c7eaa5d6aee
--- /dev/null
+++ b/tests/queries/0_stateless/03702_encode_decode_memory_usage.sql
@@ -0,0 +1,5 @@
+-- Tags: no-fasttest
+
+SELECT base32Decode(s) FROM (SELECT base32Encode(randomString(100)) AS s FROM numbers(100000)) FORMAT Null;
+SELECT base58Decode(s) FROM (SELECT base58Encode(randomString(100)) AS s FROM numbers(100000)) FORMAT Null;
+SELECT base64Decode(s) FROM (SELECT base64Encode(randomString(100)) AS s FROM numbers(100000)) FORMAT Null;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03702_not_existing_role_on_cluster.reference b/tests/queries/0_stateless/03702_not_existing_role_on_cluster.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03702_not_existing_role_on_cluster.sh b/tests/queries/0_stateless/03702_not_existing_role_on_cluster.sh
new file mode 100755
index 000000000000..d0ed2c9c4f9a
--- /dev/null
+++ b/tests/queries/0_stateless/03702_not_existing_role_on_cluster.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+user="user03702_${CLICKHOUSE_DATABASE}_$RANDOM"
+role="role03702_${CLICKHOUSE_DATABASE}_$RANDOM"
+db=${CLICKHOUSE_DATABASE}
+
+${CLICKHOUSE_CLIENT} <<EOF
+DROP DATABASE IF EXISTS shard_0;
+DROP DATABASE IF EXISTS shard_1;
+
+CREATE DATABASE IF NOT EXISTS shard_0;
+CREATE DATABASE IF NOT EXISTS shard_1;
+
+SET distributed_ddl_output_mode = 'none';
+DROP USER IF EXISTS $user ON CLUSTER test_cluster_two_shards_different_databases;
+CREATE USER $user ON CLUSTER test_cluster_two_shards_different_databases;
+
+DROP ROLE IF EXISTS $role ON CLUSTER test_cluster_two_shards_different_databases;
+CREATE ROLE $role ON CLUSTER test_cluster_two_shards_different_databases;
+
+GRANT REMOTE ON *.* TO $user ON CLUSTER test_cluster_two_shards_different_databases;
+GRANT SELECT ON *.* TO $role ON CLUSTER test_cluster_two_shards_different_databases;
+
+GRANT $role TO $user ON CLUSTER test_cluster_two_shards_different_databases;
+DROP ROLE $role ON CLUSTER test_cluster_two_shards_different_databases;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user <<EOF
+SELECT
+    hostName() AS h,
+    count()
+FROM clusterAllReplicas('test_cluster_two_shards_different_databases', system.one)
+GROUP BY h
+FORMAT Null;
+EOF
+
+${CLICKHOUSE_CLIENT} <<EOF
+SET distributed_ddl_output_mode = 'none';
+DROP USER IF EXISTS $user ON CLUSTER test_cluster_two_shards_different_databases;
+EOF
diff --git a/tests/queries/0_stateless/03707_empty_parts_with_non_empty_projections_merge.reference b/tests/queries/0_stateless/03707_empty_parts_with_non_empty_projections_merge.reference
new file mode 100644
index 000000000000..45bdb15c4b0e
--- /dev/null
+++ b/tests/queries/0_stateless/03707_empty_parts_with_non_empty_projections_merge.reference
@@ -0,0 +1,9 @@
+-- { echoOn }
+
+drop table if exists mt1;
+create table mt1 (time DateTime, projection proj (select min(time))) engine MergeTree order by () TTL time + interval 1 second settings remove_empty_parts=0, merge_with_ttl_timeout=0, deduplicate_merge_projection_mode='ignore';
+system stop merges mt1;
+insert into mt1 select number from numbers(4) settings max_block_size=1, min_insert_block_size_bytes=1;
+system start merges mt1;
+optimize table mt1 final;
+optimize table mt1 final;
diff --git a/tests/queries/0_stateless/03707_empty_parts_with_non_empty_projections_merge.sql b/tests/queries/0_stateless/03707_empty_parts_with_non_empty_projections_merge.sql
new file mode 100644
index 000000000000..75aaaa1ad963
--- /dev/null
+++ b/tests/queries/0_stateless/03707_empty_parts_with_non_empty_projections_merge.sql
@@ -0,0 +1,15 @@
+-- { echoOn }
+
+drop table if exists mt1;
+
+create table mt1 (time DateTime, projection proj (select min(time))) engine MergeTree order by () TTL time + interval 1 second settings remove_empty_parts=0, merge_with_ttl_timeout=0, deduplicate_merge_projection_mode='ignore';
+
+system stop merges mt1;
+
+insert into mt1 select number from numbers(4) settings max_block_size=1, min_insert_block_size_bytes=1;
+
+system start merges mt1;
+
+optimize table mt1 final;
+
+optimize table mt1 final;
diff --git a/tests/queries/0_stateless/03708_join_or_to_right_any_bug.reference b/tests/queries/0_stateless/03708_join_or_to_right_any_bug.reference
new file mode 100644
index 000000000000..d955b730a536
--- /dev/null
+++ b/tests/queries/0_stateless/03708_join_or_to_right_any_bug.reference
@@ -0,0 +1,2 @@
+0	1	0
+0	1	1
diff --git a/tests/queries/0_stateless/03708_join_or_to_right_any_bug.sql b/tests/queries/0_stateless/03708_join_or_to_right_any_bug.sql
new file mode 100644
index 000000000000..6c0a07ea51cc
--- /dev/null
+++ b/tests/queries/0_stateless/03708_join_or_to_right_any_bug.sql
@@ -0,0 +1,4 @@
+SELECT *
+FROM ( SELECT number AS a, number + 1 AS b FROM numbers(1) ) AS l
+INNER JOIN ( SELECT number AS a FROM numbers(2) ) AS r ON (l.a = r.a) OR (l.b = r.a)
+ORDER BY ALL;
diff --git a/tests/queries/0_stateless/03708_low_cardinality_aggregate_state_compatibility.reference b/tests/queries/0_stateless/03708_low_cardinality_aggregate_state_compatibility.reference
new file mode 100644
index 000000000000..3308c390fac5
--- /dev/null
+++ b/tests/queries/0_stateless/03708_low_cardinality_aggregate_state_compatibility.reference
@@ -0,0 +1,4 @@
+010D00040000000000000073747200
+010A00010000000000000000
+('str')
+('')
diff --git a/tests/queries/0_stateless/03708_low_cardinality_aggregate_state_compatibility.sql b/tests/queries/0_stateless/03708_low_cardinality_aggregate_state_compatibility.sql
new file mode 100644
index 000000000000..329482e7341c
--- /dev/null
+++ b/tests/queries/0_stateless/03708_low_cardinality_aggregate_state_compatibility.sql
@@ -0,0 +1,5 @@
+select hex(maxDistinctState(tuple('str'::Variant(LowCardinality(String)))));
+select hex(maxDistinctState(tuple(''::Variant(LowCardinality(String)))));
+select maxDistinctMerge(state) from (select maxDistinctState(tuple('str'::Variant(LowCardinality(String)))) as state);
+select maxDistinctMerge(state) from (select maxDistinctState(tuple(''::Variant(LowCardinality(String)))) as state);
+
diff --git a/tests/queries/0_stateless/03710_empty_tuple_lhs_in_function.reference b/tests/queries/0_stateless/03710_empty_tuple_lhs_in_function.reference
new file mode 100644
index 000000000000..856c6f2ef653
--- /dev/null
+++ b/tests/queries/0_stateless/03710_empty_tuple_lhs_in_function.reference
@@ -0,0 +1,64 @@
+1
+1
+1
+0
+1
+1
+1
+1
+1
+1
+1
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+3
+1
+1
+1
+1
+1
+0
+1
+1
+1
+1
+1
+1
+1
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+()
+3
+1
+1
diff --git a/tests/queries/0_stateless/03710_empty_tuple_lhs_in_function.sql b/tests/queries/0_stateless/03710_empty_tuple_lhs_in_function.sql
new file mode 100644
index 000000000000..ae33bc9771e4
--- /dev/null
+++ b/tests/queries/0_stateless/03710_empty_tuple_lhs_in_function.sql
@@ -0,0 +1,90 @@
+SELECT CAST(tuple(), 'Tuple()') IN (tuple());
+
+SELECT CAST(tuple(), 'Tuple()') IN [tuple()];
+
+SELECT CAST(tuple(), 'Tuple()') IN [tuple(), tuple()];
+
+SELECT CAST(tuple(), 'Tuple()') NOT IN (tuple());
+
+SELECT CAST(tuple(), 'Tuple()') IN (tuple(1));-- { serverError TYPE_MISMATCH }
+
+SELECT CAST(tuple(), 'Tuple()') IN [()];
+
+SELECT CAST(tuple(), 'Tuple()') IN (());
+
+SELECT tuple() IN (tuple());
+
+SELECT [tuple()] IN [[tuple()], [tuple()]];
+
+SELECT [tuple()] IN [()];
+
+SELECT tuple() IN (((tuple())));
+
+SELECT tuple() IN [(((tuple())))];
+
+DROP TABLE IF EXISTS test_empty_tuple;
+CREATE TABLE test_empty_tuple (t Tuple()) ENGINE = Memory;
+INSERT INTO test_empty_tuple VALUES (tuple()), (tuple()), (tuple());
+
+SELECT t FROM test_empty_tuple WHERE t IN (tuple());
+
+SELECT t FROM test_empty_tuple WHERE t IN [tuple()];
+
+SELECT t FROM test_empty_tuple WHERE t IN [()];
+
+SELECT t FROM test_empty_tuple WHERE t IN [tuple(), tuple()];
+
+SELECT t FROM test_empty_tuple WHERE t IN tuple();
+
+SELECT t FROM test_empty_tuple WHERE [t] IN [tuple()];
+
+SELECT count() FROM test_empty_tuple WHERE t IN [tuple()];
+
+SELECT arrayJoin([tuple(), tuple()]) IN (tuple());
+
+
+SET enable_analyzer = 0;
+
+SELECT CAST(tuple(), 'Tuple()') IN (tuple());
+
+SELECT CAST(tuple(), 'Tuple()') IN [tuple()];
+
+SELECT CAST(tuple(), 'Tuple()') IN [tuple(), tuple()];
+
+SELECT CAST(tuple(), 'Tuple()') NOT IN (tuple());
+
+SELECT CAST(tuple(), 'Tuple()') IN (tuple(1));-- { serverError TYPE_MISMATCH }
+
+SELECT CAST(tuple(), 'Tuple()') IN [()];
+
+SELECT CAST(tuple(), 'Tuple()') IN (());
+
+SELECT tuple() IN (tuple());
+
+SELECT [tuple()] IN [[tuple()], [tuple()]];
+
+SELECT [tuple()] IN [()];
+
+SELECT tuple() IN (((tuple())));
+
+SELECT tuple() IN [(((tuple())))];
+
+DROP TABLE IF EXISTS test_empty_tuple;
+CREATE TABLE test_empty_tuple (t Tuple()) ENGINE = Memory;
+INSERT INTO test_empty_tuple VALUES (tuple()), (tuple()), (tuple());
+
+SELECT t FROM test_empty_tuple WHERE t IN (tuple());
+
+SELECT t FROM test_empty_tuple WHERE t IN [tuple()];
+
+SELECT t FROM test_empty_tuple WHERE t IN [()];
+
+SELECT t FROM test_empty_tuple WHERE t IN [tuple(), tuple()];
+
+SELECT t FROM test_empty_tuple WHERE t IN tuple();
+
+SELECT t FROM test_empty_tuple WHERE [t] IN [tuple()];
+
+SELECT count() FROM test_empty_tuple WHERE t IN [tuple()];
+
+SELECT arrayJoin([tuple(), tuple()]) IN (tuple());
diff --git a/tests/queries/0_stateless/03712_json_advanced_shared_data_bug.reference b/tests/queries/0_stateless/03712_json_advanced_shared_data_bug.reference
new file mode 100644
index 000000000000..207c0c245e0f
--- /dev/null
+++ b/tests/queries/0_stateless/03712_json_advanced_shared_data_bug.reference
@@ -0,0 +1,3 @@
+['{"arr1":9}']	{}
+['{"arr1":9}']	{}
+[]	{"b":[{"c":42}]}
diff --git a/tests/queries/0_stateless/03712_json_advanced_shared_data_bug.sql b/tests/queries/0_stateless/03712_json_advanced_shared_data_bug.sql
new file mode 100644
index 000000000000..13a6e394b332
--- /dev/null
+++ b/tests/queries/0_stateless/03712_json_advanced_shared_data_bug.sql
@@ -0,0 +1,14 @@
+SET optimize_if_transform_strings_to_enum=0;
+
+DROP TABLE IF EXISTS t0;
+CREATE TABLE t0 (c0 JSON(max_dynamic_paths = 0)) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 1, object_serialization_version = 'v3', object_shared_data_serialization_version_for_zero_level_parts = 'advanced', object_shared_data_buckets_for_wide_part = 1, index_granularity=2;
+
+INSERT INTO t0 SELECT multiIf(
+  number < 2,
+  '{"arr" : [{"arr1" : 9}]}',
+  '{"a" : {"b" : [{"c" : 42}]}}'
+) FROM numbers(3);
+
+SELECT c0.arr.:`Array(JSON)`, c0.^a FROM t0;
+DROP TABLE t0;
+
diff --git a/tests/queries/0_stateless/03713_data_types_binary_deserialization_stack_overflow.reference b/tests/queries/0_stateless/03713_data_types_binary_deserialization_stack_overflow.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03713_data_types_binary_deserialization_stack_overflow.sql b/tests/queries/0_stateless/03713_data_types_binary_deserialization_stack_overflow.sql
new file mode 100644
index 000000000000..a013a8d0d279
--- /dev/null
+++ b/tests/queries/0_stateless/03713_data_types_binary_deserialization_stack_overflow.sql
@@ -0,0 +1 @@
+select * from format(RowBinaryWithNamesAndTypes, x'010178' || repeat(x'1e', 1000000)) settings input_format_binary_decode_types_in_binary_format=1; -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
diff --git a/tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.reference b/tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.reference
new file mode 100644
index 000000000000..2bd278038fc7
--- /dev/null
+++ b/tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.reference
@@ -0,0 +1 @@
+a_0	0
diff --git a/tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.sql b/tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.sql
new file mode 100644
index 000000000000..17c2d664beb5
--- /dev/null
+++ b/tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.sql
@@ -0,0 +1,8 @@
+SELECT
+    concat('a_', toString(number % 3)) AS a,
+    number % 5 AS b
+FROM numbers(50)
+GROUP BY (a, b)
+ORDER BY (a, b)
+LIMIT 1
+SETTINGS optimize_injective_functions_in_group_by = 0, enable_analyzer = 0;
diff --git a/tests/queries/0_stateless/03714_base32_base58_short_string.reference b/tests/queries/0_stateless/03714_base32_base58_short_string.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03714_base32_base58_short_string.sql b/tests/queries/0_stateless/03714_base32_base58_short_string.sql
new file mode 100644
index 000000000000..3690b6e7b0fc
--- /dev/null
+++ b/tests/queries/0_stateless/03714_base32_base58_short_string.sql
@@ -0,0 +1,4 @@
+-- Tags: no-fasttest
+
+SELECT base32Encode(randomString(1, 100)) FROM numbers(1000) FORMAT Null;
+SELECT base58Encode(randomString(1, 100)) FROM numbers(1000) FORMAT Null;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03714_empty_tuple_reverse_function.reference b/tests/queries/0_stateless/03714_empty_tuple_reverse_function.reference
new file mode 100644
index 000000000000..529218205d8e
--- /dev/null
+++ b/tests/queries/0_stateless/03714_empty_tuple_reverse_function.reference
@@ -0,0 +1,13 @@
+()
+()
+()
+()
+()
+()
+()
+()
+()
+Tuple()
+(3,'a',1)
+[()]
+()
diff --git a/tests/queries/0_stateless/03714_empty_tuple_reverse_function.sql b/tests/queries/0_stateless/03714_empty_tuple_reverse_function.sql
new file mode 100644
index 000000000000..1ef82834a127
--- /dev/null
+++ b/tests/queries/0_stateless/03714_empty_tuple_reverse_function.sql
@@ -0,0 +1,27 @@
+SELECT reverse(());
+
+SELECT reverse(tuple());
+
+SELECT reverse(()) FROM numbers(3);
+
+WITH () AS x SELECT reverse(x);
+
+DROP TABLE IF EXISTS table_rev_empty_tuple;
+CREATE TABLE table_rev_empty_tuple
+(
+    x Tuple()
+) ENGINE = Memory;
+
+INSERT INTO table_rev_empty_tuple SELECT tuple() FROM numbers(5);
+
+SELECT reverse(x) FROM table_rev_empty_tuple LIMIT 3;
+
+SELECT toTypeName(reverse(x)) FROM table_rev_empty_tuple LIMIT 1;
+
+DROP TABLE table_rev_empty_tuple;
+
+SELECT reverse((1, 'a', 3));
+
+SELECT reverse([()]);
+
+SELECT reverse((()));
diff --git a/tests/queries/0_stateless/03714_queries_escaping_1.reference b/tests/queries/0_stateless/03714_queries_escaping_1.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03714_queries_escaping_1.sql b/tests/queries/0_stateless/03714_queries_escaping_1.sql
new file mode 100644
index 000000000000..3675d867e70c
--- /dev/null
+++ b/tests/queries/0_stateless/03714_queries_escaping_1.sql
@@ -0,0 +1 @@
+show columns from a.b like 'a\' or 1=1;--'
diff --git a/tests/queries/0_stateless/03714_queries_escaping_2.reference b/tests/queries/0_stateless/03714_queries_escaping_2.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03714_queries_escaping_2.sql b/tests/queries/0_stateless/03714_queries_escaping_2.sql
new file mode 100644
index 000000000000..33a4890770b2
--- /dev/null
+++ b/tests/queries/0_stateless/03714_queries_escaping_2.sql
@@ -0,0 +1 @@
+show functions like 'a\' or 1=1;--'
diff --git a/tests/queries/0_stateless/03714_queries_escaping_3.reference b/tests/queries/0_stateless/03714_queries_escaping_3.reference
new file mode 100644
index 000000000000..b261da18d51a
--- /dev/null
+++ b/tests/queries/0_stateless/03714_queries_escaping_3.reference
@@ -0,0 +1,2 @@
+1
+0
diff --git a/tests/queries/0_stateless/03714_queries_escaping_3.sh b/tests/queries/0_stateless/03714_queries_escaping_3.sh
new file mode 100755
index 000000000000..dd2f2def1e73
--- /dev/null
+++ b/tests/queries/0_stateless/03714_queries_escaping_3.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
+# no-parallel: dealing with an SQLite database makes concurrent SHOW TABLES queries fail sporadically with the "database is locked" error.
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+export CURR_DATABASE="test_03714_sqllite_${CLICKHOUSE_DATABASE}"
+
+DB_PATH=${USER_FILES_PATH}/${CURR_DATABASE}_db1
+
+function cleanup()
+{
+    ${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS ${CURR_DATABASE}"
+}
+trap cleanup EXIT
+
+
+sqlite3 "${DB_PATH}" 'DROP TABLE IF EXISTS table1'
+
+sqlite3 "${DB_PATH}" 'CREATE TABLE table1 (col1 text, col2 smallint);'
+
+chmod ugo+w "${DB_PATH}"
+
+sqlite3 "${DB_PATH}" "INSERT INTO table1 VALUES ('line1', 1), ('line2', 2), ('line3', 3)"
+
+${CLICKHOUSE_CLIENT} --query="CREATE DATABASE ${CURR_DATABASE} ENGINE = SQLite('${DB_PATH}')"
+
+${CLICKHOUSE_CLIENT} --query="EXISTS TABLE ${CURR_DATABASE}.table1;"
+${CLICKHOUSE_CLIENT} --query="EXISTS TABLE ${CURR_DATABASE}.\"a\' or name='table1\";"
+
+
+${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS ${CURR_DATABASE}"
diff --git a/tests/queries/0_stateless/03715_empty_tuple_functions_conversion.reference b/tests/queries/0_stateless/03715_empty_tuple_functions_conversion.reference
new file mode 100644
index 000000000000..96eb26f2d2de
--- /dev/null
+++ b/tests/queries/0_stateless/03715_empty_tuple_functions_conversion.reference
@@ -0,0 +1,8 @@
+()
+()
+()
+()
+()
+()
+()
+()
diff --git a/tests/queries/0_stateless/03715_empty_tuple_functions_conversion.sql b/tests/queries/0_stateless/03715_empty_tuple_functions_conversion.sql
new file mode 100644
index 000000000000..0e2ed4643dbe
--- /dev/null
+++ b/tests/queries/0_stateless/03715_empty_tuple_functions_conversion.sql
@@ -0,0 +1,19 @@
+select CAST((), 'SimpleAggregateFunction(min, Tuple())');
+
+DROP TABLE IF EXISTS tab;
+CREATE TABLE tab (c0 Tuple()) ENGINE = Memory;
+INSERT INTO tab VALUES (()), (()), (());
+
+SELECT CAST(c0, 'SimpleAggregateFunction(min, Tuple())') FROM tab;
+
+DROP TABLE IF EXISTS t0;
+CREATE TABLE t0 (c0 SimpleAggregateFunction(min, Tuple())) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO t0 (c0) VALUES (tuple());
+SELECT * FROM t0;
+
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (c0 SimpleAggregateFunction(min, Tuple())) ENGINE = MergeTree() ORDER BY tuple() SETTINGS enable_block_number_column = 1, enable_block_offset_column = 1;
+UPDATE t1 SET c0 = () WHERE TRUE;
+INSERT INTO t1 (c0) VALUES (tuple()), (tuple()), (tuple());
+UPDATE t1 SET c0 = () WHERE TRUE;
+SELECT * FROM t1;
diff --git a/tests/queries/0_stateless/03716_bson_each_row_empty_tuple_column.reference b/tests/queries/0_stateless/03716_bson_each_row_empty_tuple_column.reference
new file mode 100644
index 000000000000..0265fd6791cc
--- /dev/null
+++ b/tests/queries/0_stateless/03716_bson_each_row_empty_tuple_column.reference
@@ -0,0 +1,5 @@
+1	()
+1	()
+1	()
+1	()
+1	()
diff --git a/tests/queries/0_stateless/03716_bson_each_row_empty_tuple_column.sql b/tests/queries/0_stateless/03716_bson_each_row_empty_tuple_column.sql
new file mode 100644
index 000000000000..e93b96b1fe5b
--- /dev/null
+++ b/tests/queries/0_stateless/03716_bson_each_row_empty_tuple_column.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS t0;
+DROP TABLE IF EXISTS random_filename;
+
+CREATE TABLE t0 (c0 Int32, c1 Tuple()) ENGINE = Memory;
+CREATE TABLE random_filename (name String) ENGINE = Memory;
+
+INSERT INTO random_filename SELECT concat('03716_test_bson_empty_tuple_', toString(generateUUIDv4()), '.bson');
+
+INSERT INTO FUNCTION file((SELECT name FROM random_filename LIMIT 1), 'BSONEachRow', 'c0 Int32, c1 Tuple()')
+SELECT 1, tuple() FROM numbers(5) SETTINGS engine_file_truncate_on_insert = 1;
+
+INSERT INTO t0 SELECT * FROM file((SELECT name FROM random_filename LIMIT 1), 'BSONEachRow', 'c0 Int32, c1 Tuple()');
+
+SELECT * FROM t0 ORDER BY c0;
+
+DROP TABLE t0;
+DROP TABLE random_filename;
diff --git a/tests/queries/0_stateless/03716_topk_bad_data.reference b/tests/queries/0_stateless/03716_topk_bad_data.reference
new file mode 100644
index 000000000000..f4149ae191d0
--- /dev/null
+++ b/tests/queries/0_stateless/03716_topk_bad_data.reference
@@ -0,0 +1,14 @@
+-- {echo On}
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(approx_top_k(3), Array(Array(String)))')); -- { serverError CANNOT_READ_ALL_DATA }
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(topK(3), Array(Array(String)))')); -- { serverError CANNOT_READ_ALL_DATA }
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(approx_top_k(3), Array(Array(String)))'));
+[]
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(topK(3), Array(Array(String)))'));
+[]
+-- State: Select hex(topKState(3)((number, number)) as t) AS v, toTypeName(t) from numbers(1)
+-- 01100000000000000000000000000000000001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+SELECT finalizeAggregation(CAST(unhex('01100000000000000000000000000000000001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(topK(3), Tuple(UInt64, UInt64))'));
+[(0,0)]
+-- Add some extra bytes
+SELECT finalizeAggregation(CAST(unhex('01122000000000000000000000000000000000010040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002454'), 'AggregateFunction(topK(3), Tuple(UInt64, UInt64))')); -- { serverError INCORRECT_DATA }
+SELECT finalizeAggregation(CAST(unhex('012A03000000000000000300000000000000434343030000000000000041414104000000000000004141414101008002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001'), 'AggregateFunction(topK(3), Array(Array(String)))')); -- { serverError ATTEMPT_TO_READ_AFTER_EOF }
diff --git a/tests/queries/0_stateless/03716_topk_bad_data.sql b/tests/queries/0_stateless/03716_topk_bad_data.sql
new file mode 100644
index 000000000000..9bfc1dfe7265
--- /dev/null
+++ b/tests/queries/0_stateless/03716_topk_bad_data.sql
@@ -0,0 +1,16 @@
+-- {echo On}
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(approx_top_k(3), Array(Array(String)))')); -- { serverError CANNOT_READ_ALL_DATA }
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(topK(3), Array(Array(String)))')); -- { serverError CANNOT_READ_ALL_DATA }
+
+
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(approx_top_k(3), Array(Array(String)))'));
+SELECT finalizeAggregation(CAST(unhex('012A0300000000000000030000000000000043434303000000000000004141410400000000000000414141410100800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(topK(3), Array(Array(String)))'));
+
+-- State: Select hex(topKState(3)((number, number)) as t) AS v, toTypeName(t) from numbers(1)
+-- 01100000000000000000000000000000000001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+SELECT finalizeAggregation(CAST(unhex('01100000000000000000000000000000000001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'), 'AggregateFunction(topK(3), Tuple(UInt64, UInt64))'));
+
+-- Add some extra bytes
+SELECT finalizeAggregation(CAST(unhex('01122000000000000000000000000000000000010040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002454'), 'AggregateFunction(topK(3), Tuple(UInt64, UInt64))')); -- { serverError INCORRECT_DATA }
+
+SELECT finalizeAggregation(CAST(unhex('012A03000000000000000300000000000000434343030000000000000041414104000000000000004141414101008002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001'), 'AggregateFunction(topK(3), Array(Array(String)))')); -- { serverError ATTEMPT_TO_READ_AFTER_EOF }
diff --git a/tests/queries/0_stateless/03717_msgpack_empty_tuple_column.reference b/tests/queries/0_stateless/03717_msgpack_empty_tuple_column.reference
new file mode 100644
index 000000000000..0265fd6791cc
--- /dev/null
+++ b/tests/queries/0_stateless/03717_msgpack_empty_tuple_column.reference
@@ -0,0 +1,5 @@
+1	()
+1	()
+1	()
+1	()
+1	()
diff --git a/tests/queries/0_stateless/03717_msgpack_empty_tuple_column.sql b/tests/queries/0_stateless/03717_msgpack_empty_tuple_column.sql
new file mode 100644
index 000000000000..45f81812bc8b
--- /dev/null
+++ b/tests/queries/0_stateless/03717_msgpack_empty_tuple_column.sql
@@ -0,0 +1,20 @@
+-- Tags: no-fasttest
+-- no-fasttest: 'MsgPack` format is not supported
+
+DROP TABLE IF EXISTS t0;
+DROP TABLE IF EXISTS random_filename;
+
+CREATE TABLE t0 (c0 Int32, c1 Tuple()) ENGINE = Memory;
+CREATE TABLE random_filename (name String) ENGINE = Memory;
+
+INSERT INTO random_filename SELECT concat('03716_test_msgpack_empty_tuple_', toString(generateUUIDv4()), '.msgpack');
+
+INSERT INTO FUNCTION file((SELECT name FROM random_filename LIMIT 1), 'MsgPack', 'c0 Int32, c1 Tuple()')
+SELECT 1, tuple() FROM numbers(5) SETTINGS engine_file_truncate_on_insert = 1;
+
+INSERT INTO t0 SELECT * FROM file((SELECT name FROM random_filename LIMIT 1), 'MsgPack', 'c0 Int32, c1 Tuple()');
+
+SELECT * FROM t0 ORDER BY c0;
+
+DROP TABLE t0;
+DROP TABLE random_filename;
diff --git a/tests/queries/0_stateless/03719_multiple_column_empty_tuple_formats.reference b/tests/queries/0_stateless/03719_multiple_column_empty_tuple_formats.reference
new file mode 100644
index 000000000000..82da4c4a29b5
--- /dev/null
+++ b/tests/queries/0_stateless/03719_multiple_column_empty_tuple_formats.reference
@@ -0,0 +1,198 @@
+Native
+0	()
+1	()
+2	()
+3	()
+4	()
+TSV
+0	()
+1	()
+2	()
+3	()
+4	()
+CSV
+0	\N
+1	\N
+2	\N
+3	\N
+4	\N
+TSKV
+0	()
+1	()
+2	()
+3	()
+4	()
+JSON
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONCompact
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONEachRow
+0	[]
+1	[]
+2	[]
+3	[]
+4	[]
+JSONObjectEachRow
+0	[]
+1	[]
+2	[]
+3	[]
+4	[]
+JSONCompactEachRow
+0	[]
+1	[]
+2	[]
+3	[]
+4	[]
+JSONColumns
+0	[]
+1	[]
+2	[]
+3	[]
+4	[]
+JSONCompactColumns
+0	[]
+1	[]
+2	[]
+3	[]
+4	[]
+JSONColumnsWithMetadata
+0	()
+1	()
+2	()
+3	()
+4	()
+ORC
+0	()
+1	()
+2	()
+3	()
+4	()
+Arrow
+0	()
+1	()
+2	()
+3	()
+4	()
+Avro
+0	()
+1	()
+2	()
+3	()
+4	()
+RowBinary
+0	()
+1	()
+2	()
+3	()
+4	()
+Values
+0	()
+1	()
+2	()
+3	()
+4	()
+BSONEachRow
+0	()
+1	()
+2	()
+3	()
+4	()
+MsgPack
+0	()
+1	()
+2	()
+3	()
+4	()
+Native
+0	()
+1	()
+2	()
+3	()
+4	()
+TSV
+0	()
+1	()
+2	()
+3	()
+4	()
+CSV
+0	()
+1	()
+2	()
+3	()
+4	()
+TSKV
+0	()
+1	()
+2	()
+3	()
+4	()
+JSON
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONCompact
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONEachRow
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONObjectEachRow
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONCompactEachRow
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONColumns
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONCompactColumns
+0	()
+1	()
+2	()
+3	()
+4	()
+JSONColumnsWithMetadata
+0	()
+1	()
+2	()
+3	()
+4	()
+ORC
+0	()
+1	()
+2	()
+3	()
+4	()
+Arrow
+0	()
+1	()
+2	()
+3	()
+4	()
diff --git a/tests/queries/0_stateless/03719_multiple_column_empty_tuple_formats.sh b/tests/queries/0_stateless/03719_multiple_column_empty_tuple_formats.sh
new file mode 100755
index 000000000000..0159e244ec8f
--- /dev/null
+++ b/tests/queries/0_stateless/03719_multiple_column_empty_tuple_formats.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+# Test that no formats crash or return LOGICAL_ERROR on empty tuple
+# This test is on the same spirit as 03277_empty_tuple_formats.sh except it has additional column in addition to empty tuple.
+# For example this logical error: Invalid number of rows in Chunk  Int32(size = 5) Tuple(size = 0) column Tuple() at position 1: expected 5, got 0
+# was triggered when there was another column in addition to the empty tuple. This test covers that case.
+
+FILE=03277_$CLICKHOUSE_DATABASE
+
+# With schema inference.
+for format in Native TSV CSV TSKV JSON JSONCompact JSONEachRow JSONObjectEachRow JSONCompactEachRow JSONColumns JSONCompactColumns JSONColumnsWithMetadata ORC Arrow
+do
+  echo $format
+  $CLICKHOUSE_LOCAL -q "
+    insert into function file('$FILE', '$format') select number, () from numbers(5) settings engine_file_truncate_on_insert=1;
+    select * from file('$FILE', '$format');"
+done
+
+# Picky about column names.
+echo Avro
+$CLICKHOUSE_LOCAL -q "
+  insert into function file('$FILE', 'Avro') select number as x, () as y from numbers(5) settings engine_file_truncate_on_insert=1;
+  select * from file('$FILE', 'Avro');"
+
+# Without schema inference.
+for format in RowBinary Values BSONEachRow MsgPack Native TSV CSV TSKV JSON JSONCompact JSONEachRow JSONObjectEachRow JSONCompactEachRow JSONColumns JSONCompactColumns JSONColumnsWithMetadata ORC Arrow
+do
+  echo $format
+  $CLICKHOUSE_LOCAL -q "
+    insert into function file('$FILE', '$format', 'x UInt64, y Tuple()') select number as x, () as y from numbers(5) settings engine_file_truncate_on_insert=1;
+    select * from file('$FILE', '$format', 'x UInt64, y Tuple()');"
+done
+
+# Formats that don't support empty tuples/multiple columns.
+$CLICKHOUSE_LOCAL -q "
+  insert into function file('$FILE', 'Parquet') select number, () from numbers(5) settings engine_file_truncate_on_insert=1; -- {serverError BAD_ARGUMENTS}
+  insert into function file('$FILE', 'Npy') select number, () from numbers(5) settings engine_file_truncate_on_insert=1; -- {serverError TOO_MANY_COLUMNS}
+  insert into function file('$FILE', 'CapnProto', 'x UInt64, y Tuple()') select number as x, () as y from numbers(5) settings engine_file_truncate_on_insert=1; -- {serverError CAPN_PROTO_BAD_CAST}
+  insert into function file('$FILE', 'RawBLOB') select number, () from numbers(5) settings engine_file_truncate_on_insert=1; -- {serverError NOT_IMPLEMENTED}"
+
+rm $FILE
diff --git a/tests/queries/0_stateless/03720_datetime64_bad_inference.reference b/tests/queries/0_stateless/03720_datetime64_bad_inference.reference
new file mode 100644
index 000000000000..b0138a319d38
--- /dev/null
+++ b/tests/queries/0_stateless/03720_datetime64_bad_inference.reference
@@ -0,0 +1,2 @@
+d	Nullable(String)					
+5981 10:01.000
diff --git a/tests/queries/0_stateless/03720_datetime64_bad_inference.sql b/tests/queries/0_stateless/03720_datetime64_bad_inference.sql
new file mode 100644
index 000000000000..d9c76a1bc167
--- /dev/null
+++ b/tests/queries/0_stateless/03720_datetime64_bad_inference.sql
@@ -0,0 +1,4 @@
+set date_time_input_format='basic';
+desc format(JSONEachRow, '{"d" : "5981 10:01.000"}');
+select * from format(JSONEachRow, '{"d" : "5981 10:01.000"}');
+
diff --git a/tests/queries/0_stateless/03722_json_compact_part_substreams_cache_bug.reference b/tests/queries/0_stateless/03722_json_compact_part_substreams_cache_bug.reference
new file mode 100644
index 000000000000..533dba4b83ca
--- /dev/null
+++ b/tests/queries/0_stateless/03722_json_compact_part_substreams_cache_bug.reference
@@ -0,0 +1,3 @@
+str_0	\N	{"b":{"d":0,"e":"str_0"}}
+str_1	\N	{"b":{"d":1,"e":"str_1"}}
+str_2	\N	{"b":{"d":2,"e":"str_2"}}
diff --git a/tests/queries/0_stateless/03722_json_compact_part_substreams_cache_bug.sql b/tests/queries/0_stateless/03722_json_compact_part_substreams_cache_bug.sql
new file mode 100644
index 000000000000..af67b1ed8299
--- /dev/null
+++ b/tests/queries/0_stateless/03722_json_compact_part_substreams_cache_bug.sql
@@ -0,0 +1,7 @@
+SET use_variant_as_common_type = 1;
+DROP TABLE IF EXISTS t0;
+CREATE TABLE t0 (json Nullable(JSON)) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity=1, write_marks_for_substreams_in_compact_parts=1, min_bytes_for_wide_part='100G';
+INSERT INTO t0 SELECT toJSONString(map('a.b.d', CAST(number, 'UInt32'), 'a.b.e', concat('str_', toString(number)))) FROM numbers(3);
+SELECT json.a.b.e, json.a.b.e.:Int64, json.^a FROM t0;
+DROP TABLE t0;
+
diff --git a/tests/queries/0_stateless/03722_random_utf8_bug.reference b/tests/queries/0_stateless/03722_random_utf8_bug.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03722_random_utf8_bug.sql b/tests/queries/0_stateless/03722_random_utf8_bug.sql
new file mode 100644
index 000000000000..7b08f562389c
--- /dev/null
+++ b/tests/queries/0_stateless/03722_random_utf8_bug.sql
@@ -0,0 +1 @@
+select randomStringUTF8(18446744073709551615-1000+number*2003) from numbers(2); -- { serverError TOO_LARGE_STRING_SIZE }
diff --git a/tests/queries/0_stateless/03723_incorrect_implicit_projection.reference b/tests/queries/0_stateless/03723_incorrect_implicit_projection.reference
new file mode 100644
index 000000000000..84d702e25669
--- /dev/null
+++ b/tests/queries/0_stateless/03723_incorrect_implicit_projection.reference
@@ -0,0 +1,3 @@
+ad_request	2598
+2598
+2598
diff --git a/tests/queries/0_stateless/03723_incorrect_implicit_projection.sql b/tests/queries/0_stateless/03723_incorrect_implicit_projection.sql
new file mode 100644
index 000000000000..693054eb3a1f
--- /dev/null
+++ b/tests/queries/0_stateless/03723_incorrect_implicit_projection.sql
@@ -0,0 +1,45 @@
+-- See also 03604_key_condition_set_tuple_bug.sql‎
+
+DROP TABLE IF EXISTS prd_bid_events_simple_no_partition;
+CREATE TABLE prd_bid_events_simple_no_partition
+(
+    `type` LowCardinality(String),
+    `timestamp` DateTime64(9)
+)
+ENGINE = MergeTree()
+PRIMARY KEY (timestamp, type)
+ORDER BY (timestamp, type);
+
+INSERT INTO prd_bid_events_simple_no_partition
+SELECT
+    arrayElement([
+        'impression',
+        'start',
+        'firstQuartile',
+        'midpoint',
+        'thirdQuartile',
+        'complete',
+        'ad_request',
+        'random_value'
+    ], 1 + (number % 8)),
+    toDateTime64('2025-11-19 14:26:52' - toIntervalDay(number % 30) - toIntervalSecond(number % 86400) - toIntervalMillisecond(number % 1000), 9)
+FROM numbers(500000);
+
+SELECT
+    type,
+    count()
+FROM prd_bid_events_simple_no_partition
+WHERE date(timestamp) = '2025-11-01'
+GROUP BY type
+HAVING type = 'ad_request';
+
+SELECT count()
+FROM prd_bid_events_simple_no_partition
+WHERE (date(timestamp) = '2025-11-01') AND (type = 'ad_request')
+SETTINGS optimize_use_implicit_projections = 0;
+
+SELECT
+    count()
+FROM prd_bid_events_simple_no_partition
+WHERE (date(timestamp) = '2025-11-01') AND (type = 'ad_request')
+SETTINGS optimize_use_implicit_projections = 1;
diff --git a/tests/queries/0_stateless/03724_to_date_time_or_null_negative_arg_bug.reference b/tests/queries/0_stateless/03724_to_date_time_or_null_negative_arg_bug.reference
new file mode 100644
index 000000000000..ed23201e10dc
--- /dev/null
+++ b/tests/queries/0_stateless/03724_to_date_time_or_null_negative_arg_bug.reference
@@ -0,0 +1,38 @@
+toDateOrNull:
+1960-01-01	1970-01-01
+1800-01-01	1970-01-01
+3000-01-01	2149-06-06
+toDateTimeOrNull:
+1960-01-01 00:00:00	1970-01-01 00:00:00
+1800-01-01 00:00:00	1970-01-01 00:00:00
+3000-01-01 00:00:00	2106-02-07 06:28:15
+toDateTime64OrNull:
+1800-01-01 00:00:00	1900-01-01 00:00:00.000
+3000-01-01 00:00:00	2299-12-31 00:00:00.000
+accurateCastOrNull to Date:
+1960-01-01	1970-01-01
+1800-01-01	1970-01-01
+3000-01-01	2149-06-06
+accurateCastOrNull to DateTime:
+1960-01-01	1970-01-01 00:00:00
+1800-01-01	1970-01-01 00:00:00
+3000-01-01	2106-02-07 06:28:15
+accurateCastOrNull to DateTime (best_effort):
+1960-01-01	1970-01-01 00:00:00
+1800-01-01	1970-01-01 00:00:00
+3000-01-01	2106-02-07 06:28:15
+accurateCastOrNull to DateTime (best_effort_us):
+1960-01-01	1970-01-01 00:00:00
+1800-01-01	1970-01-01 00:00:00
+3000-01-01	2106-02-07 06:28:15
+accurateCastOrNull to DateTime64:
+1800-01-01	1900-01-01 00:00:00.000
+3000-01-01	2299-12-31 00:00:00.000
+accurateCastOrNull to DateTime64 (best_effort):
+1960-01-01	1960-01-01 00:00:00.000
+1800-01-01	1900-01-01 00:00:00.000
+3000-01-01	2299-12-31 00:00:00.000
+accurateCastOrNull to DateTime64 (best_effort_us):
+1960-01-01	1960-01-01 00:00:00.000
+1800-01-01	1900-01-01 00:00:00.000
+3000-01-01	2299-12-31 00:00:00.000
diff --git a/tests/queries/0_stateless/03724_to_date_time_or_null_negative_arg_bug.sql b/tests/queries/0_stateless/03724_to_date_time_or_null_negative_arg_bug.sql
new file mode 100644
index 000000000000..8653b99dfadd
--- /dev/null
+++ b/tests/queries/0_stateless/03724_to_date_time_or_null_negative_arg_bug.sql
@@ -0,0 +1,58 @@
+set session_timezone='UTC';
+-- toDateOrNull: pre-epoch and far future dates
+select 'toDateOrNull:';
+select '1960-01-01' as input, toDateOrNull('1960-01-01') as result;
+select '1800-01-01' as input, toDateOrNull('1800-01-01') as result;
+select '3000-01-01' as input, toDateOrNull('3000-01-01') as result;
+
+-- toDateTimeOrNull: pre-epoch and far future datetimes
+select 'toDateTimeOrNull:';
+select '1960-01-01 00:00:00' as input, toDateTimeOrNull('1960-01-01 00:00:00') as result;
+select '1800-01-01 00:00:00' as input, toDateTimeOrNull('1800-01-01 00:00:00') as result;
+select '3000-01-01 00:00:00' as input, toDateTimeOrNull('3000-01-01 00:00:00') as result;
+
+-- toDateTime64OrNull: pre-epoch and far future datetimes
+select 'toDateTime64OrNull:';
+select '1800-01-01 00:00:00' as input, toDateTime64OrNull('1800-01-01 00:00:00') as result;
+select '3000-01-01 00:00:00' as input, toDateTime64OrNull('3000-01-01 00:00:00') as result;
+
+-- accurateCastOrNull to Date
+select 'accurateCastOrNull to Date:';
+select '1960-01-01' as input, accurateCastOrNull('1960-01-01', 'Date') as result;
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'Date') as result;
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'Date') as result;
+
+-- accurateCastOrNull to DateTime
+select 'accurateCastOrNull to DateTime:';
+select '1960-01-01' as input, accurateCastOrNull('1960-01-01', 'DateTime') as result;
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'DateTime') as result;
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'DateTime') as result;
+
+-- accurateCastOrNull to DateTime with best_effort mode
+select 'accurateCastOrNull to DateTime (best_effort):';
+select '1960-01-01' as input, accurateCastOrNull('1960-01-01', 'DateTime') as result settings cast_string_to_date_time_mode='best_effort';
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'DateTime') as result settings cast_string_to_date_time_mode='best_effort';
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'DateTime') as result settings cast_string_to_date_time_mode='best_effort';
+
+-- accurateCastOrNull to DateTime with best_effort_us mode
+select 'accurateCastOrNull to DateTime (best_effort_us):';
+select '1960-01-01' as input, accurateCastOrNull('1960-01-01', 'DateTime') as result settings cast_string_to_date_time_mode='best_effort_us';
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'DateTime') as result settings cast_string_to_date_time_mode='best_effort_us';
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'DateTime') as result settings cast_string_to_date_time_mode='best_effort_us';
+
+-- accurateCastOrNull to DateTime64
+select 'accurateCastOrNull to DateTime64:';
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'DateTime64') as result;
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'DateTime64') as result;
+
+-- accurateCastOrNull to DateTime64 with best_effort mode
+select 'accurateCastOrNull to DateTime64 (best_effort):';
+select '1960-01-01' as input, accurateCastOrNull('1960-01-01', 'DateTime64') as result settings cast_string_to_date_time_mode='best_effort';
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'DateTime64') as result settings cast_string_to_date_time_mode='best_effort';
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'DateTime64') as result settings cast_string_to_date_time_mode='best_effort';
+
+-- accurateCastOrNull to DateTime64 with best_effort_us mode
+select 'accurateCastOrNull to DateTime64 (best_effort_us):';
+select '1960-01-01' as input, accurateCastOrNull('1960-01-01', 'DateTime64') as result settings cast_string_to_date_time_mode='best_effort_us';
+select '1800-01-01' as input, accurateCastOrNull('1800-01-01', 'DateTime64') as result settings cast_string_to_date_time_mode='best_effort_us';
+select '3000-01-01' as input, accurateCastOrNull('3000-01-01', 'DateTime64') as result settings cast_string_to_date_time_mode='best_effort_us';
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.reference b/tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.sql b/tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.sql
new file mode 100644
index 000000000000..05a1c0a0df96
--- /dev/null
+++ b/tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (
+    s String,
+    json JSON
+)
+ENGINE = MergeTree
+ORDER BY (s)
+SETTINGS index_granularity = 2, index_granularity_bytes = 0, min_rows_for_wide_part=0, min_bytes_for_wide_part=0;
+
+INSERT INTO test SELECT 'a', '{}' FROM numbers(1);
+
+SELECT count() FROM test WHERE s = 'a' AND json.a IS NULL;
+
+DROP TABLE test;
+
diff --git a/tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.reference b/tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.reference
new file mode 100644
index 000000000000..d81cc0710eb6
--- /dev/null
+++ b/tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.reference
@@ -0,0 +1 @@
+42
diff --git a/tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.sql b/tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.sql
new file mode 100644
index 000000000000..9f240e70859a
--- /dev/null
+++ b/tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.sql
@@ -0,0 +1,6 @@
+drop table if exists test;
+create table test (s Int128, v Variant(UUID, Int128)) engine=MergeTree order by s settings index_granularity = 2, index_granularity_bytes = 0, min_rows_for_wide_part=0, min_bytes_for_wide_part=0;
+insert into test select 42::Int128, 42::Int128;
+select v from test prewhere 1;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03726_distributed_alias_column_order.reference b/tests/queries/0_stateless/03726_distributed_alias_column_order.reference
new file mode 100644
index 000000000000..0ec0640cf73d
--- /dev/null
+++ b/tests/queries/0_stateless/03726_distributed_alias_column_order.reference
@@ -0,0 +1,2 @@
+e	f
+e	f
diff --git a/tests/queries/0_stateless/03726_distributed_alias_column_order.sql b/tests/queries/0_stateless/03726_distributed_alias_column_order.sql
new file mode 100644
index 000000000000..31691861787c
--- /dev/null
+++ b/tests/queries/0_stateless/03726_distributed_alias_column_order.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS test_local;
+
+CREATE TABLE test_local
+(
+    `a` UInt64,
+    `e` String ALIAS 'e',
+    `f` String ALIAS 'f'
+)
+ENGINE = Memory;
+
+INSERT INTO test_local VALUES (1);
+
+SELECT e, f
+FROM remote('127.0.0.{1,2}', currentDatabase(), test_local)
+ORDER BY a;
+
+DROP TABLE IF EXISTS test_local;
diff --git a/tests/queries/0_stateless/03727_rename_nested_and_modify_in_one_later.reference b/tests/queries/0_stateless/03727_rename_nested_and_modify_in_one_later.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03727_rename_nested_and_modify_in_one_later.sql b/tests/queries/0_stateless/03727_rename_nested_and_modify_in_one_later.sql
new file mode 100644
index 000000000000..926fce19f92e
--- /dev/null
+++ b/tests/queries/0_stateless/03727_rename_nested_and_modify_in_one_later.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS t0;
+CREATE TABLE t0 (`c0.c1` Array(Int)) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO t0 VALUES ([1]);
+ALTER TABLE t0 (RENAME COLUMN `c0.c1` TO `c0.c2`), (MODIFY COLUMN `c0.c1` MODIFY SETTING max_compress_block_size = 1); -- {serverError NOT_FOUND_COLUMN_IN_BLOCK}
+DROP TABLE t0;
diff --git a/tests/queries/0_stateless/03727_tolowcardinality_nullable_cast.reference b/tests/queries/0_stateless/03727_tolowcardinality_nullable_cast.reference
new file mode 100644
index 000000000000..5af65742c057
--- /dev/null
+++ b/tests/queries/0_stateless/03727_tolowcardinality_nullable_cast.reference
@@ -0,0 +1,8 @@
+1	a
+4	a
+2	b
+3	\N
+4	a
+test
+\N
+1
diff --git a/tests/queries/0_stateless/03727_tolowcardinality_nullable_cast.sql b/tests/queries/0_stateless/03727_tolowcardinality_nullable_cast.sql
new file mode 100644
index 000000000000..95419ee1071a
--- /dev/null
+++ b/tests/queries/0_stateless/03727_tolowcardinality_nullable_cast.sql
@@ -0,0 +1,54 @@
+-- Test for issue #89412: Bad cast from ColumnNullable to ColumnLowCardinality
+
+DROP TABLE IF EXISTS test_tolowcardinality_nullable;
+
+-- Test 1: Original fiddle query from issue #89412
+DROP TABLE IF EXISTS t0;
+CREATE TABLE t0 (c0 Nullable(Int)) ENGINE = MergeTree() ORDER BY tuple() PARTITION BY (toLowCardinality(c0)) SETTINGS allow_nullable_key = 1;
+INSERT INTO TABLE t0 (c0) VALUES (0);
+DELETE FROM t0 WHERE c0 = 1;
+DROP TABLE t0;
+
+-- Test 2: Using toLowCardinality with Nullable in PARTITION BY
+CREATE TABLE test_tolowcardinality_nullable
+(
+    id UInt32,
+    str Nullable(String)
+)
+ENGINE = MergeTree()
+PARTITION BY toLowCardinality(str)
+ORDER BY id
+SETTINGS allow_nullable_key = 1;
+
+INSERT INTO test_tolowcardinality_nullable VALUES (1, 'a'), (2, 'b'), (3, NULL), (4, 'a');
+
+-- Query that triggers KeyCondition optimization with toLowCardinality
+SELECT * FROM test_tolowcardinality_nullable WHERE toLowCardinality(str) = 'a' ORDER BY id;
+
+-- Mutation that also uses the partition key
+ALTER TABLE test_tolowcardinality_nullable DELETE WHERE id = 1 SETTINGS mutations_sync = 2;
+
+SELECT * FROM test_tolowcardinality_nullable ORDER BY id;
+
+DROP TABLE test_tolowcardinality_nullable;
+
+-- Test 2: Direct toLowCardinality on Nullable column
+SELECT toLowCardinality(materialize(toNullable('test'))) AS result;
+SELECT toLowCardinality(materialize(CAST(NULL AS Nullable(String)))) AS result;
+
+-- Test 3: toLowCardinality in WHERE clause with Nullable
+DROP TABLE IF EXISTS test_tolowcardinality_where;
+
+CREATE TABLE test_tolowcardinality_where
+(
+    id UInt32,
+    val Nullable(String)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_tolowcardinality_where VALUES (1, 'x'), (2, 'y'), (3, NULL);
+
+SELECT id FROM test_tolowcardinality_where WHERE toLowCardinality(val) = 'x' ORDER BY id;
+
+DROP TABLE test_tolowcardinality_where;
diff --git a/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool.reference b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool.reference
new file mode 100644
index 000000000000..27ba77ddaf61
--- /dev/null
+++ b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool.reference
@@ -0,0 +1 @@
+true
diff --git a/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool.sh b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool.sh
new file mode 100755
index 000000000000..2926a8053168
--- /dev/null
+++ b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select true::LowCardinality(Bool) as a format Arrow settings allow_suspicious_low_cardinality_types = 1, output_format_arrow_low_cardinality_as_dictionary = 1" | $CLICKHOUSE_LOCAL -q "select * from table" --input-format=Arrow
diff --git a/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool_and_date32.reference b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool_and_date32.reference
new file mode 100644
index 000000000000..2841005f5171
--- /dev/null
+++ b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool_and_date32.reference
@@ -0,0 +1,2 @@
+true
+2020-01-01
diff --git a/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool_and_date32.sh b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool_and_date32.sh
new file mode 100755
index 000000000000..82ac7a1e8370
--- /dev/null
+++ b/tests/queries/0_stateless/03728_arrow_low_cardinality_over_bool_and_date32.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select true::LowCardinality(Bool) as a format Arrow settings allow_suspicious_low_cardinality_types = 1, output_format_arrow_low_cardinality_as_dictionary = 1" | $CLICKHOUSE_LOCAL -q "select * from table" --input-format=Arrow
+$CLICKHOUSE_LOCAL -q "select '2020-01-01'::LowCardinality(Date32) as a format Arrow settings allow_suspicious_low_cardinality_types = 1, output_format_arrow_low_cardinality_as_dictionary = 1" | $CLICKHOUSE_LOCAL -q "select * from table" --input-format=Arrow
diff --git a/tests/queries/0_stateless/03728_parsing_json_dynamic_variant_from_http_parameter.reference b/tests/queries/0_stateless/03728_parsing_json_dynamic_variant_from_http_parameter.reference
new file mode 100644
index 000000000000..0563b74b7756
--- /dev/null
+++ b/tests/queries/0_stateless/03728_parsing_json_dynamic_variant_from_http_parameter.reference
@@ -0,0 +1,4 @@
+{"a":1}	{"a":1}	1	{'a':'Int64'}	{'a':'Int64'}
+1	1	1	String	String
+1.1	1.1	1	Float32	Float32
+'Hello'	String
diff --git a/tests/queries/0_stateless/03728_parsing_json_dynamic_variant_from_http_parameter.sh b/tests/queries/0_stateless/03728_parsing_json_dynamic_variant_from_http_parameter.sh
new file mode 100755
index 000000000000..871444c0b027
--- /dev/null
+++ b/tests/queries/0_stateless/03728_parsing_json_dynamic_variant_from_http_parameter.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Tags: no-parallel-replicas
+# no-parallel-replicas: the query from query_log errors due to missing columns.
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&param_x=%7B%22a%22%3A1%7D" -d "SELECT {x:Json} as j1, '{\"a\":1}'::Json as j2, j1 = j2 as equals, JSONAllPathsWithTypes(j1), JSONAllPathsWithTypes(j2)";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&param_x=1" -d "SELECT {x:Dynamic} as d1, 1::Dynamic as d2, d1 = d2 as equals, dynamicType(d1), dynamicType(d2)";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&param_x=1.1" -d "SELECT {x:Variant(Float32, String)} as v1, 1.1::Variant(Float32, String) as v2, v1 = v2 as equals, variantType(v1), variantType(v2)";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&param_x=%5C%27Hello%5C%27" -d "SELECT {x:Dynamic} as d, dynamicType(d) format Raw";
diff --git a/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_bug.reference b/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_bug.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_bug.sql b/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_bug.sql
new file mode 100644
index 000000000000..5385c5923d96
--- /dev/null
+++ b/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_bug.sql
@@ -0,0 +1,9 @@
+drop table if exists test;
+drop table if exists test2;
+create table test (id UInt64, json JSON) engine=MergeTree order by id;
+insert into test select number, '{}' from numbers(100000);
+alter table test update json = '{"a" : 42}' where id > 50000 settings mutations_sync=1;
+create table test2 (json JSON) engine=MergeTree order by tuple();
+insert into test2 select if(id < 75000, json, '{"a" : 42}'::JSON) from test;
+select * from test2 format Null;
+
diff --git a/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_compact_part_bug.reference b/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_compact_part_bug.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_compact_part_bug.sql b/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_compact_part_bug.sql
new file mode 100644
index 000000000000..aa33cc217b5a
--- /dev/null
+++ b/tests/queries/0_stateless/03732_json_duplicated_path_in_dynamic_paths_and_shared_data_compact_part_bug.sql
@@ -0,0 +1,5 @@
+drop table if exists test;
+create table test (id UInt64, json JSON(max_dynamic_paths=1)) engine=MergeTree order by tuple() settings min_bytes_for_wide_part='100G', write_marks_for_substreams_in_compact_parts=0;
+insert into test select number, '{"a" : 42, "b" : {"c" : 42}}' from numbers(100000);
+select json.^b from test order by id format Null;
+drop table test;
diff --git a/tests/queries/0_stateless/03733_base58_decode_bug.reference b/tests/queries/0_stateless/03733_base58_decode_bug.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03733_base58_decode_bug.sql b/tests/queries/0_stateless/03733_base58_decode_bug.sql
new file mode 100644
index 000000000000..b484dc74c6c2
--- /dev/null
+++ b/tests/queries/0_stateless/03733_base58_decode_bug.sql
@@ -0,0 +1 @@
+SELECT base58Decode(materialize('11111111111111')) FROM numbers(100000) FORMAT Null;
diff --git a/tests/queries/0_stateless/03733_summing_merge_tree_nested_low_cardinality.reference b/tests/queries/0_stateless/03733_summing_merge_tree_nested_low_cardinality.reference
new file mode 100644
index 000000000000..e11be14429f0
--- /dev/null
+++ b/tests/queries/0_stateless/03733_summing_merge_tree_nested_low_cardinality.reference
@@ -0,0 +1 @@
+lol	10	['a','b']	[4,6]
diff --git a/tests/queries/0_stateless/03733_summing_merge_tree_nested_low_cardinality.sql b/tests/queries/0_stateless/03733_summing_merge_tree_nested_low_cardinality.sql
new file mode 100644
index 000000000000..6b43952640bf
--- /dev/null
+++ b/tests/queries/0_stateless/03733_summing_merge_tree_nested_low_cardinality.sql
@@ -0,0 +1,8 @@
+CREATE TABLE sums (key LowCardinality(String), sumOfSums UInt64, sumsMap Nested (key LowCardinality(String), sum UInt64)) ENGINE = SummingMergeTree PRIMARY KEY (key);
+
+INSERT INTO sums (key, sumOfSums, sumsMap.key, sumsMap.sum) VALUES ('lol', 3, ['a', 'b'], [1, 2]);
+INSERT INTO sums (key, sumOfSums, sumsMap.key, sumsMap.sum) VALUES ('lol', 7, ['a', 'b'], [3, 4]);
+
+OPTIMIZE TABLE sums;
+
+SELECT * FROM sums;
diff --git a/tests/queries/0_stateless/03735_excessive_buffer_flush.reference b/tests/queries/0_stateless/03735_excessive_buffer_flush.reference
new file mode 100644
index 000000000000..cdd48f6eb519
--- /dev/null
+++ b/tests/queries/0_stateless/03735_excessive_buffer_flush.reference
@@ -0,0 +1,5 @@
+buffer_flush_by_flush_time	10
+buffer_flush_by_max	10
+buffer_flush_by_min	10
+empty_buffer	10
+empty_buffer_zero_time	10
diff --git a/tests/queries/0_stateless/03735_excessive_buffer_flush.sql b/tests/queries/0_stateless/03735_excessive_buffer_flush.sql
new file mode 100644
index 000000000000..4b32e912ba65
--- /dev/null
+++ b/tests/queries/0_stateless/03735_excessive_buffer_flush.sql
@@ -0,0 +1,40 @@
+-- Note, this test uses sleep, but, it should not affect it's flakiness
+
+set function_sleep_max_microseconds_per_block=5e9;
+
+drop table if exists data;
+create table data (key Int) engine=Null;
+
+drop table if exists empty_buffer;
+create table empty_buffer (key Int) engine=Buffer(currentDatabase(), data, 2, 2, 4, 100_000, 1_000_000, 10e9, 10e9, 3);
+select sleep(5) format Null;
+optimize table empty_buffer;
+drop table empty_buffer;
+
+drop table if exists empty_buffer_zero_time;
+create table empty_buffer_zero_time (key Int) engine=Buffer(currentDatabase(), data, 2, 0, 0, 100_000, 1_000_000, 10e9, 10e9, 0);
+select sleep(1) format Null;
+optimize table empty_buffer_zero_time;
+drop table empty_buffer_zero_time;
+
+drop table if exists buffer_flush_by_min;
+create table buffer_flush_by_min (key Int) engine=Buffer(currentDatabase(), data, 2, 2, 4, 100_000, 1_000_000, 0, 10e9, 3);
+insert into buffer_flush_by_min select * from numbers(100_000 + 1);
+select sleep(5) format Null;
+drop table buffer_flush_by_min;
+
+drop table if exists buffer_flush_by_max;
+create table buffer_flush_by_max (key Int) engine=Buffer(currentDatabase(), data, 2, 2, 4, 100_000, 1_000_000, 0, 10e9);
+insert into buffer_flush_by_max select * from numbers(1);
+select sleep(5) format Null;
+drop table buffer_flush_by_max;
+
+drop table if exists buffer_flush_by_flush_time;
+create table buffer_flush_by_flush_time (key Int) engine=Buffer(currentDatabase(), data, 2, 2, 4, 100_000, 1_000_000, 10e9, 10e9, 3);
+insert into buffer_flush_by_flush_time values (1);
+select sleep(5) format Null;
+drop table buffer_flush_by_flush_time;
+
+system flush logs text_log;
+-- to avoid flakiness we only check that number of logs < 10, instead of some strict values
+select extractAll(logger_name, 'StorageBuffer \\([^.]+\\.([^)]+)\\)')[1] as table_name, max2(count(), 10) from system.text_log where logger_name LIKE format('%StorageBuffer ({}.%', currentDatabase()) group by 1 order by 1;
diff --git a/tests/queries/0_stateless/03740_alter_modify_query_dict_name_in_cse.reference b/tests/queries/0_stateless/03740_alter_modify_query_dict_name_in_cse.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03740_alter_modify_query_dict_name_in_cse.sql b/tests/queries/0_stateless/03740_alter_modify_query_dict_name_in_cse.sql
new file mode 100644
index 000000000000..568d8850bbf9
--- /dev/null
+++ b/tests/queries/0_stateless/03740_alter_modify_query_dict_name_in_cse.sql
@@ -0,0 +1,10 @@
+drop table if exists mv;
+drop table if exists dst;
+drop table if exists src;
+drop dictionary if exists dict;
+
+create table src (key Int) engine=MergeTree order by ();
+create table dst (key Int) engine=MergeTree order by ();
+create dictionary dict (key Int, value Int) primary key key layout(direct) source(clickhouse(query 'select 0 key, 0 value'));
+create materialized view mv to dst as select * from src;
+alter table mv modify query with 'dict' as dict_name select dictGetInt32(dict_name, 'value', key) from src;
diff --git a/tests/queries/0_stateless/03741_dict_get_in_cte_with_no_arguments_old_analyzer.reference b/tests/queries/0_stateless/03741_dict_get_in_cte_with_no_arguments_old_analyzer.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03741_dict_get_in_cte_with_no_arguments_old_analyzer.sql b/tests/queries/0_stateless/03741_dict_get_in_cte_with_no_arguments_old_analyzer.sql
new file mode 100644
index 000000000000..3e2fb2443d8a
--- /dev/null
+++ b/tests/queries/0_stateless/03741_dict_get_in_cte_with_no_arguments_old_analyzer.sql
@@ -0,0 +1,2 @@
+SELECT ( SELECT dictGet() ) settings enable_analyzer=0; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+
diff --git a/tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.reference b/tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.reference
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.reference
@@ -0,0 +1 @@
+{}
diff --git a/tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.sql b/tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.sql
new file mode 100644
index 000000000000..187011654ab4
--- /dev/null
+++ b/tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.sql
@@ -0,0 +1,7 @@
+drop table if exists test;
+create table test (s String, json JSON materialized s) engine=MergeTree order by tuple();
+insert into test select '{"a" : 42}';
+alter table test update s = '{}' where json.a = 42 settings mutations_sync=1;
+select * from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03742_lazy_materialization_of_array_after_alter_add_column.reference b/tests/queries/0_stateless/03742_lazy_materialization_of_array_after_alter_add_column.reference
new file mode 100644
index 000000000000..f70bede2109c
--- /dev/null
+++ b/tests/queries/0_stateless/03742_lazy_materialization_of_array_after_alter_add_column.reference
@@ -0,0 +1 @@
+42	[]
diff --git a/tests/queries/0_stateless/03742_lazy_materialization_of_array_after_alter_add_column.sql b/tests/queries/0_stateless/03742_lazy_materialization_of_array_after_alter_add_column.sql
new file mode 100644
index 000000000000..27958a300f27
--- /dev/null
+++ b/tests/queries/0_stateless/03742_lazy_materialization_of_array_after_alter_add_column.sql
@@ -0,0 +1,7 @@
+drop table if exists test_lazy;
+create table test_lazy (id UInt64) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1;
+insert into test_lazy select * from numbers(100);
+alter table test_lazy add column array Array(UInt64) settings mutations_sync=1;
+select id, array from test_lazy where id = 42 order by id limit 10 settings query_plan_optimize_lazy_materialization = 1;
+drop table test_lazy;
+
diff --git a/tests/queries/0_stateless/03743_summing_and_aggregating_merge_tree_with_json_merge.reference b/tests/queries/0_stateless/03743_summing_and_aggregating_merge_tree_with_json_merge.reference
new file mode 100644
index 000000000000..2b76d346bc7f
--- /dev/null
+++ b/tests/queries/0_stateless/03743_summing_and_aggregating_merge_tree_with_json_merge.reference
@@ -0,0 +1,9 @@
+Dynamic paths
+a
+Shared data parhs
+Dynamic paths
+a
+Shared data parhs
+Dynamic paths
+a
+Shared data parhs
diff --git a/tests/queries/0_stateless/03743_summing_and_aggregating_merge_tree_with_json_merge.sql b/tests/queries/0_stateless/03743_summing_and_aggregating_merge_tree_with_json_merge.sql
new file mode 100644
index 000000000000..94a2d3aa9106
--- /dev/null
+++ b/tests/queries/0_stateless/03743_summing_and_aggregating_merge_tree_with_json_merge.sql
@@ -0,0 +1,34 @@
+set mutations_sync=1;
+
+drop table if exists test;
+create table test (id UInt64, json JSON) engine=SummingMergeTree order by id settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1, index_granularity=32, merge_max_block_size=32;
+insert into test select number, '{}' from numbers(100);
+alter table test update json = '{"a" : 42}' where id > 90;
+optimize table test final;
+select 'Dynamic paths';
+select distinct arrayJoin(JSONDynamicPaths(json)) from test;
+select 'Shared data parhs';
+select distinct arrayJoin(JSONSharedDataPaths(json)) from test;
+drop table test;
+
+create table test (id UInt64, json JSON) engine=AggregatingMergeTree order by id settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1, index_granularity=32, merge_max_block_size=32;
+insert into test select number, '{}' from numbers(100);
+alter table test update json = '{"a" : 42}' where id > 90;
+optimize table test final;
+select 'Dynamic paths';
+select distinct arrayJoin(JSONDynamicPaths(json)) from test;
+select 'Shared data parhs';
+select distinct arrayJoin(JSONSharedDataPaths(json)) from test;
+drop table test;
+
+create table test (id UInt64, json JSON) engine=CoalescingMergeTree order by id settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1, index_granularity=32, merge_max_block_size=32;
+insert into test select number, '{}' from numbers(100);
+alter table test update json = '{"a" : 42}' where id > 90;
+optimize table test final;
+select 'Dynamic paths';
+select distinct arrayJoin(JSONDynamicPaths(json)) from test;
+select 'Shared data parhs';
+select distinct arrayJoin(JSONSharedDataPaths(json)) from test;
+drop table test;
+
+
diff --git a/tests/queries/0_stateless/03745_fix_dynamic_structure_in_compact_part.reference b/tests/queries/0_stateless/03745_fix_dynamic_structure_in_compact_part.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03745_fix_dynamic_structure_in_compact_part.sql b/tests/queries/0_stateless/03745_fix_dynamic_structure_in_compact_part.sql
new file mode 100644
index 000000000000..83421e486acc
--- /dev/null
+++ b/tests/queries/0_stateless/03745_fix_dynamic_structure_in_compact_part.sql
@@ -0,0 +1,6 @@
+drop table if exists test;
+create table test (id UInt64, json JSON) engine=CoalescingMergeTree order by id settings min_bytes_for_wide_part='100G', merge_max_block_size=33, index_granularity=800;
+insert into test select number, '{}' from numbers(10000);
+alter table test update json = '{"a" : 42}' where id > 9000 settings mutations_sync=1;
+optimize table test final;
+drop table test;
diff --git a/tests/queries/0_stateless/03748_async_insert_reset_setting.reference b/tests/queries/0_stateless/03748_async_insert_reset_setting.reference
new file mode 100644
index 000000000000..7d9d0e6aacec
--- /dev/null
+++ b/tests/queries/0_stateless/03748_async_insert_reset_setting.reference
@@ -0,0 +1,20 @@
+2
+4
+1	test1
+1	test1
+2	test2
+2	test2
+3	test3
+3	test3
+4	test4
+4	test4
+5	test5
+5	test5
+6	test6
+6	test6
+7	test7
+7	test7
+8	test8
+8	test8
+9	test9
+9	test9
diff --git a/tests/queries/0_stateless/03748_async_insert_reset_setting.sh b/tests/queries/0_stateless/03748_async_insert_reset_setting.sh
new file mode 100755
index 000000000000..8816d406fcbf
--- /dev/null
+++ b/tests/queries/0_stateless/03748_async_insert_reset_setting.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+SYNC_USER="${CLICKHOUSE_DATABASE}_sync_user"
+ASYNC_USER="${CLICKHOUSE_DATABASE}_async_user"
+
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+DROP TABLE IF EXISTS source_table, target_table, target_table_remote_sync, target_table_remote_async, async_insert_mv, sync_insert_mv;
+DROP USER IF EXISTS ${SYNC_USER}, ${ASYNC_USER};
+
+CREATE USER ${SYNC_USER} HOST ANY IDENTIFIED WITH NO_PASSWORD SETTINGS async_insert = 0;
+CREATE USER ${ASYNC_USER} HOST ANY IDENTIFIED WITH NO_PASSWORD SETTINGS async_insert = 1;
+GRANT ALL ON target_table TO ${SYNC_USER};
+GRANT ALL ON target_table TO ${ASYNC_USER};
+
+CREATE TABLE source_table (
+    id UInt64,
+    data String
+)
+ENGINE=MergeTree()
+ORDER BY id;
+
+CREATE TABLE target_table (
+    id UInt64,
+    data String
+)
+ENGINE=MergeTree()
+ORDER BY id;
+
+CREATE TABLE target_table_remote_sync (
+    id UInt64,
+    data String
+)
+AS remote('127.0.0.2', currentDatabase(), 'target_table', '${SYNC_USER}');
+
+CREATE TABLE target_table_remote_async (
+    id UInt64,
+    data String
+)
+AS remote('127.0.0.2', currentDatabase(), 'target_table', '${ASYNC_USER}');
+
+CREATE MATERIALIZED VIEW async_insert_mv TO target_table_remote_async AS
+SELECT * FROM source_table;
+
+CREATE MATERIALIZED VIEW sync_insert_mv TO target_table_remote_sync AS
+SELECT * FROM source_table;
+
+-- Default setting, unset async_insert, so its default is 0
+SET async_insert = DEFAULT;
+-- One type of inserts each
+INSERT INTO source_table (id, data) VALUES (1, 'test1'), (2, 'test2'), (3, 'test3');
+SET async_insert = 1;
+-- One type of inserts each
+INSERT INTO source_table (id, data) VALUES (4, 'test4'), (5, 'test5'), (6, 'test6');
+SET async_insert = 0;
+-- This time both inserts have async_insert = 0, so 2 async and 4 sync inserts in total
+INSERT INTO source_table (id, data) VALUES (7, 'test7'), (8, 'test8'), (9, 'test9');
+
+SYSTEM FLUSH LOGS query_log;
+SELECT count() FROM system.query_log
+WHERE query_kind = 'Insert' AND type = 'QueryFinish'
+  AND user IN ('${SYNC_USER}', '${ASYNC_USER}')
+--  AND current_database = currentDatabase() -- to silent strange style check warning
+  AND tables = [currentDatabase() || '.target_table']
+GROUP BY Settings['async_insert']
+ORDER BY count() ASC;
+
+SELECT * FROM target_table ORDER BY id;
+EOF
diff --git a/tests/queries/0_stateless/03748_coalescing_merge_tree_tuple_low_cardinality_and_dynamic.reference b/tests/queries/0_stateless/03748_coalescing_merge_tree_tuple_low_cardinality_and_dynamic.reference
new file mode 100644
index 000000000000..390bec1d914d
--- /dev/null
+++ b/tests/queries/0_stateless/03748_coalescing_merge_tree_tuple_low_cardinality_and_dynamic.reference
@@ -0,0 +1,3 @@
+Dynamic paths
+a
+Shared data parhs
diff --git a/tests/queries/0_stateless/03748_coalescing_merge_tree_tuple_low_cardinality_and_dynamic.sql b/tests/queries/0_stateless/03748_coalescing_merge_tree_tuple_low_cardinality_and_dynamic.sql
new file mode 100644
index 000000000000..cd8ddcf8900a
--- /dev/null
+++ b/tests/queries/0_stateless/03748_coalescing_merge_tree_tuple_low_cardinality_and_dynamic.sql
@@ -0,0 +1,12 @@
+set mutations_sync=1;
+drop table if exists test;
+create table test (id UInt64, t Tuple(a LowCardinality(String), json JSON)) engine=CoalescingMergeTree order by id settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1, index_granularity=32, merge_max_block_size=32;
+insert into test select number, tuple('str', '{}') from numbers(100);
+alter table test update t = tuple('str', '{"a" : 42}') where id > 90;
+optimize table test final;
+select 'Dynamic paths';
+select distinct arrayJoin(JSONDynamicPaths(t.json)) from test;
+select 'Shared data parhs';
+select distinct arrayJoin(JSONSharedDataPaths(t.json)) from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03748_join_on_complex_condition_result_memory.reference b/tests/queries/0_stateless/03748_join_on_complex_condition_result_memory.reference
new file mode 100644
index 000000000000..a3f15f5d7699
--- /dev/null
+++ b/tests/queries/0_stateless/03748_join_on_complex_condition_result_memory.reference
@@ -0,0 +1,5 @@
+18750570
+25000810
+25005842
+25000810
+25005842
diff --git a/tests/queries/0_stateless/03748_join_on_complex_condition_result_memory.sql.j2 b/tests/queries/0_stateless/03748_join_on_complex_condition_result_memory.sql.j2
new file mode 100644
index 000000000000..55d5c30e5742
--- /dev/null
+++ b/tests/queries/0_stateless/03748_join_on_complex_condition_result_memory.sql.j2
@@ -0,0 +1,50 @@
+-- Tags: long
+
+SET query_plan_join_swap_table = 0;
+SET enable_analyzer = 1;
+
+SET max_memory_usage = '50M';
+
+WITH t1 AS (
+    SELECT number % 2 AS id, sipHash64(number, 1) % 2 as attr FROM numbers(5_000)
+),
+t2 AS (
+    SELECT number % 2 AS id, sipHash64(number, 2) % 2 as attr FROM numbers(5_000)
+)
+SELECT sum(ignore(*) + 1)
+FROM t1
+LEFT JOIN t2
+ON t1.id = t2.id OR (t1.attr = t2.attr)
+;
+
+{% for join_algorithm in ['hash', 'parallel_hash'] -%}
+
+WITH t1 AS (
+    SELECT number % 2 AS id, sipHash64(number, 1) % 2 as attr FROM numbers(10_000)
+),
+t2 AS (
+    SELECT number % 2 AS id, sipHash64(number, 2) % 2 as attr FROM numbers(10_000)
+)
+SELECT sum(ignore(*) + 1)
+FROM t1
+LEFT JOIN t2
+ON t1.id = t2.id AND (t1.attr != t2.attr)
+SETTINGS join_algorithm = '{{ join_algorithm }}';
+
+-- more rows to use two-level map
+WITH t1 AS (
+    SELECT number % 2 AS id, sipHash64(number, 1) % 2 as attr FROM numbers(10_000)
+),
+t2 AS (
+    SELECT number AS id, sipHash64(number, 2) % 2 as attr FROM numbers(10_000)
+    UNION ALL
+    SELECT number % 2 AS id, sipHash64(number, 2) % 2 as attr FROM numbers(10_000)
+)
+SELECT sum(ignore(*) + 1)
+FROM t1
+LEFT JOIN t2
+ON t1.id = t2.id AND (t1.attr != t2.attr)
+SETTINGS join_algorithm = '{{ join_algorithm }}',
+    max_threads = 8; -- with too many hash tables query consumes >50M memory
+
+{% endfor -%}
diff --git a/tests/queries/0_stateless/03749_dictionary_hierarchical_null.reference b/tests/queries/0_stateless/03749_dictionary_hierarchical_null.reference
new file mode 100644
index 000000000000..b7f0ef51d182
--- /dev/null
+++ b/tests/queries/0_stateless/03749_dictionary_hierarchical_null.reference
@@ -0,0 +1,45 @@
+-- {echoOn }
+
+DROP DICTIONARY IF EXISTS d0;
+CREATE DICTIONARY d0 (c0 Int) PRIMARY KEY (c0) SOURCE(NULL()) LAYOUT(FLAT()) LIFETIME(1);
+SELECT dictGetDescendants('d0', 'c0', 1); -- { serverError UNSUPPORTED_METHOD }
+SELECT dictGetDescendants('d0', 'c0', NULL); -- { serverError UNSUPPORTED_METHOD }
+SELECT dictGetDescendants('d0', NULL, 1); -- { serverError UNSUPPORTED_METHOD }
+SELECT dictGetChildren('d0', 'c0'); -- { serverError UNSUPPORTED_METHOD }
+SELECT dictGetChildren('d0', NULL); -- { serverError UNSUPPORTED_METHOD }
+SELECT dictGetChildren(NULL, NULL); -- { serverError UNSUPPORTED_METHOD }
+DROP DICTIONARY IF EXISTS hierarchical_dictionary;
+DROP TABLE IF EXISTS hierarchy_source;
+CREATE TABLE hierarchy_source
+(
+  id UInt64,
+  parent_id UInt64,
+  name String
+) ENGINE = Memory;
+INSERT INTO hierarchy_source VALUES
+(0, 0, 'Root'),
+(1, 0, 'Level 1 - Node 1'),
+(2, 1, 'Level 2 - Node 2'),
+(3, 1, 'Level 2 - Node 3'),
+(4, 2, 'Level 3 - Node 4'),
+(5, 2, 'Level 3 - Node 5'),
+(6, 3, 'Level 3 - Node 6');
+CREATE DICTIONARY hierarchical_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL,
+    name String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'hierarchy_source'))
+LAYOUT(HASHED())
+LIFETIME(0);
+SELECT dictGetDescendants('hierarchical_dictionary', 1, 1);
+[3,2]
+SELECT dictGetDescendants('hierarchical_dictionary', NULL, 1);
+\N
+SELECT dictGetDescendants('hierarchical_dictionary', 1, NULL); -- { serverError BAD_ARGUMENTS }
+SELECT dictGetChildren('hierarchical_dictionary', 1);
+[3,2]
+SELECT dictGetChildren('hierarchical_dictionary', NULL);
+\N
diff --git a/tests/queries/0_stateless/03749_dictionary_hierarchical_null.sql b/tests/queries/0_stateless/03749_dictionary_hierarchical_null.sql
new file mode 100644
index 000000000000..10ddcccc4e71
--- /dev/null
+++ b/tests/queries/0_stateless/03749_dictionary_hierarchical_null.sql
@@ -0,0 +1,58 @@
+-- {echoOn }
+
+DROP DICTIONARY IF EXISTS d0;
+CREATE DICTIONARY d0 (c0 Int) PRIMARY KEY (c0) SOURCE(NULL()) LAYOUT(FLAT()) LIFETIME(1);
+
+SELECT dictGetDescendants('d0', 'c0', 1); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT dictGetDescendants('d0', 'c0', NULL); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT dictGetDescendants('d0', NULL, 1); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT dictGetChildren('d0', 'c0'); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT dictGetChildren('d0', NULL); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT dictGetChildren(NULL, NULL); -- { serverError UNSUPPORTED_METHOD }
+
+
+DROP DICTIONARY IF EXISTS hierarchical_dictionary;
+DROP TABLE IF EXISTS hierarchy_source;
+
+CREATE TABLE hierarchy_source
+(
+  id UInt64,
+  parent_id UInt64,
+  name String
+) ENGINE = Memory;
+
+INSERT INTO hierarchy_source VALUES
+(0, 0, 'Root'),
+(1, 0, 'Level 1 - Node 1'),
+(2, 1, 'Level 2 - Node 2'),
+(3, 1, 'Level 2 - Node 3'),
+(4, 2, 'Level 3 - Node 4'),
+(5, 2, 'Level 3 - Node 5'),
+(6, 3, 'Level 3 - Node 6');
+
+
+CREATE DICTIONARY hierarchical_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL,
+    name String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'hierarchy_source'))
+LAYOUT(HASHED())
+LIFETIME(0);
+
+SELECT dictGetDescendants('hierarchical_dictionary', 1, 1);
+
+SELECT dictGetDescendants('hierarchical_dictionary', NULL, 1);
+
+SELECT dictGetDescendants('hierarchical_dictionary', 1, NULL); -- { serverError BAD_ARGUMENTS }
+
+SELECT dictGetChildren('hierarchical_dictionary', 1);
+
+SELECT dictGetChildren('hierarchical_dictionary', NULL);
diff --git a/tests/queries/0_stateless/03749_table_function_argument_asterisk.reference b/tests/queries/0_stateless/03749_table_function_argument_asterisk.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03749_table_function_argument_asterisk.sql b/tests/queries/0_stateless/03749_table_function_argument_asterisk.sql
new file mode 100644
index 000000000000..d438ee1e19c0
--- /dev/null
+++ b/tests/queries/0_stateless/03749_table_function_argument_asterisk.sql
@@ -0,0 +1,36 @@
+SELECT *
+FROM remote(*, '127.{1,2}', view(
+    SELECT 2
+)); -- { serverError BAD_ARGUMENTS }
+
+SELECT *
+FROM remote(*, view(
+    SELECT 2
+));  -- { serverError BAD_ARGUMENTS }
+
+SELECT *
+FROM remote(*, '127.{1,2}', view(
+    SELECT toLowCardinality(2)
+));  -- { serverError BAD_ARGUMENTS }
+
+SELECT *
+FROM remote(*, '127.{1,2}', view(
+    SELECT 1
+    FROM numbers(1)
+    GROUP BY toLowCardinality(2)
+));  -- { serverError BAD_ARGUMENTS }
+
+SELECT DISTINCT '/01650_drop_part_and_deduplication_partitioned_table/blocks/', 60, k1 
+FROM remote(*, '127.{1,2}', view(SELECT 1 AS k1, 65535, 2 AS k2, 3 AS v
+FROM numbers(2, cityHash64(k1)) 
+WHERE toLowCardinality(60) GROUP BY GROUPING SETS ((toLowCardinality(2))) 
+HAVING equals(k1, toNullable(60)))) FINAL; -- { serverError BAD_ARGUMENTS }
+
+SELECT * FROM numbers(*, 2); -- { serverError BAD_ARGUMENTS }
+
+SELECT * FROM numbers(2, *); -- { serverError BAD_ARGUMENTS }
+
+SELECT * FROM numbers_mt(2, *); -- { serverError BAD_ARGUMENTS }
+
+SELECT *
+FROM generateSeries(*, 1, 3); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03751_summing_coalescing_merge_tree_sparse_columns_in_header.reference b/tests/queries/0_stateless/03751_summing_coalescing_merge_tree_sparse_columns_in_header.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03751_summing_coalescing_merge_tree_sparse_columns_in_header.sql b/tests/queries/0_stateless/03751_summing_coalescing_merge_tree_sparse_columns_in_header.sql
new file mode 100644
index 000000000000..27327607f5a0
--- /dev/null
+++ b/tests/queries/0_stateless/03751_summing_coalescing_merge_tree_sparse_columns_in_header.sql
@@ -0,0 +1,12 @@
+drop table if exists src;
+create table src (x UInt64) engine=MergeTree order by tuple();
+insert into src select 0 from numbers(1000000);
+drop table if exists dst;
+create table dst (x UInt64) engine=CoalescingMergeTree order by tuple();
+insert into dst select * from src;
+drop table dst;
+create table dst (x UInt64) engine=SummingMergeTree order by tuple();
+insert into dst select * from src;
+drop table dst;
+drop table src;
+
diff --git a/tests/queries/0_stateless/03753_file_schema_cache_for_multiple_files.reference b/tests/queries/0_stateless/03753_file_schema_cache_for_multiple_files.reference
new file mode 100644
index 000000000000..91384f6a9604
--- /dev/null
+++ b/tests/queries/0_stateless/03753_file_schema_cache_for_multiple_files.reference
@@ -0,0 +1,3 @@
+0
+Hello	42
+42	Hello
diff --git a/tests/queries/0_stateless/03753_file_schema_cache_for_multiple_files.sh b/tests/queries/0_stateless/03753_file_schema_cache_for_multiple_files.sh
new file mode 100755
index 000000000000..d08ac59da013
--- /dev/null
+++ b/tests/queries/0_stateless/03753_file_schema_cache_for_multiple_files.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "select 'Hello' as c1, 42 as c2 format Parquet" > $CLICKHOUSE_TEST_UNIQUE_NAME.1.parquet
+$CLICKHOUSE_LOCAL -q "select 42 as c1, 'Hello' as c2 format Parquet" > $CLICKHOUSE_TEST_UNIQUE_NAME.2.parquet
+$CLICKHOUSE_LOCAL -m -q "
+select sleepEachRow(2);
+desc file('$CLICKHOUSE_TEST_UNIQUE_NAME.*.parquet') format Null;
+select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.1.parquet');
+select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.2.parquet');
+"
+
+rm $CLICKHOUSE_TEST_UNIQUE_NAME.*
diff --git a/tests/queries/0_stateless/03755_nested_recursive_cte.reference b/tests/queries/0_stateless/03755_nested_recursive_cte.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03755_nested_recursive_cte.sql b/tests/queries/0_stateless/03755_nested_recursive_cte.sql
new file mode 100644
index 000000000000..d7c09e50cc8c
--- /dev/null
+++ b/tests/queries/0_stateless/03755_nested_recursive_cte.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS t0;
+CREATE TABLE t0 (x Int32) ENGINE = Memory;
+INSERT INTO t0 VALUES (1);
+
+-- The original problematic query pattern - inner CTE references outer CTE
+-- Using count() to get deterministic output regardless of how many rows are produced before hitting the limit
+SET max_recursive_cte_evaluation_depth = 5;
+SET enable_analyzer = 1;
+
+SELECT count() > 0 FROM (
+  WITH RECURSIVE q AS (
+    SELECT 1 FROM t0 UNION ALL
+      (WITH RECURSIVE x AS
+        (SELECT 1 FROM t0 UNION ALL
+          (SELECT 1 FROM q WHERE FALSE UNION ALL
+           SELECT 1 FROM x WHERE FALSE))
+         SELECT 1 FROM x))
+    SELECT 1 FROM q
+); -- { serverError TOO_DEEP_RECURSION }
+
+DROP TABLE t0;
diff --git a/tests/queries/0_stateless/03757_optimize_skip_unused_shards_with_type_cast.reference b/tests/queries/0_stateless/03757_optimize_skip_unused_shards_with_type_cast.reference
new file mode 100644
index 000000000000..422c2b7ab3b3
--- /dev/null
+++ b/tests/queries/0_stateless/03757_optimize_skip_unused_shards_with_type_cast.reference
@@ -0,0 +1,2 @@
+a
+b
diff --git a/tests/queries/0_stateless/03757_optimize_skip_unused_shards_with_type_cast.sql b/tests/queries/0_stateless/03757_optimize_skip_unused_shards_with_type_cast.sql
new file mode 100644
index 000000000000..8b733194c765
--- /dev/null
+++ b/tests/queries/0_stateless/03757_optimize_skip_unused_shards_with_type_cast.sql
@@ -0,0 +1,6 @@
+drop table if exists t1;
+
+create table t1 (Col LowCardinality(String)) engine = MergeTree order by ();
+insert into t1 values ('a'), ('b'), ('c');
+
+select * from remote('127.{1,2}', currentDatabase(), t1, multiIf(Col = 'a', 0, Col = 'b', 1, -1)) where Col in ('a', 'b') order by all settings optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/03760_keep_alive_insert_select.reference b/tests/queries/0_stateless/03760_keep_alive_insert_select.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03760_keep_alive_insert_select.sh b/tests/queries/0_stateless/03760_keep_alive_insert_select.sh
new file mode 100755
index 000000000000..5c8ef4fb5f91
--- /dev/null
+++ b/tests/queries/0_stateless/03760_keep_alive_insert_select.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+CLICKHOUSE_URL="${CLICKHOUSE_URL}&http_wait_end_of_query=1"
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'Accept-Encoding: gzip' \
+    -d 'DROP TABLE IF EXISTS insert_number_table'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'Accept-Encoding: gzip' \
+    -d 'CREATE TABLE insert_number_table (record UInt32) Engine = Memory'
+
+query_id=$(
+    ${CLICKHOUSE_CURL} -vsS "${CLICKHOUSE_URL}&max_block_size=1&http_headers_progress_interval_ms=10&send_progress_in_http_headers=1" \
+    -d 'INSERT INTO insert_number_table (record) SELECT number FROM system.numbers LIMIT 10' 2>&1 \
+    | grep -F '< X-ClickHouse-Query-Id:' | sed 's/< X-ClickHouse-Query-Id: //' | tr -d '\n\t\r' | xargs
+)
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" \
+    -d "system flush logs text_log"
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" \
+    -d "SELECT message FROM system.text_log WHERE level='Error' AND query_id='${query_id}' AND message LIKE '%Request stream is shared by multiple threads. HTTP keep alive is not possible.%'"
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'Accept-Encoding: gzip' \
+    -d 'DROP TABLE insert_number_table'
diff --git a/tests/queries/0_stateless/03760_udf_group_by_format_crash.reference b/tests/queries/0_stateless/03760_udf_group_by_format_crash.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03760_udf_group_by_format_crash.sh b/tests/queries/0_stateless/03760_udf_group_by_format_crash.sh
new file mode 100755
index 000000000000..b6f923b65fe8
--- /dev/null
+++ b/tests/queries/0_stateless/03760_udf_group_by_format_crash.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "
+  DROP FUNCTION IF EXISTS ${CLICKHOUSE_DATABASE}_f0;
+  CREATE FUNCTION ${CLICKHOUSE_DATABASE}_f0 AS (p0) -> p0;
+
+  CREATE TABLE t0 (c0 Int) ENGINE = MergeTree() ORDER BY ${CLICKHOUSE_DATABASE}_f0(${CLICKHOUSE_DATABASE}_f0(COLUMNS('1'))) SETTINGS log_formatted_queries = 1; -- { serverError BAD_ARGUMENTS };
+
+  DROP FUNCTION ${CLICKHOUSE_DATABASE}_f0;
+"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03761_count_distinct_optimization_window.reference b/tests/queries/0_stateless/03761_count_distinct_optimization_window.reference
new file mode 100644
index 000000000000..f00c965d8307
--- /dev/null
+++ b/tests/queries/0_stateless/03761_count_distinct_optimization_window.reference
@@ -0,0 +1,10 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
diff --git a/tests/queries/0_stateless/03761_count_distinct_optimization_window.sql b/tests/queries/0_stateless/03761_count_distinct_optimization_window.sql
new file mode 100644
index 000000000000..7ce3c95b887a
--- /dev/null
+++ b/tests/queries/0_stateless/03761_count_distinct_optimization_window.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/86442
+-- The transformation shouldn't be applied if the aggregation has window parameters
+SELECT uniqExact(c0) OVER (ORDER BY c0 DESC)
+FROM
+(
+    SELECT number AS c0
+    FROM numbers(10)
+) AS t0
+SETTINGS count_distinct_optimization = 1, enable_analyzer = 1;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.reference b/tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.reference
new file mode 100644
index 000000000000..e862ecadf058
--- /dev/null
+++ b/tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.reference
@@ -0,0 +1,2 @@
+143
+143
diff --git a/tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.sql b/tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.sql
new file mode 100644
index 000000000000..e099379c79d2
--- /dev/null
+++ b/tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.sql
@@ -0,0 +1,2 @@
+SELECT count(DISTINCT x, y) FROM (SELECT number % 11 AS x, number % 13 AS y FROM system.numbers LIMIT 1000) SETTINGS count_distinct_optimization = 0, enable_analyzer = 1;
+SELECT count(DISTINCT x, y) FROM (SELECT number % 11 AS x, number % 13 AS y FROM system.numbers LIMIT 1000) SETTINGS count_distinct_optimization = 1, enable_analyzer = 1;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03763_column_conflicting_with_subcolumn.reference b/tests/queries/0_stateless/03763_column_conflicting_with_subcolumn.reference
new file mode 100644
index 000000000000..93d50fd0a518
--- /dev/null
+++ b/tests/queries/0_stateless/03763_column_conflicting_with_subcolumn.reference
@@ -0,0 +1,20 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+[0]	0
+[1]	1
+[2]	2
+[3]	3
+[4]	4
+[5]	5
+[6]	6
+[7]	7
+[8]	8
+[9]	9
diff --git a/tests/queries/0_stateless/03763_column_conflicting_with_subcolumn.sql b/tests/queries/0_stateless/03763_column_conflicting_with_subcolumn.sql
new file mode 100644
index 000000000000..b3d455dc713e
--- /dev/null
+++ b/tests/queries/0_stateless/03763_column_conflicting_with_subcolumn.sql
@@ -0,0 +1,7 @@
+drop table if exists test;
+create table test (a Array(UInt64), `a.size0` UInt64) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=1;
+insert into test select [number], number from numbers(10);
+select a.size0 from test;
+select a, a.size0 from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03766_subcolumns_resolution_in_aliases.reference b/tests/queries/0_stateless/03766_subcolumns_resolution_in_aliases.reference
new file mode 100644
index 000000000000..cf3f99ff1e63
--- /dev/null
+++ b/tests/queries/0_stateless/03766_subcolumns_resolution_in_aliases.reference
@@ -0,0 +1,23 @@
+0	43
+QUERY id: 0
+  PROJECTION COLUMNS
+    ab UInt64
+    bcd UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      COLUMN id: 2, column_name: ab, result_type: UInt64, source_id: 3
+        EXPRESSION
+          FUNCTION id: 4, function_name: _CAST, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 5, nodes: 2
+                COLUMN id: 6, column_name: a.b, result_type: Dynamic, source_id: 3
+                CONSTANT id: 7, constant_value: \'UInt64\', constant_value_type: String
+      COLUMN id: 8, column_name: bcd, result_type: UInt64, source_id: 3
+        EXPRESSION
+          FUNCTION id: 9, function_name: _CAST, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 10, nodes: 2
+                COLUMN id: 11, column_name: b.c.d, result_type: Dynamic, source_id: 3
+                CONSTANT id: 12, constant_value: \'UInt64\', constant_value_type: String
+  JOIN TREE
+    TABLE id: 3, alias: __table1, table_name: default.test
diff --git a/tests/queries/0_stateless/03766_subcolumns_resolution_in_aliases.sql b/tests/queries/0_stateless/03766_subcolumns_resolution_in_aliases.sql
new file mode 100644
index 000000000000..19b4df723b02
--- /dev/null
+++ b/tests/queries/0_stateless/03766_subcolumns_resolution_in_aliases.sql
@@ -0,0 +1,9 @@
+set enable_analyzer=1;
+
+drop table if exists test;
+create table test (a JSON, `b.c` JSON, ab UInt64 alias a.b, bcd UInt64 alias b.c.d) engine=MergeTree order by tuple();
+insert into test select '{"a" : 42}', '{"d" : 43}';
+select ab, bcd from test;
+explain query tree select ab, bcd from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03772_key_condition_match_function_relaxed.reference b/tests/queries/0_stateless/03772_key_condition_match_function_relaxed.reference
new file mode 100644
index 000000000000..36bc49bead94
--- /dev/null
+++ b/tests/queries/0_stateless/03772_key_condition_match_function_relaxed.reference
@@ -0,0 +1,86 @@
+-- { echo }
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^https?://clickhouse[.]com/');
+1
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^https?://clickhouse[.]com/');
+Expression ((Project names + Projection))
+  Aggregating
+    Expression (Before GROUP BY)
+      Filter ((WHERE + Change column names to column identifiers))
+        ReadFromMergeTree (default.03772_table_match)
+        Indexes:
+          PrimaryKey
+            Keys:
+              url
+            Condition: not((url in [\'http\', \'httq\')))
+            Parts: 1/1
+            Granules: 1/1
+            Search Algorithm: generic exclusion search
+            Ranges: 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^abcd');
+1
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^abcd');
+Expression ((Project names + Projection))
+  Aggregating
+    Expression (Before GROUP BY)
+      Filter ((WHERE + Change column names to column identifiers))
+        ReadFromMergeTree (default.03772_table_match)
+        Indexes:
+          PrimaryKey
+            Keys:
+              url
+            Condition: not((url in [\'abcd\', \'abce\')))
+            Parts: 1/1
+            Granules: 1/1
+            Search Algorithm: generic exclusion search
+            Ranges: 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^abcd');
+0
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^abcd');
+Expression ((Project names + Projection))
+  Aggregating
+    Expression (Before GROUP BY)
+      Filter ((WHERE + Change column names to column identifiers))
+        ReadFromMergeTree (default.03772_table_match)
+        Indexes:
+          PrimaryKey
+            Keys:
+              url
+            Condition: (url in [\'abcd\', \'abce\'))
+            Parts: 0/1
+            Granules: 0/1
+            Search Algorithm: binary search
+            Ranges: 0
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^https?://clickhouse[.]com/') = false;
+1
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^https?://clickhouse[.]com/') = false;
+Expression ((Project names + Projection))
+  Aggregating
+    Expression (Before GROUP BY)
+      Filter ((WHERE + Change column names to column identifiers))
+        ReadFromMergeTree (default.03772_table_match)
+        Indexes:
+          PrimaryKey
+            Condition: true
+            Parts: 1/1
+            Granules: 1/1
+            Ranges: 1
diff --git a/tests/queries/0_stateless/03772_key_condition_match_function_relaxed.sql b/tests/queries/0_stateless/03772_key_condition_match_function_relaxed.sql
new file mode 100644
index 000000000000..edb033b406ed
--- /dev/null
+++ b/tests/queries/0_stateless/03772_key_condition_match_function_relaxed.sql
@@ -0,0 +1,48 @@
+-- Tags: no-replicated-database, no-parallel-replicas
+-- no-replicated-database: EXPLAIN output differs for replicated database.
+-- no-parallel-replicas: EXPLAIN output differs for parallel replicas.
+
+
+DROP TABLE IF EXISTS 03772_table_match;
+
+CREATE TABLE 03772_table_match
+ENGINE = MergeTree()
+ORDER BY url AS
+SELECT 'http://example1.com/' AS url;
+
+-- { echo }
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^https?://clickhouse[.]com/');
+
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^https?://clickhouse[.]com/');
+
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^abcd');
+
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE NOT match(url, '^abcd');
+
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^abcd');
+
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^abcd');
+
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^https?://clickhouse[.]com/') = false;
+
+EXPLAIN indexes = 1
+SELECT count(*)
+FROM 03772_table_match
+WHERE match(url, '^https?://clickhouse[.]com/') = false;
diff --git a/tests/queries/0_stateless/03773_create_user_param_auth_methods.reference b/tests/queries/0_stateless/03773_create_user_param_auth_methods.reference
new file mode 100644
index 000000000000..910de1b18dd3
--- /dev/null
+++ b/tests/queries/0_stateless/03773_create_user_param_auth_methods.reference
@@ -0,0 +1 @@
+localhost	9000	0		0	0
diff --git a/tests/queries/0_stateless/03773_create_user_param_auth_methods.sql b/tests/queries/0_stateless/03773_create_user_param_auth_methods.sql
new file mode 100644
index 000000000000..d76a5be7600d
--- /dev/null
+++ b/tests/queries/0_stateless/03773_create_user_param_auth_methods.sql
@@ -0,0 +1,12 @@
+-- Tags: no-fasttest, no-parallel, no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+-- Test for issue #92010: Query parameters in authentication methods with ON CLUSTER
+
+DROP USER IF EXISTS user_param_auth_03773;
+
+SET param_password='test_password_03773';
+
+-- Before fix: This would fail with UNKNOWN_QUERY_PARAMETER on remote nodes
+CREATE USER user_param_auth_03773 ON CLUSTER test_shard_localhost IDENTIFIED WITH plaintext_password BY {password:String};
+
+DROP USER IF EXISTS user_param_auth_03773;
diff --git a/tests/queries/0_stateless/03773_deserialise_malformed_aggregate_state.reference b/tests/queries/0_stateless/03773_deserialise_malformed_aggregate_state.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03773_deserialise_malformed_aggregate_state.sql b/tests/queries/0_stateless/03773_deserialise_malformed_aggregate_state.sql
new file mode 100644
index 000000000000..a8cf6ac6d4a4
--- /dev/null
+++ b/tests/queries/0_stateless/03773_deserialise_malformed_aggregate_state.sql
@@ -0,0 +1,13 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/93026
+SELECT hex(groupConcatMerge(',', 10)(state))
+FROM
+(
+    SELECT CAST(unhex('01580180808080108A80808010'), 'AggregateFunction(groupConcat(\',\', 10), String)') AS state
+); -- { serverError BAD_ARGUMENTS }
+
+-- Check for non-monotonic offsets
+SELECT hex(groupConcatMerge(',', 10)(state))
+FROM
+(
+    SELECT CAST(unhex('0141010100'), 'AggregateFunction(groupConcat(\',\', 10), String)') AS state
+); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03773_group_concat_overflow.reference b/tests/queries/0_stateless/03773_group_concat_overflow.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03773_group_concat_overflow.sql b/tests/queries/0_stateless/03773_group_concat_overflow.sql
new file mode 100644
index 000000000000..1aa88c3dbf63
--- /dev/null
+++ b/tests/queries/0_stateless/03773_group_concat_overflow.sql
@@ -0,0 +1,8 @@
+-- Check if we catch overflow on num_rows
+
+-- data_size = 4, data = AAAA, num_rows = 2^63
+SELECT hex(groupConcatMerge(',', 10)(state))
+FROM
+(
+    SELECT CAST(unhex('044141414180808080808080808001'), 'AggregateFunction(groupConcat(\',\', 10), String)') AS state
+) -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03773_json_with_typed_path_skip.reference b/tests/queries/0_stateless/03773_json_with_typed_path_skip.reference
new file mode 100644
index 000000000000..eac58cb4f413
--- /dev/null
+++ b/tests/queries/0_stateless/03773_json_with_typed_path_skip.reference
@@ -0,0 +1 @@
+{"skip":"Hello"}
diff --git a/tests/queries/0_stateless/03773_json_with_typed_path_skip.sql b/tests/queries/0_stateless/03773_json_with_typed_path_skip.sql
new file mode 100644
index 000000000000..a0ad48e00d56
--- /dev/null
+++ b/tests/queries/0_stateless/03773_json_with_typed_path_skip.sql
@@ -0,0 +1,2 @@
+select '{"skip" : "Hello"}'::JSON(`skip` Nullable(String));
+
diff --git a/tests/queries/0_stateless/03773_key_condition_not_materialize_not_cast.reference b/tests/queries/0_stateless/03773_key_condition_not_materialize_not_cast.reference
new file mode 100644
index 000000000000..14044fda5108
--- /dev/null
+++ b/tests/queries/0_stateless/03773_key_condition_not_materialize_not_cast.reference
@@ -0,0 +1,32 @@
+1
+2
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + Projection))
+      Filter ((WHERE + Change column names to column identifiers))
+        ReadFromMergeTree (default.t_cast_bug)
+        Indexes:
+          PrimaryKey
+            Keys:
+              val
+            Condition: (val not in [0, 0])
+            Parts: 2/3
+            Granules: 2/3
+            Search Algorithm: generic exclusion search
+            Ranges: 2
+1
+2
+Expression (Project names)
+  Sorting (Sorting for ORDER BY)
+    Expression ((Before ORDER BY + (Projection + (WHERE + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers))))))))))))
+      Filter (((WHERE + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers))))))))))[split])
+        ReadFromMergeTree (default.t_materialize_bug)
+        Indexes:
+          PrimaryKey
+            Keys:
+              val
+            Condition: (val not in [0, 0])
+            Parts: 2/3
+            Granules: 2/3
+            Search Algorithm: generic exclusion search
+            Ranges: 2
diff --git a/tests/queries/0_stateless/03773_key_condition_not_materialize_not_cast.sql b/tests/queries/0_stateless/03773_key_condition_not_materialize_not_cast.sql
new file mode 100644
index 000000000000..af7b1466fc30
--- /dev/null
+++ b/tests/queries/0_stateless/03773_key_condition_not_materialize_not_cast.sql
@@ -0,0 +1,33 @@
+-- Tags: no-replicated-database, no-parallel-replicas, no-parallel, no-random-merge-tree-settings
+-- EXPLAIN output may differ
+
+DROP TABLE IF EXISTS t_cast_bug;
+
+CREATE TABLE t_cast_bug (val UInt8) ENGINE = MergeTree ORDER BY val;
+SYSTEM STOP MERGES t_cast_bug;
+
+INSERT INTO t_cast_bug VALUES (1);
+INSERT INTO t_cast_bug VALUES (0);
+INSERT INTO t_cast_bug VALUES (0), (2);
+
+SELECT val FROM t_cast_bug WHERE NOT CAST(val = 0, 'UInt8') ORDER BY val;
+
+EXPLAIN indexes=1
+SELECT val FROM t_cast_bug WHERE NOT CAST(val = 0, 'UInt8') ORDER BY val;
+
+
+DROP TABLE IF EXISTS t_materialize_bug;
+
+CREATE TABLE t_materialize_bug (val UInt8) ORDER BY (val);
+CREATE VIEW v AS SELECT val, val = 0 AS is_zero FROM t_materialize_bug;
+SYSTEM STOP MERGES t_materialize_bug;
+
+INSERT INTO t_materialize_bug VALUES (1);
+INSERT INTO t_materialize_bug VALUES (0);
+INSERT INTO t_materialize_bug VALUES (0), (2);
+
+SELECT val FROM v WHERE NOT is_zero ORDER BY val;
+
+EXPLAIN indexes=1
+SELECT val FROM v WHERE NOT is_zero ORDER BY val;
+
diff --git a/tests/queries/0_stateless/03773_lightweight_update_index_subquery.reference b/tests/queries/0_stateless/03773_lightweight_update_index_subquery.reference
new file mode 100644
index 000000000000..8975c726eb76
--- /dev/null
+++ b/tests/queries/0_stateless/03773_lightweight_update_index_subquery.reference
@@ -0,0 +1,3 @@
+0
+0
+3
diff --git a/tests/queries/0_stateless/03773_lightweight_update_index_subquery.sql b/tests/queries/0_stateless/03773_lightweight_update_index_subquery.sql
new file mode 100644
index 000000000000..9ec34be0e280
--- /dev/null
+++ b/tests/queries/0_stateless/03773_lightweight_update_index_subquery.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS test_lwd;
+
+CREATE TABLE test_lwd (id UInt64)
+ENGINE MergeTree() ORDER BY id
+SETTINGS enable_block_number_column = 1, enable_block_offset_column = 1, index_granularity = 8192;
+
+SET lightweight_delete_mode = 'lightweight_update_force';
+
+INSERT INTO test_lwd SELECT number FROM numbers(100000);
+
+SET max_rows_to_read = 10000;
+SET force_primary_key = 1;
+
+DELETE FROM test_lwd WHERE id IN (10000, 10001, 10002);
+DELETE FROM test_lwd WHERE id IN (SELECT number FROM numbers(10003, 3));
+
+SELECT count() FROM test_lwd WHERE id IN (SELECT number FROM numbers(10000, 3));
+SELECT count() FROM test_lwd WHERE id IN (SELECT number FROM numbers(10003, 3));
+SELECT count() FROM test_lwd WHERE id IN (SELECT number FROM numbers(10006, 3));
+
+DROP TABLE IF EXISTS test_lwd;
diff --git a/tests/queries/0_stateless/03773_nullable_sparse_join.reference b/tests/queries/0_stateless/03773_nullable_sparse_join.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03773_nullable_sparse_join.sql b/tests/queries/0_stateless/03773_nullable_sparse_join.sql
new file mode 100644
index 000000000000..a361267bb344
--- /dev/null
+++ b/tests/queries/0_stateless/03773_nullable_sparse_join.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+
+SET max_partitions_per_insert_block=99999999;
+SET compatibility='23.3';
+
+CREATE TABLE t1 (`c1` String, `c3` String, `c2` DateTime) ENGINE = MergeTree PARTITION BY toYYYYMM(c2) ORDER BY c1;
+CREATE TABLE t2 (`c4` Int64) ENGINE = MergeTree ORDER BY c4;
+
+INSERT INTO t1 SELECT * FROM generateRandom() LIMIT 9;
+INSERT INTO t2 SELECT * FROM generateRandom() LIMIT 9;
+
+SELECT lo.c4 FROM t1 AS l INNER JOIN t2 AS lo ON toInt64OrNull(l.c3) = lo.c4 FORMAT NULL;
+
+DROP TABLE t1;
+DROP TABLE t2;
diff --git a/tests/queries/0_stateless/03773_parquet_roundtrip_bug.reference b/tests/queries/0_stateless/03773_parquet_roundtrip_bug.reference
new file mode 100644
index 000000000000..bc03cc2d26b4
--- /dev/null
+++ b/tests/queries/0_stateless/03773_parquet_roundtrip_bug.reference
@@ -0,0 +1,2 @@
+JSON	Tuple(\n    `1` UInt8,\n    `2` String)	JSON
+JSON	Tuple(\n    `1` UInt8,\n    `2` String)	JSON
diff --git a/tests/queries/0_stateless/03773_parquet_roundtrip_bug.sql b/tests/queries/0_stateless/03773_parquet_roundtrip_bug.sql
new file mode 100644
index 000000000000..7a8eb738812a
--- /dev/null
+++ b/tests/queries/0_stateless/03773_parquet_roundtrip_bug.sql
@@ -0,0 +1,6 @@
+-- Tags: no-fasttest
+
+set schema_inference_make_columns_nullable = 0;
+insert into function file(currentDatabase() || '_03773.parquet') select '{"a": 42}'::JSON as j1, tuple(42, '{}') as t, '{"b": 1337}'::JSON as j2 settings engine_file_truncate_on_insert=1;
+select toTypeName(j1), toTypeName(t), toTypeName(j2) from file(currentDatabase() || '_03773.parquet') settings input_format_parquet_use_native_reader_v3=0;
+select toTypeName(j1), toTypeName(t), toTypeName(j2) from file(currentDatabase() || '_03773.parquet') settings input_format_parquet_use_native_reader_v3=1;
diff --git a/tests/queries/0_stateless/03777_analyzer_unused_columns_removal_correlated_subquery.reference b/tests/queries/0_stateless/03777_analyzer_unused_columns_removal_correlated_subquery.reference
new file mode 100644
index 000000000000..93effd44c582
--- /dev/null
+++ b/tests/queries/0_stateless/03777_analyzer_unused_columns_removal_correlated_subquery.reference
@@ -0,0 +1,65 @@
+QUERY id: 0
+  PROJECTION COLUMNS
+    avg_yearly Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: divide, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Decimal(38, 2)
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: l_extendedprice, result_type: Decimal(15, 2), source_id: 7
+            CONSTANT id: 8, constant_value: Float64_7, constant_value_type: Float64
+  JOIN TREE
+    QUERY id: 7, alias: __table1, is_subquery: 1
+      PROJECTION COLUMNS
+        l_quantity Decimal(15, 2)
+        l_extendedprice Decimal(15, 2)
+        p_partkey Int32
+      PROJECTION
+        LIST id: 9, nodes: 3
+          COLUMN id: 10, column_name: l_quantity, result_type: Decimal(15, 2), source_id: 11
+          COLUMN id: 12, column_name: l_extendedprice, result_type: Decimal(15, 2), source_id: 11
+          COLUMN id: 13, column_name: p_partkey, result_type: Int32, source_id: 14
+      JOIN TREE
+        JOIN id: 15, strictness: ALL, kind: INNER
+          LEFT TABLE EXPRESSION
+            TABLE id: 11, alias: __table2, table_name: default.lineitem
+          RIGHT TABLE EXPRESSION
+            TABLE id: 14, alias: __table3, table_name: default.part
+          JOIN EXPRESSION
+            FUNCTION id: 16, function_name: equals, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 17, nodes: 2
+                  COLUMN id: 18, column_name: p_partkey, result_type: Int32, source_id: 14
+                  COLUMN id: 19, column_name: l_partkey, result_type: Int32, source_id: 11
+  WHERE
+    FUNCTION id: 20, function_name: less, function_type: ordinary, result_type: Nullable(UInt8)
+      ARGUMENTS
+        LIST id: 21, nodes: 2
+          COLUMN id: 22, column_name: l_quantity, result_type: Decimal(15, 2), source_id: 7
+          QUERY id: 23, alias: __table4, is_subquery: 1, is_correlated: 1
+            CORRELATED COLUMNS
+              LIST id: 24, nodes: 1
+                COLUMN id: 25, column_name: p_partkey, result_type: Int32, source_id: 7
+            PROJECTION COLUMNS
+              multiply(0.2, avg(l_quantity)) Float64
+            PROJECTION
+              LIST id: 26, nodes: 1
+                FUNCTION id: 27, function_name: multiply, function_type: ordinary, result_type: Float64
+                  ARGUMENTS
+                    LIST id: 28, nodes: 2
+                      CONSTANT id: 29, constant_value: Float64_0.2, constant_value_type: Float64
+                      FUNCTION id: 30, function_name: avg, function_type: aggregate, result_type: Float64
+                        ARGUMENTS
+                          LIST id: 31, nodes: 1
+                            COLUMN id: 32, column_name: l_quantity, result_type: Decimal(15, 2), source_id: 33
+            JOIN TREE
+              TABLE id: 33, alias: __table5, table_name: default.lineitem
+            WHERE
+              FUNCTION id: 34, function_name: equals, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 35, nodes: 2
+                    COLUMN id: 36, column_name: l_partkey, result_type: Int32, source_id: 33
+                    COLUMN id: 25, column_name: p_partkey, result_type: Int32, source_id: 7
diff --git a/tests/queries/0_stateless/03777_analyzer_unused_columns_removal_correlated_subquery.sql b/tests/queries/0_stateless/03777_analyzer_unused_columns_removal_correlated_subquery.sql
new file mode 100644
index 000000000000..d6f08fb97303
--- /dev/null
+++ b/tests/queries/0_stateless/03777_analyzer_unused_columns_removal_correlated_subquery.sql
@@ -0,0 +1,67 @@
+SET enable_analyzer = 1;
+SET enable_parallel_replicas = 0;
+SET correlated_subqueries_substitute_equivalent_expressions = 0;
+
+CREATE TABLE lineitem (
+    l_orderkey       Int32,
+    l_partkey        Int32,
+    l_suppkey        Int32,
+    l_linenumber     Int32,
+    l_quantity       Decimal(15,2),
+    l_extendedprice  Decimal(15,2),
+    l_discount       Decimal(15,2),
+    l_tax            Decimal(15,2),
+    l_returnflag     String,
+    l_linestatus     String,
+    l_shipdate       Date,
+    l_commitdate     Date,
+    l_receiptdate    Date,
+    l_shipinstruct   String,
+    l_shipmode       String,
+    l_comment        String)
+ORDER BY (l_orderkey, l_linenumber);
+INSERT INTO lineitem SELECT * FROM generateRandom() LIMIT 1;
+
+CREATE TABLE part (
+    p_partkey     Int32,
+    p_name        String,
+    p_mfgr        String,
+    p_brand       String,
+    p_type        String,
+    p_size        Int32,
+    p_container   String,
+    p_retailprice Decimal(15,2),
+    p_comment     String)
+ORDER BY (p_partkey);
+INSERT INTO part SELECT * FROM generateRandom() LIMIT 1;
+
+
+EXPLAIN QUERY TREE
+SELECT
+    sum(l_extendedprice) / 7.0 AS avg_yearly
+FROM
+    (SELECT * FROM lineitem, part WHERE p_partkey = l_partkey) AS lp
+WHERE
+    l_quantity < (
+        SELECT
+            0.2 * avg(l_quantity)
+        FROM
+            lineitem
+        WHERE
+            l_partkey = lp.p_partkey
+    );
+
+SELECT
+    sum(l_extendedprice) / 7.0 AS avg_yearly
+FROM
+    (SELECT * FROM lineitem, part WHERE p_partkey = l_partkey) AS lp
+WHERE
+    l_quantity < (
+        SELECT
+            0.2 * avg(l_quantity)
+        FROM
+            lineitem
+        WHERE
+            l_partkey = lp.p_partkey
+    )
+FORMAT Null;
diff --git a/tests/queries/0_stateless/03778_mutation_bad_sparse_cration_with_altered_ration.reference b/tests/queries/0_stateless/03778_mutation_bad_sparse_cration_with_altered_ration.reference
new file mode 100644
index 000000000000..7f1bc308d222
--- /dev/null
+++ b/tests/queries/0_stateless/03778_mutation_bad_sparse_cration_with_altered_ration.reference
@@ -0,0 +1,10 @@
+0	0
+1	0
+2	0
+3	0
+4	0
+5	0
+6	0
+7	0
+8	0
+9	0
diff --git a/tests/queries/0_stateless/03778_mutation_bad_sparse_cration_with_altered_ration.sql b/tests/queries/0_stateless/03778_mutation_bad_sparse_cration_with_altered_ration.sql
new file mode 100644
index 000000000000..3bdd73631fed
--- /dev/null
+++ b/tests/queries/0_stateless/03778_mutation_bad_sparse_cration_with_altered_ration.sql
@@ -0,0 +1,9 @@
+drop table if exists test;
+create table test (a UInt32, b UInt32) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=0, ratio_of_defaults_for_sparse_serialization=0.0, max_suspicious_broken_parts=0, max_suspicious_broken_parts_bytes=0;
+insert into test select number, number from numbers(10);
+alter table test modify setting ratio_of_defaults_for_sparse_serialization=1.0;
+alter table test update b = 0 where 1 settings mutations_sync=2;
+detach table test;
+attach table test;
+select * from test;
+
diff --git a/tests/queries/0_stateless/03780_insert_sparse_into_ttl_column.reference b/tests/queries/0_stateless/03780_insert_sparse_into_ttl_column.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03780_insert_sparse_into_ttl_column.sh b/tests/queries/0_stateless/03780_insert_sparse_into_ttl_column.sh
new file mode 100755
index 000000000000..871a9fb4d9f2
--- /dev/null
+++ b/tests/queries/0_stateless/03780_insert_sparse_into_ttl_column.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="
+drop table if exists test;
+create table test (c0 Int, c1 DateTime) engine=MergeTree order by tuple() ttl c1 SETTINGS ratio_of_defaults_for_sparse_serialization = 0.001;
+insert into test (c0) select * from numbers(10);
+insert into function file(${CLICKHOUSE_TEST_UNIQUE_NAME}.csv) select * from test;
+insert into test select * from file(${CLICKHOUSE_TEST_UNIQUE_NAME}.csv);
+drop table test;
+"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03780_json_typed_paths_with_same_prefix.reference b/tests/queries/0_stateless/03780_json_typed_paths_with_same_prefix.reference
new file mode 100644
index 000000000000..8e5083748216
--- /dev/null
+++ b/tests/queries/0_stateless/03780_json_typed_paths_with_same_prefix.reference
@@ -0,0 +1 @@
+{"a":42,"a":{"b":43}}	42	43
diff --git a/tests/queries/0_stateless/03780_json_typed_paths_with_same_prefix.sql b/tests/queries/0_stateless/03780_json_typed_paths_with_same_prefix.sql
new file mode 100644
index 000000000000..40231d999f7b
--- /dev/null
+++ b/tests/queries/0_stateless/03780_json_typed_paths_with_same_prefix.sql
@@ -0,0 +1,3 @@
+set enable_analyzer=1;
+select '{"a" : 42, "a.b" : 43}'::JSON(a UInt32, `a.b` UInt32) as json, json.a, json.a.b;
+
diff --git a/tests/queries/0_stateless/03784_bad_base_backup.reference b/tests/queries/0_stateless/03784_bad_base_backup.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03784_bad_base_backup.sh b/tests/queries/0_stateless/03784_bad_base_backup.sh
new file mode 100755
index 000000000000..d95c3fd6f10e
--- /dev/null
+++ b/tests/queries/0_stateless/03784_bad_base_backup.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# A test for a race condition in backups.
+# It does weird stuff, it's expected to have errors due to concurrently created files.
+# But in no circumstances it can crash the server.
+
+TIMEOUT=10
+
+function thread()
+{
+  I=0
+  while true
+  do
+    [[ $SECONDS -gt $TIMEOUT ]] && break
+    I=$((I+1))
+
+    #rm "${CLICKHOUSE_DATABASE}_${I}/backup0.tar.zst"
+
+    $CLICKHOUSE_CLIENT --query="
+    SET allow_suspicious_low_cardinality_types = 1;
+
+    DROP DATABASE IF EXISTS d1_$CLICKHOUSE_DATABASE;
+    DROP DATABASE IF EXISTS d2_$CLICKHOUSE_DATABASE;
+
+    CREATE DATABASE d1_$CLICKHOUSE_DATABASE ENGINE = Replicated('/clickhouse/databases/d1_$CLICKHOUSE_DATABASE', '{shard}', '{replica}');
+    CREATE DATABASE d2_$CLICKHOUSE_DATABASE ENGINE = Replicated('/clickhouse/databases/d2_$CLICKHOUSE_DATABASE', 's0', 'd0');
+
+    CREATE TABLE d1_$CLICKHOUSE_DATABASE.\"t4\" (\"c0\" Array(UInt64), \"c1\" Nullable(UInt256), \"c2\" Nullable(UInt8), \"c3\" LowCardinality(Nullable(Time))) ENGINE = Set();
+
+    CREATE TABLE d2_$CLICKHOUSE_DATABASE.\"t9\" (\"c0\" String COMMENT '😉', \"c1\" String, \"c2\" Nullable(UInt256), \"c3\" Nullable(JSON(max_dynamic_types=21))) ENGINE = DeltaLakeLocal('${CLICKHOUSE_USER_FILES_UNIQUE}_${I}', Parquet) SETTINGS iceberg_recent_metadata_file_by_last_updated_ms_field = 0;
+
+    BACKUP DATABASE d2_$CLICKHOUSE_DATABASE TO File('${CLICKHOUSE_DATABASE}_${I}/backup0.tar.zst') SETTINGS query_plan_enable_optimizations = 1, max_network_bandwidth = 32768, hdfs_skip_empty_files = 0, format_binary_max_array_size = 8064, force_remove_data_recursively_on_drop = 1, input_format_orc_filter_push_down = 1, parallel_replicas_index_analysis_only_on_coordinator = 1, max_threads_for_indexes = 13, output_format_decimal_trailing_zeros = 0, remote_filesystem_read_prefetch = 0, output_format_parquet_geometadata = 1, optimize_extract_common_expressions = 0, merge_tree_min_rows_for_seek = 5313, max_bytes_ratio_before_external_group_by = 0.010000, optimize_respect_aliases = 0, use_skip_indexes = 0, join_to_sort_minimum_perkey_rows = 5969, parallel_replicas_for_cluster_engines = 0, rewrite_in_to_join = 0, merge_tree_min_bytes_for_seek = 0, parallel_replica_offset = 6, update_insert_deduplication_token_in_dependent_materialized_views = 0, distributed_aggregation_memory_efficient = 0, max_number_of_partitions_for_independent_aggregation = 4222, implicit_select = 0, max_result_bytes = 0, delta_lake_throw_on_engine_predicate_error = 0, apply_row_policy_after_final = 0, input_format_defaults_for_omitted_fields = 1, filesystem_cache_enable_background_download_during_fetch = 1, output_format_sql_insert_include_column_names = 1, input_format_tsv_detect_header = 1, asterisk_include_alias_columns = 0, show_create_query_identifier_quoting_rule = 'always', log_formatted_queries = 1, database_atomic_wait_for_drop_and_detach_synchronously = 0, hdfs_ignore_file_doesnt_exist = 1, cloud_mode = 1 ASYNC;
+
+    BACKUP TABLE d1_$CLICKHOUSE_DATABASE.\"t4\" TO Memory('${CLICKHOUSE_DATABASE}_${I}/backup2.tar') SETTINGS base_backup = File('${CLICKHOUSE_DATABASE}_${I}/backup0.tar.zst'), async_insert_max_data_size = 5977266, check_table_dependencies = 1, input_format_custom_detect_header = 0, fsync_metadata = 0, group_by_use_nulls = 1 ASYNC FORMAT TabSeparatedRawWithNames;
+    "
+  done >/dev/null 2>&1
+}
+
+thread &
+thread &
+thread &
+thread &
+
+wait
diff --git a/tests/queries/0_stateless/03784_zstd_decompressed_size.reference b/tests/queries/0_stateless/03784_zstd_decompressed_size.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03784_zstd_decompressed_size.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03784_zstd_decompressed_size.sh b/tests/queries/0_stateless/03784_zstd_decompressed_size.sh
new file mode 100755
index 000000000000..36968d2e9918
--- /dev/null
+++ b/tests/queries/0_stateless/03784_zstd_decompressed_size.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+printf '\x41\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\x1a\x00\x00\x00\xe8\x03\x00\x00(\xb5/\xfd \x08A\x00\x00SELECT 1' \
+    | ${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&decompress=1&http_native_compression_disable_checksumming_on_decompress=1" --data-binary @- | grep -c "The size after decompression"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03785_double_delta_width.reference b/tests/queries/0_stateless/03785_double_delta_width.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03785_double_delta_width.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03785_double_delta_width.sh b/tests/queries/0_stateless/03785_double_delta_width.sh
new file mode 100755
index 000000000000..45cba8f66a4b
--- /dev/null
+++ b/tests/queries/0_stateless/03785_double_delta_width.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+printf '\x41\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x94\x1a\x00\x00\x00\xe8\x03\x00\x00(\xb5/\xfd \x08A\x00\x00SELECT 1' \
+    | ${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&decompress=1&http_native_compression_disable_checksumming_on_decompress=1" --data-binary @- \
+    | grep -c "Cannot decompress double-delta encoded data. File has wrong header"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03785_rebuild_projection_with_part_offset.reference b/tests/queries/0_stateless/03785_rebuild_projection_with_part_offset.reference
new file mode 100644
index 000000000000..02357561e024
--- /dev/null
+++ b/tests/queries/0_stateless/03785_rebuild_projection_with_part_offset.reference
@@ -0,0 +1,2 @@
+200000
+200000
diff --git a/tests/queries/0_stateless/03785_rebuild_projection_with_part_offset.sql b/tests/queries/0_stateless/03785_rebuild_projection_with_part_offset.sql
new file mode 100644
index 000000000000..04cddd167592
--- /dev/null
+++ b/tests/queries/0_stateless/03785_rebuild_projection_with_part_offset.sql
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test
+(
+    `a` Int32,
+    `b` Int32,
+    PROJECTION p
+    (
+        SELECT
+            a,
+            b,
+            _part_offset
+        ORDER BY b
+    )
+)
+ENGINE = ReplacingMergeTree
+ORDER BY a
+SETTINGS index_granularity_bytes = 10485760, index_granularity = 8192, deduplicate_merge_projection_mode = 'rebuild';
+
+INSERT INTO test SELECT number * 3, rand() FROM numbers(100000);
+INSERT INTO test SELECT number * 3 + 1, rand() FROM numbers(100000);
+SELECT sum(l._part_offset = r._parent_part_offset) FROM test l JOIN mergeTreeProjection(currentDatabase(), test, p) r USING (a) SETTINGS enable_analyzer = 1;
+
+OPTIMIZE TABLE test FINAL;
+
+SELECT sum(l._part_offset = r._parent_part_offset) FROM test l JOIN mergeTreeProjection(currentDatabase(), test, p) r USING (a) SETTINGS enable_analyzer = 1;
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/03789_rmv_with_multiple_subqueries.reference b/tests/queries/0_stateless/03789_rmv_with_multiple_subqueries.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/03789_rmv_with_multiple_subqueries.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03789_rmv_with_multiple_subqueries.sql b/tests/queries/0_stateless/03789_rmv_with_multiple_subqueries.sql
new file mode 100644
index 000000000000..c6dbaad00c99
--- /dev/null
+++ b/tests/queries/0_stateless/03789_rmv_with_multiple_subqueries.sql
@@ -0,0 +1,27 @@
+-- test that multiple refreshes of RMV with multiple subqueries do not leak memory or cause any other general issues with the instance 
+CREATE TABLE 03789_rmv_target (message String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/03789_rmv_with_multiple_subqueries', 'r1') ORDER BY ();
+CREATE MATERIALIZED VIEW 03789_rmv_mv REFRESH EVERY 1 MONTH APPEND TO 03789_rmv_target AS WITH
+    (
+        SELECT 1
+    ) AS lower_limit,
+    (
+        SELECT number
+        FROM numbers(10)
+        WHERE number = lower_limit
+    ) AS upper_limit,
+    result AS
+    (
+        SELECT 'OH NO' AS message
+        FROM numbers(10)
+        WHERE (number >= lower_limit) AND (number <= upper_limit)
+    )
+SELECT *
+FROM result;
+
+SYSTEM REFRESH VIEW 03789_rmv_mv;
+SYSTEM WAIT VIEW 03789_rmv_mv;
+SYSTEM REFRESH VIEW 03789_rmv_mv;
+SYSTEM WAIT VIEW 03789_rmv_mv;
+
+SYSTEM FLUSH LOGS query_log;
+SELECT uniqExact(query) FROM system.query_log WHERE has(databases, currentDatabase()) AND query LIKE '%INSERT%SELECT%' AND type = 'QueryFinish';
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03789_to_year_week_monotonicity_key_condition.reference b/tests/queries/0_stateless/03789_to_year_week_monotonicity_key_condition.reference
new file mode 100644
index 000000000000..7e87f95616da
--- /dev/null
+++ b/tests/queries/0_stateless/03789_to_year_week_monotonicity_key_condition.reference
@@ -0,0 +1,52 @@
+-- { echo }
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s String)
+ENGINE = MergeTree
+ORDER BY s;
+INSERT INTO t VALUES
+    ('2020-01-10 00:00:00'),
+    ('2020-01-2 00:00:00');
+SELECT * FROM t
+WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+2020-01-2 00:00:00
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (d Date32)
+ENGINE = MergeTree
+ORDER BY d;
+INSERT INTO t VALUES ('2020-12-31'), ('2021-01-01');
+SELECT * FROM t
+WHERE toWeek(d) = toWeek(toDate32('2020-12-31'));
+2020-12-31
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s String)
+ENGINE = MergeTree
+ORDER BY s;
+INSERT INTO t VALUES
+    ('2020-02-11 00:00:00'),
+    ('2020-02-3 00:00:00');
+SELECT * FROM t
+WHERE toWeek(s) = toWeek('2020-02-3 00:00:00');
+2020-02-3 00:00:00
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (dt DateTime) ENGINE=MergeTree ORDER BY dt SETTINGS index_granularity=1;
+INSERT INTO t SELECT toDateTime('2020-01-01 00:00:00') + number * 3600 FROM numbers(24 * 40);
+SELECT count()
+FROM t
+WHERE toWeek(dt) = toWeek(toDateTime('2020-01-15 00:00:00')) SETTINGS force_primary_key = 1, max_rows_to_read = 169;
+168
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s LowCardinality(String)) ENGINE = MergeTree ORDER BY s;
+INSERT INTO t VALUES ('2020-01-10 00:00:00'), ('2020-01-2 00:00:00');
+SELECT * FROM t WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+2020-01-2 00:00:00
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s Nullable(String)) ENGINE = MergeTree ORDER BY s SETTINGS allow_nullable_key = 1;
+INSERT INTO t VALUES ('2020-01-10 00:00:00'), ('2020-01-2 00:00:00');
+SELECT * FROM t WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+2020-01-2 00:00:00
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s LowCardinality(String)) ENGINE = MergeTree ORDER BY s;
+INSERT INTO t VALUES ('2020-01-10 00:00:00'), ('2020-01-2 00:00:00');
+SELECT * FROM t WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+2020-01-2 00:00:00
diff --git a/tests/queries/0_stateless/03789_to_year_week_monotonicity_key_condition.sql b/tests/queries/0_stateless/03789_to_year_week_monotonicity_key_condition.sql
new file mode 100644
index 000000000000..fb550e72051f
--- /dev/null
+++ b/tests/queries/0_stateless/03789_to_year_week_monotonicity_key_condition.sql
@@ -0,0 +1,61 @@
+-- { echo }
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s String)
+ENGINE = MergeTree
+ORDER BY s;
+
+INSERT INTO t VALUES
+    ('2020-01-10 00:00:00'),
+    ('2020-01-2 00:00:00');
+
+SELECT * FROM t
+WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (d Date32)
+ENGINE = MergeTree
+ORDER BY d;
+
+INSERT INTO t VALUES ('2020-12-31'), ('2021-01-01');
+
+SELECT * FROM t
+WHERE toWeek(d) = toWeek(toDate32('2020-12-31'));
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s String)
+ENGINE = MergeTree
+ORDER BY s;
+
+INSERT INTO t VALUES
+    ('2020-02-11 00:00:00'),
+    ('2020-02-3 00:00:00');
+
+SELECT * FROM t
+WHERE toWeek(s) = toWeek('2020-02-3 00:00:00');
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (dt DateTime) ENGINE=MergeTree ORDER BY dt SETTINGS index_granularity=1;
+INSERT INTO t SELECT toDateTime('2020-01-01 00:00:00') + number * 3600 FROM numbers(24 * 40);
+
+SELECT count()
+FROM t
+WHERE toWeek(dt) = toWeek(toDateTime('2020-01-15 00:00:00')) SETTINGS force_primary_key = 1, max_rows_to_read = 169;
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s LowCardinality(String)) ENGINE = MergeTree ORDER BY s;
+INSERT INTO t VALUES ('2020-01-10 00:00:00'), ('2020-01-2 00:00:00');
+
+SELECT * FROM t WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s Nullable(String)) ENGINE = MergeTree ORDER BY s SETTINGS allow_nullable_key = 1;
+INSERT INTO t VALUES ('2020-01-10 00:00:00'), ('2020-01-2 00:00:00');
+
+SELECT * FROM t WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (s LowCardinality(String)) ENGINE = MergeTree ORDER BY s;
+INSERT INTO t VALUES ('2020-01-10 00:00:00'), ('2020-01-2 00:00:00');
+
+SELECT * FROM t WHERE toYearWeek(s) = toYearWeek('2020-01-2 00:00:00');
diff --git a/tests/queries/0_stateless/03790_materialized_postgresql_nullptr_dereference.reference b/tests/queries/0_stateless/03790_materialized_postgresql_nullptr_dereference.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03790_materialized_postgresql_nullptr_dereference.sql b/tests/queries/0_stateless/03790_materialized_postgresql_nullptr_dereference.sql
new file mode 100644
index 000000000000..464fb212aae3
--- /dev/null
+++ b/tests/queries/0_stateless/03790_materialized_postgresql_nullptr_dereference.sql
@@ -0,0 +1,6 @@
+-- Tags: no-fasttest
+-- depends on libpq
+
+SET allow_experimental_database_materialized_postgresql = 1;
+CREATE DATABASE d03790_materialized_postgresql_nullptr_dereference ENGINE = MaterializedPostgreSQL; -- { serverError BAD_ARGUMENTS }
+CREATE DATABASE d03790_materialized_postgresql_nullptr_dereference ENGINE = PostgreSQL; -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03790_uniqTheta_error.reference b/tests/queries/0_stateless/03790_uniqTheta_error.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03790_uniqTheta_error.sql b/tests/queries/0_stateless/03790_uniqTheta_error.sql
new file mode 100644
index 000000000000..2e9199e98113
--- /dev/null
+++ b/tests/queries/0_stateless/03790_uniqTheta_error.sql
@@ -0,0 +1,5 @@
+-- Tags: no-fasttest
+-- - no-fasttest -- compiled w/o datasketches
+
+-- Regression for very high error in uniqTheta() due to optimization for u8 keys
+select throwIf(stddevSampStable(theta)/avg(theta)>0.1) from (select number%3 key, uniqTheta(generateUUIDv4(number)) theta FROM numbers_mt(9160000) GROUP BY key with totals SETTINGS max_threads = 8) format Null;
diff --git a/tests/queries/0_stateless/03791_function_to_subcolumns_optimization_on_subcolumns.reference b/tests/queries/0_stateless/03791_function_to_subcolumns_optimization_on_subcolumns.reference
new file mode 100644
index 000000000000..9929f29dbe76
--- /dev/null
+++ b/tests/queries/0_stateless/03791_function_to_subcolumns_optimization_on_subcolumns.reference
@@ -0,0 +1,4 @@
+SELECT count() AS `count()`
+FROM default.test AS __table1
+WHERE __table1.`a.x.size0` != 0
+999
diff --git a/tests/queries/0_stateless/03791_function_to_subcolumns_optimization_on_subcolumns.sql b/tests/queries/0_stateless/03791_function_to_subcolumns_optimization_on_subcolumns.sql
new file mode 100644
index 000000000000..9b533101adc4
--- /dev/null
+++ b/tests/queries/0_stateless/03791_function_to_subcolumns_optimization_on_subcolumns.sql
@@ -0,0 +1,9 @@
+SET enable_analyzer=1;
+SET optimize_functions_to_subcolumns=1;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Tuple(x Array(UInt64))) ENGINE=MergeTree ORDER BY tuple();
+INSERT INTO test SELECT tuple(range(number % 1000)) FROM numbers_mt(1000);
+EXPLAIN QUERY TREE dump_tree = 0, dump_ast = 1 SELECT count() FROM test WHERE notEmpty(a.x);
+SELECT count() FROM test WHERE notEmpty(a.x);
+DROP TABLE test;
+
diff --git a/tests/queries/0_stateless/03791_system_parts_race_condition_drop_part.reference b/tests/queries/0_stateless/03791_system_parts_race_condition_drop_part.reference
new file mode 100644
index 000000000000..d86bac9de59a
--- /dev/null
+++ b/tests/queries/0_stateless/03791_system_parts_race_condition_drop_part.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/03791_system_parts_race_condition_drop_part.sh b/tests/queries/0_stateless/03791_system_parts_race_condition_drop_part.sh
new file mode 100755
index 000000000000..25001fa4fc8b
--- /dev/null
+++ b/tests/queries/0_stateless/03791_system_parts_race_condition_drop_part.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Tags: race, no-parallel
+# Test for a race condition between reading system.parts and removing parts.
+# The race was in DataPartStorageOnDiskBase::remove() modifying part_dir
+# while getFullPath() was reading it concurrently.
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "DROP TABLE IF EXISTS part_race"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "CREATE TABLE part_race (x UInt64) ENGINE = MergeTree ORDER BY x PARTITION BY x % 10
+    SETTINGS old_parts_lifetime = 0, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0,
+    cleanup_thread_preferred_points_per_iteration = 0, max_cleanup_delay_period = 0"
+
+TIMEOUT=30
+
+function thread_insert()
+{
+    local TIMELIMIT=$((SECONDS+TIMEOUT))
+    local i=0
+    while [ $SECONDS -lt "$TIMELIMIT" ]
+    do
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "INSERT INTO part_race SELECT $i" 2>/dev/null
+        ((i++)) || true
+    done
+}
+
+function thread_drop_partition()
+{
+    local TIMELIMIT=$((SECONDS+TIMEOUT))
+    while [ $SECONDS -lt "$TIMELIMIT" ]
+    do
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "ALTER TABLE part_race DROP PARTITION ID '$((RANDOM % 10))'" 2>/dev/null
+        sleep 0.0$RANDOM
+    done
+}
+
+function thread_select_parts()
+{
+    local TIMELIMIT=$((SECONDS+TIMEOUT))
+    while [ $SECONDS -lt "$TIMELIMIT" ]
+    do
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "SELECT name, path FROM system.parts WHERE database = '${CLICKHOUSE_DATABASE}' AND table = 'part_race' FORMAT Null" 2>/dev/null
+    done
+}
+
+# Start multiple instances of each thread
+thread_insert &
+thread_insert &
+
+thread_drop_partition &
+thread_drop_partition &
+
+thread_select_parts &
+thread_select_parts &
+thread_select_parts &
+thread_select_parts &
+
+wait
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "DROP TABLE part_race"
+
+echo "OK"
diff --git a/tests/queries/0_stateless/03799_any_left_join_isnotnull_crash.reference b/tests/queries/0_stateless/03799_any_left_join_isnotnull_crash.reference
new file mode 100644
index 000000000000..2c13876f6cc5
--- /dev/null
+++ b/tests/queries/0_stateless/03799_any_left_join_isnotnull_crash.reference
@@ -0,0 +1 @@
+{"site":"STORE_A","page_level":1,"count":1}
diff --git a/tests/queries/0_stateless/03799_any_left_join_isnotnull_crash.sql b/tests/queries/0_stateless/03799_any_left_join_isnotnull_crash.sql
new file mode 100644
index 000000000000..7edb0fff58ad
--- /dev/null
+++ b/tests/queries/0_stateless/03799_any_left_join_isnotnull_crash.sql
@@ -0,0 +1,53 @@
+SET allow_experimental_analyzer = 1;
+
+DROP TABLE IF EXISTS AddedToCart;
+DROP TABLE IF EXISTS Session;
+
+CREATE TABLE Session
+(
+    id String,
+    site Enum8('STORE_A' = 1, 'STORE_B' = 2),
+    device Enum8('DESKTOP' = 1, 'MOBILE' = 2)
+)
+ENGINE = MergeTree
+ORDER BY id;
+
+CREATE TABLE AddedToCart
+(
+    sessionId String,
+    order Int32,
+    top Nullable(Int32),
+    screenHeight Nullable(Int32),
+    screenWidth Nullable(Int32),
+    isPromotion UInt8,
+    date DateTime64(3)
+)
+ENGINE = MergeTree
+ORDER BY (sessionId, date);
+
+INSERT INTO Session (id, site, device) VALUES
+    ('s1', 'STORE_A', 'DESKTOP'),
+    ('s2', 'STORE_B', 'MOBILE');
+
+INSERT INTO AddedToCart (sessionId, order, top, screenHeight, screenWidth, isPromotion, date) VALUES
+    ('s1', 1, 100, 400, 1024, 1, parseDateTime64BestEffort('2026-01-19T12:00:00.000Z', 3)),
+    ('s2', 2, 100, 400, 1024, 1, parseDateTime64BestEffort('2026-01-19T12:00:01.000Z', 3));
+
+SELECT
+    s.site AS site,
+    if((a.order IS NULL) OR (a.order <= 0) OR (a.order > 30), NULL, accurateCastOrNull(a.order, 'Int32')) AS page_level,
+    count() AS count
+FROM AddedToCart AS a
+ANY LEFT JOIN Session AS s ON a.sessionId = s.id
+WHERE (a.top IS NOT NULL)
+  AND (a.screenHeight IS NOT NULL)
+  AND (a.screenHeight > 0)
+  AND (a.isPromotion = _CAST(1, 'UInt8'))
+  AND (s.device = 'DESKTOP')
+  AND isNotNull(s.site)
+GROUP BY site, page_level
+ORDER BY site ASC, page_level ASC
+FORMAT JSONEachRow;
+
+DROP TABLE AddedToCart;
+DROP TABLE Session;
diff --git a/tests/queries/0_stateless/03799_backup_restore_security.reference b/tests/queries/0_stateless/03799_backup_restore_security.reference
new file mode 100644
index 000000000000..0f956314d345
--- /dev/null
+++ b/tests/queries/0_stateless/03799_backup_restore_security.reference
@@ -0,0 +1,2 @@
+Test 1 OK
+0
diff --git a/tests/queries/0_stateless/03799_backup_restore_security.sh b/tests/queries/0_stateless/03799_backup_restore_security.sh
new file mode 100755
index 000000000000..e3e7e67404a3
--- /dev/null
+++ b/tests/queries/0_stateless/03799_backup_restore_security.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+# Test for security fixes related to BACKUP and RESTORE operations:
+# 1. RESTORE should be forbidden in readonly mode
+# 2. The 'internal' setting should not be allowed for initial queries
+# 3. Permission check should happen before backup destination is opened (e.g., S3 connection)
+#
+# All tests use fake S3 URLs with invalid credentials. Since all security checks happen
+# before any connection attempt, we should always get ACCESS_DENIED errors, not S3 errors.
+# We set backup_restore_s3_retry_attempts=0 to avoid retries on connection failure
+# when running against a version without the fix.
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+backup_name="${CLICKHOUSE_DATABASE}_03799_backup_security"
+user_name="test_03799_user_${CLICKHOUSE_DATABASE}"
+
+function cleanup()
+{
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_backup_security"
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_restored"
+    $CLICKHOUSE_CLIENT -q "DROP USER IF EXISTS $user_name"
+}
+trap cleanup EXIT
+
+$CLICKHOUSE_CLIENT -q "
+DROP TABLE IF EXISTS test_backup_security;
+CREATE TABLE test_backup_security (id Int32) ENGINE=MergeTree() ORDER BY id;
+INSERT INTO test_backup_security VALUES (1), (2), (3);
+"
+
+# Test 1: RESTORE should be forbidden in readonly mode
+# The readonly check happens before any backup destination is accessed.
+# We use CLICKHOUSE_CLIENT_BINARY directly to avoid test framework injecting settings that conflict with readonly mode.
+$CLICKHOUSE_CLIENT --readonly=1 --backup_restore_s3_retry_attempts=0 -q "RESTORE TABLE test_backup_security AS test_restored FROM S3('http://localhost:11111/test/backups/${backup_name}', 'INVALID_ACCESS_KEY', 'INVALID_SECRET')" 2>&1 | grep -q "ACCESS_DENIED" && echo "Test 1 OK" || echo "Test 1 FAIL"
+# Verify that the table was not created
+$CLICKHOUSE_CLIENT -q "SELECT count() FROM system.tables WHERE database = currentDatabase() AND name = 'test_restored'"
+
+# Test 2: The 'internal' setting should not be allowed for initial BACKUP query
+# This check happens before any connection attempt.
+$CLICKHOUSE_CLIENT -m -q "
+BACKUP TABLE test_backup_security TO S3('http://localhost:11111/test/backups/${backup_name}_internal', 'INVALID_ACCESS_KEY', 'INVALID_SECRET') SETTINGS internal=1, backup_restore_s3_retry_attempts=0; -- { serverError ACCESS_DENIED }
+"
+
+# Test 3: The 'internal' setting should not be allowed for initial RESTORE query
+# This check happens before any connection attempt.
+$CLICKHOUSE_CLIENT -m -q "
+RESTORE TABLE test_backup_security AS test_restored FROM S3('http://localhost:11111/test/backups/${backup_name}', 'INVALID_ACCESS_KEY', 'INVALID_SECRET') SETTINGS internal=1, backup_restore_s3_retry_attempts=0; -- { serverError ACCESS_DENIED }
+"
+
+# Test 4: User without BACKUP permission should get ACCESS_DENIED (not S3_ERROR)
+# This tests that permission check happens before opening backup destination.
+# We use S3 with invalid credentials - if we get ACCESS_DENIED instead of S3_ERROR,
+# it proves the permission check happens before attempting to connect to S3.
+$CLICKHOUSE_CLIENT -q "DROP USER IF EXISTS $user_name"
+$CLICKHOUSE_CLIENT -q "CREATE USER $user_name"
+$CLICKHOUSE_CLIENT -q "GRANT SELECT ON ${CLICKHOUSE_DATABASE}.test_backup_security TO $user_name"
+# User has SELECT but not BACKUP permission - should get ACCESS_DENIED, not S3_ERROR
+$CLICKHOUSE_CLIENT --user=$user_name -m -q "
+BACKUP TABLE test_backup_security TO S3('http://localhost:11111/test/backups/${CLICKHOUSE_DATABASE}/no_permission_backup', 'INVALID_ACCESS_KEY', 'INVALID_SECRET') SETTINGS backup_restore_s3_retry_attempts=0; -- { serverError ACCESS_DENIED }
+"
+$CLICKHOUSE_CLIENT -q "DROP USER IF EXISTS $user_name"
diff --git a/tests/queries/0_stateless/03799_parallel_right_join_flag_per_row.reference b/tests/queries/0_stateless/03799_parallel_right_join_flag_per_row.reference
new file mode 100644
index 000000000000..6b14c324970a
--- /dev/null
+++ b/tests/queries/0_stateless/03799_parallel_right_join_flag_per_row.reference
@@ -0,0 +1,9 @@
+1	10	1	30
+0	0	2	20
+-
+1	10	1	30
+0	0	2	20
+-
+0	0	2	20
+-
+0	0	2	20
diff --git a/tests/queries/0_stateless/03799_parallel_right_join_flag_per_row.sql b/tests/queries/0_stateless/03799_parallel_right_join_flag_per_row.sql
new file mode 100644
index 000000000000..f9bbbdfb76e7
--- /dev/null
+++ b/tests/queries/0_stateless/03799_parallel_right_join_flag_per_row.sql
@@ -0,0 +1,54 @@
+DROP TABLE IF EXISTS t0;
+DROP TABLE IF EXISTS t1;
+
+CREATE TABLE t0 (c0 UInt64, c1 UInt64) ENGINE = MergeTree() ORDER BY (c0);
+INSERT INTO t0 VALUES (2, 20), (1, 30);
+CREATE TABLE t1 (c0 UInt64, c1 UInt64) ENGINE = MergeTree() ORDER BY (c0);
+INSERT INTO t1 VALUES (1, 10);
+
+SET query_plan_join_swap_table = 0;
+SET enable_analyzer = 1;
+
+SELECT
+    *
+FROM t1
+RIGHT JOIN t0
+    ON (t0.c0 = t1.c0)
+    AND (t0.c1 >= t1.c1)
+ORDER BY t0.c0
+SETTINGS join_algorithm='hash';
+
+SELECT '-';
+
+SELECT
+    *
+FROM t1
+RIGHT JOIN t0
+    ON (t0.c0 = t1.c0)
+    AND (t0.c1 >= t1.c1)
+ORDER BY t0.c0
+SETTINGS join_algorithm='parallel_hash';
+
+
+SELECT '-';
+
+SELECT
+    *
+FROM t1
+RIGHT JOIN t0
+    ON (t0.c0 = t1.c0)
+    AND (t0.c1 >= t1.c1)
+WHERE t0.c0 = 2
+SETTINGS join_algorithm='parallel_hash', query_plan_filter_push_down = 1;
+
+SELECT '-';
+
+
+SELECT
+    *
+FROM t1
+RIGHT JOIN t0
+    ON (t0.c0 = t1.c0)
+    AND (t0.c1 >= t1.c1)
+WHERE t0.c0 = 2
+SETTINGS join_algorithm='parallel_hash', query_plan_filter_push_down = 0;
diff --git a/tests/queries/0_stateless/03801_domain_empty_string_msan.reference b/tests/queries/0_stateless/03801_domain_empty_string_msan.reference
new file mode 100644
index 000000000000..a02e23450817
--- /dev/null
+++ b/tests/queries/0_stateless/03801_domain_empty_string_msan.reference
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/queries/0_stateless/03801_domain_empty_string_msan.sql b/tests/queries/0_stateless/03801_domain_empty_string_msan.sql
new file mode 100644
index 000000000000..fa8ec2c850f6
--- /dev/null
+++ b/tests/queries/0_stateless/03801_domain_empty_string_msan.sql
@@ -0,0 +1,21 @@
+-- Test for empty and short strings in domain functions to catch use-of-uninitialized-value errors (MSan)
+
+SELECT domainRFC('');
+SELECT domainRFC('a');
+SELECT domainRFC('/');
+SELECT domainRFC('//');
+
+SELECT domainWithoutWWWRFC('');
+SELECT domainWithoutWWWRFC('a');
+SELECT domainWithoutWWWRFC('/');
+SELECT domainWithoutWWWRFC('//');
+
+SELECT domain('');
+SELECT domain('a');
+SELECT domain('/');
+SELECT domain('//');
+
+SELECT domainWithoutWWW('');
+SELECT domainWithoutWWW('a');
+SELECT domainWithoutWWW('/');
+SELECT domainWithoutWWW('//');
diff --git a/tests/queries/0_stateless/03801_merge_tree_on_readonly_disk.reference b/tests/queries/0_stateless/03801_merge_tree_on_readonly_disk.reference
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/queries/0_stateless/03801_merge_tree_on_readonly_disk.sh b/tests/queries/0_stateless/03801_merge_tree_on_readonly_disk.sh
new file mode 100755
index 000000000000..aef5f6215bc6
--- /dev/null
+++ b/tests/queries/0_stateless/03801_merge_tree_on_readonly_disk.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "
+create table mt_ro (key Int) order by tuple() settings disk=disk(readonly = 1, type = 's3_plain_rewritable', endpoint = 'http://localhost:11111/test/s3_plain_rewritable_$CLICKHOUSE_DATABASE', access_key_id = clickhouse, secret_access_key = clickhouse);
+
+insert into mt_ro values (1); -- { serverError TABLE_IS_READ_ONLY }
+
+drop table mt_ro;
+"
+
+$CLICKHOUSE_CLIENT -nm -q "
+create table mt_ro (key Int) order by tuple() settings disk=disk(type='encrypted', readonly=1, key='1234567812345678', disk=disk(readonly = 1, type = 's3_plain_rewritable', endpoint = 'http://localhost:11111/test/s3_plain_rewritable_encrypted_$CLICKHOUSE_DATABASE', access_key_id = clickhouse, secret_access_key = clickhouse));
+
+insert into mt_ro values (1); -- { serverError TABLE_IS_READ_ONLY }
+
+drop table mt_ro;
+"
diff --git a/tests/queries/0_stateless/03820_plain_rewritable_over_another_disk_with_same_path.reference b/tests/queries/0_stateless/03820_plain_rewritable_over_another_disk_with_same_path.reference
new file mode 100644
index 000000000000..03f56863b12a
--- /dev/null
+++ b/tests/queries/0_stateless/03820_plain_rewritable_over_another_disk_with_same_path.reference
@@ -0,0 +1,2 @@
+cache_on_write_operations=0
+cache_on_write_operations=1
diff --git a/tests/queries/0_stateless/03820_plain_rewritable_over_another_disk_with_same_path.sh b/tests/queries/0_stateless/03820_plain_rewritable_over_another_disk_with_same_path.sh
new file mode 100755
index 000000000000..dd4662468fe1
--- /dev/null
+++ b/tests/queries/0_stateless/03820_plain_rewritable_over_another_disk_with_same_path.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+settings=(
+    # Not compatible with DC
+    --write_through_distributed_cache=0
+    --read_through_distributed_cache=0
+)
+
+echo "cache_on_write_operations=0"
+endpoint="http://localhost:11111/test/s3_plain_rewritable_${CLICKHOUSE_DATABASE}_cache_on_write_operations_0"
+cache_path="${CLICKHOUSE_DATABASE}_cache_disk_cache_on_write_operations_0"
+$CLICKHOUSE_CLIENT "${settings[@]}" -nm -q "
+drop table if exists mt1;
+drop table if exists mt1;
+drop table if exists mt3;
+drop table if exists mt4;
+
+create table mt1 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=0, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse);
+-- cache disk on top of s3_plain_rewritable is allowed
+create table mt2 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=0, type='cache', path='$cache_path', max_size=100000, disk=disk(cache_on_write_operations=0, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse));
+-- encrypted disk with the same path as original s3_plain_rewritable disk is allowed
+create table mt3 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=0, type='encrypted', key='1234567812345678', disk=disk(cache_on_write_operations=0, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse));
+-- encrypted disk over cache is allowed
+create table mt4 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=0, type='encrypted', key='1234567812345678', disk=disk(cache_on_write_operations=0, type='cache', path='$cache_path', max_size=100000, disk=disk(cache_on_write_operations=0, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse)));
+
+drop table mt1;
+drop table mt2;
+drop table mt3;
+drop table mt4;
+"
+
+echo "cache_on_write_operations=1"
+endpoint="http://localhost:11111/test/s3_plain_rewritable_${CLICKHOUSE_DATABASE}_cache_on_write_operations_1"
+cache_path="${CLICKHOUSE_DATABASE}_cache_disk_cache_on_write_operations_1"
+$CLICKHOUSE_CLIENT "${settings[@]}" -nm -q "
+drop table if exists mt1;
+drop table if exists mt1;
+drop table if exists mt3;
+drop table if exists mt4;
+
+create table mt1 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=1, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse);
+-- cache disk on top of s3_plain_rewritable is allowed
+create table mt2 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=1, type='cache', path='$cache_path', max_size=100000, disk=disk(cache_on_write_operations=1, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse));
+-- encrypted disk with the same path as original s3_plain_rewritable disk is allowed
+create table mt3 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=1, type='encrypted', key='1234567812345678', disk=disk(cache_on_write_operations=1, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse));
+-- encrypted disk over cache is allowed
+create table mt4 (key Int) engine=MergeTree order by () settings disk=disk(cache_on_write_operations=1, type='encrypted', key='1234567812345678', disk=disk(cache_on_write_operations=1, type='cache', path='$cache_path', max_size=100000, disk=disk(cache_on_write_operations=1, type='s3_plain_rewritable', endpoint='$endpoint', access_key_id=clickhouse, secret_access_key=clickhouse)));
+
+drop table mt1;
+drop table mt2;
+drop table mt3;
+drop table mt4;
+"
diff --git a/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/83521e92-07a7-450d-ba44-3a179b730c85-m0.avro b/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/83521e92-07a7-450d-ba44-3a179b730c85-m0.avro
new file mode 100644
index 000000000000..e21b3f8b25f1
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/83521e92-07a7-450d-ba44-3a179b730c85-m0.avro
@@ -0,0 +1 @@
+Intentionally corrupted file which pretends to have avro format. 
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/snap-3858160944799047644-1-83521e92-07a7-450d-ba44-3a179b730c85.avro b/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/snap-3858160944799047644-1-83521e92-07a7-450d-ba44-3a179b730c85.avro
new file mode 100644
index 000000000000..9bcfd963918e
Binary files /dev/null and b/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/snap-3858160944799047644-1-83521e92-07a7-450d-ba44-3a179b730c85.avro differ
diff --git a/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/v1.metadata.json b/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/v1.metadata.json
new file mode 100644
index 000000000000..e7340cb1b433
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/corrupted_avro_files_test/metadata/v1.metadata.json
@@ -0,0 +1,75 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "a5920f9f-12d0-4773-87fc-569c00676258",
+  "location" : "s3a://test/corrupted_avro_files_test",
+  "last-sequence-number" : 1,
+  "last-updated-ms" : 1740666694866,
+  "last-column-id" : 2,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "order_number",
+      "required" : false,
+      "type" : "long"
+    }, {
+      "id" : 2,
+      "name" : "product_code",
+      "required" : false,
+      "type" : "string"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "divanik",
+    "option.format-version" : "2",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 3858160944799047644,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 3858160944799047644,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 3858160944799047644,
+    "timestamp-ms" : 1740666694866,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1740666666602",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "701",
+      "changed-partition-count" : "1",
+      "total-records" : "1",
+      "total-files-size" : "701",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3a://test/corrupted_avro_files_test/metadata/snap-3858160944799047644-1-83521e92-07a7-450d-ba44-3a179b730c85.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1740666694866,
+    "snapshot-id" : 3858160944799047644
+  } ],
+  "metadata-log" : []
+}
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_minio/field_ids_complex_test/data/00000-1-a4207d9e-e52b-45e4-9f8f-40d60dda5485-0-00001.parquet b/tests/queries/0_stateless/data_minio/field_ids_complex_test/data/00000-1-a4207d9e-e52b-45e4-9f8f-40d60dda5485-0-00001.parquet
new file mode 100644
index 000000000000..22c6bb74d3df
Binary files /dev/null and b/tests/queries/0_stateless/data_minio/field_ids_complex_test/data/00000-1-a4207d9e-e52b-45e4-9f8f-40d60dda5485-0-00001.parquet differ
diff --git a/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/140c8dff-1d83-4841-bc40-9aa85205b555-m0.avro b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/140c8dff-1d83-4841-bc40-9aa85205b555-m0.avro
new file mode 100644
index 000000000000..56d5fd911c2a
Binary files /dev/null and b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/140c8dff-1d83-4841-bc40-9aa85205b555-m0.avro differ
diff --git a/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/snap-607752583403487091-1-140c8dff-1d83-4841-bc40-9aa85205b555.avro b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/snap-607752583403487091-1-140c8dff-1d83-4841-bc40-9aa85205b555.avro
new file mode 100644
index 000000000000..1cc580ce46f5
Binary files /dev/null and b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/snap-607752583403487091-1-140c8dff-1d83-4841-bc40-9aa85205b555.avro differ
diff --git a/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/v1.metadata.json b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/v1.metadata.json
new file mode 100644
index 000000000000..a983881af8f0
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/v1.metadata.json
@@ -0,0 +1,109 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "d4b695ca-ceeb-4537-8a2a-eee90dc6e313",
+  "location" : "s3a://test/field_ids_complex_test",
+  "last-sequence-number" : 1,
+  "last-updated-ms" : 1757661733693,
+  "last-column-id" : 9,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "col-1",
+      "required" : false,
+      "type" : {
+        "type" : "list",
+        "element-id" : 4,
+        "element" : "long",
+        "element-required" : false
+      }
+    }, {
+      "id" : 2,
+      "name" : "col-2",
+      "required" : false,
+      "type" : {
+        "type" : "map",
+        "key-id" : 5,
+        "key" : "long",
+        "value-id" : 6,
+        "value" : "string",
+        "value-required" : false
+      }
+    }, {
+      "id" : 3,
+      "name" : "col-3",
+      "required" : false,
+      "type" : {
+        "type" : "list",
+        "element-id" : 7,
+        "element" : {
+          "type" : "struct",
+          "fields" : [ {
+            "id" : 8,
+            "name" : "id",
+            "required" : false,
+            "type" : "long"
+          }, {
+            "id" : 9,
+            "name" : "name",
+            "required" : false,
+            "type" : "string"
+          } ]
+        },
+        "element-required" : false
+      }
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "scanhex12",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 607752583403487091,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 607752583403487091,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 607752583403487091,
+    "timestamp-ms" : 1757661733693,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1757661643417",
+      "added-data-files" : "1",
+      "added-records" : "1",
+      "added-files-size" : "1957",
+      "changed-partition-count" : "1",
+      "total-records" : "1",
+      "total-files-size" : "1957",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3a://test/field_ids_complex_test/metadata/snap-607752583403487091-1-140c8dff-1d83-4841-bc40-9aa85205b555.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1757661733693,
+    "snapshot-id" : 607752583403487091
+  } ],
+  "metadata-log" : [ ]
+}
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/version-hint.text b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/version-hint.text
new file mode 100644
index 000000000000..56a6051ca2b0
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/field_ids_complex_test/metadata/version-hint.text
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_minio/field_ids_struct_test/metadata/v1.metadata.json b/tests/queries/0_stateless/data_minio/field_ids_struct_test/metadata/v1.metadata.json
index 2d149abb44e7..d6c9079228ac 100644
--- a/tests/queries/0_stateless/data_minio/field_ids_struct_test/metadata/v1.metadata.json
+++ b/tests/queries/0_stateless/data_minio/field_ids_struct_test/metadata/v1.metadata.json
@@ -1,7 +1,7 @@
 {
   "format-version" : 2,
   "table-uuid" : "149ecc15-7afc-4311-86b3-3a4c8d4ec08e",
-  "location" : "s3a://test/field_ids_struct_test/metadata/field_ids_struct_test",
+  "location" : "s3a://test/field_ids_struct_test",
   "last-sequence-number" : 1,
   "last-updated-ms" : 1753959190403,
   "last-column-id" : 6,
@@ -84,7 +84,7 @@
       "total-position-deletes" : "0",
       "total-equality-deletes" : "0"
     },
-    "manifest-list" : "s3a://test/field_ids_struct_test/metadata/field_ids_struct_test/metadata/snap-2512638186869817292-1-ec467367-15a4-4610-8ea8-cf76797afb03.avro",
+    "manifest-list" : "s3a://test/field_ids_struct_test/metadata/snap-2512638186869817292-1-ec467367-15a4-4610-8ea8-cf76797afb03.avro",
     "schema-id" : 0
   } ],
   "statistics" : [ ],
diff --git a/tests/queries/0_stateless/data_minio/field_ids_table_test/metadata/v1.metadata.json b/tests/queries/0_stateless/data_minio/field_ids_table_test/metadata/v1.metadata.json
index 32225eb618ad..1ddc3492cc82 100644
--- a/tests/queries/0_stateless/data_minio/field_ids_table_test/metadata/v1.metadata.json
+++ b/tests/queries/0_stateless/data_minio/field_ids_table_test/metadata/v1.metadata.json
@@ -1,7 +1,7 @@
 {
   "format-version" : 2,
   "table-uuid" : "8f1f9ae2-18bb-421e-b640-ec2f85e67bce",
-  "location" : "s3a://test/field_ids_table_test/metadata/field_ids_table_test",
+  "location" : "s3a://test/field_ids_table_test",
   "last-sequence-number" : 1,
   "last-updated-ms" : 1752481476160,
   "last-column-id" : 1,
@@ -56,7 +56,7 @@
       "total-position-deletes" : "0",
       "total-equality-deletes" : "0"
     },
-    "manifest-list" : "s3a://test/field_ids_table_test/metadata/field_ids_table_test/metadata/snap-2811410366534688344-1-3b002f99-b012-4041-9a97-db477fcc7115.avro",
+    "manifest-list" : "s3a://test/field_ids_table_test/metadata/snap-2811410366534688344-1-3b002f99-b012-4041-9a97-db477fcc7115.avro",
     "schema-id" : 0
   } ],
   "statistics" : [ ],
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_dictionary.parquet.columns b/tests/queries/0_stateless/data_parquet/alltypes_dictionary.parquet.columns
deleted file mode 100644
index cbc891b2ca74..000000000000
--- a/tests/queries/0_stateless/data_parquet/alltypes_dictionary.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`id` Nullable(Int32), `bool_col` Nullable(UInt8), `tinyint_col` Nullable(Int32), `smallint_col` Nullable(Int32), `int_col` Nullable(Int32), `bigint_col` Nullable(Int64), `float_col` Nullable(Float32), `double_col` Nullable(Float64), `date_string_col` Nullable(String), `string_col` Nullable(String), `timestamp_col` Nullable(Int64)
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
deleted file mode 100644
index 3bf762ed7d5f..000000000000
--- a/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a1` Array(Int8), `a2` Array(UInt8), `a3` Array(Int16), `a4` Array(UInt16), `a5` Array(Int32), `a6` Array(UInt32), `a7` Array(Int64), `a8` Array(UInt64), `a9` Array(String), `a10` Array(FixedString(4)), `a11` Array(Float32), `a12` Array(Float64), `a13` Array(Date), `a14` Array(Datetime('Asia/Istanbul')), `a15` Array(Decimal(4, 2)), `a16` Array(Decimal(10, 2)), `a17` Array(Decimal(25, 2))
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_plain.parquet.columns b/tests/queries/0_stateless/data_parquet/alltypes_plain.parquet.columns
deleted file mode 100644
index cbc891b2ca74..000000000000
--- a/tests/queries/0_stateless/data_parquet/alltypes_plain.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`id` Nullable(Int32), `bool_col` Nullable(UInt8), `tinyint_col` Nullable(Int32), `smallint_col` Nullable(Int32), `int_col` Nullable(Int32), `bigint_col` Nullable(Int64), `float_col` Nullable(Float32), `double_col` Nullable(Float64), `date_string_col` Nullable(String), `string_col` Nullable(String), `timestamp_col` Nullable(Int64)
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet.columns
deleted file mode 100644
index cbc891b2ca74..000000000000
--- a/tests/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`id` Nullable(Int32), `bool_col` Nullable(UInt8), `tinyint_col` Nullable(Int32), `smallint_col` Nullable(Int32), `int_col` Nullable(Int32), `bigint_col` Nullable(Int64), `float_col` Nullable(Float32), `double_col` Nullable(Float64), `date_string_col` Nullable(String), `string_col` Nullable(String), `timestamp_col` Nullable(Int64)
diff --git a/tests/queries/0_stateless/data_parquet/array_float.parquet b/tests/queries/0_stateless/data_parquet/array_float.parquet
old mode 100755
new mode 100644
diff --git a/tests/queries/0_stateless/data_parquet/array_float.parquet.columns b/tests/queries/0_stateless/data_parquet/array_float.parquet.columns
deleted file mode 100644
index 19f950d2b777..000000000000
--- a/tests/queries/0_stateless/data_parquet/array_float.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-idx String, lst Array(Float32)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/array_int.parquet.columns b/tests/queries/0_stateless/data_parquet/array_int.parquet.columns
deleted file mode 100644
index 3b9395715d7e..000000000000
--- a/tests/queries/0_stateless/data_parquet/array_int.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`idx` String, `lst` Array(Int32)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/array_string.parquet b/tests/queries/0_stateless/data_parquet/array_string.parquet
old mode 100755
new mode 100644
diff --git a/tests/queries/0_stateless/data_parquet/array_string.parquet.columns b/tests/queries/0_stateless/data_parquet/array_string.parquet.columns
deleted file mode 100644
index 67a7b6bc04d5..000000000000
--- a/tests/queries/0_stateless/data_parquet/array_string.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`idx` String, `lst` Array(String)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/binary.parquet.columns b/tests/queries/0_stateless/data_parquet/binary.parquet.columns
deleted file mode 100644
index 8f3b137647fd..000000000000
--- a/tests/queries/0_stateless/data_parquet/binary.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`foo` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/byte_array_decimal.parquet.columns b/tests/queries/0_stateless/data_parquet/byte_array_decimal.parquet.columns
deleted file mode 100644
index cb2a97de8c45..000000000000
--- a/tests/queries/0_stateless/data_parquet/byte_array_decimal.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`value` Nullable(Decimal(4, 2))
diff --git a/tests/queries/0_stateless/data_parquet/case_insensitive_column_matching.parquet.columns b/tests/queries/0_stateless/data_parquet/case_insensitive_column_matching.parquet.columns
deleted file mode 100644
index e25da8f923d1..000000000000
--- a/tests/queries/0_stateless/data_parquet/case_insensitive_column_matching.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`Id` Nullable(String), `Score` Nullable(Int32)
diff --git a/tests/queries/0_stateless/data_parquet/conversion_to_datetime64_test.parquet b/tests/queries/0_stateless/data_parquet/conversion_to_datetime64_test.parquet
new file mode 100644
index 000000000000..fe7e6e12f894
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/conversion_to_datetime64_test.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
deleted file mode 100644
index dc094bef8ede..000000000000
--- a/tests/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a` Nullable(String), `b` Nullable(Int32), `c` Nullable(Float64), `d` Nullable(UInt8), `e` Array(Nullable(Int32))
diff --git a/tests/queries/0_stateless/data_parquet/datatype-date32.parquet.columns b/tests/queries/0_stateless/data_parquet/datatype-date32.parquet.columns
deleted file mode 100644
index 202a8a7087b3..000000000000
--- a/tests/queries/0_stateless/data_parquet/datatype-date32.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`date32` Date32
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet.columns b/tests/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet.columns
deleted file mode 100644
index 1ea0876ce954..000000000000
--- a/tests/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`l_partkey` Nullable(Int32)
diff --git a/tests/queries/0_stateless/data_parquet/fixed_array_int.parquet.columns b/tests/queries/0_stateless/data_parquet/fixed_array_int.parquet.columns
deleted file mode 100644
index 2c383e8343f8..000000000000
--- a/tests/queries/0_stateless/data_parquet/fixed_array_int.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`idx` String, `lst` Array(Int64)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/fixed_array_nested_list_int.parquet.columns b/tests/queries/0_stateless/data_parquet/fixed_array_nested_list_int.parquet.columns
deleted file mode 100644
index 3e1c9533a324..000000000000
--- a/tests/queries/0_stateless/data_parquet/fixed_array_nested_list_int.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`idx` String, `lst` Array(Array(Int64))
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/fixed_array_str.parquet.columns b/tests/queries/0_stateless/data_parquet/fixed_array_str.parquet.columns
deleted file mode 100644
index 67a7b6bc04d5..000000000000
--- a/tests/queries/0_stateless/data_parquet/fixed_array_str.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`idx` String, `lst` Array(String)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/fixed_length_decimal.parquet.columns b/tests/queries/0_stateless/data_parquet/fixed_length_decimal.parquet.columns
deleted file mode 100644
index 469105337a64..000000000000
--- a/tests/queries/0_stateless/data_parquet/fixed_length_decimal.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`value` Nullable(Decimal(25, 2))
diff --git a/tests/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet.columns b/tests/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet.columns
deleted file mode 100644
index 469105337a64..000000000000
--- a/tests/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`value` Nullable(Decimal(25, 2))
diff --git a/tests/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet.columns b/tests/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet.columns
deleted file mode 100644
index 5e61877db589..000000000000
--- a/tests/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`value` Nullable(Decimal(13, 2))
diff --git a/tests/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet.columns b/tests/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet.columns
deleted file mode 100644
index 5a0c330c88f8..000000000000
--- a/tests/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`c0` Nullable(Int64), `c1` Nullable(String), `v11` Nullable(Float64)
diff --git a/tests/queries/0_stateless/data_parquet/hudi_array.parquet.gz b/tests/queries/0_stateless/data_parquet/hudi_array.parquet.gz
new file mode 100644
index 000000000000..01a117bb5990
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/hudi_array.parquet.gz differ
diff --git a/tests/queries/0_stateless/data_parquet/hudi_array_nonnullable.parquet.gz b/tests/queries/0_stateless/data_parquet/hudi_array_nonnullable.parquet.gz
new file mode 100644
index 000000000000..7359e4ed6485
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/hudi_array_nonnullable.parquet.gz differ
diff --git a/tests/queries/0_stateless/data_parquet/hudi_nested_array.parquet.gz b/tests/queries/0_stateless/data_parquet/hudi_nested_array.parquet.gz
new file mode 100644
index 000000000000..169958208548
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/hudi_nested_array.parquet.gz differ
diff --git a/tests/queries/0_stateless/data_parquet/hudi_nested_array_nonnullable.parquet.gz b/tests/queries/0_stateless/data_parquet/hudi_nested_array_nonnullable.parquet.gz
new file mode 100644
index 000000000000..fedd53d7d57e
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/hudi_nested_array_nonnullable.parquet.gz differ
diff --git a/tests/queries/0_stateless/data_parquet/int32_decimal.parquet.columns b/tests/queries/0_stateless/data_parquet/int32_decimal.parquet.columns
deleted file mode 100644
index cb2a97de8c45..000000000000
--- a/tests/queries/0_stateless/data_parquet/int32_decimal.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`value` Nullable(Decimal(4, 2))
diff --git a/tests/queries/0_stateless/data_parquet/int64_decimal.parquet.columns b/tests/queries/0_stateless/data_parquet/int64_decimal.parquet.columns
deleted file mode 100644
index 3624a5719702..000000000000
--- a/tests/queries/0_stateless/data_parquet/int64_decimal.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`value` Nullable(Decimal(10, 2))
diff --git a/tests/queries/0_stateless/data_parquet/iris.parquet b/tests/queries/0_stateless/data_parquet/iris.parquet
new file mode 100644
index 000000000000..9224dead94cc
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/iris.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns b/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns
deleted file mode 100644
index 1a488ee6e003..000000000000
--- a/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`int64_list` Array(Nullable(Int64)), `utf8_list` Array(Nullable(String))
diff --git a/tests/queries/0_stateless/data_parquet/nation.dict-malformed.parquet.columns b/tests/queries/0_stateless/data_parquet/nation.dict-malformed.parquet.columns
deleted file mode 100644
index 34513a1a8e24..000000000000
--- a/tests/queries/0_stateless/data_parquet/nation.dict-malformed.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`nation_key` Nullable(Int32), `name` Nullable(String), `region_key` Nullable(Int32), `comment_col` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/nested_lists.parquet.columns b/tests/queries/0_stateless/data_parquet/nested_lists.parquet.columns
deleted file mode 100644
index c4ca44432366..000000000000
--- a/tests/queries/0_stateless/data_parquet/nested_lists.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a1` Array(Array(Array(UInt32))), `a2` Array(Array(Array(String))), `a3` Array(Array(Nullable(UInt32))), `a4` Array(Array(Nullable(String)))
diff --git a/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
deleted file mode 100644
index 99310769309f..000000000000
--- a/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a` Array(Array(Array(Nullable(String)))), `b` Nullable(Int32)
diff --git a/tests/queries/0_stateless/data_parquet/nested_maps.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/nested_maps.snappy.parquet.columns
deleted file mode 100644
index eef66ae66c72..000000000000
--- a/tests/queries/0_stateless/data_parquet/nested_maps.snappy.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a` Map(String, Map(Int32, Nullable(UInt8))), `b` Nullable(Int32), `c` Nullable(Float64)
diff --git a/tests/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet.columns b/tests/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet.columns
deleted file mode 100644
index 5a0c330c88f8..000000000000
--- a/tests/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`c0` Nullable(Int64), `c1` Nullable(String), `v11` Nullable(Float64)
diff --git a/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns b/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
deleted file mode 100644
index 3eafbc1bb023..000000000000
--- a/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`ID` Nullable(Int64), `Int_Array` Array(Nullable(Int32)), `int_array_array` Array(Array(Nullable(Int32))), `Int_Map` Map(String, Nullable(Int32)), `int_map_array` Array(Map(String, Nullable(Int32))), `nested_Struct` Tuple(Nullable(Int32), Array(Nullable(Int32)), Tuple(Array(Array(Tuple(Nullable(Int32), Nullable(String))))), Map(String, Tuple(Tuple(Array(Nullable(Float64))))))
diff --git a/tests/queries/0_stateless/data_parquet/not_utc.parquet b/tests/queries/0_stateless/data_parquet/not_utc.parquet
new file mode 100644
index 000000000000..66de04100e63
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/not_utc.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns b/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
deleted file mode 100644
index f8e51d8b43a7..000000000000
--- a/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`id` Nullable(Int64), `int_array` Array(Nullable(Int32)), `int_array_Array` Array(Array(Nullable(Int32))), `int_map` Map(String, Nullable(Int32)), `int_Map_Array` Array(Map(String, Nullable(Int32))), `nested_struct` Tuple(Nullable(Int32), Array(Nullable(Int32)), Tuple(Array(Array(Tuple(Nullable(Int32), Nullable(String))))), Map(String, Tuple(Tuple(Array(Nullable(Float64))))))
diff --git a/tests/queries/0_stateless/data_parquet/nullable_list.parquet.columns b/tests/queries/0_stateless/data_parquet/nullable_list.parquet.columns
deleted file mode 100644
index 2f308030da64..000000000000
--- a/tests/queries/0_stateless/data_parquet/nullable_list.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a1` Array(Nullable(UInt32)), `a2` Array(Nullable(String)), `a3` Array(Nullable(Decimal(4, 2)))
diff --git a/tests/queries/0_stateless/data_parquet/nulls.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/nulls.snappy.parquet.columns
deleted file mode 100644
index 6e723ef72c37..000000000000
--- a/tests/queries/0_stateless/data_parquet/nulls.snappy.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`b_struct` Tuple(Nullable(Int32))
diff --git a/tests/queries/0_stateless/data_parquet/single_nan.parquet.columns b/tests/queries/0_stateless/data_parquet/single_nan.parquet.columns
deleted file mode 100644
index f2bb48365be9..000000000000
--- a/tests/queries/0_stateless/data_parquet/single_nan.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`mycol` Nullable(Float64)
diff --git a/tests/queries/0_stateless/data_parquet/userdata1.parquet.columns b/tests/queries/0_stateless/data_parquet/userdata1.parquet.columns
deleted file mode 100644
index 93e617f04670..000000000000
--- a/tests/queries/0_stateless/data_parquet/userdata1.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`registration_dttm` Nullable(Int64), `id` Nullable(Int32), `first_name` Nullable(String), `last_name` Nullable(String), `email` Nullable(String), `gender` Nullable(String), `ip_address` Nullable(String), `cc` Nullable(String), `country` Nullable(String), `birthdate` Nullable(String), `salary` Nullable(Float64), `title` Nullable(String), `comments` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/userdata2.parquet.columns b/tests/queries/0_stateless/data_parquet/userdata2.parquet.columns
deleted file mode 100644
index 93e617f04670..000000000000
--- a/tests/queries/0_stateless/data_parquet/userdata2.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`registration_dttm` Nullable(Int64), `id` Nullable(Int32), `first_name` Nullable(String), `last_name` Nullable(String), `email` Nullable(String), `gender` Nullable(String), `ip_address` Nullable(String), `cc` Nullable(String), `country` Nullable(String), `birthdate` Nullable(String), `salary` Nullable(Float64), `title` Nullable(String), `comments` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/userdata3.parquet.columns b/tests/queries/0_stateless/data_parquet/userdata3.parquet.columns
deleted file mode 100644
index 93e617f04670..000000000000
--- a/tests/queries/0_stateless/data_parquet/userdata3.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`registration_dttm` Nullable(Int64), `id` Nullable(Int32), `first_name` Nullable(String), `last_name` Nullable(String), `email` Nullable(String), `gender` Nullable(String), `ip_address` Nullable(String), `cc` Nullable(String), `country` Nullable(String), `birthdate` Nullable(String), `salary` Nullable(Float64), `title` Nullable(String), `comments` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/userdata4.parquet.columns b/tests/queries/0_stateless/data_parquet/userdata4.parquet.columns
deleted file mode 100644
index 93e617f04670..000000000000
--- a/tests/queries/0_stateless/data_parquet/userdata4.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`registration_dttm` Nullable(Int64), `id` Nullable(Int32), `first_name` Nullable(String), `last_name` Nullable(String), `email` Nullable(String), `gender` Nullable(String), `ip_address` Nullable(String), `cc` Nullable(String), `country` Nullable(String), `birthdate` Nullable(String), `salary` Nullable(Float64), `title` Nullable(String), `comments` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/userdata5.parquet.columns b/tests/queries/0_stateless/data_parquet/userdata5.parquet.columns
deleted file mode 100644
index 93e617f04670..000000000000
--- a/tests/queries/0_stateless/data_parquet/userdata5.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`registration_dttm` Nullable(Int64), `id` Nullable(Int32), `first_name` Nullable(String), `last_name` Nullable(String), `email` Nullable(String), `gender` Nullable(String), `ip_address` Nullable(String), `cc` Nullable(String), `country` Nullable(String), `birthdate` Nullable(String), `salary` Nullable(Float64), `title` Nullable(String), `comments` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet.columns b/tests/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet.columns
deleted file mode 100644
index 3f152e350018..000000000000
--- a/tests/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`carat` Nullable(Float64), `depth` Nullable(Float64), `table` Nullable(Float64), `price` Nullable(Int64), `x` Nullable(Float64), `y` Nullable(Float64), `z` Nullable(Float64), `cut` Nullable(String), `color` Nullable(String), `clarity` Nullable(String)
diff --git a/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns b/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
deleted file mode 100644
index c6d754f04c7d..000000000000
--- a/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`a` Nullable(Int64), `b` Nullable(Float64), `c` Nullable(DateTime('Asia/Istanbul')), `index` Nullable(String), `__index_level_1__` Nullable(DateTime('Asia/Istanbul'))
diff --git a/tests/queries/0_stateless/data_parquet/v0.7.1.parquet.columns b/tests/queries/0_stateless/data_parquet/v0.7.1.parquet.columns
deleted file mode 100644
index 57a97f5fce96..000000000000
--- a/tests/queries/0_stateless/data_parquet/v0.7.1.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`carat` Nullable(Float64), `cut` Nullable(String), `color` Nullable(String), `clarity` Nullable(String), `depth` Nullable(Float64), `table` Nullable(Float64), `price` Nullable(Int64), `x` Nullable(Float64), `y` Nullable(Float64), `z` Nullable(Float64), `__index_level_0__` Nullable(Int64)
diff --git a/tests/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet.columns b/tests/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet.columns
deleted file mode 100644
index 50b4cb1dfbc4..000000000000
--- a/tests/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet.columns
+++ /dev/null
@@ -1 +0,0 @@
-`carat` Nullable(Float64), `depth` Nullable(Float64), `table` Nullable(Float64), `price` Nullable(Int64), `x` Nullable(Float64), `y` Nullable(Float64), `z` Nullable(Float64), `cut` Nullable(String), `__index_level_1__` Nullable(String), `clarity` Nullable(String)
diff --git a/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py b/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
deleted file mode 100755
index 1b35174af0f3..000000000000
--- a/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import sys
-
-TYPE_PARQUET_CONVERTED_TO_CLICKHOUSE = {
-    "TIMESTAMP_MICROS": "DateTime('Asia/Istanbul')",
-    "TIMESTAMP_MILLIS": "DateTime('Asia/Istanbul')",
-    "UTF8": "String",
-}
-
-TYPE_PARQUET_PHYSICAL_TO_CLICKHOUSE = {
-    "BOOLEAN": "UInt8",
-    "INT32": "Int32",
-    "INT64": "Int64",
-    "FLOAT": "Float32",
-    "DOUBLE": "Float64",
-    "BYTE_ARRAY": "String",
-    "INT96": "Int64",  # TODO!
-}
-
-
-def read_file(filename):
-    with open(filename, "rb") as f:
-        return f.read().decode("raw_unicode_escape")
-
-
-def get_column_name(column):
-    return column["Name"].split(".", 1)[0]
-
-
-def resolve_clickhouse_column_type(column):
-    column_name = get_column_name(column)
-    logical_type = column.get("LogicalType", {})
-    converted_type = column.get("ConvertedType", "").upper()
-    physical_type = column.get("PhysicalType", "").upper()
-    if logical_type and logical_type.get("Type", "").upper() == "DECIMAL":
-        precision = int(logical_type["precision"])
-        scale = int(logical_type["scale"])
-        if precision < 1 or precision > 76:
-            raise RuntimeError(
-                "Column {} has invalid Decimal precision {}".format(
-                    column_name, precision
-                )
-            )
-        if precision > 38:
-            raise RuntimeError(
-                "Column {} has unsupported Decimal precision {}".format(
-                    column_name, precision
-                )
-            )
-        if scale < 0 or scale > precision:
-            raise RuntimeError(
-                "Column {} has invalid Decimal scale {} for precision {}".format(
-                    column_name, scale, precision
-                )
-            )
-        return "Decimal({}, {})".format(precision, scale)
-    if converted_type and converted_type != "NONE":
-        result_type = TYPE_PARQUET_CONVERTED_TO_CLICKHOUSE.get(converted_type)
-        if result_type:
-            return result_type
-        raise RuntimeError(
-            "Column {} has unknown ConvertedType: {}".format(
-                column_name, converted_type
-            )
-        )
-    if physical_type and physical_type != "NONE":
-        result_type = TYPE_PARQUET_PHYSICAL_TO_CLICKHOUSE.get(physical_type)
-        if result_type:
-            return result_type
-        raise RuntimeError(
-            "Column {} has unknown PhysicalType: {}".format(column_name, physical_type)
-        )
-    raise RuntimeError(
-        "Column {} has invalid types: ConvertedType={}, PhysicalType={}".format(
-            column_name, converted_type, physical_type
-        )
-    )
-
-
-def dump_columns(obj):
-    descr_by_column_name = {}
-    columns_descr = []
-    for column in obj["Columns"]:
-        column_name = get_column_name(column)
-        column_type = resolve_clickhouse_column_type(column)
-        result_type = "Nullable({})".format(column_type)
-        if column_name in descr_by_column_name:
-            descr = descr_by_column_name[column_name]
-            descr["types"].append(result_type)
-        else:
-            descr = {
-                "name": column_name,
-                "types": [result_type],
-            }
-            descr_by_column_name[column_name] = descr
-            columns_descr.append(descr)
-
-    # Make tuples from nested types. CH Server doesn't support such Arrow type but it makes Server Exceptions more relevant.
-    def _format_type(types):
-        if len(types) == 1:
-            return types[0]
-        else:
-            return "Tuple({})".format(", ".join(types))
-
-    print(
-        ", ".join(
-            map(
-                lambda descr: "`{}` {}".format(
-                    descr["name"], _format_type(descr["types"])
-                ),
-                columns_descr,
-            )
-        )
-    )
-
-
-def dump_columns_from_file(filename):
-    dump_columns(json.loads(read_file(filename), strict=False))
-
-
-if __name__ == "__main__":
-    filename = sys.argv[1]
-    dump_columns_from_file(filename)
diff --git a/utils/tests-visualizer/index.html b/utils/tests-visualizer/index.html
index b2db5dbed338..09f7ced3c444 100644
--- a/utils/tests-visualizer/index.html
+++ b/utils/tests-visualizer/index.html
@@ -53,7 +53,7 @@
 <pre id="info" class="hide"></pre>
 <h1 id="fail-message" class="hide">Data not load</h1>
 <div id="loading">
-    <img src="https://presentations.clickhouse.com/images/logo.svg">
+    <img src="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTUwIDE1MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMTkgNzIgODItNDhMNzUgOSAxOSA0MnptNSAzIDIzIDE0VjYyem00OSAzNEwxOSA3OHY2MnptMjgtNTIgMjktMTctMjQtMTMtMjggMTd6bTMgN3Y2MGwyOCAxNlY4MHptMi00IDI2IDE1VjQ1eiIgZmlsbD0iIzE5OURDRiIvPjwvc3ZnPg==">
     <h1>Loading (~10 seconds, ~20 MB)</h1>
 </div>
 <canvas id="canvas"></canvas>